diff --git a/Shadowrun3e/README.MD b/Shadowrun3e/README.MD
index cdd0c2a490..cb95447748 100644
--- a/Shadowrun3e/README.MD
+++ b/Shadowrun3e/README.MD
@@ -1,5 +1,38 @@
 # Shadowrun 3rd Edition
 
+## Release Notes 9/28/2021
+
+### changes/bug fixes
+1. Tar Pit ad Tar baby: when using the "execute" button it will roll the Opposed test between the ic ratin and the utility as well as a sensor test.  The resutls of the three rolls will be whispered to the GM.
+2. added chat buttons at the end of melee attack.  Defending character can click on either Defense or Full defense.  The results of the attack test will be passed to the new "defense" roll.  The defense roll will compare successes and determin winner.  Weapon damage and power will be stagged up as per the melee combat rules of srun3e.  If the attacker wins the contest, the defeder will get  Resist buton.
+If "full defense" was chosen, the defender will also be presented with a "dodge" button.  Choosing dodge will roll a melee dodge test and present the player with a "resist" button.  The only differnce between the "Resist" button displayed afer the offense test and the dodge test is that the reults of the dodge are passed to the resist and count towards the resist successes.  If the defender wins the melee contest and they choose "full defence" the roll will result in "Attack Parried".  Else, a "resist" button will be displayed and the attacking character will be able to roll damage resistnace based on the staged up weapon damage and power for the melee weapon currently equipped by the defender.   The chat buttons do not have to be used, regular sheet rolls can still be used i.e. the defender can use the attack button for a melee weapon and then the player that looses the contest can roll a resistance test.  The benefit for the chat buttons is that they reduce the amount of roll queries presented to the players as the data is already sent to the roll. 
+3. fixed bug on matrix wound penalty
+4. added pool tracking for dispel tests
+5. added foci to repeating spells
+6. added button to select and add player to the "operator/rigger" section of the vehicle tab.  Will also update value of control pool and gunnery skill.  Vehicle skill still needs to be updated manually.
+7. resist explosion now asks for distance in meters from explosion and calculates power reduction accordingly.
+8. added chat button after AoE spells.  Any charcter in the range of the spell can click on the button and it will determine attack successes.
+9. added chat button after magic attack ( regular and AoE ) for spell defense for an ally mage/shaman to click on.
+10. added chat button after magic attack or spell defense to resist spell. Resistance is based on attribute if not an elemental spell, in which case resistance is 1/2 impact.
+11. All chat buttons published after magic attack roll template pass the value of the original roll to prepopulate most of the roll questions. 
+12. Resist and Dodge buttons presented after ranged attack roll template will pass value of original roll to dodge and resist rolls.
+13. Added translation tags for all html elements and rolls 
+14. removed the use of case statements
+15. switched from show/hide buttons to tabs for sub tabs
+16. fixed bugs and added opposed roll for Matrix Combat Manuevers
+
+
+### Impact on existing characters.
+none
+
+### Todo
+add knockdown test chat button after melee and ranged attacks.
+add shotgun ammo to ammo type list on repeating ranged weapons.
+add translation to sheet worker rolls.
+add opposition tests with payload for banish rolls
+add opposition tests with payload for spirit control rolls
+
+
 ## Release Notes 9/1/2021
 
 ### changes/bug fixes
diff --git a/Shadowrun3e/shadowrun3e.css b/Shadowrun3e/shadowrun3e.css
index 0329f8fe47..f02005291d 100644
--- a/Shadowrun3e/shadowrun3e.css
+++ b/Shadowrun3e/shadowrun3e.css
@@ -262,6 +262,14 @@ input:checked+.slider:before {
     border-radius: 50%;
 }
 
+.nuyen-total {
+	display: grid;
+	align-items: center;
+    	grid-template-columns: auto auto 1fr;
+	border-bottom: 3px solid black;
+
+}
+
 .karma-max {
 	display: grid;
 	align-items: center;
@@ -357,6 +365,7 @@ input:checked+.slider:before {
     grid-template-columns: 220px;
 }
 
+.show-weaponmod .header,
 .matrix-rating .header {
     font-weight: bold;
 }
@@ -433,7 +442,7 @@ input:checked+.slider:before {
     grid-template-columns: 45px 45px 45px 45px 45px 45px 45px;
 }
 
-.conditionstatus2-attrs span {
+.number-span {
     background-color: white;
     color: black;
     padding: 5px;
@@ -466,6 +475,7 @@ input:checked+.slider:before {
     column-gap: 5px;
 }
 
+.deck-combat-system2 span,
 .deck-memory-used span,
 .dicepool span {
     background-color: white;
@@ -513,6 +523,183 @@ input:checked+.slider:before {
     color: black;
 }
 
+.combat-tabs,
+.magic-tabs {
+	display: grid;
+    	grid-template-columns: auto auto auto auto auto auto auto auto 1fr;
+}
+.spirit-magic-tabs {
+	display: grid;
+    	grid-template-columns: auto auto 1fr;
+}
+.ware-tabs,
+.rigger-tabs,
+.decking-tabs {
+	display: grid;
+    	grid-template-columns: auto auto auto 1fr;
+}
+.gear-tabs {
+	display: grid;
+    	grid-template-columns: auto auto auto auto auto 1fr;
+}
+
+.ware-tabs-cyber,
+.ware-tabs-bio,
+.ware-tabs-nano,
+.combat-tabs-combat,
+.combat-tabs-ranged,
+.combat-tabs-melee,
+.combat-tabs-explosives,
+.combat-tabs-armor,
+.combat-tabs-ammo,
+.rigger-tabs-skills,
+.rigger-tabs-rcdeck,
+.rigger-tabs-subscriber,
+.decking-tabs-skills,
+.decking-tabs-cyberdeck,
+.decking-tabs-frame,
+.decking-tabs-utilities,
+.gear-tabs-gear,
+.gear-tabs-credsticks,
+.gear-tabs-vehiclelist,
+.magic-tabs-spells,
+.magic-tabs-totem,
+.magic-tabs-initiate,
+.magic-tabs-skills,
+.magic-tabs-foci,
+.magic-tabs-adept,
+.magic-tabs-geas,
+.magic-tabs-conjuring,
+.magic-tabs-astral {
+    display: grid;
+    background-color: white;
+    border-bottom: 3px solid black;
+    text-align: center;
+    align-items: center;
+    border-top-right-radius: 10px;
+    border-top-left-radius: 10px;
+    font-size: 18;
+    color: black;
+}
+.tabs-empty {
+	border-bottom: 3px solid black;
+}
+.ware-tabs-switch[value="cyber"]~button.ware-tabs-cyber,
+.ware-tabs-switch[value="bio"]~button.ware-tabs-bio,
+.ware-tabs-switch[value="nano"]~button.ware-tabs-nano,
+.combat-tabs-switch[value="combat"]~button.combat-tabs-combat,
+.combat-tabs-switch[value="ranged"]~button.combat-tabs-ranged,
+.combat-tabs-switch[value="melee"]~button.combat-tabs-melee,
+.combat-tabs-switch[value="explosives"]~button.combat-tabs-explosives,
+.combat-tabs-switch[value="armor"]~button.combat-tabs-armor,
+.combat-tabs-switch[value="ammo"]~button.combat-tabs-ammo,
+.rigger-tabs-switch[value="rigger"]~button.rigger-tabs-skills,
+.rigger-tabs-switch[value="rcdeck"]~button.rigger-tabs-rcdeck,
+.rigger-tabs-switch[value="subscriber"]~button.rigger-tabs-subscriber,
+.decking-tabs-switch[value="decking"]~button.decking-tabs-skills,
+.decking-tabs-switch[value="cyberdeck"]~button.decking-tabs-cyberdeck,
+.decking-tabs-switch[value="frame"]~button.decking-tabs-frame,
+.decking-tabs-switch[value="utilities"]~button.decking-tabs-utilities,
+.gear-tabs-switch[value="gear"]~button.gear-tabs-gear,
+.gear-tabs-switch[value="credsticks"]~button.gear-tabs-credsticks,
+.gear-tabs-switch[value="vehiclelist"]~button.gear-tabs-vehiclelist,
+.magic-tabs-switch[value="spells"]~button.magic-tabs-spells,
+.magic-tabs-switch[value="totem"]~button.magic-tabs-totem,
+.magic-tabs-switch[value="initiate"]~button.magic-tabs-initiate,
+.magic-tabs-switch[value="sorcery"]~button.magic-tabs-skills,
+.magic-tabs-switch[value="foci"]~button.magic-tabs-foci,
+.magic-tabs-switch[value="adept"]~button.magic-tabs-adept,
+.magic-tabs-switch[value="geas"]~button.magic-tabs-geas,
+.magic-tabs-switch[value="conjuring"]~button.magic-tabs-conjuring,
+.magic-tabs-switch[value="astral"]~button.magic-tabs-astral {
+    color: white;
+    font-weight: bold;
+    text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
+    background-color: rgba(192,192,192,.9);
+    font-weight: bold;
+    border-top: 3px solid black;
+    border-left: 3px solid black;
+    border-right: 3px solid black;
+    border-bottom: unset;
+}
+.cyberware,
+.bioware,
+.nanoware,
+.combat-skills,
+.rangedweapons,
+.meleeweapons,
+.explosives,
+.armor,
+.ammo,
+.rigger-rcdeck,
+.vehicle-skills,
+.drones-list,
+.deck-utilities,
+.deck-cyberdeck,
+.deck-skills,
+.gear,
+.credsticks-show,
+.vehicles-list,
+.sorcery-skills,
+.spells-section,
+.fetish-foci,
+.totem,
+.geas,
+.adept-powers,
+.conjuring,
+.magicinitiate,
+.astralattributes {
+	display: none;
+}
+
+.ware-tabs-switch[value="cyber"]~div.cyberware,
+.ware-tabs-switch[value="bio"]~div.bioware,
+.ware-tabs-switch[value="nano"]~div.nanoware,
+.combat-tabs-switch[value="combat"]~div.combat-skills,
+.combat-tabs-switch[value="ranged"]~div.rangedweapons,
+.combat-tabs-switch[value="melee"]~div.meleeweapons,
+.combat-tabs-switch[value="explosives"]~div.explosives,
+.combat-tabs-switch[value="armor"]~div.armor,
+.combat-tabs-switch[value="ammo"]~div.ammo,
+.rigger-tabs-switch[value="rigger"]~div.vehicle-skills,
+.rigger-tabs-switch[value="rcdeck"]~div.rigger-rcdeck,
+.rigger-tabs-switch[value="subscriber"]~div.drones-list,
+.decking-tabs-switch[value="decking"]~div.deck-skills,
+.decking-tabs-switch[value="cyberdeck"]~div.deck-cyberdeck,
+.decking-tabs-switch[value="frame"]~div.deck-cyberdeck,
+.decking-tabs-switch[value="utilities"]~div.deck-utilities,
+.gear-tabs-switch[value="gear"]~div.gear,
+.gear-tabs-switch[value="credsticks"]~div.credsticks-show,
+.gear-tabs-switch[value="vehiclelist"]~div.vehicles-list,
+.magic-tabs-switch[value="spells"]~div.spells-section,
+.magic-tabs-switch[value="totem"]~div.totem,
+.magic-tabs-switch[value="initiate"]~div.magicinitiate,
+.magic-tabs-switch[value="sorcery"]~div.sorcery-skills,
+.magic-tabs-switch[value="foci"]~div.fetish-foci,
+.magic-tabs-switch[value="adept"]~div.adept-powers,
+.magic-tabs-switch[value="geas"]~div.geas,
+.magic-tabs-switch[value="conjuring"]~div.conjuring,
+.magic-tabs-switch[value="astral"]~div.astralattributes {
+	display: block;
+    	border-bottom: 3px solid black;
+    	border-left: 3px solid black;
+    	border-right: 3px solid black;
+    	background-color: rgba(192,192,192,.9);
+    	border-bottom-left-radius: 10px;
+    	border-bottom-right-radius: 10px;
+}
+
+.buttontoggle[value="Frame"]~button.decking-tabs-skills,
+.buttontoggle[value="Frame"]~button.decking-tabs-cyberdeck {
+	display: none;
+}
+
+.buttontoggle[value="NPC"]~button.decking-tabs-frame,
+.buttontoggle[value="Character"]~button.decking-tabs-frame {
+	display: none;
+}
+
+
 .sheet-tabstoggle[value="magic"]+.charsheet {
     background-image: url("https://raw.githubusercontent.com/bahornbeck/img/master/images/nebula2.jpg");
 }
@@ -622,6 +809,7 @@ input:checked+.slider:before {
    color: black;
 }
 
+.spirit-magic-tabs,
 .reaction-spirit,
 .alwaysdisplayed-buttons,
 .critters-only,
@@ -653,6 +841,7 @@ input:checked+.slider:before {
    display: none;
 }
 
+.buttontoggle[value="Spirit"]~div.magic-tabs,
 .buttontoggle[value="Spirit"]~div.hide-spirit-critter,
 .buttontoggle[value="Critter"]~div.hide-spirit-critter,
 .buttontoggle[value="Spirit"]~div.normal-init,
@@ -663,6 +852,7 @@ input:checked+.slider:before {
    display: none;
    }
 
+.buttontoggle[value="Spirit"]~div.spirit-magic-tabs,
 .buttontoggle[value="Spirit"]~div.spells-spirit-status,
 .buttontoggle[value="Spirit"]~div.reaction-spirit,
 .buttontoggle[value="Spirit"]~div.spirittype-info {
@@ -727,8 +917,7 @@ input:checked+.slider:before {
 }
 
 .deck-memory-used,
-.frame-util-used,
-.deck-attributes {
+.frame-util-used {
     padding: 5px;
     background-color: rgba(192,192,192,.9);
     border: 1px solid darkslategray;
@@ -775,6 +964,27 @@ min-width: 0;
     grid-template-columns: 73px 1fr;
 
 }
+.sheet-rolltemplate-conjure div.sheet-conjure-resist-table,
+.sheet-rolltemplate-spell div.sheet-spell-resist-table,
+.sheet-rolltemplate-resistadv div.sheet-spell-resist-table {
+    display: grid;
+    align-items: center;
+    text-align: center;
+    grid-template-columns: auto auto auto auto auto;
+}
+.sheet-rolltemplate-resistadv div.sheet-resist-table {
+    display: grid;
+    align-items: center;
+    text-align: center;
+    grid-template-columns: auto auto auto auto auto auto auto;
+}
+
+.sheet-rolltemplate-spell div.sheet-spell-pool-table {
+    display: grid;
+    align-items: center;
+    text-align: center;
+    grid-template-columns: auto auto; 
+}
 
 .char-attributes {
     display: grid;
@@ -880,8 +1090,17 @@ min-width: 0;
     font-family: 'Pictos';
 }
 
+.pictos-custom-attack,
 .pictos-custom-button {
     font-family: 'Pictos Custom';
+    font-size: 22px;
+    height: 80%;
+    padding-right: unset;
+    padding-left: unset;
+}
+.pictos-custom-attack {
+    padding-top: 4px;
+    padding-bottom: 4px;
 }
 
 .d6-button {
@@ -908,13 +1127,16 @@ min-width: 0;
 .sheet-rolltemplate-vehicle div.sheet-rtcontainer,
 .sheet-rolltemplate-matrix div.sheet-rtcontainer,
 .sheet-rolltemplate-spell div.sheet-rtcontainer,
+.sheet-rolltemplate-conjure div.sheet-rtcontainer,
 .sheet-rolltemplate-init div.sheet-rtcontainer,
 .sheet-rolltemplate-attribute div.sheet-rtcontainer,
 .sheet-rolltemplate-explosive div.sheet-rtcontainer,
 .sheet-rolltemplate-skill div.sheet-rtcontainer,
 .sheet-rolltemplate-adept div.sheet-rtcontainer,
 .sheet-rolltemplate-attack div.sheet-rtcontainer,
-.sheet-rolltemplate-resistance div.sheet-rtcontainer {
+.sheet-rolltemplate-aoe div.sheet-rtcontainer,
+.sheet-rolltemplate-resist div.sheet-rtcontainer,
+.sheet-rolltemplate-resistadv div.sheet-rtcontainer {
     width: 100%;
     border: 3px solid black;
     color: black;
@@ -928,12 +1150,16 @@ min-width: 0;
     color: white;
 }
 
+
+.sheet-rolltemplate-conjure div.sheet-rtheader,
 .sheet-rolltemplate-spell div.sheet-rtheader {
     border-bottom: 3px solid black;
     background-color: olivedrab;
     color: white;
 }
 
+.sheet-rolltemplate-melee div.sheet-rtheader,
+.sheet-rolltemplate-aoe div.sheet-rtheader,
 .sheet-rolltemplate-attack div.sheet-rtheader {
     border-bottom: 3px solid black;
     background-color: red;
@@ -967,7 +1193,8 @@ min-width: 0;
     color: black;
 }
 
-.sheet-rolltemplate-resistance div.sheet-rtheader {
+.sheet-rolltemplate-resist div.sheet-rtheader,
+.sheet-rolltemplate-resistadv div.sheet-rtheader {
     border-bottom: 3px solid black;
     background-color: black;
     color: white;
@@ -979,18 +1206,25 @@ min-width: 0;
     color: black;
 }
 
+.sheet-rolltemplate-spell div.sheet-conjure-resist-table:nth-child(odd),
+.sheet-rolltemplate-spell div.sheet-spell-resist-table:nth-child(odd),
+.sheet-rolltemplate-spell div.sheet-spell-pool-table:nth-child(odd),
 .sheet-rolltemplate-info div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-item div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-vehicle div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-matrix div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-spell div.sheet-rtrow:nth-child(odd),
+.sheet-rolltemplate-conjure div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-init div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-attribute div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-explosive div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-skill div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-adept div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-attack div.sheet-rtrow:nth-child(odd),
-.sheet-rolltemplate-resistance div.sheet-rtrow:nth-child(odd) {
+.sheet-rolltemplate-aoe div.sheet-rtrow:nth-child(odd),
+.sheet-rolltemplate-melee div.sheet-rtrow:nth-child(odd),
+.sheet-rolltemplate-resist div.sheet-rtrow:nth-child(odd),
+.sheet-rolltemplate-resistadv div.sheet-rtrow:nth-child(odd) {
     background-color: white;
 }
 
@@ -998,6 +1232,9 @@ min-width: 0;
 	font-size: 10px;
 }
 
+.sheet-rolltemplate-spell div.sheet-conjure-resist-table:nth-child(even),
+.sheet-rolltemplate-spell div.sheet-spell-resist-table:nth-child(even),
+.sheet-rolltemplate-spell div.sheet-spell-pool-table:nth-child(even),
 .sheet-rolltemplate-item div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-info div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-vehicle div.sheet-rtrow:nth-child(even),
@@ -1008,7 +1245,11 @@ min-width: 0;
 .sheet-rolltemplate-skill div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-adept div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-attack div.sheet-rtrow:nth-child(even),
-.sheet-rolltemplate-resistance div.sheet-rtrow:nth-child(even),
+.sheet-rolltemplate-aoe div.sheet-rtrow:nth-child(even),
+.sheet-rolltemplate-melee div.sheet-rtrow:nth-child(even),
+.sheet-rolltemplate-conjure div.sheet-rtrow:nth-child(even),
+.sheet-rolltemplate-resistadv div.sheet-rtrow:nth-child(odd),
+.sheet-rolltemplate-resist div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-spell div.sheet-rtrow:nth-child(even) {
     background-color: lightgrey;
 }
@@ -1022,7 +1263,11 @@ min-width: 0;
 .sheet-rolltemplate-skill .sheet-numberspan,
 .sheet-rolltemplate-adept .sheet-numberspan,
 .sheet-rolltemplate-spell .sheet-numberspan,
-.sheet-rolltemplate-resistance .sheet-numberspan,
+.sheet-rolltemplate-melee .sheet-numberspan,
+.sheet-rolltemplate-conjure .sheet-numberspan,
+.sheet-rolltemplate-aoe .sheet-numberspan,
+.sheet-rolltemplate-resist .sheet-numberspan,
+.sheet-rolltemplate-resistadv .sheet-numberspan,
 .sheet-rolltemplate-attack .sheet-numberspan{
     background-color: yellow;
     display: inline-block;
@@ -1042,7 +1287,11 @@ min-width: 0;
 .sheet-rolltemplate-skill .inlinerollresult,
 .sheet-rolltemplate-adept .inlinerollresult,
 .sheet-rolltemplate-attack .inlinerollresult,
-.sheet-rolltemplate-resistance .inlinerollresult,
+.sheet-rolltemplate-aoe .inlinerollresult,
+.sheet-rolltemplate-melee .inlinerollresult,
+.sheet-rolltemplate-conjure .inlinerollresult,
+.sheet-rolltemplate-resist .inlinerollresult,
+.sheet-rolltemplate-resistadv .inlinerollresult,
 .sheet-rolltemplate-spell .inlinerollresult {
     display: inline-block;
     min-width: 1.5em;
@@ -1061,7 +1310,11 @@ min-width: 0;
 .sheet-rolltemplate-skill .inlinerollresult.fullcrit,
 .sheet-rolltemplate-adept .inlinerollresult.fullcrit,
 .sheet-rolltemplate-attack .inlinerollresult.fullcrit,
-.sheet-rolltemplate-resistance .inlinerollresult.fullcrit,
+.sheet-rolltemplate-aoe .inlinerollresult.fullcrit,
+.sheet-rolltemplate-melee .inlinerollresult.fullcrit,
+.sheet-rolltemplate-conjure .inlinerollresult.fullcrit,
+.sheet-rolltemplate-resist .inlinerollresult.fullcrit,
+.sheet-rolltemplate-resistadv .inlinerollresult.fullcrit,
 .sheet-rolltemplate-spell .inlinerollresult.fullcrit {
     border: 2px solid #3FB315;
 }
@@ -1076,7 +1329,11 @@ min-width: 0;
 .sheet-rolltemplate-skill .inlinerollresult.fullfail,
 .sheet-rolltemplate-adept .inlinerollresult.fullfail,
 .sheet-rolltemplate-attack .inlinerollresult.fullfail,
-.sheet-rolltemplate-resistance .inlinerollresult.fullfail,
+.sheet-rolltemplate-aoe .inlinerollresult.fullfail,
+.sheet-rolltemplate-melee .inlinerollresult.fullfail,
+.sheet-rolltemplate-conjure .inlinerollresult.fullfail,
+.sheet-rolltemplate-resist .inlinerollresult.fullfail,
+.sheet-rolltemplate-resistadv .inlinerollresult.fullfail,
 .sheet-rolltemplate-spell .inlinerollresult.fullfail {
     border: 2px solid #B31515;
 }
@@ -1091,7 +1348,11 @@ min-width: 0;
 .sheet-rolltemplate-skill .inlinerollresult.importantroll,
 .sheet-rolltemplate-adept .inlinerollresult.importantroll,
 .sheet-rolltemplate-attack .inlinerollresult.importantroll,
-.sheet-rolltemplate-resistance .inlinerollresult.importantroll,
+.sheet-rolltemplate-aoe .inlinerollresult.importantroll,
+.sheet-rolltemplate-melee .inlinerollresult.importantroll,
+.sheet-rolltemplate-conjure .inlinerollresult.importantroll,
+.sheet-rolltemplate-resist .inlinerollresult.importantroll,
+.sheet-rolltemplate-resistadv .inlinerollresult.importantroll,
 .sheet-rolltemplate-spell .inlinerollresult.importantroll {
     border: 2px solid #4A57ED;
 }
@@ -1207,7 +1468,7 @@ min-width: 0;
 
 .spells-status-buttons {
     display: grid;
-    grid-template-columns: 200px 60px 25px 60px 25px 60px 25px 60px 25px 60px 25px;
+    grid-template-columns: 100px 45px 60px 25px 60px 25px 60px 25px 60px 25px 60px 25px;
     align-items: center;
     text-align: end;
     background-color: rgba(192,192,192,.9);
@@ -1220,7 +1481,7 @@ min-width: 0;
 
 .spells-spirit-status {
     display: grid;
-    grid-template-columns: auto auto auto 60px 25px auto 25px 60px 25px 60px 25px;
+    grid-template-columns: auto 45px auto 35px auto 45px auto 35px auto 35px 20px;
     align-items: center;
     text-align: end;
     background-color: rgba(192,192,192,.9);
@@ -1241,15 +1502,17 @@ color:red;
 .magic-spells-row, 
 .magic-spells-table {
     display: grid;
-    grid-template-columns: 105px 70px 45px 35px 53px 50px 85px 63px 45px 45px 73px 30px 1fr;
+    grid-template-columns: 95px 70px 40px 40px 40px 40px 53px 50px 75px 77px 40px 40px 73px 30px 1fr;
     font-size: 10px;
 }
 .sorcery-config {
-    grid-template-columns: auto auto auto auto auto auto;
+    grid-template-columns: 20px auto 30px auto auto 30px auto auto 30px auto auto 30px 20px;
     display: grid;
     background-color: rgba(192,192,192,.9);
     border: 2px solid #fff;
     border-radius: 10px;
+    text-align: right;
+    align-items: center;
 }
 .magic-spells-row {
     box-sizing: border-box;
@@ -1297,17 +1560,10 @@ input[type="checkbox"].hidden-checkbox {
     border-radius: 5px;
 }
 
-.astralattributes {
-    border: 1px solid #fff;
-    padding: 3px;
-    background-color: rgba(192,192,192,.9);
-    border-radius: 5px;
-}
-
 .astralspace {
     display: grid;
     vertical-align: middle;
-    grid-template-columns: 235px 100px 20px 50px 120px 45px 45px 35px;
+    grid-template-columns: 120px 130px 100px 20px 50px 120px 45px 45px 35px;
 }
 .astralspace select{
         vertical-align: middle;
@@ -1317,7 +1573,7 @@ input[type="checkbox"].hidden-checkbox {
 .astralcombat {
     display: grid;
     align-items: center;
-    grid-template-columns: 100px 30px 160px 90px 10px 40px 60px;
+    grid-template-columns: 100px 30px 120px 120px 90px 10px 30px 40px 60px;
 }
 
 .geas-table,
@@ -1325,7 +1581,10 @@ input[type="checkbox"].hidden-checkbox {
     display: grid;
     grid-template-columns: 220px 220px;
 }
-
+.conjuring-table {
+    display: grid;
+    grid-template-columns: 120px 120px 120px 120px 120px 100px 100px 1fr;
+}
 
 .totem-table {
     display: grid;
@@ -1401,7 +1660,6 @@ input.foci-switch:checked~div.fetish-foci {
     grid-template-columns: auto auto auto auto auto;
     border: 2px solid #fff;
     border-radius: 10px;
-    background-color: rgba(192,192,192,.9);
 }
 
 .combat-skills-items {
@@ -1414,12 +1672,12 @@ input.foci-switch:checked~div.fetish-foci {
 .combat-unarmed {
     display: grid;
     align-items: center;
-    grid-template-columns: 180px 80px auto auto auto;
+    text-align: right;
+    grid-template-columns: auto 50px 20px auto auto auto auto 1fr;
     border-bottom: 2px solid #fff;
     border-left: 2px solid #fff;
     border-right: 2px solid #fff;
     border-radius: 10px;
-    background-color: rgba(192,192,192,.9);
 }
 melee-table-row input[type="textarea"],
 .combat-unarmed input[type="textarea"] {
@@ -1435,6 +1693,7 @@ melee-table-row input[type="textarea"],
     grid-template-columns: 50px 225px 210px 100px 90px 150px 1fr;
 }
 
+
 .ranged-table-items {
     font-weight: bold;
     display: grid;
@@ -1457,15 +1716,20 @@ melee-table-row input[type="textarea"],
 	text-align: center;
 	vertical-align: middle;
 }
+.explosives-table-row-bg input[type="number"],
 .explosives-table-row input[type="number"],
 .ranged-table-row input[type="number"] {
   	-moz-appearance: textfield;
 }
+.ranged-table-row-bg input::-webkit-outer-spin-button,
+.ranged-table-row-bg input::-webkit-inner-spin-button,
 .ranged-table-row input::-webkit-outer-spin-button,
 .ranged-table-row input::-webkit-inner-spin-button {
   -webkit-appearance: none;
   margin: 0;
 } 
+
+.ranged-table-row-bg select,
 .ranged-table-row select {
     -webkit-appearance: none;
     -moz-appearance: none;
@@ -1473,10 +1737,14 @@ melee-table-row input[type="textarea"],
     text-overflow: '';
 }
 
+.ranged-table-row-bg {
+    background-color: rgba(192,192,192,.9);
+}
+
+.ranged-table-row-bg,
 .ranged-table-row {
     align-self: center;
     display: grid;
-    background-color: rgba(192,192,192,.9);
     border-left: 2px solid #fff;
     border-right: 2px solid #fff;
     text-align: center;
@@ -1516,16 +1784,22 @@ melee-table-row input[type="textarea"],
     border-top-left-radius: 10px;
 }
 
+.table-top-left-nc,
 .table-top-left {
-    background-color: rgba(192,192,192,.9);
     border: 2px solid #fff;
     text-align: center;
     vertical-align: middle;
     border-top-left-radius: 10px;
 }
-
-.table-top-right {
+.table-top-left {
     background-color: rgba(192,192,192,.9);
+}
+.table-top-left-w {
+    background-color: white;
+}
+.table-top-right-nc,
+.table-top-right-w,
+.table-top-right {
     border-top: 2px solid #fff;
     border-bottom: 2px solid #fff;
     border-right: 2px solid #fff;
@@ -1533,15 +1807,28 @@ melee-table-row input[type="textarea"],
     vertical-align: middle;
     border-top-right-radius: 10px;
 }
-
-.table-top-mid{
+.table-top-right {
     background-color: rgba(192,192,192,.9);
+}
+.table-top-right-w {
+    background-color: white;
+}
+
+.table-top-mid-w,
+.table-top-mid-nc,
+.table-top-mid {
     border-right: 2px solid #fff;
     border-top: 2px solid #fff;
     border-bottom: 2px solid #fff;
     text-align: center;
     vertical-align: middle;
 }
+.table-top-white {
+    background-color: white;
+}
+.table-top-mid {
+    background-color: rgba(192,192,192,.9);
+}
 .table-bottom{
     background-color: rgba(192,192,192,.9);
     border-top: 2px solid #fff;
@@ -1549,14 +1836,17 @@ melee-table-row input[type="textarea"],
     vertical-align: middle;
 }
 
+.table-item-left-nc,
 .table-item-left { 
-    background-color: rgba(192,192,192,.9);
     border-left: 2px solid #fff;
     border-bottom: 2px solid #fff;
     border-right: 2px solid #fff;
     text-align: center;
     vertical-align: middle;
 }
+.table-item-left { 
+    background-color: rgba(192,192,192,.9);
+}
 .table-item {
     display: flex;
     align-items: center;
@@ -1655,10 +1945,9 @@ melee-table-row input[type="textarea"],
     border-bottom-right-radius: 10px;
 }
 
-.armor {
+.armor-headers {
     display: grid;
-    background-color: rgba(192,192,192,.9);
-    grid-template-columns: 120px 35px 70px 35px 70px 35px 160px 180px 120px;
+    grid-template-columns: auto 35px auto 35px auto 35px auto 35px auto 35px auto 25px;
     text-align: right;
     align-items: center;
     border: 2px solid #fff;
@@ -1674,7 +1963,6 @@ melee-table-row input[type="textarea"],
 }
 .armorsets-table-row {
     display: grid;
-    background-color: rgba(192,192,192,.9);
     text-align: center;
     border-left: 2px solid #fff;
     border-right: 2px solid #fff;
@@ -1689,7 +1977,6 @@ melee-table-row input[type="textarea"],
 }
 .ammo-table-row {
     display: grid;
-    background-color: rgba(192,192,192,.9);
     border-left: 2px solid #fff;
     border-right: 2px solid #fff;
     grid-template-columns: 230px 70px 70px 1fr;
@@ -1699,7 +1986,7 @@ melee-table-row input[type="textarea"],
     display: grid;
     font-weight: bold;
     font-size: 10px;
-    grid-template-columns: 50px 100px 60px 100px 50px 45px 45px 50px 60px 40px 1fr;
+    grid-template-columns: 50px 100px 60px 100px 50px 45px 45px 50px 60px 40px 40px 1fr;
 }
 .weaponfocus-attributes {
     display: grid;
@@ -1711,7 +1998,7 @@ melee-table-row input[type="textarea"],
     border-bottom-left-radius: 10px;
     border-bottom-right-radius: 10px;
     text-align: center;
-    grid-template-columns: 50px 100px 60px 100px 50px 45px 45px 50px 60px 40px 1fr;
+    grid-template-columns: 50px 100px 60px 100px 50px 45px 45px 50px 60px 40px 40px 1fr;
 }
 
 .melee-table-header {
@@ -1720,13 +2007,12 @@ melee-table-row input[type="textarea"],
     font-size: 10px;
     grid-template-columns: 50px 100px 100px 50px 45px 45px 50px 60px 60px 40px 1fr;
 }
-
+.weaponfocus,
 .melee-table-row {
     align-content: center;
     display: grid;
     font-size: 10px;
     border-left: 2px solid #fff;
-    background-color: rgba(192,192,192,.9);
     border-right: 2px solid #fff;
     text-align: center;
     grid-template-columns: 50px 100px 100px 50px 45px 45px 50px 60px 60px 40px 1fr;
@@ -1737,17 +2023,20 @@ melee-table-row input[type="textarea"],
     font-weight: bold;
     display: grid;
     font-size: 10px;
-    grid-template-columns: 110px 100px 55px 40px 40px 40px 40px 40px 45px 70px 35px 40px 40px 40px 45px 45px 1fr;
+    grid-template-columns: 100px 100px 55px 40px 40px 50px 50px 50px 45px 55px 35px 40px 40px 40px 45px 45px 1fr
 }
 
+.explosives-table-row-bg {
+    background-color: rgba(192,192,192,.9);
+}
+.explosives-table-row-bg,
 .explosives-table-row {
     text-align: center;
     display: grid;
     border-left: 2px solid #fff;
-    background-color: rgba(192,192,192,.9);
     border-right: 2px solid #fff;
     font-size: 10px;
-    grid-template-columns: 110px 100px 55px 40px 40px 40px 40px 40px 45px 70px 35px 40px 40px 40px 45px 45px 1fr;
+    grid-template-columns: 100px 100px 55px 40px 40px 50px 50px 50px 45px 55px 35px 40px 40px 40px 45px 45px 1fr
 }
 
 .explosive-mods-switch {
@@ -1775,22 +2064,6 @@ melee-table-row input[type="textarea"],
     margin-bottom: unset;
 }
 
-.mediumselect3 {
-    width: 100%;
-    height: inherit;
-    font-size: 10px;
-}
-
-.smallselect2 {
-    width: 60px;
-    font-size: 10px;
-}
-
-.smallselect {
-    width: 40px;
-    font-size: 10px;
-}
-
 .charsheet input[type=text] {
     width: 100%;
     height: 100%;
@@ -1895,13 +2168,6 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
     grid-template-columns: 140px 140px 130px 70px 110px 90px 1fr;
     font-size: 14px;
 }
-.combat-modifiers-total span {
-    background-color: white;
-    color: black;
-    padding-left: 5px;
-    padding-right: 5px;
-    border: 1px solid #000000;
-}
 
 .combat-conditions {
     text-align: center;
@@ -1966,7 +2232,6 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
     border-left: 2px solid #fff;
     border-right: 2px solid #fff;
     border-radius: 10px;
-    background-color: rgba(192,192,192,.9);
    display: grid;
    align-self: center;
    grid-template-columns: 130px 55px 130px 55px 95px 55px;
@@ -2082,7 +2347,7 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 .vehicle-driver {
     align-items: center;
     display: grid;
-    grid-template-columns: 50px 1fr;
+    grid-template-columns: 50px 1fr 20px;
 }
 
 .vehicle-quickstats{
@@ -2263,12 +2528,21 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 
 .deck-combat-system {
     display: grid;
-    vertical-align: middle;
     align-items: center;
     text-align: right;
-    grid-template-columns: 140px 65px 20px 20px 50px 20px 20px 50px 20px 20px 30px 20px 20px 50px 20px;
+    grid-template-columns: auto 20px 30px 20px 20px 70px 20px 70px 20px 70px 20px 70px 20px 70px 20px 1fr;
+}
+.deck-combat-system2 {
+    display: grid;
+    align-items: center;
+    text-align: right;
+    grid-template-columns: auto 20px 20px auto 20px 20px auto 20px 20px auto 20px 20px auto 20px 20px auto 20px 20px auto 20px 1fr;
+ }
+.hack-pool-option {
+    display: grid;
+    align-items: center;
+    grid-template-columns: auto 20px 1fr;
 }
-
 .deck-summary-attributes {
     display: grid;
     grid-template-columns: 65px 25px 50px 50px 50px;
@@ -2277,7 +2551,9 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 
 .deck-memory-used {
     display: grid;
-    grid-template-columns: 150px 60px 100px 150px 180px 180px;
+    text-align: right;
+    align-items: center;
+    grid-template-columns: auto 25px 20px auto auto auto auto 20px auto auto 20px auto auto 20px auto auto 1fr;
 }
 
 .frame-util-used {
@@ -2294,6 +2570,15 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
    padding-right: 5px;
 }
 
+.matrix-status[value="out"] ~.matrix-status {
+	background: green;
+	color: white;
+}
+.matrix-status[value="in"] ~.matrix-status {
+	background: red;
+	color: white;
+}
+
 .taskpool-over[value="1"] ~ .taskpool-over,
 .astralpool-over[value="1"] ~ .astralpool-over,
 .controlpool-over[value="1"] ~ .controlpool-over,
@@ -2307,11 +2592,6 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
     background-color: red;
 }
 
-.deck-utilities {
-    display: grid;
-    padding: 2px;
-    /* grid-template-columns: 350px 350px; */
-}
 
 .frame-attributes {
     display: grid;
@@ -2384,19 +2664,9 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 .manual-gunnery-tn[value="0"]~button.gunneryswitch {
     background-color: green;
 }
-.weaponfocus-show[value="false"]~div.weaponfocus {
+.weaponfocus-show[value="false"]~div.show-weaponfocus-melee {
     display: none;
 }
-.armor-show,
-.armor-hide,
-.ammo-show,
-.ammo-hide,
-.explosives-show,
-.explosives-hide,
-.meleeweapons-show,
-.meleeweapons-hide,
-.rangedweapons-show,
-.rangedweapons-hide,
 .vehicle-stats-show,
 .vehicle-stats-hide,
 .drone-list-show,
@@ -2411,99 +2681,64 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 .manual-gunnery-mods,
 .manual-gunnery-show,
 .manual-gunnery-hide,
-.deck-utilities-show,
-.deck-utilities-hide,
-.deck-skills-show,
-.deck-skills-hide,
-.deck-cyberdeck-show,
-.deck-cyberdeck-hide,
 .securitysheaf-show,
 .securitysheaf-hide,
-.combatskills-show,
-.combatskills-hide,
 .vehicle-skills-show,
 .vehicle-skills-hide,
 .rc-deck-show,
 .rc-deck-hide,
-.foci-show,
-.foci-hide,
-.totem-show,
-.totem-hide,
-.magicinitiate-show,
-.magicinitiate-hide,
-.geas-show,
-.geas-hide,
-.adeptpowers-show,
-.adeptpowers-hide,
-.spells-show,
-.spells-hide,
-.astralattributes-show,
-.astralattributes-hide,
-.sorceryskills-show,
 .sorceryskills-hide {
     display: none;
 }
 
+.vehicle-stats-switch[value="show"]~div.vehicle-stats-hide,
+.vehicle-stats-switch[value="hide"]~div.vehicle-stats-show,
+.vehicle-condition-switch[value="show"]~div.vehicle-condition-hide,
+.vehicle-condition-switch[value="hide"]~div.vehicle-condition-show,
+.rc-condition-switch[value="show"]~div.rc-condition-hide,
+.rc-condition-switch[value="hide"]~div.rc-condition-show,
+.gunnery-switch[value="show"]~div.manual-gunnery-hide,
+.gunnery-switch[value="hide"]~div.manual-gunnery-show {
+    display: block;
+}
+
+.ic-switch[value="show"]~div.ic-hide,
+.ic-switch[value="hide"]~div.ic-show,
 .armor-switch[value="hide"]~div.armor-hide,
 .armor-switch[value="show"]~div.armor-show,
 .ammo-switch[value="hide"]~div.ammo-hide,
 .ammo-switch[value="show"]~div.ammo-show,
 .explosives-switch[value="hide"]~div.explosives-hide,
 .explosives-switch[value="show"]~div.explosives-show,
-.meleeweapons-switch[value="hide"]~div.meleeweapons-hide,
-.meleeweapons-switch[value="show"]~div.meleeweapons-show,
 .rangedweapons-switch[value="hide"]~div.rangedweapons-hide,
 .rangedweapons-switch[value="show"]~div.rangedweapons-show,
-.vehicle-stats-switch[value="show"]~div.vehicle-stats-hide,
-.vehicle-stats-switch[value="hide"]~div.vehicle-stats-show,
-.drone-list-switch[value="show"]~div.drone-list-hide,
-.drone-list-switch[value="hide"]~div.drone-list-show,
-.vehicle-condition-switch[value="show"]~div.vehicle-condition-hide,
-.vehicle-condition-switch[value="hide"]~div.vehicle-condition-show,
-.rc-condition-switch[value="show"]~div.rc-condition-hide,
-.rc-condition-switch[value="hide"]~div.rc-condition-show,
-.rc-deck-switch[value="show"]~div.rc-deck-hide,
-.rc-deck-switch[value="hide"]~div.rc-deck-show,
+.meleeweapons-switch[value="hide"]~div.meleeweapons-hide,
+.meleeweapons-switch[value="show"]~div.meleeweapons-show,
+.combatskills-switch[value="show"]~div.combatskills-hide,
+.combatskills-switch[value="hide"]~div.combatskills-show,
 .vehicle-skills-switch[value="show"]~div.vehicle-skills-hide,
 .vehicle-skills-switch[value="hide"]~div.vehicle-skills-show,
-.ic-switch[value="show"]~div.ic-hide,
-.ic-switch[value="hide"]~div.ic-show,
-.gunnery-switch[value="show"]~div.manual-gunnery-hide,
-.gunnery-switch[value="hide"]~div.manual-gunnery-show,
+.rc-deck-switch[value="show"]~div.rc-deck-hide,
+.rc-deck-switch[value="hide"]~div.rc-deck-show,
+.drone-list-switch[value="show"]~div.drone-list-hide,
+.drone-list-switch[value="hide"]~div.drone-list-show,
 .deck-utilities-switch[value="show"]~div.deck-utilities-hide,
 .deck-utilities-switch[value="hide"]~div.deck-utilities-show,
-.deck-skills-switch[value="show"]~div.deck-skills-hide,
-.deck-skills-switch[value="hide"]~div.deck-skills-show,
 .deck-cyberdeck-switch[value="show"]~div.deck-cyberdeck-hide,
 .deck-cyberdeck-switch[value="hide"]~div.deck-cyberdeck-show,
 .securitysheaf-switch[value="show"]~div.securitysheaf-hide,
 .securitysheaf-switch[value="hide"]~div.securitysheaf-show,
-.combatskills-switch[value="show"]~div.combatskills-hide,
-.combatskills-switch[value="hide"]~div.combatskills-show,
-.totem-switch[value="show"]~div.totem-hide,
-.totem-switch[value="hide"]~div.totem-show,
-.geas-switch[value="show"]~div.geas-hide,
-.geas-switch[value="hide"]~div.geas-show,
-.magicinitiate-switch[value="show"]~div.magicinitiate-hide,
-.magicinitiate-switch[value="hide"]~div.magicinitiate-show,
-.foci-switch[value="show"]~div.foci-hide,
-.foci-switch[value="hide"]~div.foci-show,
-.adeptpowers-switch[value="show"]~div.adeptpowers-hide,
-.adeptpowers-switch[value="hide"]~div.adeptpowers-show,
-.spells-switch[value="show"]~div.spells-hide,
-.spells-switch[value="hide"]~div.spells-show,
-.sorceryskills-switch[value="show"]~div.sorceryskills-hide,
-.sorceryskills-switch[value="hide"]~div.sorceryskills-show,
-.astralattributes-switch[value="show"]~div.astralattributes-hide,
-.astralattributes-switch[value="hide"]~div.astralattributes-show {
-    display: block;
+.deck-skills-switch[value="show"]~div.deck-skills-hide,
+.deck-skills-switch[value="hide"]~div.deck-skills-show {
+    display: grid;
+    grid-template-columns: auto 60px 1fr;
 }
 
-.ammo-switch[value="hide"]~div.ammo-show,
-.armor-switch[value="hide"]~div.armor-show,
-.explosives-switch[value="hide"]~div.explosives-show,
-.meleeweapons-switch[value="hide"]~div.meleeweapons-show,
-.rangedweapons-switch[value="hide"]~div.rangedweapons-show,
+.ammo-switch[value="hide"]~div.ammo,
+.armor-switch[value="hide"]~div.armor,
+.explosives-switch[value="hide"]~div.explosives,
+.meleeweapons-switch[value="hide"]~div.meleeweapons,
+.rangedweapons-switch[value="hide"]~div.rangedweapons,
 .vehicle-stats-switch[value="hide"]~div.vehicle-stats,
 .drone-list-switch[value="hide"]~div.drones-list,
 .vehicle-condition-switch[value="hide"]~div.vehicle-condition,
@@ -2514,19 +2749,18 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 .deck-cyberdeck-switch[value="hide"]~div.deck-cyberdeck,
 .securitysheaf-switch[value="hide"]~div.securitysheaf,
 .combatskills-switch[value="hide"]~div.combat-skills,
-.sorceryskills-switch[value="hide"]~div.sorcery-skills,
-.spells-switch[value="hide"]~div.spells-section,
-.astralattributes-switch[value="hide"]~div.astralattributes,
-.totem-switch[value="hide"]~div.totem,
-.geas-switch[value="hide"]~div.geas,
-.foci-switch[value="hide"]~div.fetish-foci,
-.magicinitiate-switch[value="hide"]~div.magicinitiate,
-.adeptpowers-switch[value="hide"]~div.adept-powers,
 .rc-deck-switch[value="hide"]~div.rc-deck,
 .vehicle-skills-switch[value="hide"]~div.vehicle-skills {
     display: none;
 }
 
+.magicinitiate-level {
+    display: grid;
+    grid-template-columns: auto 60px 1fr;
+
+
+}
+
 .charsheet button[type=roll].hidedice-button::before {
     content: '';
 }
@@ -2581,13 +2815,9 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
     border: 1px solid red;
 }
 
-.cyberware-lists{
-    display: grid;
-    grid-template-columns: 580px
-}
 .cyberware-list{
     display: grid;
-    grid-template-columns: 230px 70px 70px 310px;
+    grid-template-columns: 230px 70px 70px 1fr;
 }
 
 .contacts {
@@ -2614,7 +2844,9 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
     	grid-template-columns: 80px 80px 55px 80px 35px 1fr;
 }
 
-.armor header,
+.vehicle-quickstats-border header,
+.vehicle-electronics header,
+.armor-headers header,
 .credsticks header,
 .karma-history header,
 .deck-utilities-special header,
diff --git a/Shadowrun3e/shadowrun3e.html b/Shadowrun3e/shadowrun3e.html
index c9f49fa2fa..3e9b5dd425 100644
--- a/Shadowrun3e/shadowrun3e.html
+++ b/Shadowrun3e/shadowrun3e.html
@@ -1,81 +1,82 @@
 <input type='hidden' class='sheet-tabstoggle' name='attr_sheetTab' />
 <div class="geninfo">
     <div>
-        <div class="SRH2W">General Information</div>
+        <div class="SRH2W" data-i18n="general-info">General Information</div>
         <div class="geninfo-item">
-            <div class="SRH5">Name:</div>
+            <div class="SRH5" data-i18n="name">Name</div>
             <input class="text-mid" type="text" name="attr_character_name" disabled="true">
             <div></div>
             <div></div>
-            <div class="SRH5">Sheet Type:</div>
-            <select name="attr_sheettype" class="largeselect">
-                    <option selected>Character</option>
-                    <option>NPC</option>
-                    <option>Critter</option>
-                    <option>Spirit</option>
-                    <option>Drone</option>
-                    <option>Vehicle</option>
-                    <option>Matrix</option>
-                    <option>Frame</option>
-                </select>
-	    <div></div>
-            <div class="box text-mid"><a class="button" href="#popup1">Import</a></div>
-            <div class="box text-mid"><a class="button" href="#popup2">Export</a></div>
+            <div class="SRH5" data-i18n="sheet-type">Sheet Type:</div>
+            <select name="attr_sheettype" class="largeselect" value="Character">
+                <option data-i18n="character" value="Character" selected>Character</option>
+                <option data-i18n="npc" value="NPC">NPC</option>
+                <option data-i18n="critter" value="Critter">Critter</option>
+                <option data-i18n="spirit" value="Spirit">Spirit</option>
+                <option data-i18n="drone" value="Drone">Drone</option>
+                <option data-i18n="vehicle" value="Vehicle">Vehicle</option>
+                <option data-i18n="matrix" value="Matrix">Matrix</option>
+                <option data-i18n="frame" value="Frame">Frame</option>
+            </select>
+            <div></div>
+            <div class="box text-mid"><a class="button" href="#popup1" data-i18n="import">Import</a><a class="button"
+                    href="#popup2" data-i18n="export">Export</a></div>
+
         </div>
         <input type='hidden' class='buttontoggle' name='attr_sheettype' value="Character" />
         <div class="metatype-info">
-            <div class="SRH5">MetaType:</div><select name="attr_metatype" class="largeselect">
-                    <option selected>Human</option>
-                    <option>Dwarf</option>
-                    <option>Elf</option>
-                    <option>Ork</option>
-                    <option>Troll</option>
-                </select>
-            <div class="SRH5">Age:</div> <input type="number" name="attr_age">
-            <div class="SRH5">Height:</div> <input type='number' name="attr_height">
-            <div class="SRH5">Weight:</div> <input type='number' name="attr_weight" step='0.01'>
+            <div class="SRH5" data-i18n="metatype">MetaType:</div><select name="attr_metatype" class="largeselect">
+                <option value="Human" data-i18n="human" selected>Human</option>
+                <option value="Dwarf" data-i18n="dwarf">Dwarf</option>
+                <option value="Elf" data-i18n="efl">Elf</option>
+                <option value="Ork" data-i18n="ork">Ork</option>
+                <option value="Troll" data-i18n="troll">Troll</option>
+            </select>
+            <div class="SRH5" data-i18n="age">Age:</div> <input type="number" name="attr_age">
+            <div class="SRH5" data-i18n="height">Height:</div> <input type='number' name="attr_height">
+            <div class="SRH5" data-i18n="weight">Weight:</div> <input type='number' name="attr_weight" step='0.01'>
         </div>
         <div class="spirittype-info">
-            <div class="SRH5">Spirit Type: </div>
-                <select id="spirit-type" name="attr_spirit-type" style="largeselect">
-                    <option>Watcher</option>
-                    <optgroup label="Elementals">
-                        <option>Air Elemental</option>
-                        <option>Water Elemental</option>
-                        <option>Earth Elemental</option>
-                        <option>Fire Elemental</option>
-                    </optgroup>
-                    <optgroup label="Spirits of Man">
-                        <option>City Spirit</option>
-                        <option>Field Spirit</option>
-                        <option>Hearth Spirit</option>
-                    </optgroup>
-                    <optgroup label="Spirits of the Land">
-                        <option>Desert Spirit</option>
-                        <option>Forest Spirit</option>
-                        <option>Mountain Spirit</option>
-                        <option>Prairie Spirit</option>
-                    </optgroup>
-                    <optgroup label="Spirits of the Sky">
-                        <option>Mist Spirit</option>
-                        <option>Storm Spirit</option>
-                        <option>Wind Spirit</option>
-                    </optgroup>
-                    <optgroup label="Spirits of the Waters">
-                        <option>Lake Spirit</option>
-                        <option>River Spirit</option>
-                        <option>Sea Spirit</option>
-                    </optgroup>
-                    <optgroup label="Spirits of the Elements">
-                        <option>Gnome</option>
-                        <option>Manitous</option>
-                        <option>Salamander</option>
-                        <option>Sylphs</option>
-                        <option>Ancestor</option>
-                    </optgroup>
-                </select>
-            <div class="SRH5">Force:</div>
-	    <input type="number" name="attr_force">
+            <div class="SRH5" data-i18n="spirit-type">Spirit Type: </div>
+            <select id="spirit-type" name="attr_spirit-type" class="mediumselect2">
+                <option data-i18n="watcher">Watcher</option>
+                <optgroup data-i18n-label="elementals" label="Elementals">
+                    <option data-i18n="air-elemental">Air Elemental</option>
+                    <option data-i18n="water-elemental">Water Elemental</option>
+                    <option data-i18n="earth-elemental">Earth Elemental</option>
+                    <option data-i18n="fire-elemental">Fire Elemental</option>
+                </optgroup>
+                <optgroup data-i18n-label="spirit-of-man" label="Spirits of Man">
+                    <option data-i18n="city-spirit">City Spirit</option>
+                    <option data-i18n="field-spirit">Field Spirit</option>
+                    <option data-i18n="hearth-spirit">Hearth Spirit</option>
+                </optgroup>
+                <optgroup data-i18n-label="spirit-of-land" label="Spirits of the Land">
+                    <option data-i18n="desert-spirit">Desert Spirit</option>
+                    <option data-i18n="forest-spirit">Forest Spirit</option>
+                    <option data-i18n="mountain-spirit">Mountain Spirit</option>
+                    <option data-i18n="prairie-spirit">Prairie Spirit</option>
+                </optgroup>
+                <optgroup data-i18n-label="spirit-of-sky" label="Spirits of the Sky">
+                    <option data-i18n="mist-spirit">Mist Spirit</option>
+                    <option data-i18n="storm-spirit">Storm Spirit</option>
+                    <option data-i18n="wind-spirit">Wind Spirit</option>
+                </optgroup>
+                <optgroup data-i18n-label="spirit-of-water" label="Spirits of the Waters">
+                    <option data-i18n="lake-spirit">Lake Spirit</option>
+                    <option data-i18n="river-spirit">River Spirit</option>
+                    <option data-i18n="sea-spirit">Sea Spirit</option>
+                </optgroup>
+                <optgroup data-i18n-label="spirit-of-elements" label="Spirits of the Elements">
+                    <option data-i18n="gnome">Gnome</option>
+                    <option data-i18n="manitous">Manitous</option>
+                    <option data-i18n="salamander">Salamander</option>
+                    <option data-i18n="sylph">Sylphs</option>
+                    <option data-i18n="ancestor">Ancestor</option>
+                </optgroup>
+            </select>
+            <div class="SRH5" data-i18n="force">Force:</div>
+            <input type="number" name="attr_force">
         </div>
     </div>
     <div><img src="https://raw.githubusercontent.com/bahornbeck/img/master/images/srlogo.png"
@@ -85,16 +86,26 @@
 
 
 <div class="hidden-constants">
+    <input type="hidden" name="attr_rangedTN" value=0>
+    <input type="hidden" name="attr_meleeTN" value=0>
+    <input type="hidden" name="attr_meelereach" value=0>
+    <input type="hidden" name="attr_api-newsheet" value=0>
+    <input type="hidden" name="attr_stun_pen" value=0>
+    <input type="hidden" name="attr_wound_pen" value=0>
+    <input type="hidden" name="attr_meleevizTN" value=0>
+    <input type="hidden" name="attr_rangedvizTN" value=0>
     <input type="hidden" name="attr_iconstatuscode" value=0>
     <input type='hidden' name='attr_gyro-on' value=0 />
+    <input type='hidden' name='attr_armor-on' value=0 />
     <input type='hidden' name='attr_wp-char' value="(@{stun_pen} + @{wound_pen})" />
     <input type='hidden' name='attr_wp-matrix' value="(@{stun_pen} + @{wound_pen} + @{matrix-penalty})" />
     <input type='hidden' name='attr_wp-vehicle'
         value="(@{vehicle-penalty} +@{rccommand-penalty} + @{rcsimsense-penalty} +@{rcsystem-penalty})" />
-    <input type='hidden' name='attr_ask-range' value="?{Range|Short,4|Medium,5|Long,6|Extreme,9}" />
     <button type="action" name="act_init-aug" class="d6-button" title="Augmented Initiative">L</button>
     <button type="action" name="act_endturn" class="d6-button" title="End Combat Turn">L</button>
     <button type="action" name="act_resistroll" class="d6-button" title="Resist Roll">L</button>
+    <button type="action" name="act_resistspell" class="d6-button" title="Resist Spell">L</button>
+    <button type="action" name="act_checkaoe" class="d6-button" title="Check AoE result">L</button>
     <button type="action" name="act_resist-ballistic-normal" class="d6-button"
         title="Resist with Ballistic Armor">L</button>
     <button type="action" name="act_resist-ballistic-half" class="d6-button"
@@ -110,6 +121,10 @@
         title="Attack with primary equipped ranged weapons">L</button>
     <button type="action" name="act_meleeattack-primary" class="d6-button"
         title="Attack with primary equipped melee weapons">L</button>
+    <button type="action" name="act_missed" class="d6-button" title="attack missed">L</button>
+    <button type="action" name="act_spellblocked" class="d6-button" title="spell fully blocked">L</button>
+    <button type="action" name="act_meleedefend" class="d6-button" title="melee defense test">L</button>
+    <button type="action" name="act_meleedefendfull" class="d6-button" title="melee full-defense test">L</button>
     <button type="action" name="act_spiritcontrol" class="d6-button" title="spirit control test">L</button>
     <button type="action" name="act_banishing" class="d6-button" title="banishing test">L</button>
     <button type="action" name="act_summoning" class="d6-button" title="summoning test">L</button>
@@ -128,50 +143,63 @@
     <div class="alwaysdisplayed-buttons">
         <input type='hidden' class='magictype' name='attr_magic-type' value="mage" />
         <input type='hidden' class='sheet-tabstoggle' name='attr_sheetTab' value="character" />
-        <button class="charbutton" type="action" name="act_character" title="Character Attributes and Karma">Attributes</button>
-        <button class="skillsbutton" type="action" name="act_skills" title="Active and Knowledge Skills">Skills</button>
-        <button class="magicbutton" type="action" name="act_magic" title="Magic Skills, Spells, Fetishes, Initiation and Adept Powers">Magic</button>
-        <button class="adeptbutton" type="action" name="act_magic" title="Magic Skills, Spells, Fetishes, Initiation and Adept Powers">Adept</button>
-        <button class="decksbutton" type="action" name="act_decks" title="Computer Skills, Cyberdeck configuration and Utilities">Decking</button>
-        <button class="gearbutton" type="action" name="act_gear" title="Gear, Vehicles and Nuyen">Gear</button>
-        <button class="riggerbutton" type="action" name="act_rigger" title="VCR, Remote Control Deck and Electronic Warfare">Rigger</button>
-        <button class="combatbutton" type="action" name="act_combat" title="Combat Skills and Weapons for Ranged and Melee">Combat</button>
-        <button class="cyberwarebutton" type="action" name="act_cyberware" title="Cyberware, Bioware and Nanotech">Cyberware</button>
-        <button class="contactsbutton" type="action" name="act_contacts" title="Contacts and Lifestyle Notes">Contacts/Lifestyle</button>
-        <button class="karmabutton" type="action" name="act_karma" title="Karma and Karam expenditures">Karma</button>
+        <button class="charbutton" type="action" name="act_character" title="Character Attributes and Karma"
+            data-i18n="attributes">Attributes</button>
+        <button class="skillsbutton" type="action" name="act_skills" title="Active and Knowledge Skills"
+            data-i18n="skills">Skills</button>
+        <button class="magicbutton" type="action" name="act_magic"
+            title="Magic Skills, Spells, Fetishes, Initiation and Adept Powers" data-i18n="magic">Magic</button>
+        <button class="adeptbutton" type="action" name="act_magic"
+            title="Magic Skills, Spells, Fetishes, Initiation and Adept Powers" data-i18n="adept">Adept</button>
+        <button class="decksbutton" type="action" name="act_decks"
+            title="Computer Skills, Cyberdeck configuration and Utilities" data-i18n="decking">Decking</button>
+        <button class="gearbutton" type="action" name="act_gear" title="Gear, Vehicles and Nuyen"
+            data-i18n="gear">Gear</button>
+        <button class="riggerbutton" type="action" name="act_rigger"
+            title="VCR, Remote Control Deck and Electronic Warfare" data-i18n="rigger">Rigger</button>
+        <button class="combatbutton" type="action" name="act_combat"
+            title="Combat Skills and Weapons for Ranged and Melee" data-i18n="combat">Combat</button>
+        <button class="cyberwarebutton" type="action" name="act_cyberware" title="Cyberware, Bioware and Nanotech"
+            data-i18n="cyberware">Cyberware</button>
+        <button class="contactsbutton" type="action" name="act_contacts" title="Contacts and Lifestyle Notes"
+            data-i18n="contacts-lifesytle">Contacts/Lifestyle</button>
+        <button class="karmabutton" type="action" name="act_karma" title="Karma and Karam expenditures"
+            data-i18n="karma">Karma</button>
     </div>
     <div class="critters-only critters-buttons">
         <input type='hidden' class='sheet-tabstoggle' name='attr_sheetTab' value="character" />
-        <button class="charbutton" type="action" name="act_character"
-            title="Character Attributes and Karma">Attributes</button>
+        <button class="charbutton" type="action" name="act_character" title="Character Attributes and Karma"
+            data-i18n="attributes">Attributes</button>
         <button class="combatbutton" type="action" name="act_combat"
-            title="Combat Skills and Weapons for Ranged and Melee">Combat</button>
+            title="Combat Skills and Weapons for Ranged and Melee" data-i18n="combat">Combat</button>
         <button class="critters-powers-button" type="action" name="act_critter-powers"
-            title="Critter Powers and Weaknesses">Powers</button>
-        <button class="magicbutton" type="action" name="act_magic" title="Critter Magic">Magic</button>
+            title="Critter Powers and Weaknesses" data-i18n="powers">Powers</button>
+        <button class="magicbutton" type="action" name="act_magic" title="Critter Magic"
+            data-i18n="magic">Magic</button>
     </div>
     <div class="spirits-only spirits-buttons">
         <input type='hidden' class='sheet-tabstoggle' name='attr_sheetTab' value="character" />
-        <button class="charbutton" type="action" name="act_character" title="Spirit Attributes">Attributes</button>
+        <button class="charbutton" type="action" name="act_character" title="Spirit Attributes"
+            data-i18n="attributes">Attributes</button>
         <button class="critters-powers-button" type="action" name="act_critter-powers"
-            title="Spirit Powers and Weaknesses">Powers</button>
-        <button class="magicbutton" type="action" name="act_magic" title="Spirit Magic">Magic</button>
+            title="Spirit Powers and Weaknesses" data-i18n="powers">Powers</button>
+        <button class="magicbutton" type="action" name="act_magic" title="Spirit Magic" data-i18n="magic">Magic</button>
     </div>
     <input type='hidden' class='sheet-tabstoggle' name='attr_sheetTab' value='character' />
 
     <div class="alwaysdisplayed">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' value="Character" />
         <div class="organism-condition">
-            <div class="SRH3">Condition Monitor</div>
-	    <br>
+            <div class="SRH3" data-i18n="condition-monitor">Condition Monitor</div>
+            <br>
             <div class="conditionstatus">
                 <div></div>
-                <div>Uninjured</div>
-                <div>Light Stun</div>
-                <div>Moderate Stun</div>
-                <div>Serious Stun</div>
-                <div>Unconscious</div>
-                <div>Stun</div>
+                <div data-i18n="uninjured">Uninjured</div>
+                <div data-i18n="light-stun">Light Stun</div>
+                <div data-i18n="moderate-stun">Moderate Stun</div>
+                <div data-i18n="serious-stun">Serious Stun</div>
+                <div data-i18n="unconscious">Unconscious</div>
+                <div data-i18n="stun">Stun</div>
                 <div>
                     <input type="radio" name="attr_stun" value=0 CHECKED>
                 </div>
@@ -191,7 +219,7 @@
                     <input type="radio" name="attr_stun" value=9>
                 </div>
                 <div><input type="radio" name="attr_stun" value=100></div>
-                <div>Physical</div>
+                <div data-i18n="physical">Physical</div>
                 <div>
                     <input type="radio" name="attr_wounds" value=0 CHECKED>
                 </div>
@@ -212,11 +240,11 @@
                 </div>
                 <div><input type="radio" name="attr_wounds" value=100></div>
                 <div></div>
-                <div>Uninjured</div>
-                <div>Light Wound</div>
-                <div>Moderate Wound</div>
-                <div>Serious Wound</div>
-                <div>Unconscious/Dead</div>
+                <div data-i18n="uninjured">Uninjured</div>
+                <div data-i18n="light-wound">Light Wound</div>
+                <div data-i18n="moderate-wound">Moderate Wound</div>
+                <div data-i18n="serious-wound">Serious Wound</div>
+                <div data-i18n="deadly-wound">Deadly Wound</div>
                 <div></div>
 
             </div>
@@ -231,121 +259,143 @@
             <input type="hidden" name="attr_controlpool-used" value=0 />
             <input type="hidden" name="attr_astralpool-used" value=0 />
             <input type="hidden" name="attr_taskpool-used" value=0 />
-            <div class="SRH3">Dice Pools</div>
-            <div>Max</div>
-            <div>Used</div>
-            <div> Combat Pool:</div>
+            <div class="SRH3" data-i18n="dice-pools">Dice Pools</div>
+            <div data-i18n="maxiumum-abreviation">Max</div>
+            <div data-i18n="used">Used</div>
+            <div data-i18n="combat-pool"> Combat Pool:</div>
             <div><span name="attr_combatpool"></span></div>
-            <div><input type='hidden' class='combatpool-over' name='attr_combatpool-over' /><span class="combatpool-over" name="attr_combatpool-used"></span></div>
-            <div> Spell Pool:</div>
+            <div><input type='hidden' class='combatpool-over' name='attr_combatpool-over' /><span
+                    class="combatpool-over" name="attr_combatpool-used"></span></div>
+            <div data-i18n="spell-pool"> Spell Pool:</div>
             <div><span type="number" name="attr_spellpool"></span> </div>
-            <div><input type='hidden' class='spellpool-over' name='attr_spellpool-over' /><span class="spellpool-over" name="attr_spellpool-used-total"></span></div>
-            <div> Hacking Pool:</div>
+            <div><input type='hidden' class='spellpool-over' name='attr_spellpool-over' /><span class="spellpool-over"
+                    name="attr_spellpool-used-total"></span></div>
+            <div data-i18n="hacking-pool"> Hacking Pool:</div>
             <div><span type="number" name="attr_hackingpool"></span> </div>
-            <div><input type='hidden' class='hackingpool-over' name='attr_hackingpool-over' /><span class="hackingpool-over" name="attr_hackingpool-used-total"></span></div>
-            <div> Control Pool:</div>
+            <div><input type='hidden' class='hackingpool-over' name='attr_hackingpool-over' /><span
+                    class="hackingpool-over" name="attr_hackingpool-used-total"></span></div>
+            <div data-i18n="control-pool"> Control Pool:</div>
             <div><span type="number" name="attr_controlpool"></span> </div>
-            <div><input type='hidden' class='controlpool-over' name='attr_controlpool-over' /><span class="controlpool-over" name="attr_controlpool-used"></span></div>
-            <div> Astral Pool:</div>
+            <div><input type='hidden' class='controlpool-over' name='attr_controlpool-over' /><span
+                    class="controlpool-over" name="attr_controlpool-used"></span></div>
+            <div data-i18n="astral-pool"> Astral Pool:</div>
             <div><span type="number" name="attr_astralpool"></span> </div>
-            <div><input type='hidden' class='astralpool-over' name='attr_astralpool-over' /><span class="astralpool-over" name="attr_astralpool-used"></span></div>
-            <div> Task Pool:</div>
+            <div><input type='hidden' class='astralpool-over' name='attr_astralpool-over' /><span
+                    class="astralpool-over" name="attr_astralpool-used"></span></div>
+            <div data-i18n="task-pool"> Task Pool:</div>
             <div><span type="number" name="attr_taskpool"></span> </div>
-            <div><input type='hidden' class='taskpool-over' name='attr_taskpool-over' /><span class="taskpool-over" name="attr_taskpool-used"></span></div>
+            <div><input type='hidden' class='taskpool-over' name='attr_taskpool-over' /><span class="taskpool-over"
+                    name="attr_taskpool-used"></span></div>
         </div>
     </div>
     <div class="conditionstatus2">
-        <div>Physical Damage Overflow:</div>
+        <div data-i18n="physical-damage-overflow">Physical Damage Overflow:</div>
         <div><input type="number" name="attr_overflow" value=0 min=0 /></div>
         <input type='hidden' class='buttontoggle' name='attr_sheettype' value="Character" />
         <div></div>
-        <div class="normal-init text-mid">Init Nat.</div>
+        <div class="normal-init text-mid" data-i18n="initiative-natural">Init Nat.</div>
         <div class="normal-init"><button type="action" name="act_init" class="d6-button" title="Unaugmented Initiative"
                 id="natrualinit">L</button></div>
-        <div class="normal-init text-mid">Init. Aug.</div>
+        <div class="normal-init text-mid" data-i18n="initiative-augmented">Init. Aug.</div>
         <div class="normal-init"><button type="action" name="act_init" class="d6-button" title="Augmented Initiative"
                 id="augmentedinit">L</button></div>
-        <div class="spirits-only text-mid">Init. Phy.</div>
+        <div class="spirits-only text-mid" data-i18n="initiative-physical">Init. Phy.</div>
         <div class="spirits-only"><button type="action" name="act_init" class="d6-button" title="Physical Initiative"
                 id="spiritinit">L</button></div>
-        <div class="spirits-only text-mid">Init. Astr. </div>
+        <div class="spirits-only text-mid" data-i18n="initiative-astral">Init. Astr. </div>
         <div class="spirits-only"><button type="action" name="act_init" class="d6-button" title="Astral Initiative"
                 id="astralinit">L</button></div>
-        <div class="text-mid">End Turn</div>
+        <div class="text-mid" data-i18n="end-turn">End Turn</div>
         <div><button type="action" name="act_endturn" class="d6-button" title="End Combat Turn" id="endturn">L</button>
         </div>
         <div class="conditionstatus2-attrs">
-            <div class="text-mid">B: <span name="attr_body_max"></span></div>
-            <div class="text-mid">Q: <span name="attr_quickness_max"></span></div>
-            <div class="text-mid">S: <span name="attr_strength_max"></span></div>
-            <div class="text-mid">C: <span name="attr_charisma_max"></span></div>
-            <div class="text-mid">I: <span name="attr_intelligence_max"></span></div>
-            <div class="text-mid">W: <span name="attr_willpower_max"></span></div>
-            <div class="text-mid">R: <span name="attr_reaction_max"></span></div>
+            <div class="text-mid"> <span data-i18n="body-abbreviation">B:</span> <span class="number-span"
+                    name="attr_body_max"></span></div>
+            <div class="text-mid"> <span data-i18n="quickness-abbreviation">Q:</span> <span class="number-span"
+                    name="attr_quickness_max"></span></div>
+            <div class="text-mid"> <span data-i18n="strength-abbreviation">S:</span> <span class="number-span"
+                    name="attr_strength_max"></span></div>
+            <div class="text-mid"> <span data-i18n="charisma-abbreviation">C:</span> <span class="number-span"
+                    name="attr_charisma_max"></span></div>
+            <div class="text-mid"> <span data-i18n="intelligence-abbreviation">I:</span> <span class="number-span"
+                    name="attr_intelligence_max"></span></div>
+            <div class="text-mid"> <span data-i18n="willpower-abbreviation">W:</span> <span class="number-span"
+                    name="attr_willpower_max"></span></div>
+            <div class="text-mid"> <span data-i18n="reaction-abbreviation">R:</span> <span class="number-span"
+                    name="attr_reaction_max"></span></div>
         </div>
     </div>
     <div class="combat-always-visible">
-        <div class="SRH3">Combat conditions</div>
+        <div class="SRH3" data-i18n="combat-conditions">Combat conditions</div>
         <div class="combat-modifiers-total">
-            <div class="text-mid">Ranged Modifiers: <span name="attr_rangedTN"></span></div>
-            <div class="text-mid">Melee Modifiers: <span name="attr_meleeTN"></span></div>
-            <div class="text-mid">Rounds Fired: <span name="attr_rounds-phase" value=0></span></div>
-            <div>Dodge<button type="action" name="act_dodge" class="d6-button" title="Dodge Attack"
-                    id="dodge">L</button></div>
-            <div>Ballistic: <span name="attr_ballistic" value=0></span><button type="action" name="act_resistdmg" class="d6-button" title="Resist Damage with Ballistic Armor" id="ballistic">L</button> </div>
-            <div>Impact: <span name="attr_impact" value=0></span><button type="action" name="act_resistdmg" class="d6-button" title="Resist Damage with Impact Armor" id="impact">L</button> </div>
+            <div class="text-mid"><span data-i18n="ranged-modifiers">Ranged Modifiers:</span><span class="number-span"
+                    name="attr_rangedTN"></span></div>
+            <div class="text-mid"><span data-i18n="melee-modifiers">Melee Modifiers:</span> <span class="number-span"
+                    name="attr_meleeTN"></span></div>
+            <div class="text-mid"><span data-i18n="rounds-fired">Rounds Fired:</span> <span class="number-span"
+                    name="attr_rounds-phase" value=0></span></div>
+            <div class="text-mid"><span data-i18n="dodge">Dodge</span><button type="action" name="act_dodge"
+                    class="d6-button" title="Dodge Attack" id="dodge">L</button></div>
+            <div class="text-mid"><span data-i18n="ballistic">Ballistic:</span> <span class="number-span"
+                    name="attr_ballistic" value=0></span><button type="action" name="act_resistdmg" class="d6-button"
+                    title="Resist Damage with Ballistic Armor" id="ballistic">L</button> </div>
+            <div class="text-mid"><span data-i18n="impact">Impact:</span> <span class="number-span" name="attr_impact"
+                    value=0></span><button type="action" name="act_resistdmg" class="d6-button"
+                    title="Resist Damage with Impact Armor" id="impact">L</button> </div>
             <input type='hidden' class='buttontoggle' name='attr_sheettype' />
             <div class="manual-gunnery">
                 <input type='hidden' class='gunnery-switch' name='attr_gunneryswitch' value="show" />
 
                 <div class="manual-gunnery-show">
                     <input type="hidden" class="manual-gunnery-tn" name="attr_manualgunneryTN" value=0>
-                    <button class="gunneryswitch" type="action" name="act_gunneryswitch">Show Manual
-                        Gunnery</button><span name="attr_manualgunneryTN"></span>
+                    <button class="gunneryswitch" type="action" name="act_gunneryswitch"
+                        data-i18n="show-manual-gunnery">Show Manual Gunnery</button><span class="number-span"
+                        name="attr_manualgunneryTN"></span>
                 </div>
                 <div class="manual-gunnery-hide">
                     <input type="hidden" class="manual-gunnery-tn" name="attr_manualgunneryTN" value=0>
-                    <button class="gunneryswitch" type="action" name="act_gunneryswitch">Hide Manual
-                        Gunnery</button><span name="attr_manualgunneryTN"></span>
+                    <button class="gunneryswitch" type="action" name="act_gunneryswitch"
+                        data-i18n="hide-manual-gunnery">Hide Manual Gunnery</button><span class="number-span"
+                        name="attr_manualgunneryTN"></span>
                 </div>
             </div>
         </div>
         <div class="combat-conditions">
-            <div class="text-mid">Visibility</div>
-            <div class="text-mid">Vision Enhacement</div>
-            <div class="text-mid">Target Cover</div>
-            <div class="text-mid">Movement</div>
-            <div>Dual Wield</div>
-            <div>Called Shot</div>
-            <div>Aim Actions</div>
-            <div>Melee Foes</div>
-            <div>Melee Friends</div>
-            <div class="text-mid">Targets</div>
-            <div class="text-mid">Position</div>
-            <div>Misc Modifiers</div>
+            <div class="text-mid" data-i18n="visibility">Visibility</div>
+            <div class="text-mid" data-i18n="vision-enhacement">Vision Enhacement</div>
+            <div class="text-mid" data-i18n="target-cover">Target Cover</div>
+            <div class="text-mid" data-i18n="movement">Movement</div>
+            <div data-i18n="dual-wield">Dual Wield</div>
+            <div data-i18n="called-shot">Called Shot</div>
+            <div data-i18n="aim-actions">Aim Actions</div>
+            <div data-i18n="melee-foes">Melee Foes</div>
+            <div data-i18n="melee-friends">Melee Friends</div>
+            <div class="text-mid" data-i18n="targets">Targets</div>
+            <div class="text-mid" data-i18n="position">Position</div>
+            <div data-i18n="miscellaneous-modifiers">Misc Modifiers</div>
             <div class="center-checkbox"><select name="attr_visibility" class="mediumselect2">
-                    <option value=0 selected>Normal</option>
-                    <option value="@{fulldark}">Full Dark</option>
-                    <option value="@{partiallight}">Partail Light</option>
-                    <option value="@{minlight}">Minimal Light</option>
-                    <option value="@{glare}">Glare</option>
-                    <option value="@{mist}">Mist</option>
-                    <option value="@{lightsmoke}">Light Smoke/Rain</option>
-                    <option value="@{fullsmoke}">Heavy Smoke/Rain</option>
-                    <option value="@{thermalsmoke}">Thermal Smoke</option>
+                    <option data-i18n="normal" value=0 selected>Normal</option>
+                    <option data-i18n="full-dark" value="@{fulldark}">Full Dark</option>
+                    <option data-i18n="partial-light" value="@{partiallight}">Partail Light</option>
+                    <option data-i18n="minimal-light" value="@{minlight}">Minimal Light</option>
+                    <option data-i18n="glare" value="@{glare}">Glare</option>
+                    <option data-i18n="mist" value="@{mist}">Mist</option>
+                    <option data-i18n="light-smoke-rain" value="@{lightsmoke}">Light Smoke/Rain</option>
+                    <option data-i18n="heavy-smoke-rain" value="@{fullsmoke}">Heavy Smoke/Rain</option>
+                    <option data-i18n="thermal-smoke" value="@{thermalsmoke}">Thermal Smoke</option>
                 </select>
             </div>
             <div><select name="attr_visionenhancement" class="mediumselect2">
-                    <option selected>None</option>
-                    <option>LowLight</option>
-                    <option>Thermal</option>
+                    <option data-i18n="none" value="None" selected>None</option>
+                    <option value="LowLight" data-i18n="low-light">LowLight</option>
+                    <option value="Thermal" data-i18n="thermal">Thermal</option>
                 </select></div>
             <div><select name="attr_cover" class="mediumselect2">
-                    <optgroup label="Standard">
+                    <optgroup data-i18n-label="standard" label="Standard">
                         <option value=0 SELECTED>None</option>
-                        <option value=4>Partial</option>
-                        <option value=8>Blind Fire</option>
-                    <optgroup label="GM's Choice">
+                        <option data-i18n="partial" value=4>Partial</option>
+                        <option data-i18n="blind-fire" value=8>Blind Fire</option>
+                    <optgroup data-i18n-label="gm-choice" label="GM's Choice">
                         <option value=1>+1</option>
                         <option value=2>+2</option>
                         <option value=3>+3</option>
@@ -354,11 +404,11 @@
                         <option value=6>+6</option>
                 </select></div>
             <div><select name="attr_move" title="Movement actions taken" class="mediumselect2">
-                    <option selected value=0 selected>not moving</option>
-                    <option value=1>walk</option>
-                    <option value=2>walk (difficult ground)</option>
-                    <option value=4>run</option>
-                    <option value=6>run (difficult ground)</option>s
+                    <option selected value=0 data-i18n="not-moving">not moving</option>
+                    <option value=1 data-i18n="walk">walk</option>
+                    <option value=2 data-i18n="walk-difficult-ground">walk (difficult ground)</option>
+                    <option value=4 data-i18n="run">run</option>
+                    <option value=6 data-i18n="run-difficult-ground">run (difficult ground)</option>s
                 </select></div>
 
             <div class="center-checkbox"><input type='checkbox' name="attr_dualwield" value='2' title="2 Guns Equipped">
@@ -374,9 +424,9 @@
             <div><input type='number' name="attr_meleetargets" value="0" min="0"
                     title="How many targets are you attacking at one time"></div>
             <div><select name="attr_position" title="Position of you vs. target in Melee" class="mediumselect2">
-                    <option value=0 selected>None</option>
-                    <option value=1>Superior Position</option>
-                    <option value=2>Target Prone</option>
+                    <option data-i18n="none" value=0 selected>None</option>
+                    <option data-i18n="superior-position" value=1>Superior Position</option>
+                    <option data-i18n="target-prone" value=2>Target Prone</option>
                 </select></div>
             <div><input type='number' name="attr_misccombatmods" value="0" title="Any other modifiers for combat?">
             </div>
@@ -384,64 +434,64 @@
         <input type='hidden' class='gunnery-switch' name='attr_gunneryswitch' value="show" />
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
         <div class="manual-gunnery-mods">
-            <div>Relative Motion</div>
-            <div>Relative Speed</div>
-            <div>Maneuver Score</div>
-            <div>Vehicle Damage</div>
-            <div>Weapon Mount</div>
-            <div>Terrain</div>
-            <div>Target Type</div>
+            <div data-i18n="relative-motion">Relative Motion</div>
+            <div data-i18n="relative-speed">Relative Speed</div>
+            <div data-i18n="maneuver-score">Maneuver Score</div>
+            <div data-i18n="vehicle-damage">Vehicle Damage</div>
+            <div data-i18n="Weapon-mount">Weapon Mount</div>
+            <div data-i18n="terrain">Terrain</div>
+            <div data-i18n="target-type">Target Type</div>
             <div><select name="attr_gunnerymotion" title="motion relative to target" class="mediumselect2">
                     <option value=0 selected>None</option>
-                    <option value=-1>Towards</option>
-                    <option value=1>Away</option>
+                    <option data-i18n="towards" value=-1>Towards</option>
+                    <option data-i18n="away" value=1>Away</option>
                 </select></div>
             <div><select name="attr_gunneryspeed" title="speed relative to target" class="mediumselect2">
-                    <option value=0 selected>About Equal</option>
-                    <option value=2>Up to 2X</option>
-                    <option value=4>Up to 3X</option>
-                    <option value=6>More than 3X</option>
+                    <option value=0 selected> = </option>
+                    <option value=2> &LT;= 2X</option>
+                    <option value=4> &LT;= 3X</option>
+                    <option value=6> &GT; 3X</option>
                 </select></div>
             <div><select name="attr_gunnerymaneuver" title="Maneuver score difference" class="mediumselect2">
-                    <option value=0 selected>None</option>
-                    <option value=-1>Attacker Greaty by 10</option>
-                    <option value=1>Target Greater by 10</option>
+                    <option data-i18n="none" value=0 selected>None</option>
+                    <option data-i18n="attacker-greater" value=-1>Attacker Greaty by 10</option>
+                    <option data-i18n="target-greater" value=1>Target Greater by 10</option>
                 </select></div>
             <div><select name="attr_gunneryvehicledmg" title="Vehicle Damaged Modifiers" class="mediumselect2">
-                    <option value=0 selected>None</option>
-                    <option value=1>L</option>
-                    <option value=2>M</option>
-                    <option value=3>S</option>
+                    <option data-i18n="none" value=0 selected>None</option>
+                    <option data-i18n="light-damage-abbreviation" value=1>L</option>
+                    <option data-i18n="moderate-damage-abbreviation" value=2>M</option>
+                    <option data-i18n="serious-damage-abbreviation" value=3>S</option>
                 </select></div>
             <div><select name="attr_gunnerymount" title="Is weapon mounted?" class="mediumselect2">
-                    <option value=2>Unmounted</option>
-                    <option value=0 selected>mounted</option>
+                    <option data-i18n="unmounted" value=2>Unmounted</option>
+                    <option data-i18n="mounted" value=0 selected>mounted</option>
                 </select></div>
             <div><select name="attr_gunneryterrain" title="Moving through terrain" class="mediumselect2">
-                    <option value=0 selected>Normal</option>
-                    <option value=2>Restricted</option>
-                    <option value=4>Tight</option>
-                    <option value=2>Combat Zone</option>
+                    <option data-i18n="normal" value=0 selected>Normal</option>
+                    <option data-i18n="restricted" value=2>Restricted</option>
+                    <option data-i18n="tight" value=4>Tight</option>
+                    <option data-i18n="combat-zone" value=2>Combat Zone</option>
                 </select></div>
             <div><select name="attr_gunnerytargettype" title="Target type/size" class="mediumselect2">
-                    <option value=0 selected>Metahuman sized</option>
-                    <option value=1>Small critter</option>
-                    <option value=-1>Large critter</option>
-                    <option value=1>Small drone</option>
-                    <option value=0>Motorcyle</option>
-                    <option value=-1>Automobile</option>
-                    <option value=-1>Limo/Light Truck</option>
-                    <option value=-3>Heavy Truck/Trailer</option>
-                    <option value=-1>Boat</option>
-                    <option value=-3>Yacht</option>
-                    <option value=-8>Freighter/Tanker</option>
-                    <option value=0>Ultralight glider</option>
-                    <option value=-2>Fixed Wing</option>
-                    <option value=-6>Commerical Airliner</option>
-                    <option value=-2>Helicopter</option>
-                    <option value=-6>Zepplin/Blimp</option>
-                    <option value=-3>LAV</option>
-                    <option value=-3>Military Ground Vehicle</option>
+                    <option data-i18n="metahuman-sized" value=0 selected>Metahuman sized</option>
+                    <option data-i18n="small-critter" value=1>Small critter</option>
+                    <option data-i18n="large-critter" value=-1>Large critter</option>
+                    <option data-i18n="small-drone" value=1>Small drone</option>
+                    <option data-i18n="motorcyle" value=0>Motorcyle</option>
+                    <option data-i18n="automobile" value=-1>Automobile</option>
+                    <option data-i18n="limo-Light-truck" value=-1>Limo/Light Truck</option>
+                    <option data-i18n="heavy-truck-trailer" value=-3>Heavy Truck/Trailer</option>
+                    <option data-i18n="boat" value=-1>Boat</option>
+                    <option data-i18n="yacht" value=-3>Yacht</option>
+                    <option data-i18n="freighter-tanker" value=-8>Freighter/Tanker</option>
+                    <option data-i18n="ultralight-glider" value=0>Ultralight glider</option>
+                    <option data-i18n="fixed-wing" value=-2>Fixed Wing</option>
+                    <option data-i18n="commerical-airliner" value=-6>Commerical Airliner</option>
+                    <option data-i18n="helicopter" value=-2>Helicopter</option>
+                    <option data-i18n="zepplin-blimp" value=-6>Zepplin/Blimp</option>
+                    <option data-i18n="lav" value=-3>LAV</option>
+                    <option data-i18n="military-ground-vehicle" value=-3>Military Ground Vehicle</option>
                 </select></div>
         </div>
     </div>
@@ -451,162 +501,163 @@
     <div class="attributes-init">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
         <div>
-            <div class="SRH3">Attributes</div>
+            <div class="SRH3" data-i18n="attributes">Attributes</div>
             <div class="char-attributes">
-                <header class="table-top-left">Attribute</header>
-                <header class="table-top-mid">Base</header>
-                <header class="table-top-mid">Mods</header>
-                <header class="table-top-right">Final</header>
-                <header class="table-item-left">Body</header>
+                <header class="table-top-left" data-i18n="attribute">Attribute</header>
+                <header class="table-top-mid" data-i18n="base">Base</header>
+                <header class="table-top-mid" data-i18n="mods">Mods</header>
+                <header class="table-top-right" data-i18n="final">Final</header>
+                <header class="table-item-left" data-i18n="body">Body</header>
                 <div class="table-item">
                     <input type="number" name="attr_body" value=1 min=1 style='width:39px;' />
-                    <div><button title="Body Test without augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="body">L</button></div>
+                    <div><button data-i18n-title="body-test-natural" title="Body Test without augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="body">L</button></div>
                 </div>
                 <div class="table-item">+<input type="number" name="attr_body-mods" value=0 style='width:39px;' />=
                 </div>
                 <div class="table-item">
                     <span name="attr_body_max"></span>
-                    <div><button title="Body Test with augmentation" class="d6-button" type="action" name="act_attrib"
-                            id="body|max">L</button></div>
+                    <div><button data-i18n-title="body-test-aug" title="Body Test with augmentation" class="d6-button"
+                            type="action" name="act_attrib" id="body|max">L</button></div>
                 </div>
-                <header class="table-item-left">Quickness</header>
+                <header class="table-item-left" data-i18n="quickness">Quickness</header>
                 <div class="table-item">
                     <input type="number" name="attr_quickness" value=1 min=1 style='width:39px;' />
-                    <div><button title="Quickness Test without augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="quickness">L</button></div>
+                    <div><button data-i18n-title="quickness-test-natural" title="Quickness Test without augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="quickness">L</button></div>
                 </div>
                 <div class="table-item">+<input type="number" name="attr_quickness-mods" value=0 style='width:39px;' />=
                 </div>
                 <div class="table-item">
                     <span name="attr_quickness_max"></span>
-                    <div><button title="Quickness Test witht augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="quickness|max">L</button></div>
+                    <div><button data-i18n-title="quickness-test-natural" title="Quickness Test witht augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="quickness|max">L</button></div>
                 </div>
-                <header class="table-item-left">Strength</header>
+                <header class="table-item-left" data-i18n="strength">Strength</header>
                 <div class="table-item">
                     <input type="number" name="attr_strength" value=1 min=1 style='width:39px;' />
-                    <div><button title="Strength Test without augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="strength">L</button></div>
+                    <div><button data-i18n-title="strength-test-natural" title="Strength Test without augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="strength">L</button></div>
                 </div>
                 <div class="table-item">+<input type="number" name="attr_strength-mods" value=0 style='width:39px;' />=
                 </div>
                 <div class="table-item">
                     <span name="attr_strength_max"></span>
-                    <div><button title="Strength Test with augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="strength|max">L</button></div>
+                    <div><button data-i18n-title="strength-test-natural" title="Strength Test with augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="strength|max">L</button></div>
                 </div>
-                <header class="table-item-left">Charisma</header>
+                <header class="table-item-left" data-i18n="charisma">Charisma</header>
                 <div class="table-item">
                     <input type="number" name="attr_Charisma" value=1 min=1 style='width:39px;' />
-                    <div><button title="Charisma Test without augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="charisma">L</button></div>
+                    <div><button data-i18n-title="charisma-test-natural" title="Charisma Test without augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="charisma">L</button></div>
                 </div>
                 <div class="table-item">+<input type="number" name="attr_charisma-mods" value=0 style='width:39px;' />=
                 </div>
                 <div class="table-item">
                     <span name="attr_charisma_max" value=1></span>
-                    <div><button title="Charisma Test with augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="charisma|max">L</button></div>
+                    <div><button data-i18n-title="charisma-test-natural" title="Charisma Test with augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="charisma|max">L</button></div>
                 </div>
-                <header class="table-item-left">Intelligence</header>
+                <header class="table-item-left" data-i18n="intelligence">Intelligence</header>
                 <div class="table-item">
                     <input type="number" name="attr_intelligence" value=1 min=1 style='width:39px;' />
-                    <div><button title="Intelligence Test without augmentation" class="d6-button" type="action"
+                    <div><button data-i18n-title="intelligence-test-natural"
+                            title="Intelligence Test without augmentation" class="d6-button" type="action"
                             name="act_attrib" id="intelligence">L</button></div>
                 </div>
                 <div class="table-item">+<input type="number" name="attr_intelligence-mods" value=0
                         style='width:39px;' />=</div>
                 <div class="table-item">
                     <span name="attr_intelligence_max" value=1></span>
-                    <div><button title="Intelligence Test with augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="intelligence|max">L</button></div>
+                    <div><button data-i18n-title="intelligence-test-natural" title="Intelligence Test with augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="intelligence|max">L</button></div>
                 </div>
-                <header class="table-item-left">Willpower</header>
+                <header class="table-item-left" data-i18n="willpower">Willpower</header>
                 <div class="table-item">
                     <input type="number" name="attr_willpower" value=1 min=1 style='width:39px;' />
-                    <div><button title="Willpower Test without augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="willpower">L</button></div>
+                    <div><button data-i18n-title="willpower-test-natural" title="Willpower Test without augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="willpower">L</button></div>
                 </div>
                 <div class="table-item">+<input type="number" name="attr_willpower-mods" value=0 style='width:39px;' />=
                 </div>
                 <div class="table-item">
                     <span name="attr_willpower_max" value=1></span>
-                    <div><button title="Willpower Test with augmentation" class="d6-button" type="action"
-                            name="act_attrib" id="willpower|max">L</button></div>
+                    <div><button data-i18n-title="willpower-test-natural" title="Willpower Test with augmentation"
+                            class="d6-button" type="action" name="act_attrib" id="willpower|max">L</button></div>
                 </div>
-                <header class="table-item-left">Essence</header>
+                <header class="table-item-left" data-i18n="essence">Essence</header>
                 <div class="table-item">
                     <input type="number" name="attr_essence" value=6 step='0.01' min='0.00' style='width:39px' />
-                    <div><button title="Essence Test" class="d6-button" type="action" name="act_attrib"
-                            id="essence">L</button></div>
+                    <div><button data-i18n-title="essence-test" title="Essence Test" class="d6-button" type="action"
+                            name="act_attrib" id="essence">L</button></div>
                 </div>
                 <div></div>
                 <div></div>
-                <header class="table-item-left">Magic</header>
+                <header class="table-item-left" data-i18n="magic">Magic</header>
                 <div class="table-item">
                     <input type="number" name="attr_magic" value=0 style='width:39px;' />
-                    <div><button title="Essence Test" class="d6-button" type="action" name="act_attrib"
-                            id="magic">L</button></div>
+                    <div><button data-i18n-title="magic-test" title="Magic Test" class="d6-button" type="action"
+                            name="act_attrib" id="magic">L</button></div>
                 </div>
                 <input type="number" name="attr_signature" value=4 hidden="true">
             </div>
         </div>
 
         <div class="critters-only spirits-only">
-            <div class="SRH3">Attributes</div>
+            <div class="SRH3" data-i18n="attributes">Attributes</div>
             <div class="critter-attributes">
-                <div class="table-top-left"><b>Attribute</div>
-                <div class="table-top-right"><b>Level</div>
-                <div class="table-item-left"><b>Perception</div>
+                <header class="table-top-left" data-i18n="attribute">Attribute</header>
+                <header class="table-top-right" data-i18n="level">Level</header>
+                <header class="table-item-left" data-i18n="perception">Perception</header>
                 <div class="table-item">
                     <div class="sidebyside"><input type="number" name="attr_perception" value=0 min=0 />
-                        <button type="action" name="act_attrib" class="d6-button" title="Perception Test"
-                            id="perception">L</button>
+                        <button type="action" name="act_attrib" class="d6-button" data-i18n-title="perception-test"
+                            title="Perception Test" id="perception">L</button>
                     </div>
                 </div>
-                <div class="table-item-left"><b>Reach</div>
+                <header class="table-item-left" data-i18n="reach">Reach</header>
                 <div class="table-item">
                     <div class="sidebyside"><input type="number" name="attr_meleereach" value=0 />
                         <div></div>
                     </div>
                 </div>
-                <div class="table-item-left"><b>Force</div>
+                <header class="table-item-left" data-i18n="force">Force</header>
                 <div class="table-item">
                     <div class="sidebyside"><input type="number" name="attr_force" value=0 min=0 />
                         <div></div>
                     </div>
                 </div>
-                <div class="table-item-left"><b>Attacks</div>
+                <header class="table-item-left" data-i18n="attacks">Attacks</header>
                 <div class="table-item">
-		    <div class="critter-attack">
-                    <input type="number" name="attr_attackpower" value=0 min=0 />
-                    <select name="attr_attackdamage" class="mediumselect2">
-                            <option>L</option>
-                            <option SELECTED>M</option>
-                            <option>S</option>
-                            <option>D</option>
-                            <option>L(stun)</option>
-                            <option>M(stun)</option>
-                            <option>S(stun)</option>
-                            <option>D(stun)</option>
+                    <div class="critter-attack">
+                        <input type="number" name="attr_attackpower" value=0 min=0 />
+                        <select name="attr_attackdamage" class="mediumselect2">
+                            <option data-i18n="light-damage-abbreviation" value="L">L</option>
+                            <option data-i18n="moderate-damage-abbreviation" value="M" SELECTED>M</option>
+                            <option data-i18n="serious-damage-abbreviation" value="S">S</option>
+                            <option data-i18n="deadly-damage-abbreviation" value="D">D</option>
+                            <option data-i18n="light-stun-abbreviation" value="L(stun)">L(s)</option>
+                            <option data-i18n="moderate-stun-abbreviation" value="M(stun)">M(s)</option>
+                            <option data-i18n="serious-stun-abbreviation" value="S(stun)">S(s)</option>
+                            <option data-i18n="deadly-stun-abbreviation" value="D(stun)">D(s)</option>
                             <option></option>
                         </select>
-                    <button type="action" name="act_melee" id="critterattack" class="d6-button"
-                        title="Attack Offensive">L</button>
-			</div>
+                        <button type="action" name="act_melee" id="critterattack" class="d6-button"
+                            title="Attack">L</button>
+                    </div>
                 </div>
             </div>
         </div>
         <div>
             <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-            <div class="SRH3">Reaction, Init & Speed</div>
+            <div class="SRH3" data-i18n="reaction-init-speed">Reaction, Init & Speed</div>
             <div class="reaction">
                 <div class="table-top-left"></div>
-                <div class="table-top-mid">Natural</div>
-                <div class="table-top-mid">Mods</div>
-                <div class="table-top-right">Final</div>
-                <header class="table-item-left">Reaction:</header>
+                <div class="table-top-mid" data-i18n="natural">Natural</div>
+                <div class="table-top-mid" data-i18n="mods">Mods</div>
+                <div class="table-top-right" data-i18n="final">Final</div>
+                <header class="table-item-left" data-i18n="reaction">Reaction:</header>
                 <div class="table-item">
                     <input type="number" name="attr_reaction" value="1" min="1">
                     <button type="action" name="act_attrib" class="d6-button" title="Un-augmented Reaction Test"
@@ -617,7 +668,7 @@
                     <button type="action" name="act_attrib" class="d6-button" title="Augmented Reaction Test"
                         id="reaction|max">L</button>
                 </div>
-                <header class="table-item-left">Initiative:</header>
+                <header class="table-item-left" data-i18n="initiative">Initiative:</header>
                 <div class="table-item">
                     <input type="number" name="attr_initiative" value="1" min="1">d6
                     <button type="action" name="act_init" class="d6-button" title="Unaugmented Initiative"
@@ -633,9 +684,9 @@
             </div>
             <div class="reaction-spirit">
                 <div class="table-top-left"></div>
-                <div class="table-top-mid">Physical</div>
-                <div class="table-top-right">Astral</div>
-                <header class="table-item-left">Reaction:</header>
+                <div class="table-top-mid" data-i18n="physical">Physical</div>
+                <div class="table-top-right" data-i18n="astral">Astral</div>
+                <header class="table-item-left" data-i18n="reaction">Reaction:</header>
                 <div class="table-item">
                     <input type="number" name="attr_reaction" value="1" min="1">
                     <button type="action" name="act_attrib" class="d6-button" title="Reaction Test"
@@ -646,7 +697,7 @@
                     <button type="action" name="act_attrib" class="d6-button" title="Astral Reaction Test"
                         id="astralreaction">L</button>
                 </div>
-                <header class="table-item-left">Initiative:</header>
+                <header class="table-item-left" data-i18n="initiative">Initiative:</header>
                 <div class="table-item">
                     <input type="number" name="attr_initiative" value="1" min="1">d6+<span
                         name="attr_spirit-initp"></span>
@@ -663,60 +714,60 @@
             <div class="walk-run">
                 <input type="hidden" name="attr_run" value=0 />
                 <input type="hidden" name="attr_walk" value=0 />
-                <header class="table-item-left">Walking Rate:</header>
+                <header class="table-item-left" data-i18n="walking-rate">Walking Rate:</header>
                 <div class="table-item"><span class="numberspan" name="attr_walk"></span></div>
-                <div class="table-item">meters per combat turn</div>
-                <header class="table-item-left">Running Rate:</header>
+                <div class="table-item" data-i18n="meters-per-combat-turn">meters per combat turn</div>
+                <header class="table-item-left" data-i18n="running-rate">Running Rate:</header>
                 <div class="table-item"><span class="numberspan" name="attr_run"></span></div>
-                <div class="table-item">meters per combat turn</div>
+                <div class="table-item" data-i18n="meters-per-combat-turn">meters per combat turn</div>
             </div>
 
 
-	     <div class="SRH3">Dice Pools</div>
+            <div class="SRH3">Dice Pools</div>
             <div class="dice-pools">
-                <header class="table-top-left">Pool</header>
-                <header class="table-top-mid">Calculated</header>
-                <header class="table-top-mid">Mods</header>
-                <header class="table-top-right">Final</header>
-		<div class="table-item-left">Combat</div>
-		<div class="table-item"><span name="attr_combatpool-base"></span></div>
-		<div class="table-item"><input type="number" name="attr_combatpool-mods" value=0></div>
-		<div class="table-item"><span name="attr_combatpool"></span></div>
-		<div class="table-item-left">Spell</div>
-		<div class="table-item"><span name="attr_spellpool-base"></span></div>
-		<div class="table-item"><input type="number" name="attr_spellpool-mods" value=0></div>
-		<div class="table-item"><span name="attr_spellpool"></span></div>
-		<div class="table-item-left">Hacking</div>
-		<div class="table-item"><span name="attr_hackingpool-base"></span></div>
-		<div class="table-item"><input type="number" name="attr_hackingpool-mods" value=0></div>
-		<div class="table-item"><span name="attr_hackingpool"></span></div>
-		<div class="table-item-left">Control</div>
-		<div class="table-item"><span name="attr_controlpool-base"></span></div>
-		<div class="table-item"><input type="number" name="attr_controlpool-mods" value=0></div>
-		<div class="table-item"><span name="attr_controlpool"></span></div>
-		<div class="table-item-left">Astral</div>
-		<div class="table-item"><span name="attr_astralpool-base"></span></div>
-		<div class="table-item"><input type="number" name="attr_astralpool-mods" value=0></div>
-		<div class="table-item"><span name="attr_astralpool"></span></div>
-		<div class="table-item-left">Task</div>
-		<div class="table-item"></div>
-		<div class="table-item"></div>
-		<div class="table-item"><input type="number" name="attr_taskpool" value=0></div>
-	    </div>
+                <header class="table-top-left" data-i18n="pool">Pool</header>
+                <header class="table-top-mid" data-i18n="calculated">Calculated</header>
+                <header class="table-top-mid" data-i18n="mods">Mods</header>
+                <header class="table-top-right" data-i18n="final">Final</header>
+                <div class="table-item-left" data-i18n="combat">Combat</div>
+                <div class="table-item"><span name="attr_combatpool-base"></span></div>
+                <div class="table-item"><input type="number" name="attr_combatpool-mods" value=0></div>
+                <div class="table-item"><span name="attr_combatpool"></span></div>
+                <div class="table-item-left" data-i18n="spell">Spell</div>
+                <div class="table-item"><span name="attr_spellpool-base"></span></div>
+                <div class="table-item"><input type="number" name="attr_spellpool-mods" value=0></div>
+                <div class="table-item"><span name="attr_spellpool"></span></div>
+                <div class="table-item-left" data-i18n="hacking">Hacking</div>
+                <div class="table-item"><span name="attr_hackingpool-base"></span></div>
+                <div class="table-item"><input type="number" name="attr_hackingpool-mods" value=0></div>
+                <div class="table-item"><span name="attr_hackingpool"></span></div>
+                <div class="table-item-left" data-i18n="control">Control</div>
+                <div class="table-item"><span name="attr_controlpool-base"></span></div>
+                <div class="table-item"><input type="number" name="attr_controlpool-mods" value=0></div>
+                <div class="table-item"><span name="attr_controlpool"></span></div>
+                <div class="table-item-left" data-i18n="astral">Astral</div>
+                <div class="table-item"><span name="attr_astralpool-base"></span></div>
+                <div class="table-item"><input type="number" name="attr_astralpool-mods" value=0></div>
+                <div class="table-item"><span name="attr_astralpool"></span></div>
+                <div class="table-item-left" data-i18n="task">Task</div>
+                <div class="table-item"></div>
+                <div class="table-item"></div>
+                <div class="table-item"><input type="number" name="attr_taskpool" value=0></div>
+            </div>
 
         </div>
         <div class="npc-chars-only">
             <div class="SRH3">Karma</div>
             <div class="karma-pool">
-                <header class="table-top-left">Karma Pool:</header>
+                <header class="table-top-left" data-i18n="karma-pool">Karma Pool:</header>
                 <div class="table-top-right karma-max">
                     <input type="number" name="attr_karma-pool" value=0>
                     /
                     <input type="number" name="attr_karma-pool-used" value=0>
                 </div>
-                <header class="table-item-left">Good Karma:</header>
+                <header class="table-item-left" data-i18n="good-karma">Good Karma:</header>
                 <div class="table-item"><input type="number" name="attr_karma-good" value=0 /></div>
-                <header class="table-item-left">Professional Rating:</header>
+                <header class="table-item-left" data-i18n="professional-rating">Professional Rating:</header>
                 <div class="table-item"><input type="number" name="attr_prorating" /></div>
             </div>
         </div>
@@ -725,29 +776,29 @@
 <div class="sheet-skills">
     <!-- Skills Tab -->
 
-    <div class="SRH2">Skills/Edges/Flaws</div>
+    <div class="SRH2" data-i18n="skills-edges-flaws">Skills/Edges/Flaws</div>
     <div class="skills-edges">
         <div class="text-center">
             <div class="SRH4">Skills</div>
             <div class="skills-table">
-                <header class="table-top-left">Name</header>
-                <header class="table-top-mid">Rating</header>
-                <header class="table-top-mid">Pool</header>
-                <header class="table-top-right">Roll</header>
+                <header class="table-top-left" data-i18n="name">Name</header>
+                <header class="table-top-mid" data-i18n="rating">Rating</header>
+                <header class="table-top-mid" data-i18n="pool">Pool</header>
+                <header class="table-top-right" data-i18n="roll">Roll</header>
             </div>
             <fieldset class="repeating_skills">
                 <div class="skills-table">
                     <div class="table-item-left"><input type="text" name="attr_skillname" class="myweapontxt"></div>
                     <div class="table-item"><input type="number" name="attr_skillrating" min=1 value=1></div>
                     <div class="table-item"><select name="attr_pool" class="mediumselect2">
-		    	<option SELECTED value="none">None</option>
-		    	<option value="combat">Combat</option>
-		    	<option value="task">Task</option>
-		    	<option value="hacking">Hacking</option>
-		    	<option value="control">Control</option>
-		    	<option value="spell">Spell</option>
-		    	<option value="astral">Astral</option>
-		      </select></div>
+                            <option SELECTED value="none">None</option>
+                            <option data-i18n="combat" value="combat">Combat</option>
+                            <option data-i18n="task" value="task">Task</option>
+                            <option data-i18n="hacking" value="hacking">Hacking</option>
+                            <option data-i18n="control" value="control">Control</option>
+                            <option data-i18n="spell" value="spell">Spell</option>
+                            <option data-i18n="astral" value="astral">Astral</option>
+                        </select></div>
                     <div class="table-item"><button class="d6-button" type="action" name="act_skills">L</button></div>
                 </div>
             </fieldset>
@@ -755,8 +806,8 @@
         <div class="text-center">
             <div class="SRH4">Edges</div>
             <div class="edges-table">
-                <header class="table-top-left">Type</header>
-                <header class="table-top-right">Rating</header>
+                <header class="table-top-left" data-i18n="type">Type</header>
+                <header class="table-top-right" data-i18n="rating">Rating</header>
             </div>
             <fieldset class='repeating_edges'>
                 <div class="edges-table">
@@ -768,8 +819,8 @@
         <div class="text-center">
             <div class="SRH4">Flaws</div>
             <div class="edges-table">
-                <header class="table-top-left">Type</header>
-                <header class="table-top-right">Rating</header>
+                <header class="table-top-left" data-i18n="type">Type</header>
+                <header class="table-top-right" data-i18n="rating">Rating</header>
             </div>
             <fieldset class='repeating_flaws'>
                 <div class="edges-table">
@@ -783,6 +834,7 @@
 <div class='sheet-magic'>
     <!-- Magic Tab -->
     <input type='hidden' class='magictype' name='attr_magic-type' />
+    <input type='hidden' name='attr_spelldefmin' value=0 />
     <input type='hidden' name='attr_sorcery-used' value=0 />
     <input type='hidden' name='attr_sorcery-used-total' value=0 />
     <input type='hidden' name='attr_conjuring-used' value=0 />
@@ -793,100 +845,117 @@
     <div class="spells-status">
         <div class="spells-status-tracking">
             <div></div>
-            <div>Stacked</div>
-            <div>Sustained</div>
-
+            <div data-i18n="stacked">Stacked</div>
+            <div data-i18n="sustained">Sustained</div>
             <div></div>
-            <div>Max</div>
-            <div>Used</div>
-
+            <div data-i18n="max">Max</div>
+            <div data-i18n="used">Used</div>
             <div></div>
-            <div>Max</div>
-            <div>Defense</div>
-            <div>Used</div>
+            <div data-i18n="max">Max</div>
+            <div data-i18n="defense">Defense</div>
+            <div data-i18n="used">Used</div>
             <div></div>
-            <div>Max</div>
-            <div>Defense</div>
-            <div>Used</div>
-
+            <div data-i18n="max">Max</div>
+            <div data-i18n="defense">Defense</div>
+            <div data-i18n="used">Used</div>
             <div></div>
-            <div>Max</div>
-            <div>Used</div>
-
-            <div>Spells</div>
+            <div data-i18n="max">Max</div>
+            <div data-i18n="used">Used</div>
+            <div data-i18n="spells">Spells</div>
             <div><input type="number" name='attr_spellstack' class="smallnumber" min=0 value=0></div>
             <div><input type="number" name='attr_spellsus' min=0 value=0></div>
-            <div>Spell Defense</div>
+            <div data-i18n="spell-defense">Spell Defense</div>
             <div><input type="number" name='attr_spelldefensedice' min=0 value=0></div>
             <div><span name="attr_spelldefensedice-used"></span></div>
-            <div>Sorcery</div>
+            <div data-i18n="sorcery">Sorcery</div>
             <div><span class="sorcery-over" name="attr_sorcery"></span></div>
             <div><input type="number" name="attr_sorcery-defense" min=0 value=0></input></div>
             <div>
                 <input type='hidden' class='sorcery-over' name='attr_sorcery-over' />
                 <span class="sorcery-over" name="attr_sorcery-used-total"></span>
             </div>
-            <div>Spell Pool</div>
+            <div data-i18n="spell-pool">Spell Pool</div>
             <div><span name="attr_spellpool"></span></div>
             <div><input type="number" name="attr_spellpool-defense" min=0 value=0></input></div>
             <div>
                 <input type='hidden' class='spellpool-over' name='attr_spellpool-over' />
                 <span class="spellpool-over" name="attr_spellpool-used-total"></span>
             </div>
-            <div>Conjuring</div>
+            <div data-i18n="conjuring">Conjuring</div>
             <div><span name="attr_conjuring"></span></div>
             <div><span name="attr_conjuring-used"></span></div>
 
         </div>
         <div class="spells-status-buttons">
-            <div title="Miscelaneous Modifiers for Spell Casting and Conjuring">Misc. Modifiers: <input type="number"
-                    name='attr_spellmisc' min=0 value=0></div>
-            <div>Defend: </div><button title="Spell Defense" type="action" class="d6-button" name='act_spelldefense'
-                id="spelldefense">L</button>
-            <div>Dispell: </div><button title="Cancel an existing spell" type="action" class="d6-button"
-                name='act_dispell' id="dispelling">L</button>
-            <div>Summon: </div><button title="Summon a Spirit or Element" type="action" class="d6-button"
-                name='act_conjure' id="summoning">L</button>
-            <div>Banish: </div><button title="Banish a Spirit or Element" type="action" class="d6-button"
-                name='act_conjure' id="banishing">L</button>
-            <div>Control: </div><button title="Take Control of a Spirit or Element" type="action" class="d6-button"
-                name='act_conjure' id="spiritcontrol">L</button>
+            <div title="Miscelaneous Modifiers for Spell Casting and Conjuring" data-i18n="misc-modifiers">Misc.
+                Modifiers: </div>
+            <input type="number" name='attr_spellmisc' min=0 value=0>
+            <div data-i18n="defend">Defend: </div><button title="Spell Defense" type="action" class="d6-button"
+                name='act_spelldefense' id="spelldefense">L</button>
+            <div data-i18n="dispell">Dispell: </div><button title="Cancel an existing spell" type="action"
+                class="d6-button" name='act_dispell' id="dispelling">L</button>
+            <div data-i18n="summon">Summon: </div><button title="Summon a Spirit or Element" type="action"
+                class="d6-button" name='act_conjure' id="summoning">L</button>
+            <div data-i18n="banish">Banish: </div><button title="Banish a Spirit or Element" type="action"
+                class="d6-button" name='act_conjure' id="banishing">L</button>
+            <div data-i18n="control">Control: </div><button title="Take Control of a Spirit or Element" type="action"
+                class="d6-button" name='act_conjure' id="spiritcontrol">L</button>
         </div>
     </div>
     <div class="spells-spirit-status">
-        <div>Spells Stacked: <input type="number" name='attr_spellstack' class="smallnumber" min=0 value=0></div>
-        <div>Spells Sustained: <input type="number" name='attr_spellsus' min=0 value=0></div>
-        <div title="Miscelaneous Modifiers for Spell Casting and Conjuring">Misc. Modifiers: <input type="number"
-                name='attr_spellmisc' min=0 value=0></div>
-        <div>Dispell: </div><button title="Cancel an existing spell" type="action" class="d6-button" name='act_dispell'
-            id="dispelling">L</button>
-        <div>Resist Banish: </div><button title="Resist a Banishing action by a Mage/Shaman " type="action"
-            class="d6-button" name='act_resistbanish' id="resistbanish">L</button>
+        <div data-i18n="spells-stacked">Spells Stacked:</div> <input type="number" name='attr_spellstack'
+            class="smallnumber" min=0 value=0>
+        <div data-i18n="spells-sustained">Spells Sustained:</div> <input type="number" name='attr_spellsus' min=0
+            value=0>
+        <div title="Miscelaneous Modifiers for Spell Casting and Conjuring" data-i18n="misc-modifiers">Misc. Modifiers:
+        </div> <input type="number" name='attr_spellmisc' min=0 value=0>
+        <div data-i18n="dispell">Dispell: </div><button title="Cancel an existing spell" type="action" class="d6-button"
+            name='act_dispell' id="dispelling">L</button>
+        <div data-i18n="resist-banish">Resist Banish: </div><button title="Resist a Banishing action by a Mage/Shaman "
+            type="action" class="d6-button" name='act_resistbanish' id="resistbanish">L</button>
     </div>
-    <div class="astralattributes-show">
-        <div class="SRH3">Astral Space
-            <button class="switch-button-show" type="action" name="act_astralattributesswitch">Show</button>
+    <input type='hidden' class='buttontoggle' name='attr_sheettype' />
+    <div class="magic-tabs">
+        <input type='hidden' class='magictype' name='attr_magic-type' />
+        <input type="hidden" class="magic-tabs-switch" name="attr_magictab" value="sorcery">
+        <button class="magic-tabs-astral" type="action" name="act_astral-tab" data-i8n="astral-uppercase" data-i18n-title="astral-state-combat" title="Astral State and Combat">ASTRAL</button>
+        <button class="magic-tabs-skills" type="action" name="act_sorcery-tab" data-i8n="skills-uppercase" data-i18n-title="magic-skills-configuration" title="Magic Skills and Configuration">SKILLS</button>
+        <button class="magic-tabs-spells" type="action" name="act_spells-tab">SPELLS</button>
+        <button class="magic-tabs-conjuring" type="action" name="act_conjuring-tab">CONJURING</button>
+        <div class="adept-only">
+            <button class="magic-tabs-adept" type="action" name="act_adept-tab" data-i8n="adept-uppercase"
+                data-i18n-title="adept-powers" title="Adept Powers">ADEPT</button>
         </div>
+        <button class="magic-tabs-foci" type="action" name="act_foci-tab" data-i8n="foci-uppercase">FOCI</button>
+        <button class="magic-tabs-initiate" type="action" name="act_initiate-tab"
+            data-i8n="initiate-uppercase">INITIATE</button>
+        <button class="magic-tabs-geas" type="action" name="act_geas-tab" data-i8n="geas-uppercase">GAES</button>
+        <button class="magic-tabs-totem" type="action" name="act_totem-tab" data-i8n="totem-uppercase">TOTEM</button>
+	<div class="tabs-empty"></div>
     </div>
-    <div class="astralattributes-hide">
-        <div class="SRH3">Astral Space
-            <button class="switch-button-hide" type="action" name="act_astralattributesswitch">Hide</button>
-        </div>
+    <div class="spirit-magic-tabs">
+        <input type='hidden' class='magictype' name='attr_magic-type' />
+        <input type="hidden" class="magic-tabs-switch" name="attr_magictab" value="astral">
+        <button class="magic-tabs-astral" type="action" name="act_astral-tab" data-i8n="astral-uppercase" data-i18n-title="astral-state-combat" title="Astral State and Combat">ASTRAL</button>
+        <button class="magic-tabs-spells" type="action" name="act_spells-tab">SPELLS</button>
+	<div class="tabs-empty"></div>
     </div>
+    <input type="hidden" class="magic-tabs-switch" name="attr_magictab" value="sorcery">
     <input type="hidden" name="attr_astralreaction" value=0>
     <div class="astralattributes">
+        <br>
         <div class="astralspace">
-            <div><b>Astral State: <select name="attr_astralstate">
-                        <option selected>Physical</option>
-                        <option>Astral Perception</option>
-                        <option>Astral Projection</option>
-                    </select>
-            </div>
-            <div class="text-mid"><b>Astral Reaction:</div>
+            <div><b>Astral State:</div>
+            <select name="attr_astralstate" class="mediumselect2">
+                <option data-i18n="physical" value="physical" selected>Physical</option>
+                <option data-i18n="astral-perception" value="astral-perception">Astral Perception</option>
+                <option data-i18n="astral-projection" value="astral-projection">Astral Projection</option>
+            </select>
+            <header class="text-mid" data-i18n="astral-reaction">Astral Reaction:</header>
             <div class="text-mid"><span class="numberspan" name="attr_astralreaction" /></div>
             <div class="text-mid"><button type="action" name="act_attrib" class="d6-button" title="Astral Reaction Test"
                     id="astralreaction">L</button></div>
-            <div class="text-mid"><b>Astral Initiative:</div>
+            <header class="text-mid" data-i18n="astral-initiative">Astral Initiative:</header>
             <div class="text-mid">1d6+<span class="numberspan" name="attr_astralreaction" /></div>
             <div class="text-mid">
                 <button title="Astral Initiative" class="d6-button" type="action" name="act_init"
@@ -895,33 +964,30 @@
             <div></div>
         </div>
         <div class="astralcombat">
-            <div><b>Astral Combat:</div>
+            <header data-i18n="astral-combat">Astral Combat:</header>
             <div class="text-mid"><button class="attack-dice" id="astralattack" type="action" name="act_melee"
                     title="Astral Combat"></button></div>
-            <div>Weapon Focus: <span name="attr_weaponfocus-name"></span></div>
-            <div>Enabled <input type="checkbox" name="attr_weaponfocus-equipped" checked></div>
-            <div>Force:<span name="attr_weaponfocus-force"></span></div>
+            <div data-i18n="weapon-focus">Weapon Focus:</div>
+            <div> <span name="attr_weaponfocus-name"></span></div>
+            <div data-i18n="enabled">Enabled</div><input type="checkbox" name="attr_weaponfocus-equipped" checked>
+            <div></div>
+            <div data-i18n="force">Force:</div>
+            <div><span name="attr_weaponfocus-force"></span></div>
         </div>
         <br>
     </div>
-    <input type='hidden' class='sorceryskills-switch' name='attr_sorceryskillsswitch' value="show" />
-    <div class="sorceryskills-show">
-        <div class="SRH3">Magic Skills and Configuration
-            <button class="switch-button-show" type="action" name="act_sorceryskillsswitch">Show</button>
-        </div>
-    </div>
-    <div class="sorceryskills-hide">
-        <div class="SRH3">Magic Skills and Configuration
-            <button class="switch-button-hide" type="action" name="act_sorceryskillsswitch">Hide</button>
-        </div>
-    </div>
     <div class="sorcery-skills">
+        <br>
         <div class="sorcery-config">
             <div></div>
-            <div><b>Adept<input type="radio" name="attr_magic-type" value="adept"></div>
-            <div><b>Mage<input type="radio" name="attr_magic-type" value="mage" selected></div>
-            <div><b>Shaman<input type="radio" name="attr_magic-type" value="shaman"></div>
-            <div><b>Aspected Mage<input type="radio" name="attr_magic-type" value="aspect"></div>
+            <header data-i18n="adept">Adept</header><input type="radio" name="attr_magic-type" value="adept">
+            <div></div>
+            <header data-i18n="mage">Mage</header><input type="radio" name="attr_magic-type" value="mage" selected>
+            <div></div>
+            <header data-i18n="shaman">Shaman</header><input type="radio" name="attr_magic-type" value="shaman">
+            <div></div>
+            <header data-i18n="aspected-mage">Aspected Mage</header><input type="radio" name="attr_magic-type"
+                value="aspect">
             <div></div>
         </div>
         <div class="sorcery-table">
@@ -929,50 +995,50 @@
                 <input type="checkbox" name="attr_sorcery-spec-switch" class="sorcery-spec-switch hidden-checkbox"
                     value=1 />
                 <div class="sorcery-row table-top">
-                    <header>Sorcery:</header>
+                    <header data-i18n="sorcer">Sorcery:</header>
                     <input type="number" name="attr_sorcery" value=0>
                     <button class="d6-button" type="action" name="act_skilltest" id="sorcery spell" title="Spell Casting Test">L</button>
-                    <div class="skillspec">Specialize</div>
+                    <div class="skillspec" data-i18n="specialize">Specialize</div>
                     <input type="checkbox" name="attr_sorcery-spec-switch" class="sorcery-spec-switch" value=1 />
-                   
+
                 </div>
                 <div class="sorcery-spec-off table-row">
                     <div class="magic-skills-table">
-                        <div class="table-item-left">Spellcasting:</div>
+                        <div class="table-item-left" data-i18n="spellcasting">Spellcasting:</div>
                         <div class="table-item"><span name="attr_spellcasting"></span></div>
-                        <div class="table-item-left">Spell Defense:</div>
+                        <div class="table-item-left" data-i18n="spell-defense">Spell Defense:</div>
                         <div class="table-item"><span name="attr_spelldefense"></span></div>
-                        <div class="table-item-left">Dispelling:</div>
+                        <div class="table-item-left" data-i18n="dispelling">Dispelling:</div>
                         <div class="table-item"><span name="attr_dispelling"></span></div>
-                        <div class="table-item-left">Astral Combat:</div>
+                        <div class="table-item-left" data-i18n="astral-combat">Astral Combat:</div>
                         <div class="table-item"><span name="attr_astralcombat"></span></div>
-                        <div class="table-item-left">Ritual Magic:</div>
+                        <div class="table-item-left" data-i18n="ritual-magic">Ritual Magic:</div>
                         <div class="table-item"><span name="attr_ritualsorcery"></span></div>
                     </div>
                 </div>
                 <div class="sorcery-spec-on">
                     <div class="magic-skills-table table-row">
-                        <header class="table-item-left">Spellcasting:</header>
+                        <header class="table-item-left" data-i18n="spellcasting">Spellcasting:</header>
                         <div class="table-item"><input type="number" name="attr_spellcasting">
                             <button class="d6-button" type="action" name="act_skilltest" id="spellcasting spell"
                                 title="Spell Casting Test">L</button>
                         </div>
-                        <header class="table-item-left">Spell Defense:</header>
+                        <header class="table-item-left" data-i18n="spell-defense">Spell Defense:</header>
                         <div class="table-item"><input type="number" name="attr_spelldefense">
                             <button class="d6-button" type="action" name="act_skilltest" id="spelldefense spell"
                                 title="Spell Defense Test">L</button>
                         </div>
-                        <header class="table-item-left">Dispelling:</header>
+                        <header class="table-item-left" data-i18n="dispelling">Dispelling:</header>
                         <div class="table-item"><input type="number" name="attr_dispelling">
                             <button class="d6-button" type="action" name="act_skilltest" id="dispelling spell"
                                 title="Dispelling Test">L</button>
                         </div>
-                        <header class="table-item-left">Astral Combat:</header>
+                        <header class="table-item-left" data-i18n="astral-combat">Astral Combat:</header>
                         <div class="table-item"><input type="number" name="attr_astralcombat">
                             <button class="d6-button" type="action" name="act_skilltest" id="astralcombat astral"
                                 title="Ritual Magic Test">L</button>
                         </div>
-                        <header class="table-item-left">Ritual Magic:</header>
+                        <header class="table-item-left" data-i18n="ritual-magic">Ritual Magic:</header>
                         <div class="table-item"><input type="number" name="attr_ritualsorcery">
                             <button class="d6-button" type="action" name="act_skilltest" id="ritualsorcery spell"
                                 title="Ritual Magic Test">L</button>
@@ -984,39 +1050,39 @@
                 <input type="checkbox" style="opacity:0;" class="conjuring-spec-switch hidden-checkbox"
                     name="attr_conjuring-spec-switch" value="1" />
                 <div class="sorcery-row table-top">
-                    <header>Conjuring:</header>
+                    <header data-i18n="conjuring">Conjuring:</header>
                     <div><input type="number" name="attr_conjuring" value=0 /></div>
                     <div><button class="d6-button" type="action" name="act_skilltest" id="conjuring spell"
                             title="Spirit Conjuring/Control/Banishing Test">L</button></div>
-                    <div class="skillspec">Specialize</div>
+                    <div class="skillspec" data-i18n="specialize">Specialize</div>
                     <div class="text-center"><input type="checkbox" class="conjuring-spec-switch"
                             name="attr_conjuring-spec-switch" value="1" /></div>
                 </div>
                 <div class="conjuring-spec-off">
                     <div class="magic-skills-table">
-                        <div class="table-item-left">Summoning:</div>
+                        <div class="table-item-left" data-i18n="summoning">Summoning:</div>
                         <div class="table-item"><span name="attr_summoning">
                         </div>
-                        <div class="table-item-left">Banishing:</div>
+                        <div class="table-item-left" data-i18n="banishing">Banishing:</div>
                         <div class="table-item"><span name="attr_banishing">
                         </div>
-                        <div class="table-item-left">Controlling:</div>
+                        <div class="table-item-left" data-i18n="controlling">Controlling:</div>
                         <div class="table-item"><span name="attr_spiritcontrol"></div>
                     </div>
                 </div>
                 <div class="conjuring-spec-on">
                     <div class="magic-skills-table">
-                        <header class="table-item-left">Summoning:</header>
+                        <header class="table-item-left" data-i18n="summoning">Summoning:</header>
                         <div class="table-item"><input type="number" name="attr_summoning">
                             <button class="d6-button" type="action" name="act_skilltest" id="summoning spell"
                                 title="Spirit Summoning Test">L</button>
                         </div>
-                        <header class="table-item-left">Banishing:</header>
+                        <header class="table-item-left" data-i18n="banishing">Banishing:</header>
                         <div class="table-item"><input type="number" name="attr_banishing">
                             <button class="d6-button" type="action" name="act_skilltest" id="banishing spell"
                                 title="Spirit Banishing Test">L</button>
                         </div>
-                        <header class="table-item-left">Controlling:</header>
+                        <header class="table-item-left" data-i18n="controlling">Controlling:</header>
                         <div class="table-item"><input type="number" name="attr_spiritcontrol">
                             <button class="d6-button" type="action" name="act_skilltest" id="spiritcontrol spell"
                                 title="Spirit Controlling Test">L</button>
@@ -1028,48 +1094,48 @@
                 <input type="checkbox" style="opacity:0;" class="auraread-spec-switch hidden-checkbox"
                     name="attr_auraread-spec-switch" value="1" />
                 <div class="sorcery-row table-top">
-                    <header>Aura Reading:</header>
+                    <header data-i18n="aura-reading">Aura Reading:</header>
                     <div><input type="number" name="attr_aurareading" value=0></div>
                     <div><button class="d6-button" type="action" name="act_skilltest" id="aurareading spell"
                             title="Aura Reading Test">L</button></div>
-                    <div class="skillspec">Specialize</div>
+                    <div class="skillspec" data-i18n="specialize">Specialize</div>
                     <div class="text-center"><input type="checkbox" class="auraread-spec-switch"
                             name="attr_auraread-spec-switch" value="1" /></div>
                 </div>
                 <div class="auraread-spec-off">
                     <div class="magic-skills-table">
-                        <div class="table-item-left">Auras:</div>
+                        <div class="table-item-left" data-i18n="auras">Auras:</div>
                         <div class="table-item"><span name="attr_areadauras">
                         </div>
-                        <div class="table-item-left">Signatures:</div>
+                        <div class="table-item-left" data-i18n="signatures">Signatures:</div>
                         <div class="table-item"><span name="attr_areadsignatures">
                         </div>
-                        <div class="table-item-left">Sorcery:</div>
+                        <div class="table-item-left" data-i18n="sorcery">Sorcery:</div>
                         <div class="table-item"><span name="attr_areadsorcery">
                         </div>
-                        <div class="table-item-left">Conjuring:</div>
+                        <div class="table-item-left" data-i18n="conjuring">Conjuring:</div>
                         <div class="table-item"><span name="attr_areadconjuring">
                         </div>
                     </div>
                 </div>
                 <div class="auraread-spec-on">
                     <div class="magic-skills-table">
-                        <header class="table-item-left">Auras:</header>
+                        <header class="table-item-left" data-i18n="auras">Auras:</header>
                         <div class="table-item"><input type="number" name="attr_areadauras" value=0>
                             <button class="d6-button" type="action" name="act_skilltest" id="areadauras spell"
                                 title="Aura Reading Test">L</button>
                         </div>
-                        <header class="table-item-left">Signatures:</header>
+                        <header class="table-item-left" data-i18n="signatures">Signatures:</header>
                         <div class="table-item"><input type="number" name="attr_areadsignatures">
                             <button class="d6-button" type="action" name="act_skilltest" id="areadsignatures spell"
                                 title="Aura Signature Reading Test">L</button>
                         </div>
-                        <header class="table-item-left">Sorcery:</header>
+                        <header class="table-item-left" data-i18n="sorcery">Sorcery:</header>
                         <div class="table-item"><input type="number" name="attr_areadsorcery">
                             <button class="d6-button" type="action" name="act_skilltest" id="areadsorcery spell"
                                 title="Aura Sorcery Reading Test">L</button>
                         </div>
-                        <header class="table-item-left">Conjuring:</header>
+                        <header class="table-item-left" data-i18n="conjuring">Conjuring:</header>
                         <div class="table-item"><input type="number" name="attr_areadconjuring">
                             <button class="d6-button" type="action" name="act_skilltest" id="areadconjuring spell"
                                 title="Aura Conjuring Reading Test">L</button>
@@ -1079,66 +1145,56 @@
             </div>
             <div>
                 <div class="magic-skills-table table-top">
-                    <header class="text-mid">Magic:</header>
+                    <header class="text-mid" data-i18n="magic">Magic:</header>
                     <div class="sidebyside"><span name="attr_magic"></span><button class="d6-button" type="action"
                             name="act_skilltest" id="magic spell" title="Magic Test">L</button></div>
-                    <header class="text-mid">Drain:</header>
+                    <header class="text-mid" data-i18n="drain">Drain:</header>
                     <div class="sidebyside"><span name="attr_willpower_max"></span><button class="d6-button"
                             type="action" name="act_skilltest" id="willpower|max spell" title="Drain Test">L</button>
                     </div>
-                    <header class="text-mid">Enchanting:</header>
+                    <header class="text-mid" data-i18n="enchanting">Enchanting:</header>
                     <div class="sidebyside"><input type="number" name="attr_enchanting" value=0>
                         <button class="d6-button" type="action" name="act_skilltest" id="enchanting spell"
                             title="Enchanting Test">L</button>
                     </div>
-                    <header class="text-mid">Divining:</header>
+                    <header class="text-mid" data-i18n="divining">Divining:</header>
                     <div class="sidebyside"><input type="number" name="attr_divining" value=0>
                         <button class="d6-button" type="action" name="act_skilltest" id="divining spell"
                             title="Divining Test">L</button>
                     </div>
-                    <header class="text-mid">Centering:</header>
+                    <header class="text-mid" data-i18n="centering">Centering:</header>
                     <div class="sidebyside"><input type="number" name="attr_centering" value=0>
                         <button class="d6-button" type="action" name="act_skilltest" id="centering spell"
                             title="Centering Test">L</button>
                     </div>
-                    <header class="text-mid">Creative Skill:</header>
+                    <header class="text-mid" data-i18n="creative-skill">Creative Skill:</header>
                     <input type="text" name="attr_centeringskillname">
                 </div>
             </div>
         </div>
-        <br>
     </div>
     <div class="adept-only">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
         <div class="hide-spirit-critter">
-            <input type='hidden' class='adeptpowers-switch' name='attr_adeptpowersswitch' value="show" />
-            <div class="adeptpowers-show">
-                <div class="SRH3">Adept Powers
-                    <button class="switch-button-show" type="action" name="act_adeptpowersswitch">Show</button>
-                </div>
-            </div>
-            <div class="adeptpowers-hide">
-                <div class="SRH3">Adept Powers
-                    <button class="switch-button-hide" type="action" name="act_adeptpowersswitch">Hide</button>
-                </div>
-            </div>
+            <input type="hidden" class="magic-tabs-switch" name="attr_magictab" value="skills">
             <div class="adept-powers">
+                <br>
                 <div class="adept-skills-table">
-                    <header class="table-top-left">Power</header>
-                    <header class="table-top-mid">Rating</header>
-                    <header class="table-top-mid">Cost</header>
-                    <header class="table-top-mid">Activate</header>
-                    <header class="table-top-right">Notes</header>
+                    <header class="table-top-left" data-i18n="power">Power</header>
+                    <header class="table-top-mid" data-i18n="rating">Rating</header>
+                    <header class="table-top-mid" data-i18n="cost">Cost</header>
+                    <header class="table-top-mid" data-i18n="activate">Activate</header>
+                    <header class="table-top-right" data-i18n="notes">Notes</header>
                 </div>
                 <div class="adept-skills-table">
-                    <header class="table-item-left">Improved Reflexes: </header>
+                    <header class="table-item-left" data-i18n="improved-reflexes">Improved Reflexes: </header>
                     <div class="table-item"><input type="number" name="attr_adeptimprovedreflexes" value=0 /></div>
                     <div class="table-item"><input type="number" name="attr_adeptimprovedreflexescost" value=0 /></div>
                     <div class="table-item"><input type="checkbox" name="attr_adeptimprovedreflexesactive"></div>
                     <div class="table-item"><input type="text" name="attr_adeptimprovedreflexesnotes"></div>
                 </div>
                 <div class="adept-skills-table">
-                    <header class="table-item-left">Body Boost: </header>
+                    <header class="table-item-left" data-i18n="body-boost">Body Boost: </header>
                     <div class="table-item"><input type="number" name="attr_adeptbodyboost" value=0 /></div>
                     <div class="table-item"><input type="number" name="attr_adeptbodyboostcost" value=0></div>
                     <div class="table-item"><button class="d6-button" type="action" name="act_adeptpower" id="body"
@@ -1146,7 +1202,7 @@
                     <div class="table-item"><input type="text" name="attr_aadeptstrengthboostnotes"></div>
                 </div>
                 <div class="adept-skills-table">
-                    <header class="table-item-left">Strength Boost: </header>
+                    <header class="table-item-left" data-i18n="strength-boost">Strength Boost: </header>
                     <div class="table-item"><input type="number" name="attr_adeptstrboost" value=0 /></div>
                     <div class="table-item"><input type="number" name="attr_adeptstrboostcost" value=0></div>
                     <div class="table-item"><button class="d6-button" type="action" name="act_adeptpower" id="strength"
@@ -1154,7 +1210,7 @@
                     <div class="table-item"><input type="text" name="attr_adeptstrboostnotes"></div>
                 </div>
                 <div class="adept-skills-table">
-                    <header class="table-item-left">Agility Boost: </header>
+                    <header class="table-item-left" data-i18n="agility-boost">Agility Boost: </header>
                     <div class="table-item"><input type="number" name="attr_adeptquicknessboost" value=0></div>
                     <div class="table-item"><input type="number" name="attr_adeptagilityboostcost" value=0></div>
                     <div class="table-item"><button class="d6-button" type="action" name="act_adeptpower" id="quickness"
@@ -1162,7 +1218,7 @@
                     <div class="table-item"><input type="text" name="attr_aadeptagilityboostnotes"></div>
                 </div>
                 <div class="adept-skills-table">
-                    <header class="table-item-left">Pain Resistance: </header>
+                    <header class="table-item-left" data-i18n="pain-resistance">Pain Resistance: </header>
                     <div class="table-item"><input type="number" name="attr_adeptpainres" value=0></div>
                     <div class="table-item"><input type="number" name="attr_adeptpainrescost" value=0></div>
                     <div class="table-item"><input type="checkbox" name="attr_adeptpainresactive"></div>
@@ -1181,65 +1237,61 @@
             </div>
         </div>
     </div>
-    <input type='hidden' class='spells-switch' name='attr_spellsswitch' value="show" />
-    <div class="spells-show">
-        <div class="SRH3">Spells
-            <button class="switch-button-show" type="action" name="act_spellsswitch">Show</button>
-        </div>
-    </div>
-    <div class="spells-hide">
-        <div class="SRH3">Spells
-            <button class="switch-button-hide" type="action" name="act_spellsswitch">Hide</button>
-        </div>
-    </div>
     <div class="spells-section">
+        <br>
         <div class="spells-table">
             <div class="magic-spells-table">
-                <div class="table-top-left header">Name</div>
-                <div class="table-top-mid header" title="Spell Category">Category</div>
-                <div class="table-top-mid header" title="Specialization">Spec.</div>
-                <div class="table-top-mid header" title="Force of spell">Force</div>
-                <div class="table-top-mid header" title="Mana or Physical Spell">Type</div>
-                <div class="table-top-mid header" title="Line of Sight, Touch or AOE">Range</div>
-                <div class="table-top-mid header" title="attribute to target">Target</div>
-                <div class="table-top-mid header" title="Spell Damage">Dmg.</div>
-                <div class="table-top-mid header" title="Spell Durration">Dur.</div>
-                <div class="table-top-mid header" title="+/- modifier for Force/2 drain">Drain</div>
-                <div class="table-top-mid header">Drain Damage</div>
-                <div class="table-top-mid header">Roll</div>
-                <div class="table-top-right header">Description</div>
+                <div class="table-top-left header" data-i18n="name">Name</div>
+                <div class="table-top-mid header" title="Spell Category" data-i18n="category">Category</div>
+                <div class="table-top-mid header" title="Specialization" data-i18n="specialization-abbreviation">Spec.
+                </div>
+                <div class="table-top-mid header" title="Force of spell" data-i18n="force">Force</div>
+                <div class="table-top-mid header" title="Reusable Foci" data-i18n="foci">Foci</div>
+                <div class="table-top-mid header" title="Expendable Foci" data-i18n="expendable-abbreviation">Exp.</div>
+                <div class="table-top-mid header" title="Mana or Physical Spell" data-i18n="type">Type</div>
+                <div class="table-top-mid header" title="Line of Sight, Touch or AOE" data-i18n="range">Range</div>
+                <div class="table-top-mid header" title="attribute to target" data-i18n="target">Target</div>
+                <div class="table-top-mid header" title="Spell Damage" data-i18n="damage-abbreviation">Dmg.</div>
+                <div class="table-top-mid header" title="Spell Durration" data-i18n="durration-abbreviation">Dur.</div>
+                <div class="table-top-mid header" title="+/- modifier for Force/2 drain" data-i18n="drain">Drain</div>
+                <div class="table-top-mid header" data-i18n="drain-damage">Drain Damage</div>
+                <div class="table-top-mid header" data-i18n="roll">Roll</div>
+                <div class="table-top-right header" data-i18n="description">Description</div>
             </div>
             <fieldset class="repeating_spells">
                 <div class="magic-spells-row">
                     <input class="myweapontxt" type="text" name="attr_name">
                     <select class="mediumselect2" name="attr_spellcategory">
-                        <option SELECTED>Combat</option>
-                        <option>Health</option>
-                        <option>Detection</option>
-                        <option>Illusion</option>
-                        <option>Elemental</option>
-                        <option>Control</option>
-                        <option>Telekinetic</option>
-                        <option>Transformation</option>
+                        <option data-i18n="combat" value="Combat" SELECTED>Combat</option>
+                        <option data-i18n="health" value="Health">Health</option>
+                        <option data-i18n="detection" value="Detection">Detection</option>
+                        <option data-i18n="illusion" value="Illusion">Illusion</option>
+                        <option data-i18n="elemental" value="Elemental">Elemental</option>
+                        <option data-i18n="control" value="Control">Control</option>
+                        <option data-i18n="telekinetic" value="Telekinetic">Telekinetic</option>
+                        <option data-i18n="transformation" value="Transformation">Transformation</option>
                     </select>
                     <input type="number" name="attr_specialized" value=0>
                     <input type="number" name="attr_force" min="1" value=1>
+                    <input type="number" name="attr_foci" value=0>
+                    <input type="number" name="attr_expendable-foci" value=0>
                     <select name="attr_spelltype" class="mediumselect2">
-                        <option value=0>Mana</option>
-                        <option value=0>Physical</option>
+                        <option data-i18n="mana" value="mana">Mana</option>
+                        <option data-i18n="physical" value="physical">Physical</option>
                     </select>
                     <select class="mediumselect2" type="text" name="attr_range">
-                        <option SELECTED title="Line of Sight Spell">LoS</option>
-                        <option title="Area of Effect Spell">AoE</option>
-                        <option title="Must Touch Target">Touch</option>
+                        <option data-i18n="line-of-sight-acronym" value="LoS" SELECTED title="Line of Sight Spell">LoS
+                        </option>
+                        <option data-i18n="area-of-effect-acronym" value="AoE" title="Area of Effect Spell">AoE</option>
+                        <option data-i18n="touch" value="Touch" title="Must Touch Target">Touch</option>
                     </select>
                     <select name="attr_target" class="mediumselect2">
-                        <option value="@{target|Target|body|max}">Body</option>
-                        <option value="@{target|Target|willpower|max}">Willpower</option>
-                        <option value="@{target|Target|intelligence|max}">Intelligence</option>
-                        <option value="@{target|Target|targetMove}">Elemental</option>
-                        <option value="?{Target Number|4}">Target Number</option>
-                        <option value="@{target|Target|force}">Force</option>
+                        <option data-i18n="body" value="@{target|Target|body|max}">Body</option>
+                        <option data-i18n="willpower" value="@{target|Target|willpower|max}">Willpower</option>
+                        <option data-i18n="intelligence" value="@{target|Target|intelligence|max}">Intelligence</option>
+                        <option data-i18n="elemental" value="@{target|Target|targetMove}">Elemental</option>
+                        <option data-i18n="target-number" value="?{Target Number|4}">Target Number</option>
+                        <option data-i18n="force" value="@{target|Target|force}">Force</option>
                         <option value="2">2</option>
                         <option value="3">3</option>
                         <option value="4">4</option>
@@ -1250,35 +1302,39 @@
                         <option value=0 SELECTED title="Choose for non combat spell">N/A</option>
                         <option value="?{Damage Level|M,2|S,3|L,1|D,4}"
                             title="Choose Damage at time of roll, default for combat spells">Choose</option>
-                        <option value=1>Light</option>
-                        <option value=2>Medium</option>
-                        <option value=3>Serious</option>
-                        <option value=4>Deadly</option>
-                        <option value=10>Light(s)</option>
-                        <option value=11>Medium(s)</option>
-                        <option value=12>Serious(s)</option>
-                        <option value=13>Deadly(s)</option>
+                        <option data-i18n="light" value=1>Light</option>
+                        <option data-i18n="moderate" value=2>Moderate</option>
+                        <option data-i18n="serious" value=3>Serious</option>
+                        <option data-i18n="deadly" value=4>Deadly</option>
+                        <option data-i18n="light-stun-abbreviation" value=10>Light(s)</option>
+                        <option data-i18n="moderate-stun-abbreviation" value=11>Moderate(s)</option>
+                        <option data-i18n="serious-stun-abbreviation" value=12>Serious(s)</option>
+                        <option data-i18n="deadly-stun-abbreviation" value=13>Deadly(s)</option>
                     </select>
                     <select name="attr_duration" class="mediumselect2">
-                        <option SELECTED>I</option>
-                        <option>S</option>
-                        <option>P</option>
+                        <option data-i18n="instant-abbreviation" value="I" SELECTED>I</option>
+                        <option data-i18n="sustained-abbreviation" value="S">S</option>
+                        <option data-i18n="permanent-abbreviation" value="P">P</option>
                     </select>
                     <input type="number" title="modifier to force/2 for drain resistance test" name="attr_drain"
                         value=0>
                     <select name="attr_drainlvl" class="mediumselect2">
-                        <option value=1>Light</option>
-                        <option value="dmglvl" SELECTED>Damage Lvl</option>
-                        <option value=2>Medium</option>
-                        <option value=3>Serious</option>
-                        <option value=4>Deadly</option>
-                        <option title="stages drain damage up 1 level from damage level of spell" value="dmglvl + 1">
-                            Damage +1</option>
-                        <option title="stages drain damage up 2levels from damage level of spell" value="dmglvl + 2">
-                            Damage +2</option>
-                        <option title="stages drain damage down 1 level from damage level of spell" value="dmglvl - 1">
+                        <option data-i18n="light" value=1>Light</option>
+                        <option data-i18n="damage-level" value="dmglvl" SELECTED>Damage Lvl</option>
+                        <option data-i18n="medium" value=2>Medium</option>
+                        <option data-i18n="serious" value=3>Serious</option>
+                        <option data-i18n="deadly" value=4>Deadly</option>
+                        <option data-i18n="damage-level-add-1"
+                            title="stages drain damage up 1 level from damage level of spell" value="dmglvl + 1">Damage
+                            +1</option>
+                        <option data-i18n="damage-level-add-2"
+                            title="stages drain damage up 2levels from damage level of spell" value="dmglvl + 2">Damage
+                            +2</option>
+                        <option data-i18n="damage-level-subtract-1"
+                            title="stages drain damage down 1 level from damage level of spell" value="dmglvl - 1">
                             Damage -1</option>
-                        <option title="stages drain damage down 2 levels from damage level of spell" value="dmglvl - 2">
+                        <option data-i18n="damage-level-subtract-2"
+                            title="stages drain damage down 2 levels from damage level of spell" value="dmglvl - 2">
                             Damage -2</option>
                     </select>
                     <button class="d6-button" type="action" name="act_cast" id="spell" title="Cast Spell">L</button>
@@ -1288,32 +1344,22 @@
         </div>
         <br>
     </div>
-    <input type='hidden' class='foci-switch' name='attr_fociswitch' value="show" />
-    <div class="foci-show">
-        <div class="SRH3">Fetishes and Foci
-            <button class="switch-button-show" type="action" name="act_fociswitch">Show</button>
-        </div>
-    </div>
-    <div class="foci-hide">
-        <div class="SRH3">Fetishes and Foci
-            <button class="switch-button-hide" type="action" name="act_fociswitch">Hide</button>
-        </div>
-    </div>
     <div class="fetish-foci">
+        <br>
         <div class="foci-table">
-            <header class="table-top-left">Type</header>
-            <header class="table-top-mid">Category</header>
-            <header class="table-top-mid">Force</header>
-            <header class="table-top-right">Quantity</header>
+            <header class="table-top-left" data-i18n="type">Type</header>
+            <header class="table-top-mid" data-i18n="category">Category</header>
+            <header class="table-top-mid" data-i18n="force">Force</header>
+            <header class="table-top-right" data-i18n="quantity">Quantity</header>
         </div>
         <fieldset class="repeating_foci">
             <div class="foci-table">
                 <select name="attr_type" class="mediumselect2">
-                    <option value="none"></option>
-                    <option>Expendable</option>
-                    <option>Reusable</option>
-                    <option>Power Focus</option>
-                    <option>Spirit Focus</option>
+                    <option data-i18n="none" value="none"></option>
+                    <option data-i18n="expendable" value="expendable">Expendable</option>
+                    <option data-i18n="reusable" value="reusable">Reusable</option>
+                    <option data-i18n="power-focus" value="power">Power Focus</option>
+                    <option data-i18n="spirit-focus" value="spirit">Spirit Focus</option>
                 </select>
                 <input type='hidden' class='focitype' name='attr_type' />
                 <div class="powerfocus">
@@ -1321,43 +1367,43 @@
                 </div>
                 <div class="reusable">
                     <select name="attr_category" class="mediumselect2">
-                        <option value="none"></option>
-                        <option value="combat">Combat</option>
-                        <option value="health">Health</option>
-                        <option value="detection">Detection</option>
-                        <option value="illusion">Illusion</option>
-                        <option value="elemental">Elemental</option>
-                        <option value="control">Control</option>
-                        <option value="telekinetic">Telekinetic</option>
-                        <option value="transformation">Transformation</option>
+                        <option data-i18n="none" value="none"></option>
+                        <option data-i18n="combat" value="combat">Combat</option>
+                        <option data-i18n="health" value="health">Health</option>
+                        <option data-i18n="detection" value="detection">Detection</option>
+                        <option data-i18n="illusion" value="illusion">Illusion</option>
+                        <option data-i18n="elemental" value="elemental">Elemental</option>
+                        <option data-i18n="control" value="control">Control</option>
+                        <option data-i18n="telekinetic" value="telekinetic">Telekinetic</option>
+                        <option data-i18n="transformation" value="transformation">Transformation</option>
                     </select>
                 </div>
                 <div class="spiritfocus">
                     <input type='hidden' class='magictype' name='attr_magic-type' />
                     <div class="mage-foci"><select name="attr_category" class="mage-foci mediumselect2">
-                            <option value="none"></option>
-                            <option value="fire-elem-focus">Fire</option>
-                            <option value="water-elem-focus">Water</option>
-                            <option value="earth-elem-focus">Earth</option>
-                            <option value="air-elem-focus">Air</option>
-                            <option value="city-spirit-focus">City Spirit</option>
-                            <option value="field-spirit-focus">Field Spirit</option>
-                            <option value="hearth-spirit-focus">Hearth Spirit</option>
-                            <option value="desert-spirit-focus">Desert Spirit</option>
-                            <option value="forest-spirit-focus">Forest Spirit</option>
-                            <option value="mountain-spirit-focus">Mountain Spirit</option>
-                            <option value="prairie-spirit-focus">Prairie Spirit</option>
-                            <option value="mist-spirit-focus">Mist Spirit</option>
-                            <option value="storm-spirit-focus">Storm Spirit</option>
-                            <option value="wind-spirit-focus">Wind Spirit</option>
-                            <option value="lake-spirit-focus">Lake Spirit</option>
-                            <option value="river-spirit-focus">River Spirit</option>
-                            <option value="sea-spirit-focus">Sea Spirit</option>
-                            <option value="gnome-spirit-focus">Gnome</option>
-                            <option value="manitous-spirit-focus">Manitous</option>
-                            <option value="salamander-spirit-focus">Salamander</option>
-                            <option value="sylphs-spirit-focus">Sylphs</option>
-                            <option value="ancestor-spirit-focus">Ancestor</option>
+                            <option data-i18n="none" value="none"></option>
+                            <option data-i18n="fire" value="fire-elem-focus">Fire</option>
+                            <option data-i18n="water" value="water-elem-focus">Water</option>
+                            <option data-i18n="earth" value="earth-elem-focus">Earth</option>
+                            <option data-i18n="air" value="air-elem-focus">Air</option>
+                            <option data-i18n="city-sprit" value="city-spirit-focus">City Spirit</option>
+                            <option data-i18n="field-sprit" value="field-spirit-focus">Field Spirit</option>
+                            <option data-i18n="hearth-sprit" value="hearth-spirit-focus">Hearth Spirit</option>
+                            <option data-i18n="desert-sprit" value="desert-spirit-focus">Desert Spirit</option>
+                            <option data-i18n="forest-sprit" value="forest-spirit-focus">Forest Spirit</option>
+                            <option data-i18n="mountain-sprit" value="mountain-spirit-focus">Mountain Spirit</option>
+                            <option data-i18n="prairie-sprit" value="prairie-spirit-focus">Prairie Spirit</option>
+                            <option data-i18n="mist-sprit" value="mist-spirit-focus">Mist Spirit</option>
+                            <option data-i18n="storm-sprit" value="storm-spirit-focus">Storm Spirit</option>
+                            <option data-i18n="wind-sprit" value="wind-spirit-focus">Wind Spirit</option>
+                            <option data-i18n="lake-sprit" value="lake-spirit-focus">Lake Spirit</option>
+                            <option data-i18n="river-sprit" value="river-spirit-focus">River Spirit</option>
+                            <option data-i18n="sea-sprit" value="sea-spirit-focus">Sea Spirit</option>
+                            <option data-i18n="gnome" value="gnome-spirit-focus">Gnome</option>
+                            <option data-i18n="manitous" value="manitous-spirit-focus">Manitous</option>
+                            <option data-i18n="salamander" value="salamander-spirit-focus">Salamander</option>
+                            <option data-i18n="sylphs" value="sylphs-spirit-focus">Sylphs</option>
+                            <option data-i18n="ancestor" value="ancestor-spirit-focus">Ancestor</option>
                         </select></div>
                 </div>
                 <input type="number" name="attr_force" value=0 min=0 />
@@ -1370,148 +1416,184 @@
                 <input type='hidden' name='attr_fociresource' />
             </div>
         </fieldset>
-	<br>
+        <br>
         <input type='hidden' class='weaponfocus-show' name='attr_weaponfocus-show' value="false" />
         <div class="weaponfocus-header">
-            <div class="table-top-left">Equip</div>
-            <div class="table-top-mid">Name</div>
-            <div class="table-top-mid">Reach</div>
-            <div class="table-top-mid">Skill</div>
-            <div class="table-top-mid">Conceal</div>
-            <div class="table-top-mid">Force</div>
-            <div class="table-top-mid">Power</div>
-            <div class="table-top-mid">Damage</div>
-            <div class="table-top-mid">Specialize</div>
-            <div class="table-top-mid">Attack</div>
-            <div class="table-top-right">Notes</div>
+            <div class="table-top-left" data-i18n="equip">Equip</div>
+            <div class="table-top-mid" data-i18n="name">Name</div>
+            <div class="table-top-mid" data-i18n="reach">Reach</div>
+            <div class="table-top-mid" data-i18n="skill">Skill</div>
+            <div class="table-top-mid" data-i18n="conceal">Conceal</div>
+            <div class="table-top-mid" data-i18n="force">Force</div>
+            <div class="table-top-mid" data-i18n="power">Power</div>
+            <div class="table-top-mid" data-i18n="damage">Damage</div>
+            <div class="table-top-mid" data-i18n="plus-dice-abbreviation">+Dice</div>
+            <div class="table-top-mid" data-i18n="plus-target-number-abberviation">+TN</div>
+            <div class="table-top-mid" data-i18n="attack">Attack</div>
+            <div class="table-top-right" data-i18n="notes">Notes</div>
         </div>
         <div class="weaponfocus-attributes">
             <div class="text-mid"><input type="checkbox" name="attr_weaponfocus-equipped" checked></div>
             <input class="myweapontxt" type="text" name="attr_weaponfocus-name" value="Weapon Focus">
             <input type="number" name="attr_weaponfocus-reach" value=0>
             <select class="mediumselect2" name="attr_weaponfocus skill">
-                <option value="@{edged}" SELECTED>Edged</option>
-                <option value="@{clubs}">Club</option>
-                <option value="@{poles}">Pole Arm</option>
-                <option value="@{whips}">Whip</option>
+                <option value="@{edged}" SELECTED data-i18n="edged">Edged</option>
+                <option value="@{clubs}" data-i18n="club">Club</option>
+                <option value="@{poles}" data-i18n="pole-arm">Pole Arm</option>
+                <option value="@{whips}" data-i18n="whip">Whip</option>
             </select>
             <input type="number" name="attr_weaponfocus-conceal" value=0>
             <input type="number" name="attr_weaponfocus-force" value=0>
-            <input type="number" name="attr_weaponfocus-pawer" value=0>
+            <input type="number" name="attr_weaponfocus-power" value=0>
             <select name="attr_weaponfocus-damage" class="mediumselect2">
-                <option>L</option>
-                <option SELECTED>M</option>
-                <option>S</option>
-                <option>D</option>
+                <option data-i18n="light-damage-abbreviation">L</option>
+                <option data-i18n="moderate-damage-abbreviation" SELECTED>M</option>
+                <option data-i18n="serious-damage-abbreviation">S</option>
+                <option data-i18n="deadly-damage-abbreviation">D</option>
             </select>
             <input type="number" name="attr_weaponfocus-specialized" value=0 \>
+            <input type="number" name="attr_weaponfocus-tnmods" value=0 \>
             <div><button class="attack-dice" id="weaponfocus" type="action" name="act_melee"
                     title="Melee Attack"></button></div>
             <input class="myweapontxt" type="text" name="attr_weaponfocus-notes">
-            <br>
-        </div>
-        <input type='hidden' class='magicinitiate-switch' name='attr_magicinitiateswitch' value="show" />
-        <div class="magicinitiate-show">
-            <div class="SRH3">Initiation and Metamagic
-                <button class="switch-button-show" type="action" name="act_magicinitiateswitch">Show</button>
-            </div>
-        </div>
-        <div class="magicinitiate-hide">
-            <div class="SRH3">Initiation and Metamagic
-                <button class="switch-button-hide" type="action" name="act_magicinitiateswitch">Hide</button>
-            </div>
-        </div>
-        <div class="magicinitiate">
-            <div class="SRH4">Initiate Grade:<input type="number" name="attr_initiategrade" value=0></div>
-            <div class="metamagic-table">
-                <header class="table-top-left">Metamagic</header>
-                <header class="table-top-right">Notes</header>
-            </div>
-            <fieldset class="repeating_metamagic">
-                <div class="metamagic-table">
-                    <div class="table-item-left"><input type="text" name="attr_metamagicname" /></div>
-                    <div class="table-item"><input type="text" name="attr_metamagicnotes" /></div>
-                </div>
-            </fieldset>
-            <br>
-        </div>
-        <input type='hidden' class='geas-switch' name='attr_geasswitch' value="show" />
-        <div class="geas-show">
-            <div class="SRH3">Geas
-                <button class="switch-button-show" type="action" name="act_geasswitch">Show</button>
-            </div>
-        </div>
-        <div class="geas-hide">
-            <div class="SRH3">Geas
-                <button class="switch-button-hide" type="action" name="act_geasswitch">Hide</button>
-            </div>
-        </div>
-        <div class="geas">
-            <div class="geas-table">
-                <header class="table-top-left">Geas Type</header>
-                <header class="table-top-right">Geas Notes</header>
-            </div>
-            <fieldset class='repeating_geas'>
-                <div class="geas-table">
-                    <div class="table-item-left"><input type="text" name="attr_geastype"></div>
-                    <div class="table-item"><input type="text" name="attr_geasnotes"></div>
-                </div>
-            </fieldset>
-            <br>
-        </div>
-        <input type='hidden' class='totem-switch' name='attr_totemswitch' value="show" />
-        <div class="totem-show">
-            <div class="SRH3">Totem/Abilities
-                <button class="switch-button-show" type="action" name="act_totemswitch">Show</button>
-            </div>
-        </div>
-        <div class="totem-hide">
-            <div class="SRH3">Totem/Abilities
-                <button class="switch-button-hide" type="action" name="act_totemswitch">Hide</button>
-            </div>
-        </div>
-        <div class="totem">
-            <div class="totem-table">
-                <header class="table-top-left">Totem</header>
-                <header class="table-top-mid">Environment</header>
-                <header class="table-top-mid">Advantages</header>
-                <header class="table-top-right">Disadvantages</header>
-                <div class="table-item-left"><input type='text' name="attr_totem" class="myweapontxt2"></div>
-                <div class="table-item"><input type='text' name="attr_totemenv" class="myweapontxt2"></div>
-                <div class="table-item"><input type="text" name="attr_totemadv" class="myweapontxt2"></div>
-                <div class="table-item"><input type="text" name="attr_totemdisadv" class="myweapontxt2"></div>
-            </div>
         </div>
     </div>
+    <div class="magicinitiate">
+        <br>
+        <div class="magicinitiate-level">
+            <div class="SRH4" data-i18n="initiate-grade">Initiate Grade:</div>
+            <input type="number" name="attr_initiategrade" value=0>
+        </div>
+        <div class="metamagic-table">
+            <header class="table-top-left-w" data-i18n="metamagic">Metamagic</header>
+            <header class="table-top-right-w" data-i18n="notes">Notes</header>
+        </div>
+        <fieldset class="repeating_metamagic">
+            <div class="metamagic-table">
+                <div class="table-item-left-nc"><input type="text" name="attr_metamagicname" /></div>
+                <div class="table-item-nc"><input type="text" name="attr_metamagicnotes" /></div>
+            </div>
+        </fieldset>
+        <br>
+    </div>
+    <div class="geas">
+        <br>
+        <div class="geas-table">
+            <header class="table-top-left" data-i18n="geas-type">Geas Type</header>
+            <header class="table-top-right" data-i18n="geas-notes">Geas Notes</header>
+        </div>
+        <fieldset class='repeating_geas'>
+            <div class="geas-table">
+                <div class="table-item-left"><input type="text" name="attr_geastype"></div>
+                <div class="table-item"><input type="text" name="attr_geasnotes"></div>
+            </div>
+        </fieldset>
+        <br>
+    </div>
+    <div class="totem">
+        <br>
+        <div class="totem-table">
+            <header class="table-top-left" data-i18n="totem">Totem</header>
+            <header class="table-top-mid" data-i18n="environment">Environment</header>
+            <header class="table-top-mid" data-i18n="advantages">Advantages</header>
+            <header class="table-top-right" data-i18n="disadvantages">Disadvantages</header>
+            <div class="table-item-left"><input type='text' name="attr_totem" class="myweapontxt2"></div>
+            <div class="table-item"><input type='text' name="attr_totemenv" class="myweapontxt2"></div>
+            <div class="table-item"><input type="text" name="attr_totemadv" class="myweapontxt2"></div>
+            <div class="table-item"><input type="text" name="attr_totemdisadv" class="myweapontxt2"></div>
+        </div>
+    </div>
+    <div class="conjuring">
+        <br>
+        <div class="conjuring-table">
+            <div class="table-top-left header" data-i18n="spirit-name">Spirit Name</div>
+            <div class="table-top-mid header" data-i18n="spirit-type">Spirit Type</div>
+            <div class="table-top-mid header" data-i18n="force">Force</div>
+            <div class="table-top-mid header" data-i18n="fetish">Fetish</div>
+            <div class="table-top-mid header" data-i18n="expendable">Expendable</div>
+            <div class="table-top-mid header" data-i18n="summon">Summon</div>
+            <div class="table-top-right header" data-i18n="banish">Banish</div>
+        </div>
+        <fieldset class='repeating_conjuring'>
+            <div class="conjuring-table">
+                <input type="text" name="name">
+                <select id="spirit-type" name="attr_type" class="mediumselect2">
+                    <option data-i18n="watcher">Watcher</option>
+                    <optgroup data-i18n-label="elementals" label="Elementals">
+                        <option data-i18n="air-elemental">Air Elemental</option>
+                        <option data-i18n="water-elemental">Water Elemental</option>
+                        <option data-i18n="earth-elemental">Earth Elemental</option>
+                        <option data-i18n="fire-elemental">Fire Elemental</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-man" label="Spirits of Man">
+                        <option data-i18n="city-spirit">City Spirit</option>
+                        <option data-i18n="field-spirit">Field Spirit</option>
+                        <option data-i18n="hearth-spirit">Hearth Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-land" label="Spirits of the Land">
+                        <option data-i18n="desert-spirit">Desert Spirit</option>
+                        <option data-i18n="forest-spirit">Forest Spirit</option>
+                        <option data-i18n="mountain-spirit">Mountain Spirit</option>
+                        <option data-i18n="prairie-spirit">Prairie Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-sky" label="Spirits of the Sky">
+                        <option data-i18n="mist-spirit">Mist Spirit</option>
+                        <option data-i18n="storm-spirit">Storm Spirit</option>
+                        <option data-i18n="wind-spirit">Wind Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-water" label="Spirits of the Waters">
+                        <option data-i18n="lake-spirit">Lake Spirit</option>
+                        <option data-i18n="river-spirit">River Spirit</option>
+                        <option data-i18n="sea-spirit">Sea Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-elements" label="Spirits of the Elements">
+                        <option data-i18n="gnome">Gnome</option>
+                        <option data-i18n="manitous">Manitous</option>
+                        <option data-i18n="salamander">Salamander</option>
+                        <option data-i18n="sylph">Sylphs</option>
+                        <option data-i18n="ancestor">Ancestor</option>
+                    </optgroup>
+                </select>
+                <input type="number" value=1 name="attr_force">
+                <input type="number" value=0 name="attr_fetish">
+                <input type="number" value=0 name="attr_expendable">
+                <button class="pictos-button" data-i18n-title="summon-spirit" title="summon spirit" type="action"
+                    id="summons" name="act_conjure-spirit">L</button>
+                <button class="pictos-button" data-i18n-title="banish-spirit" title="banish spirit" type="action"
+                    id="banish" name="act_conjure-spirit">L</button>
+            </div>
+        </fieldset>
+    </div>
+</div>
 </div>
 <div class='sheet-decks'>
     <input type='hidden' class='buttontoggle' name='attr_sheettype' />
     <!--Decks Tab -->
     <div class="matrix-show-deck">
-        <div class="SRH2">Cyberdecks and Utilities</div>
+        <div class="SRH2" data-i18n="cyberdecks-and-utilities">Cyberdecks and Utilities</div>
     </div>
     <div class="matrix-show-frame">
-        <div class="SRH2">Smart Frames and Agents</div>
+        <div class="SRH2" data-i18n="smart-frames-and-agents">Smart Frames and Agents</div>
     </div>
     <div class="deck-combat">
         <div>
             <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-            <div class="SRH3">Cyber Combat</div>
+            <div class="SRH3" data-i18n="cyber-combat">Cyber Combat</div>
             <div></div>
             <div class="matrix-combat-condition">
                 <input type='hidden' class='buttontoggle' name='attr_sheettype' />
                 <div class="matrix-show-deck">
-                    <div class="SRH4">Persona</div>
+                    <div class="SRH4" data-i18n="persona">Persona</div>
                 </div>
                 <div class="matrix-show-frame">
-                    <div class="SRH4">Core</div>
+                    <div class="SRH4" data-i18n="core">Core</div>
                 </div>
-                <div>Undamaged</div>
-                <div>Light Damage</div>
-                <div>Moderate Damage</div>
-                <div>Serious Damage</div>
-                <div>Crashed</div>
-                <div class="SRH4">Condition</div>
+                <div data-i18n="undamaged">Undamaged</div>
+                <div data-i18n="light-damage">Light Damage</div>
+                <div data-i18n="moderate-damage">Moderate Damage</div>
+                <div data-i18n="serious-damage">Serious Damage</div>
+                <div data-i18n="crashed">Crashed</div>
+                <div class="SRH4" data-i18n="condition">Condition</div>
                 <div>
                     <input type="radio" name="attr_matrix-damage" value=0 CHECKED>
                 </div>
@@ -1536,48 +1618,48 @@
             <div class="matrix-show-deck">
                 <div class="deck-summary">
                     <div class="text-mid">DNI</div>
-                    <div>Hot ASIST</div>
-                    <div>Reality Filter</div>
-                    <div>IC Suppressed</div>
-                    <div class="text-mid">Icon Status</div>
-                    <div class="text-mid">Host/Grid Rating</div>
+                    <div data-i18n="hot-asist">Hot ASIST</div>
+                    <div data-i18n="reality-filter">Reality Filter</div>
+                    <div data-i18n="ic-suppressed">IC Suppressed</div>
+                    <div class="text-mid" data-i18n="icon-status">Icon Status</div>
+                    <div class="text-mid" data-i18n="host-grid-rating">Host/Grid Rating</div>
                     <div><input checked="checked" type="checkbox" name="attr_deck-dni" value=1></div>
                     <div><input type="checkbox" name="attr_deck-asist" value=1> </div>
                     <div><input type="checkbox" name="attr_deck-realityfilter" value=1></div>
                     <div><input type="number" name="attr_deck-icsuppressed" value=0></div>
                     <select name="attr_matrix-iconstatus" class="mediumselect2">
-                            <option SELECTED>Intruder</option>
-                            <option>Legitimate</option>
+                        <option data-i18n="intruder" value="Intruder" SELECTED>Intruder</option>
+                        <option data-i18n="legitimate" value="Legitimate">Legitimate</option>
                     </select>
-                    <select name="attr_deck-systemrating" class= "mediumselect2">
-                            <option SELECTED>Unknown</option>
-                            <option>Blue</option>
-                            <option>Green</option>
-                            <option>Orange</option>
-                            <option>Red</option>
+                    <select name="attr_deck-systemrating" class="mediumselect2">
+                        <option data-i18n="unknown" value="Unknown" SELECTED>Unknown</option>
+                        <option data-i18n="blue" value="Blue">Blue</option>
+                        <option data-i18n="green" value="Green">Green</option>
+                        <option data-i18n="orange" value="Orange">Orange</option>
+                        <option data-i18n="red" value="Red">Red</option>
                     </select>
                 </div>
             </div>
             <div class="matrix-show-frame">
                 <div class="frame-summary">
-                    <div>Pilot Rating</div>
-                    <div>Utility Payload</div>
-                    <div>IC Suppressed</div>
-                    <div class="text-mid">Icon Status</div>
-                    <div class="text-mid">Host/Grid Rating</div>
+                    <div data-i18n="pilot-rating">Pilot Rating</div>
+                    <div data-i18n="utility-payload">Utility Payload</div>
+                    <div data-i18n="ic-suppressed">IC Suppressed</div>
+                    <div class="text-mid" data-i18n="icon-status">Icon Status</div>
+                    <div class="text-mid" data-i18n="host-grid-rating">Host/Grid Rating</div>
                     <div><input type="number" name="attr_decking" min=0 value=0> </div>
                     <div><input type="number" name="attr_deck-utilitypayload" min=0 value=0></div>
                     <div><input type="number" name="attr_deck-icsuppressed" min=0 value=0></div>
                     <select name="attr_matrix-iconstatus" style="width: 85px;">
-                            <option SELECTED>Intruder</option>
-                            <option>Legitimate</option>
+                        <option data-i18n="intruder" value="Intruder" SELECTED>Intruder</option>
+                        <option data-i18n="legitimate" value="Legitimate">Legitimate</option>
                     </select>
-                    <select name="attr_deck-systemrating" class= "mediumselect2">
-                            <option SELECTED>Unknown</option>
-                            <option>Blue</option>
-                            <option>Green</option>
-                            <option>Orange</option>
-                            <option>Red</option>
+                    <select name="attr_deck-systemrating" class="mediumselect2">
+                        <option data-i18n="unknown" value="Unknown" SELECTED>Unknown</option>
+                        <option data-i18n="blue" value="Blue">Blue</option>
+                        <option data-i18n="green" value="Green">Green</option>
+                        <option data-i18n="orange" value="Orange">Orange</option>
+                        <option data-i18n="red" value="Red">Red</option>
                     </select>
                 </div>
             </div>
@@ -1586,211 +1668,192 @@
             <input type='hidden' name='attr_deck-util-size-loaded' value=0 />
             <input type='hidden' name='attr_deck-util-rating-loaded' value=0 />
             <input type='hidden' name='attr_deck-tn' value=0 />
+            <input type='hidden' name='attr_deck-initiative' value=0 />
             <div class="deck-combat-system">
-                <div>Initiative <span name=attr_deck-initiative></span>d6 + <span name=attr_deck-reaction-final></span>
-                    <input type='hidden' name='attr_deck-initiative' value=0 />
-                    <button type="action" name="act_init" class="d6-button" title="Matrix Initiative"
-                        id="matrixinit">L</button>
-                </div>
-        	End Turn<button type="action" name="act_endturn" class="d6-button" title="End Combat Turn" id="endturn">L</button>
+                <div data-i18n="initiative">Initiative</div><span name=attr_deck-initiative></span>d6 + <span
+                    name=attr_deck-reaction-final></span>
+                <button type="action" name="act_init" class="d6-button" title="Matrix Initiative"
+                    id="matrixinit">L</button>
+                <div data-i18n="end-turn">End Turn</div><button type="action" name="act_endturn" class="d6-button" title="End Combat Turn" id="endturn">L</button>
+                <div data-i18n="attack">Attack></div><div><button type="action" name="act_matrixattack" class="pictos-custom-attack" title="Execute Attack vs. System Code or Icon" id="deckattack">[</button></div>
+                <div data-i18n="evade">Evade</div><button type="action" name="act_matrixmaneuvers" class="d6-button" title="Evade Detection" id="matrixevade">L</button>
+                <div data-i18n="parry">Parry</div><button type="action" name="act_matrixmaneuvers" class="d6-button" title="Parry Attack" id="matrixparry">L</button>
+                <div data-i18n="position">Posistion</div><button type="action" name="act_matrixmaneuvers"
+                    class="d6-button" title="Position Attack" id="matrixposition">L</button>
+            </div>
+            <div class="deck-combat-system2">
+                <div class="numberspan" data-i18n="combat-tn">Combat TN</div><span name="attr_deck-tn"></span>
                 <div></div>
-                Sensor<button type="action" name="act_matrixmaneuvers" class="d6-button" title="Sensor Test"
-                    id="matrixsensor">L</button>
+                <div data-i18n="resist">Resist</div><div><button type="action" name="act_matrixresist" class="pictos3-button" title="Damage Resistance Test" id="matrixresist">b</button></div>
                 <div></div>
-                Evade<button type="action" name="act_matrixmaneuvers" class="d6-button" title="Evade Detection"
-                    id="matrixevade">L</button>
+                <div data-i18n="medic">Medic</div><div><button type="action" name="act_matrixmedic" class="pictos-button" title="Medic Utility" id="matrixmedic">k</button></div>
                 <div></div>
-                Parry<button type="action" name="act_matrixmaneuvers" class="d6-button" title="Parry Attack"
-                    id="matrixparry">L</button>
+                <div data-i18n="decking">Decking</div><button type="action" name="act_matrixtest" class="d6-button"
+                    title="General Decking Test" id="decking">L</button>
                 <div></div>
-                Posistion<button type="action" name="act_matrixmaneuvers" class="d6-button" title="Position Attack"
-                    id="matrixposition">L</button>
-                <div class="numberspan">Combat TN<span name="attr_deck-tn"></span></div>
-                Resist<button type="action" name="act_matrixresist" class="d6-button" title="Damage Resistance Test"
-                    id="matrixresist">L</button>
+		<div data-i18n="hardening">Hardening</div> <span name="attr_deck-hardening"> </span>
                 <div></div>
-                Medic<button type="action" name="act_matrixmedic" class="d6-button" title="Medic Utility"
-                    id="matrixmedic">L</button>
+		<div data-i18n="armor">Armor</div> <span name="attr_deckarmor-rating-final"> </span>
                 <div></div>
-                Decking<button type="action" name="act_matrixtest" class="d6-button" title="General Decking Test"
-                    id="decking">L</button>
             </div>
             <br>
-            <div>Use Hacking Pool for IC supression<input type="checkbox" name="attr_deck-icsuppresspool" value=1
-                    checked="checked"></div>
+            <div class="hack-pool-option">
+                <div data-i18n="use-hacking-pool-for-ic-supression">Use Hacking Pool for IC supression</div><input
+                    type="checkbox" name="attr_deck-icsuppresspool" value=1 checked="checked">
+            </div>
         </div>
         <div>
             <div class="deck-summary-attributes">
                 <div></div>
                 <div></div>
-                <div>Full</div>
-                <div>Mods</div>
-                <div>Final</div>
+                <div data-i18n="full">Full</div>
+                <div data-i18n="mods">Mods</div>
+                <div data-i18n="final">Final</div>
                 <div class="mpcp-frame-toggle"><input type='hidden' class='buttontoggle' name='attr_sheettype' />
                     <div class="matrix-show-deck">MPCP</div>
-                    <div class="matrix-show-frame">Core</div>
+                    <div class="matrix-show-frame" data-i18n="core">Core</div>
                 </div>
                 <div><button type="action" name="act_matrixtest" class="d6-button" title="MPCP Test"
                         id="deck-mpcp-final">L</button></div>
                 <div><span name="attr_deck-mpcp-max"></span></div>
                 <div><input type="number" name="attr_deck-mpcp-mods" value=0></div>
                 <div><span name="attr_deck-mpcp-final"></span></div>
-                <div>Bod</div>
+                <div data-i18n="bod">Bod</div>
                 <div><button type="action" name="act_matrixtest" class="d6-button" title="Bod Test"
                         id="deck-bod-final">L</button></div>
                 <div> <span name="attr_deck-bod-max"></span></div>
                 <div><input type="number" name="attr_deck-bod-mods" value=0></div>
                 <div><span name="attr_deck-bod-final"></span></div>
-                <div>Evasion</div>
+                <div data-i18n="evasion">Evasion</div>
                 <div><button type="action" name="act_matrixtest" class="d6-button" title="Evasion Test"
                         id="deck-evasion-final">L</button></div>
                 <div> <span name="attr_deck-evasion-max"></span></div>
                 <div><input type="number" name="attr_deck-evasion-mods" value=0></div>
                 <div><span name="attr_deck-evasion-final"></span></div>
-                <div>Masking</div>
+                <div data-i18n="masking">Masking</div>
                 <div><button type="action" name="act_matrixtest" class="d6-button" title="Masking Test"
                         id="deck-masking-final">L</button></div>
                 <div> <span name="attr_deck-masking-max"></span></div>
                 <div><input type="number" name="attr_deck-masking-mods" value=0></div>
                 <div><span name="attr_deck-masking-final"></span></div>
-                <div>Sensors</div>
+                <div data-i18n="sensors">Sensors</div>
                 <div><button type="action" name="act_matrixtest" class="d6-button" title="Sensors Test"
                         id="deck-sensors-final">L</button></div>
                 <div> <span name="attr_deck-sensors-max"></span></div>
                 <div><input type="number" name="attr_deck-sensors-mods" value=0></div>
                 <div><span name="attr_deck-sensors-final"></span></div>
-                <div title="Detection Factor">Detect.F</div>
+                <div data-i18n="detection-factor-abbreviation" title="Detection Factor">Detect.F</div>
                 <div></div>
                 <div title="Detection Factor Maximum"> <span name="attr_deck-detection-max"></span></div>
                 <div><input type="number" name="attr_deck-detection-mods" value=0></div>
                 <div title="Detection Factor Final Modified Number"><span name="attr_deck-detection-final"></span></div>
             </div>
-            <div class="deck-combat-modifiers">
-                <input type='hidden' name='attr_matrix-penalty' value=0 />
-                <div>Penalties: <span class="matrix-pens" name="attr_matrix-penalty"></span></div>
-            </div>
         </div>
 
     </div>
+    <input type='hidden' class='buttontoggle' name='attr_sheettype' />
+    <div class="matrix-show-deck">
+        <div class='deck-memory-used'>
+            <input type='hidden' class='matrix-status' name='attr_matrix-status' value="out" />
+            <div data-i18n="jack-in">Jack In</div><button class="pictos-button matrix-status" type="action"
+                name="act_jackin">Q</button>
+            <div></div>
+            <div data-i18n="memory-in-use">Memory In Use:</div>
+            <div><input type='hidden' class='deck-mem-full' name='attr_deck-mem-overloaded' value=0 />
+                <span class="deck-overload" name="attr_deck-util-size-loaded"></span>
+            </div>
+	    <div>/<span name="attr_deck-activemem"></div>
+            <div><button class="switch-button-hide" title="unload all utilities" type="action"
+                    name="act_deck-utilities-unloadall" data-i18n="reset">Reset</button></div>
+            <div></div>
+            <div data-i18n="hacking-pool">Hacking Pool:</div>
+            <div><span name="attr_hackingpool"></span></div>
+            <div></div>
+            <div data-i18n="hacking-pool-used">Hacking Pool Used:</div>
+            <input type='hidden' class='hackingpool-over' name='attr_hackingpool-over' /> <span class="hackingpool-over"
+                name="attr_hackingpool-used"></span>
+            <input type='hidden' name='attr_matrix-penalty' value=0 />
+            <div></div>
+            <div data-i18n="penalties">Penalties:</div>
+            <div><span class="matrix-pens" name="attr_matrix-penalty"></span></div>
+        </div>
+    </div>
+    <div class="decking-tabs">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-        <div class="matrix-show-deck">
-            <div class='deck-memory-used'>
-                <div class="SRH4">Memory In Use:</div>
-                <div><input type='hidden' class='deck-mem-full' name='attr_deck-mem-overloaded' value=0 />
-                    <span class="deck-overload" name="attr_deck-util-size-loaded"></span>
-                </div>
-                <div><button class="switch-button-hide" title="unload all utilities" type="action"
-                        name="act_deck-utilities-unloadall">Reset</button></div>
-            	<div>Hacking Pool: <span name="attr_hackingpool"></span></div>
-            	<div>Hacking Pool Used:<input type='hidden' class='hackingpool-over' name='attr_hackingpool-over' /> <span class="hackingpool-over" name="attr_hackingpool-used"></span></div>
-                <input type='hidden' name='attr_matrix-penalty' value=0 />
-                <div>Penalties: <span class="matrix-pens" name="attr_matrix-penalty"></span></div>
-            </div>
-        </div>
-    <div class="matrix-show-deck">
-        <input type='hidden' class='deck-skills-switch' name='attr_deck-skills-switch' value="show" />
-        <div class="deck-skills-show">
-            <div class="SRH3">Computer skills
-                <button class="switch-button-show" type="action" name="act_deck-skills-switch">Show</button>
-            </div>
-        </div>
-        <div class="deck-skills-hide">
-            <div class="SRH3">Computer skills
-                <button class="switch-button-hide" type="action" name="act_deck-skills-switch">Hide</button>
-            </div>
-        </div>
-        <div class="deck-skills">
-            <input type="checkbox" style="opacity:0;" class="deck-spec-switch" name="attr_deck-spec-switch" value=1>
-            <div class="deck-skills-row table-top">
-                <header>Computer</header>
-                <input type="number" name="attr_computer" value=0>
-                <button class="d6-dice" type="action" name="act_skilltest" id="computer hacking"></button>
-                <div>specialize</div>
-                <input type="checkbox" class="deck-spec-switch" name="attr_deck-spec-switch" value=1>
-            </div>
-            <div class="deck-spec-off">
-                <div class="table-item-left">Hardware</div>
-                <div class="table-item"><span name="attr_computer"></div>
-                <div class="table-item-left">Decking</div>
-                <div class="table-item"><span name="attr_computer"></div>
-                <div class="table-item-left">Programming</div>
-                <div class="table-item"><span name="attr_computer"></div>
-            </div>
-            <div class="deck-spec-on">
-                <div class="table-item-left">Hardware</div>
-                <div class="table-item"><input type="number" name="attr_hardware">
-                    <button class="d6-dice" type="action" name="act_skilltest" id="hardware hacking"></button>
-                </div>
-                <div class="table-item-left">Decking</div>
-                <div class="table-item"><input type="number" name="attr_decking">
-                    <button class="d6-dice" type="action" name="act_skilltest" id="decking hacking"></button>
-                </div>
-                <div class="table-item-left">Programming</div>
-                <div class="table-item"><input type="number" name="attr_programming">
-                    <button class="d6-dice" type="action" name="act_skilltest" id="programming hacking"></button>
-                </div>
-            </div><br>
-        </div>
+        <input type="hidden" class="decking-tabs-switch" name="attr_deckingtab" value="decking">
+        <button class="decking-tabs-cyberdeck" type="action" name="act_cyberdeck-tab" data-i8n="cyberdeck-uppercase" data-i18n-title="cyberdeck-configuration" title="Cyberdeck Configuration">CYBERDECK</button>
+        <button class="decking-tabs-skills" type="action" name="act_decking-tab" data-i8n="computer-skills-uppercase" data-i18n-title="computer-skills" title="Computer Skills">COMPUTER SKILLS</button>
+        <button class="decking-tabs-frame" type="action" name="act_frame-tab" data-i8n="frame-core-uppercase" data-i18n-title="frame-configuration" title="Frame Configuration">FRAME CORE</button>
+        <button class="decking-tabs-utilities" type="action" name="act_utilities-tab" data-i8n="utilities-uppercase" data-i18n-title="utilities-configuration" title="Utilities Configuration">UTILITIES</button>
+	<div class="tabs-empty"></div>
     </div>
-    <div class="matrix-show-deck">
-        <input type='hidden' class='deck-cyberdeck-switch' name='attr_deck-cyberdeck-switch' value="show" />
-        <div class="deck-cyberdeck-show">
-            <div class="SRH3">Cyberdeck
-                <button class="switch-button-show" type="action" name="act_deck-cyberdeck-switch">Show</button>
-            </div>
+    <input type="hidden" class="decking-tabs-switch" name="attr_deckingtab" value="decking">
+    <div class="deck-skills">
+        <div class="deck-skills-row table-top">
+            <header data-i18n="computer">Computer</header>
+            <input type="number" name="attr_computer" value=0>
+            <button class="d6-dice" type="action" name="act_skilltest" id="computer hacking"></button>
+            <div data-i18n="specialize">specialize</div>
+            <input type="checkbox" class="deck-spec-switch" name="attr_deck-spec-switch" value=1>
         </div>
-        <div class="deck-cyberdeck-hide">
-            <div class="SRH3">Cyberdeck
-                <button class="switch-button-hide" type="action" name="act_deck-cyberdeck-switch">Hide</button>
+        <input type="checkbox" class="deck-spec-switch hidden-checkbox" name="attr_deck-spec-switch" value=1>
+        <div class="deck-spec-off">
+            <div data-i18n="hardware" class="table-item-left">Hardware</div>
+            <div class="table-item"><span name="attr_computer"></div>
+            <div data-i18n="decking" class="table-item-left">Decking</div>
+            <div class="table-item"><span name="attr_computer"></div>
+            <div data-i18n="programming" class="table-item-left">Programming</div>
+            <div class="table-item"><span name="attr_computer"></div>
+        </div>
+        <div class="deck-spec-on">
+            <div data-i18n="hardware" class="table-item-left">Hardware</div>
+            <div class="table-item"><input type="number" name="attr_hardware">
+                <button class="d6-dice" type="action" name="act_skilltest" id="hardware hacking"></button>
+            </div>
+            <div data-i18n="decking" class="table-item-left">Decking</div>
+            <div class="table-item"><input type="number" name="attr_decking">
+                <button class="d6-dice" type="action" name="act_skilltest" id="decking hacking"></button>
+            </div>
+            <div data-i18n="programming" class="table-item-left">Programming</div>
+            <div class="table-item"><input type="number" name="attr_programming">
+                <button class="d6-dice" type="action" name="act_skilltest" id="programming hacking"></button>
             </div>
         </div>
     </div>
-    <div class="matrix-show-frame">
-        <input type='hidden' class='deck-cyberdeck-switch' name='attr_deck-cyberdeck-switch' value="show" />
-        <div class="deck-cyberdeck-show">
-            <div class="SRH3">Frame Core
-                <button class="switch-button-show" type="action" name="act_deck-cyberdeck-switch">Show</button>
-            </div>
-        </div>
-        <div class="deck-cyberdeck-hide">
-            <div class="SRH3">Frame Core
-                <button class="switch-button-hide" type="action" name="act_deck-cyberdeck-switch">Hide</button>
-            </div>
-        </div>
-    </div>
-    <input type='hidden' class='deck-cyberdeck-switch' name='attr_deck-cyberdeck-switch' value="show" />
     <div class="deck-cyberdeck">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
         <div class="matrix-show-deck">
             <div class="deck-attributes">
-	        <div class="deck-name"><div>Deck Name</div><input type=text name="attr_deck-name"></div>
+                <div class="deck-name">
+                    <div data-i18n="deck-name">Deck Name</div><input type=text name="attr_deck-name">
+                </div>
                 <div class="deck-persona">
                     <div>MPCP</div>
                     <input type="number" name="attr_deck-mpcp-max" value=0 min=0>
                     <input type="hidden" name="attr_deck-maxpersona" value=0>
-                    <div>Bod</div>
+                    <div data-i18n="bod">Bod</div>
                     <input type="number" name="attr_deck-bod-max" value=0 min=0>
-                    <div>Evasion</div>
+                    <div data-i18n="evasion">Evasion</div>
                     <input type="number" name="attr_deck-evasion-max" value=0 min=0>
-                    <div>Masking</div>
+                    <div data-i18n="masking">Masking</div>
                     <input type="number" name="attr_deck-masking-max" value=0 min=0>
-                    <div>Sensors</div>
+                    <div data-i18n="sensors">Sensors</div>
                     <input type="number" name="attr_deck-sensors-max" value=0 min=0>
                 </div>
                 <div class="deck-cyberdeck-specs">
-                    <div>Hardening</div>
+                    <div data-i18n="hardening">Hardening</div>
                     <input type="number" name="attr_deck-hardening" value=0 min=0>
-                    <div>Active Memory</div>
+                    <div data-i18n="active-memory">Active Memory</div>
                     <input type="number" name="attr_deck-activemem" value=0 min=0>
-                    <div>Storage Memory</div>
+                    <div data-i18n="storage-memory">Storage Memory</div>
                     <input type="number" name="attr_deck-storagemem" value=0 min=0>
-                    <div>I/O Speed</div>
+                    <div data-i18n="io-speed">I/O Speed</div>
                     <input type="number" name="attr_deck-iospeed" value=0 min=0>
-                    <div>Response Increase</div>
+                    <div data-i18n="response-increase">Response Increase</div>
                     <input type="number" name="attr_deck-response" value=0 min=0>
                     <div>ICCM</div>
                     <input type="number" name="attr_deck-iccm" value=0 min=0>
-                    <div>Offline Storage</div>
+                    <div data-i18n="offline-storage">Offline Storage</div>
                     <input type="number" name="attr_deck-offlinestorage" value=0 min=0>
                 </div>
                 <div class="deck-extras"> </div>
@@ -1799,53 +1862,40 @@
         <div class="matrix-show-frame">
             <div class="deck-attributes">
                 <div class="frame-core">
-                    <div>Type</div>
+                    <div data-i18n="type">Type</div>
                     <div><select name="attr_frametype" style="width: 115px;">
-                            <option>Smart Frame</option>
-                            <option selected>Agent</option>
+                            <option value="Smart Frame" data-i18n="smart-frame">Smart Frame</option>
+                            <option value="Agent" selected data-i18n="agent">Agent</option>
                         </select>
                     </div>
-                    <div>Core Rating</div>
+                    <div data-i18n="core-rating">Core Rating</div>
                     <div><input type="number" name="attr_frame-core" value=0 min=0></div>
                     <input type="hidden" name="attr_deck-maxpersona" value=0>
-                    <div>Utility Payload</div>
+                    <div data-i18n="utility-payload">Utility Payload</div>
                     <div><input type="number" name="attr_deck-utilitypayload" value=0 min=0></div>
-                    <div>Pilot</div>
+                    <div data-i18n="pilot">Pilot</div>
                     <div><input type="number" name="attr_decking" value=0 min=0></div>
-                    <div>Initiative</div>
+                    <div data-i18n="initiative">Initiative</div>
                     <div><input type="number" name="attr_frame-initiative" value=0 min=0></div>
                 </div>
                 <div class="frame-attributes">
-                    <div>Bod</div>
+                    <div data-i18n="bod">Bod</div>
                     <input type="number" name="attr_deck-bod-max" value=0 min=0>
-                    <div>Evasion</div>
+                    <div data-i18n="evasion">Evasion</div>
                     <input type="number" name="attr_deck-evasion-max" value=0 min=0>
-                    <div>Masking</div>
+                    <div data-i18n="masking">Masking</div>
                     <input type="number" name="attr_deck-masking-max" value=0 min=0>
-                    <div>Sensors</div>
+                    <div data-i18n="sensors">Sensors</div>
                     <input type="number" name="attr_deck-sensors-max" value=0 min=0>
                 </div>
             </div>
         </div>
     </div>
-    <input type='hidden' class='deck-utilities-switch' name='attr_deck-utilities-switch' value="show" />
-    <div class="deck-utilities-show">
-        <div class="SRH3">Utilities
-            <button class="switch-button-show" type="action" name="act_deck-utilities-switch">Show</button>
-        </div>
-    </div>
-    <div class="deck-utilities-hide">
-        <div class="SRH3">Utilities
-            <button class="switch-button-hide" type="action" name="act_deck-utilities-switch">Hide</button>
-        </div>
-    </div>
-    <br>
-
     <div class="deck-utilities">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
         <div class="matrix-show-frame">
             <div class='frame-util-used'>
-                <label>Utility Rating Sum</label>
+                <label data-i18n="utility-rating-sum">Utility Rating Sum</label>
                 <div><input type='hidden' class='frame-utility-full' name='attr_deck-util-overloaded' value=0 />
                     <span class="frame-overload" name="attr_deck-util-rating-loaded"></span>
                 </div>
@@ -1855,83 +1905,90 @@
         </div>
         <div>
             <div>
-                <div class="SRH4">Special Utilities</div>
+                <div class="SRH4" data-i18n="special-utilities">Special Utilities</div>
                 <div class="deck-utilities-special">
-                    <header class="table-top-left">Utility</header>
-                    <header class="table-top-mid">Rating</header>
-                    <header class="table-top-mid">Multiplier</header>
-                    <header class="table-top-mid">Size</header>
-                    <header class="table-top-mid">Loaded</header>
-                    <header class="table-top-mid">Effective Rating</header>
-                    <header class="table-top-mid">Test</header>
-                    <header class="table-top-mid">Swap Memory</header>
-                    <header class="table-top-right">Notes</header>
-                    <div class="table-item-left">Sleaze</div>
+                    <header data-i18n="utility" class="table-top-left">Utility</header>
+                    <header data-i18n="rating" class="table-top-mid">Rating</header>
+                    <header data-i18n="multiple" class="table-top-mid">Multiplier</header>
+                    <header data-i18n="size" class="table-top-mid">Size</header>
+                    <header data-i18n="loaded" class="table-top-mid">Loaded</header>
+                    <header data-i18n="effective-rating" class="table-top-mid">Effective Rating</header>
+                    <header data-i18n="test" class="table-top-mid">Test</header>
+                    <header data-i18n="swap-memory" class="table-top-mid">Swap Memory</header>
+                    <header data-i18n="notes" class="table-top-right">Notes</header>
+                    <div data-i18n="sleaze" class="table-item-left">Sleaze</div>
                     <div class="table-item"><input type="number" name="attr_decksleaze-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_decksleaze-multiplier" value=3></div>
                     <div class="table-item"><input type="number" name="attr_decksleaze-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_decksleaze-loaded" class="text-mid" value=1></div>
+                    <div class="table-item"><input type="checkbox" name="attr_decksleaze-loaded" class="text-mid"
+                            value=1></div>
                     <div class="table-item"><input type="number" name="attr_decksleaze-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Sleaze Utility Test" id="decksleaze-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Sleaze Utility Test" id="decksleaze-rating-final">2</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Sleaze Utility from Disk" id="decksleaze-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_decksleaze-notes"></div>
-                    <div class="table-item-left">Track</div>
+                    <div data-i18n="track" class="table-item-left">Track</div>
                     <div class="table-item"><input type="number" name="attr_decktrack-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_decktrack-multiplier" value=8></div>
                     <div class="table-item"><input type="number" name="attr_decktrack-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_decktrack-loaded" class="text-mid" value=1></div>
+                    <div class="table-item"><input type="checkbox" name="attr_decktrack-loaded" class="text-mid"
+                            value=1></div>
                     <div class="table-item"><input type="number" name="attr_decktrack-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Tracking Utility Test" id="decktrack-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Tracking Utility Test" id="decktrack-rating-final">2</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Tracking Utility from Disk" id="decktrack-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_decktrack-notes"></div>
 
                 </div>
 
-                <div class="SRH4">Defensive Utilities</div>
+                <div data-i18n="defensive-utilities" class="SRH4">Defensive Utilities</div>
                 <div class="deck-utilities-defensive">
-                    <header class="table-top-left">Utility</header>
-                    <header class="table-top-mid">Rating</header>
-                    <header class="table-top-mid">Multiplier</header>
-                    <header class="table-top-mid">size</header>
-                    <header class="table-top-mid">loaded</header>
-                    <header class="table-top-mid">Effective Rating</header>
-                    <header class="table-top-mid">Test</header>
-                    <header class="table-top-mid">Swap Memory</header>
-                    <header class="table-top-right">Notes</header>
-                    <div class="table-item-left">Armor</div>
+                    <header data-i18n="utility" class="table-top-left">Utility</header>
+                    <header data-i18n="rating" class="table-top-mid">Rating</header>
+                    <header data-i18n="multiplier" class="table-top-mid">Multiplier</header>
+                    <header data-i18n="size" class="table-top-mid">size</header>
+                    <header data-i18n="loaded" class="table-top-mid">loaded</header>
+                    <header data-i18n="effective-rating" class="table-top-mid">Effective Rating</header>
+                    <header data-i18n="test" class="table-top-mid">Test</header>
+                    <header data-i18n="swap-memory" class="table-top-mid">Swap Memory</header>
+                    <header data-i18n="notes" class="table-top-right">Notes</header>
+                    <div data-i18n="armor" class="table-item-left">Armor</div>
                     <div class="table-item"><input type="number" name="attr_deckarmor-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_deckarmor-multiplier" value=3></div>
                     <div class="table-item"><input type="number" name="attr_deckarmor-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_deckarmor-loaded" class="text-mid" value=1></div>
+                    <div class="table-item"><input type="checkbox" name="attr_deckarmor-loaded" class="text-mid"
+                            value=1></div>
                     <div class="table-item"><input type="number" name="attr_deckarmor-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Armor Utility Test" id="deckarmor-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Armor Utility Test" id="deckarmor-rating-final">2</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Armor Utility from Disk" id="deckarmor-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_deckarmor-notes"></div>
-                    <div class="table-item-left">Cloak</div>
+                    <div data-i18n="cloak" class="table-item-left">Cloak</div>
                     <div class="table-item"><input type="number" name="attr_deckcloak-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_deckcloak-multiplier" value=3></div>
                     <div class="table-item"><input type="number" name="attr_deckcloak-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_deckcloak-loaded" class="text-mid" value=1> </div>
+                    <div class="table-item"><input type="checkbox" name="attr_deckcloak-loaded" class="text-mid"
+                            value=1> </div>
                     <div class="table-item"><input type="number" name="attr_deckcloak-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Cloak Utility Test" id="deckcloak-rating-final">L</button></div>
-                    <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Cloak Utility from Disk" id="deckcloak-rating">0</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Cloak Utility Test" id="deckcloak-rating-final">2</button></div>
+                    <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button"
+                            title="Reload Cloak Utility from Disk" id="deckcloak-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_deckcloak-notes"></div>
-                    <div class="table-item-left">Lock-On</div>
+                    <div data-i18n="lock-on" class="table-item-left">Lock-On</div>
                     <div class="table-item"><input type="number" name="attr_decklockon-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_decklockon-multiplier" value=3></div>
                     <div class="table-item"><input type="number" name="attr_decklockon-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_decklockon-loaded" class="text-mid" value=1> </div>
+                    <div class="table-item"><input type="checkbox" name="attr_decklockon-loaded" class="text-mid"
+                            value=1> </div>
                     <div class="table-item"><input type="number" name="attr_decklockon-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Lock-On Utility Test" id="decklockon-rating-final">L</button></div>
-                    <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Lock-On Utility from Disk" id="decklockon-rating">0</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Lock-On Utility Test" id="decklockon-rating-final">2</button></div>
+                    <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button"
+                            title="Reload Lock-On Utility from Disk" id="decklockon-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_decklockon-notes"></div>
-                    <div class="table-item-left">Medic</div>
+                    <div data-i18n="medic" class="table-item-left">Medic</div>
                     <div class="table-item"><input type="number" name="attr_deckmedic-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_deckmedic-multiplier" value=4></div>
                     <div class="table-item"><input type="number" name="attr_deckmedic-size" value=0></div>
                     <div class="table-item"><input type="checkbox" name="attr_deckmedic-loaded" class="text-mid" value=1> </div>
                     <div class="table-item"><input type="number" name="attr_deckmedic-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Medic Utility Test" id="deckmedic-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixmedic" class="pictos-button" title="Medic Utility Execute" id="deckmedic-rating-final">k</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Medic Utility from Disk" id="deckmedic-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_deckmedic-notes"></div>
                 </div>
@@ -1941,71 +1998,78 @@
                         <div class="table-item"><input type="number" name="attr_rating" value=0></div>
                         <div class="table-item"><input type="number" name="attr_multiplier" value=0></div>
                         <div class="table-item"><input type="number" name="attr_size" value=0></div>
-                        <div class="table-item "><input class="text-mid" type="checkbox" name="attr_loaded" value=1> </div>
+                        <div class="table-item "><input class="text-mid" type="checkbox" name="attr_loaded" value=1>
+                        </div>
                         <div class="table-item"><input type="number" name="attr_rating-final" value=0></div>
-                        <div class="table-item"><button type="action" name="act_matrixrepeatingtest" class="d6-button" title="Utility Test" id="repeating">L</button></div>
-                        <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Utility from Disk" id="repeating">0</button></div>
+                        <div class="table-item"><button type="action" name="act_matrixrepeatingtest" class="pictos-button" title="Utility Test" id="repeating">2</button></div>
+                        <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button"
+                                title="Reload Utility from Disk" id="repeating">0</button></div>
                         <div class="table-item"><input type="text" name="attr_utilitynotes"></div>
                     </div>
                 </fieldset>
             </div>
             <div>
-                <div class="SRH4">Offensive Utilities</div>
+                <div data-i18n="offensive-utilities" class="SRH4">Offensive Utilities</div>
                 <div class="deck-utilities-offensive">
-                    <header class="table-top-left">Utility</header>
-                    <header class="table-top-mid">Rating</header>
-                    <header class="table-top-mid">Multiplier</header>
-                    <header class="table-top-mid">size</header>
-                    <header class="table-top-mid">loaded</header>
-                    <header class="table-top-mid">Effective Rating</header>
-                    <header class="table-top-mid">Execute</header>
-                    <header class="table-top-mid">Test</header>
-                    <header class="table-top-mid">Swap Memory</header>
-                    <header class="table-top-right">Notes</header>
+                    <header data-i18n="utility" class="table-top-left">Utility</header>
+                    <header data-i18n="rating" class="table-top-mid">Rating</header>
+                    <header data-i18n="multiplier" class="table-top-mid">Multiplier</header>
+                    <header data-i18n="size" class="table-top-mid">size</header>
+                    <header data-i18n="loaded" class="table-top-mid">loaded</header>
+                    <header data-i18n="effective-rating" class="table-top-mid">Effective Rating</header>
+                    <header data-i18n="execute" class="table-top-mid">Execute</header>
+                    <header data-i18n="test" class="table-top-mid">Test</header>
+                    <header data-i18n="swap-memory" class="table-top-mid">Swap Memory</header>
+                    <header data-i18n="notes" class="table-top-right">Notes</header>
                     <div class="table-item-left"><select name="attr_deckattacklevel" class="mediumselect2">
-                            <option value="L">Attack (L)</option>
-                            <option value="M" selected>Attack (M)</option>
-                            <option value="S">Attack (S)</option>
-                            <option value="D">Attack (D)</option>
+                            <option data-i18n="attack-light-damage-abbreviation" value="L">Attack (L)</option>
+                            <option data-i18n="attack-moderate-damage-abbreviation" value="M" selected>Attack (M)
+                            </option>
+                            <option data-i18n="attack-serious-damage-abbreviation" value="S">Attack (S)</option>
+                            <option data-i18n="attack-deadly-damage-abbreviation" value="D">Attack (D)</option>
                         </select>
                     </div>
                     <div class="table-item"><input type="number" name="attr_deckattack-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_deckattack-multiplier" value=4></div>
                     <div class="table-item"><input type="number" name="attr_deckattack-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_deckattack-loaded" class="text-mid" value=1></div>
+                    <div class="table-item"><input type="checkbox" name="attr_deckattack-loaded" class="text-mid"
+                            value=1></div>
                     <div class="table-item"><input type="number" name="attr_deckattack-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixattack" class="d6-button" title="Execute Attack vs. System Code or Icon" id="deckattack">L</button></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Attack Utility Test" id="deckattack-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixattack" class="pictos-custom-button" title="Execute Attack vs. System Code or Icon" id="deckattack">[</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Attack Utility Test" id="deckattack-rating-final">2</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Attack Utility from Disk" id="deckattack-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_deckattack-notes"></div>
-                    <div class="table-item-left">Black Hammer</div>
+                    <div data-i18n="black-hammer" class="table-item-left">Black Hammer</div>
                     <div class="table-item"><input type="number" name="attr_deckblackhammer-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_deckblackhammer-multiplier" value=20></div>
                     <div class="table-item"><input type="number" name="attr_deckblackhammer-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_deckblackhammer-loaded" class="text-mid" value=1></div>
+                    <div class="table-item"><input type="checkbox" name="attr_deckblackhammer-loaded" class="text-mid"
+                            value=1></div>
                     <div class="table-item"><input type="number" name="attr_deckblackhammer-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixattack" class="d6-button" title="Blackhammer Utility Attack" id="deckblackhammer">L</button></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Blackhammer Utility Test" id="deckblackhammer-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixattack" class="pictos-custom-button" title="Blackhammer Utility Attack" id="deckblackhammer">[</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Blackhammer Utility Test" id="deckblackhammer-rating-final">2</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Blackhammer Utility from Disk" id="deckblackhammer-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_deckblackhammer-notes"></div>
-                    <div class="table-item-left">Killjoy</div>
+                    <div data-i18n="killjoy" class="table-item-left">Killjoy</div>
                     <div class="table-item"><input type="number" name="attr_deckkilljoy-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_deckkilljoy-multiplier" value=10></div>
                     <div class="table-item"><input type="number" name="attr_deckkilljoy-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_deckkilljoy-loaded" class="text-mid" value=1></div>
+                    <div class="table-item"><input type="checkbox" name="attr_deckkilljoy-loaded" class="text-mid"
+                            value=1></div>
                     <div class="table-item"><input type="number" name="attr_deckkilljoy-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixattack" class="d6-button" title="KillJoy Utility Attack" id="deckkilljoy">L</button></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="KillJoy Utility Test" id="deckkilljoy-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixattack" class="pictos-custom-button" title="KillJoy Utility Attack" id="deckkilljoy">[</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="KillJoy Utility Test" id="deckkilljoy-rating-final">2</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload KillJoy Utility from Disk" id="deckkilljoy-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_deckkilljoy-notes"></div>
-                    <div class="table-item-left">Slow</div>
+                    <div data-i18n="slow" class="table-item-left">Slow</div>
                     <div class="table-item"><input type="number" name="attr_deckslow-rating" value=0></div>
                     <div class="table-item"><input type="number" name="attr_deckslow-multiplier" value=4></div>
                     <div class="table-item"><input type="number" name="attr_deckslow-size" value=0></div>
-                    <div class="table-item"><input type="checkbox" name="attr_deckslow-loaded" class="text-mid" value=1></div>
+                    <div class="table-item"><input type="checkbox" name="attr_deckslow-loaded" class="text-mid" value=1>
+                    </div>
                     <div class="table-item"><input type="number" name="attr_deckslow-rating-final" value=0></div>
-                    <div class="table-item"><button type="action" name="act_matrixattack" class="d6-button" title="Slow Utility Attack" id="deckslow">L</button></div>
-                    <div class="table-item"><button type="action" name="act_matrixtest" class="d6-button" title="Slow Utility Test" id="deckslow-rating-final">L</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixattack" class="pictos-button" title="Slow Utility Attack" id="deckslow">t</button></div>
+                    <div class="table-item"><button type="action" name="act_matrixtest" class="pictos-button" title="Slow Utility Test" id="deckslow-rating-final">2</button></div>
                     <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Slow Utility from Disk" id="deckslow-rating">0</button></div>
                     <div class="table-item"><input type="text" name="attr_deckslow-notes"></div>
 
@@ -2016,48 +2080,50 @@
                         <div class="table-item"><input type="number" name="attr_rating" value=0></div>
                         <div class="table-item"><input type="number" name="attr_multiplier" value=0></div>
                         <div class="table-item"><input type="number" name="attr_size" value=0></div>
-                        <div class="table-item"><input type="checkbox" name="attr_loaded" class="text-mid" value=1> </div>
+                        <div class="table-item"><input type="checkbox" name="attr_loaded" class="text-mid" value=1>
+                        </div>
                         <div class="table-item"><input type="number" name="attr_rating-final" value=0></div>
-                        <div class="table-item"><button type="action" name="act_matrixrepeatingtest" class="d6-button" title="Utility Attack" id="matrixrepeatingattack">L</button></div>
-                        <div class="table-item"><button type="action" name="act_matrixrepeatingtest" class="d6-button" title="Utility Test" id="matrixrepeatingtest">L</button></div>
+                        <div class="table-item"><button type="action" name="act_matrixrepeatingtest" class="pictos-custom-button" title="Utility Attack" id="matrixrepeatingattack">[</button></div>
+                        <div class="table-item"><button type="action" name="act_matrixrepeatingtest" class="pictos-button" title="Utility Test" id="matrixrepeatingtest">2</button></div>
                         <div class="table-item"><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Utility from Disk" id="repeating">0</button></div>
                         <div class="table-item"><input type="text" name="attr_utilitynotes"></div>
                     </div>
                 </fieldset>
             </div>
             <div class="deck-util-background">
-                <div class="SRH4">Additional Utilities</div>
+                <div class="SRH4" data-i18n="additional-utilities">Additional Utilities</div>
                 <div class="deck-utilities-additional">
-                    <header class="table-top-left">Utility</header>
-                    <header class="table-top-mid">Rating</header>
-                    <header class="table-top-mid">Target</header>
-                    <header class="table-top-mid">Multiplier</header>
-                    <header class="table-top-mid">Size</header>
-                    <header class="table-top-mid">Loaded</header>
-                    <header class="table-top-mid">Effective Rating</header>
-                    <header class="table-top-mid">Execute</header>
-                    <header class="table-top-mid">Test</header>
-                    <header class="table-top-mid">Swap Memory</header>
-                    <header class="table-top-right">Notes</header>
+                    <header data-i18n="utility" class="table-top-left">Utility</header>
+                    <header data-i18n="rating" class="table-top-mid">Rating</header>
+                    <header data-i18n="target" class="table-top-mid">Target</header>
+                    <header data-i18n="multiplier" class="table-top-mid">Multiplier</header>
+                    <header data-i18n="size" class="table-top-mid">Size</header>
+                    <header data-i18n="loaded" class="table-top-mid">Loaded</header>
+                    <header data-i18n="effective-rating" class="table-top-mid">Effective Rating</header>
+                    <header data-i18n="execute" class="table-top-mid">Execute</header>
+                    <header data-i18n="test" class="table-top-mid">Test</header>
+                    <header data-i18n="swap-memory" class="table-top-mid">Swap Memory</header>
+                    <header data-i18n="notes" class="table-top-right">Notes</header>
                 </div>
                 <fieldset class="repeating_deck-utilities">
                     <div class="deck-utilities-addrow">
                         <input type="text" name="attr_utility" class="myweapontxt">
                         <input type="number" name="attr_rating" value=0>
                         <select name="attr_target" class="mediumselect2">
-                            <option value="@{target|Target|matrixaccessrating}">control</option>
-                            <option value="@{target|Target|matrixcontrolrating}">access</option>
-                            <option value="@{target|Target|matrixindexrating}">index</option>
-                            <option value="@{target|Target|matrixfilesrating}">files</option>
-                            <option value="@{target|Target|matrixslaverating}">slave</option>
+                            <option data-i18n="control" value="@{target|Target|matrixaccessrating}">control</option>
+                            <option data-i18n="access" value="@{target|Target|matrixcontrolrating}">access</option>
+                            <option data-i18n="index" value="@{target|Target|matrixindexrating}">index</option>
+                            <option data-i18n="files" value="@{target|Target|matrixfilesrating}">files</option>
+                            <option data-i18n="slave" value="@{target|Target|matrixslaverating}">slave</option>
                         </select>
                         <input type="number" name="attr_multiplier" value=0>
                         <input type="number" name="attr_size" value=0>
                         <div class="text-mid"><input type="checkbox" name="attr_loaded" value=1></div>
                         <input type="number" name="attr_rating-final" value=0>
                         <div><button type="action" name="act_matrixrepeatingtest" class="d6-button" title="System Operation with Utility" id="matrixrepeatingexec">L</button></div>
-                        <div><button type="action" name="act_matrixrepeatingtest" class="d6-button" title="Utility Test - use vs. Tar programs" id="matrixrepeatingtest">L</button></div>
-                        <div><button type="action" name="act_swapmemory" class="pictos-button" title="Reload Utility from Disk" id="repeating">0</button></div>
+                        <div><button type="action" name="act_matrixrepeatingtest" class="pictos-button" title="Utility Test - use vs. Tar programs" id="matrixrepeatingtest">2</button></div>
+                        <div><button type="action" name="act_swapmemory" class="pictos-button"
+                                title="Reload Utility from Disk" id="repeating">0</button></div>
                         <input type="text" name="attr_notes" class="myweapontxt">
                     </div>
                     <div class="table-bottom" />
@@ -2068,132 +2134,150 @@
 </div>
 </div>
 <div class='sheet-karma'>
-    <div class="SRH3">Karma</div>
+    <div data-i18n="karma" class="SRH3">Karma</div>
     <div class="karma-summary">
-    	<div class="table-top-left"><b>Karma Pool:</b></div>
-    	<div class="table-top-mid"><b>Good Karma:</b></div>
-    	<div class="table-top-right"><b>Karma Total:</b></div>
-	<input type="number" name="attr_karma-pool" value=0>
-	<input type="number" name="attr_karma-good" value=0>
-	<input type="number" name="attr_karma-total" value=0>
+        <header data-i18n="karma-pool" class="table-top-left">Karma Pool:</header>
+        <header data-i18n="good-karma" class="table-top-mid">Good Karma:</header>
+        <header data-i18n="karma-total" class="table-top-right">Karma Total:</header>
+        <input type="number" name="attr_karma-pool" value=0>
+        <input type="number" name="attr_karma-good" value=0>
+        <input type="number" name="attr_karma-total" value=0>
     </div>
     <br>
     <div class="karma-history">
-            <header class="table-top-left">Attribute/Skill/Spell/etc.</header>
-            <header class="table-top-mid">Ammount of Karma</header>
-            <header class="table-top-mid">Date</header>
-            <header class="table-top-right">Notes</header>
+        <header data-i18n="attribute-skill-spell-etc" class="table-top-left">Attribute/Skill/Spell/etc.</header>
+        <header data-i18n="ammount-of-karma" class="table-top-mid">Ammount of Karma</header>
+        <header data-i18n="date" class="table-top-mid">Date</header>
+        <header data-i18n="notes" class="table-top-right">Notes</header>
     </div>
     <fieldset class="repeating_karma">
-    	<div class="karma-history">
-    		<div class="table-item-left"><input type="text" class="myweapontxt" name="attr_purchase"></div>
-		<div class="table-item"><input type="number" name="attr_cost" value=0 min=0></div>
-		<div class="table-item"><input type="date" name="attr_date" value=0 min=0></div>
-    		<div class="table-item"><input type="text" class="myweapontxt" name="attr_notes"></div>
-	</div>
+        <div class="karma-history">
+            <div class="table-item-left"><input type="text" class="myweapontxt" name="attr_purchase"></div>
+            <div class="table-item"><input type="number" name="attr_cost" value=0 min=0></div>
+            <div class="table-item"><input type="date" name="attr_date" value=0 min=0></div>
+            <div class="table-item"><input type="text" class="myweapontxt" name="attr_notes"></div>
+        </div>
     </fieldset>
     <br>
-    <div class="SRH3">Notes</div>
+    <div data-i18n="notes" class="SRH3">Notes</div>
     <div class="character-notes">
-         <textarea name="attr_character-notes"></textarea>
-    	
+        <textarea name="attr_character-notes"></textarea>
     </div>
 
 
 </div>
 
 <div class='sheet-gear'>
-    <div class="SRH3">Nuyen:<input type="number" style="width:200px;" name="attr_nuyen" value=0></div>
+    <input type="hidden" class="gear-tabs-switch" name="attr_geartab" value="gear">
+    <div class="gear-tabs">
+        <input type="hidden" class="gear-tabs-switch" name="attr_geartab" value="gear">
+        <input type="hidden" class="gear-tabs-switch" name="attr_geartab" value="gear">
+        <button class="gear-tabs-gear" type="action" name="act_gear-tab" data-i8n="gear-uppercase"
+            data-i18n-title="gear" title="Gear">GEAR</button>
+        <button class="gear-tabs-credsticks" type="action" name="act_credsticks-tab" data-i8n="credsticks-uppercase"
+            data-i18n-title="credsticks" title="credsticks">CREDSTICKS</button>
+        <button class="gear-tabs-vehiclelist" type="action" name="act_vehiclelist-tab"
+            data-i8n="vehicles-list-uppercase" data-i18n-title="vehilces-owned-by-character"
+            title="Vehicles Owned by Character">Vehicles List</button>
+	<div class="tabs-empty"></div>
+        <div class="nuyen-total">
+            <div class="SRH3">Nuyen:</div><input type="number" style="width:200px;" name="attr_nuyen" value=0>
+        </div>
+	<div class="tabs-empty"></div>
+    </div>
     <div class="gear">
-        <div class="SRH3">Gear</div>
+        <div class="SRH3" data-i18n="gear">Gear</div>
         <div class="gear-table">
-            <header class="table-top-left">Name</header>
-            <header class="table-top-mid">Rating</header>
-            <header class="table-top-mid">Weight</header>
-            <header class="table-top-mid">Conceal</header>
-            <header class="table-top-mid">Type</header>
-            <header class="table-top-mid">Quantity</header>
-            <header class="table-top-mid">Pool</header>
-            <header class="table-top-mid">Roll</header>
-            <header class="table-top-right">Description</header>
+            <header data-i18n="name" class="table-top-left">Name</header>
+            <header data-i18n="rating" class="table-top-mid">Rating</header>
+            <header data-i18n="weight" class="table-top-mid">Weight</header>
+            <header data-i18n="conceal" class="table-top-mid">Conceal</header>
+            <header data-i18n="type" class="table-top-mid">Type</header>
+            <header data-i18n="quantity" class="table-top-mid">Quantity</header>
+            <header data-i18n="pool" class="table-top-mid">Pool</header>
+            <header data-i18n="roll" class="table-top-mid">Roll</header>
+            <header data-i18n="description" class="table-top-right">Description</header>
         </div>
         <fieldset class="repeating_gear">
             <div class="gear-table">
                 <div class="table-item-left"><input type="text" class="myweapontxt" name="attr_name"></div>
                 <div class="table-item"><input type="number" name="attr_rating" value=0 min=0></div>
                 <div class="table-item"><input type="number" name="attr_weight" value=0 step='0.01' min='0.00'></div>
-                <div class="table-item"><input type="number" name="attr_conceal" value=0 ></div>
+                <div class="table-item"><input type="number" name="attr_conceal" value=0></div>
                 <div class="table-item"><select name="attr_type" class="mediumselect2">
-				<option value='reuse'>Reusable</option>
-				<option value='onetime'>Consumeable</option>
-			</select>
-		</div>
+                        <option data-i18n="reusable" value='reuse'>Reusable</option>
+                        <option data-i18n="consumeable" value='onetime'>Consumeable</option>
+                    </select>
+                </div>
                 <div class="table-item"><input type="number" name="attr_quantity" value=0 min=0></div>
                 <div class="table-item"><select name="attr_pool" class="mediumselect2">
-		    	<option SELECTED value="none">None</option>
-		    	<option value="combat">Combat</option>
-		    	<option value="task">Task</option>
-		    	<option value="hacking">Hacking</option>
-		    	<option value="control">Control</option>
-		    	<option value="spell">Spell</option>
-		    	<option value="astral">Astral</option>
-		      </select>
-		</div>
-                <div class="table-item"><button type="action" class="d6-button" name="act_usegear" title="Use Item">L</button></div>
+                        <option SELECTED value="none">None</option>
+                        <option data-i18n="combat" value="combat">Combat</option>
+                        <option data-i18n="task" value="task">Task</option>
+                        <option data-i18n="hacking" value="hacking">Hacking</option>
+                        <option data-i18n="control" value="control">Control</option>
+                        <option data-i18n="spell" value="spell">Spell</option>
+                        <option data-i18n="astral" value="astral">Astral</option>
+                    </select>
+                </div>
+                <div class="table-item"><button type="action" class="d6-button" name="act_usegear"
+                        title="Use Item">L</button></div>
                 <div class="table-item"><input type="text" name="attr_description"></div>
             </div>
         </fieldset>
     </div>
-    <br>
-    <div class="SRH3">Credsticks &#165;</div>
-    <div class="credsticks">
-            <header class="table-top-left">Type</header>
-            <header class="table-top-mid">ID</header>
-            <header class="table-top-mid">Rating</header>
-            <header class="table-top-mid">Balance &#165;</header>
-            <header class="table-top-mid">Roll</header>
-            <header class="table-top-right">Permits</header>
-    </div>
+    <div class="credsticks-show">
+        <div class="SRH3" data-i18n="credsticks">Credsticks &#165;</div>
+        <div class="credsticks">
+            <header data-i18n="type" class="table-top-left">Type</header>
+            <header data-i18n="id" class="table-top-mid">ID</header>
+            <header data-i18n="rating" class="table-top-mid">Rating</header>
+            <header data-i18n="balance" class="table-top-mid">Balance &#165;</header>
+            <header data-i18n="roll" class="table-top-mid">Roll</header>
+            <header data-i18n="permits" class="table-top-right">Permits</header>
+        </div>
         <fieldset class="repeating_credsticks">
-	   <div class="credsticks">
-            <div class="table-item-left">
-                <select name="attr_type" class="mediumselect2">
-                    <option SELECTED>Certified</option>
-                    <option SELECTED>Standard</option>
-                    <option SELECTED>Silver</option>
-                    <option SELECTED>Gold</option>
-                    <option SELECTED>Platinum</option>
-                    <option SELECTED>Ebony</option>
-		</select>
-	    </div>		  
-    	    <div class="table-item">
-                <select name="attr_id" class="mediumselect2">
-                    <option SELECTED>Legitmate</option>
-                    <option SELECTED>Forged</option>
-		</select>
-	    </div>
-            <div class="table-item"><input type="number" name="attr_rating" value=1></div>
-            <div class="table-item"><input type="number" name="attr_balance" value=1><span>&#165;</span></div>
-            <div class="table-item"><button type="action" name="act_checkcredstick" class="d6-button">L</button></div>
-    	    <div class="table-item"><input type="text" class="myweapontxt" name="attr_notes"></div>
-	    </div>
-	</fieldset>
-    <br>
+            <div class="credsticks">
+                <div class="table-item-left">
+                    <select name="attr_type" class="mediumselect2">
+                        <option data-i18n="certified" value="Certified" SELECTED>Certified</option>
+                        <option data-i18n="standard" value="Standard" SELECTED>Standard</option>
+                        <option data-i18n="silver" value="Silver" SELECTED>Silver</option>
+                        <option data-i18n="gold" value="Gold" SELECTED>Gold</option>
+                        <option data-i18n="platinum" value="Platinum" SELECTED>Platinum</option>
+                        <option data-i18n="ebony" value="Ebony" SELECTED>Ebony</option>
+                    </select>
+                </div>
+                <div class="table-item">
+                    <select name="attr_id" class="mediumselect2">
+                        <option data-i18n="legitimate" value="Legitimate" SELECTED>Legitimate</option>
+                        <option data-i18n="forged" value="Forged" SELECTED>Forged</option>
+                    </select>
+                </div>
+                <div class="table-item"><input type="number" name="attr_rating" value=1></div>
+                <div class="table-item"><input type="number" name="attr_balance" value=1><span>&#165;</span></div>
+                <div class="table-item"><button type="action" name="act_checkcredstick" class="d6-button">L</button>
+                </div>
+                <div class="table-item"><input type="text" class="myweapontxt" name="attr_notes"></div>
+            </div>
+        </fieldset>
+    </div>
     <div class="vehicles-list">
-        <div class="SRH3">Vehicles List</div>
-        <div class="table-top">Vehicle Details and Skill rating go on sepperate Vehicle Character Sheet</div>
+        <div class="SRH3" data-i18n="vehicles-list">Vehicles List</div>
+        <div class="table-top" data-i18n="vehicles-skill-message">Vehicle Details and Skill rating go on sepperate
+            Vehicle Character Sheet</div>
         <div class="vehicles-table">
-            <header class="table-item-left">Name</header>
-            <header class="table-item">Model</header>
-            <header class="table-item">Cost &#165;</header>
-            <header class="table-item">Notes</header>
+            <header data-i18n="name" class="table-item-left">Name</header>
+            <header data-i18n="model" class="table-item">Model</header>
+            <header data-i18n="cost" class="table-item">Cost &#165;</header>
+            <header data-i18n="notes" class="table-item">Notes</header>
         </div>
         <fieldset class="repeating_vehicles">
             <div class="vehicles-table">
-                <div class="table-item-left"><input type="text" name="attr_name" class="myweapontxt" ></div>
-                <div class="table-item"><input type="text" name="attr_model" class="myweapontxt" ></div>
-                <div class="table-item"><input type="number" name="attr_cost"  value=0 ><span>&#165;</span></div>
-                <div class="table-item"><input type="text" name="attr_notes" class="myweapontxt" ></div>
+                <div class="table-item-left"><input type="text" name="attr_name" class="myweapontxt"></div>
+                <div class="table-item"><input type="text" name="attr_model" class="myweapontxt"></div>
+                <div class="table-item"><input type="number" name="attr_cost" value=0><span>&#165;</span></div>
+                <div class="table-item"><input type="text" name="attr_notes" class="myweapontxt"></div>
             </div>
         </fieldset>
     </div>
@@ -2202,446 +2286,470 @@
 
 <div class="sheet-rigger">
     <div class="vcr-attributes">
-        <div class="text-mid">VCR Rating:</div>
+        <div data-i18n="vcr-rating" class="text-mid">VCR Rating:</div>
         <div><input type="number" name="attr_vcr" value=0></div>
-        <div class="text-mid">Vehicle Reaction:</div>
+        <div data-i18n="vehicle-reaction" class="text-mid">Vehicle Reaction:</div>
         <div class="text-mid"><span class="numberspan" name="attr_vcr-reaction" \></div>
-        <div class="text-mid">Vehicle Initiative:</div>
+        <div data-i18n="vehicle-initiative" class="text-mid">Vehicle Initiative:</div>
         <div class="text-mid"><span class="numberspan" name="attr_vcr-initiative" \></div>
-        <div class="text-mid">IVIS Master Unit:</div><input class="text-mid" type="checkbox"
-            name="attr_rcdeck-ivis-master" \>
-        <div class="text-mid">FDDM Master Unit:</div>
+        <div data-i18n="ivis-master-unit" class="text-mid">IVIS Master Unit:</div><input class="text-mid"
+            type="checkbox" name="attr_rcdeck-ivis-master" \>
+        <div data-i18n="fddm-master-unit" class="text-mid">FDDM Master Unit:</div>
         <div class="text-mid"><input type="checkbox" name="attr_rcdeck-fddm-master" \></div>
     </div>
-
-    <input type='hidden' class='rc-deck-switch' name='attr_rc-deck-switch' value="show" />
-    <div class="rc-deck-show">
-        <div class="SRH3">Remote Control Deck
-            <button class="switch-button-show" type="action" name="act_rc-deck-switch">Show</button>
-        </div>
+    <div class="rigger-tabs">
+        <input type="hidden" class="rigger-tabs-switch" name="attr_riggertab" value="rigger">
+        <button class="rigger-tabs-rcdeck" type="action" name="act_rcdeck-tab" data-i8n="remote-control-deck-uppercase"
+            data-i18n-title="remote control deck" title="Remote Control Deck Configuration">Remote Control Deck</button>
+        <button class="rigger-tabs-subscriber" type="action" name="act_subscriber-tab"
+            data-i8n="drone-subscriber-list-uppercase" data-i18n-title="drone-subscriber-list"
+            title="Drone Subscriber List">Subscriber List</button>
+        <button class="rigger-tabs-skills" type="action" name="act_rigger-tab"
+            data-i8n="vehicle-skills-uppercase">Vehicle Skills</button>
+	<div class="tabs-empty"></div>
     </div>
-    <div class="rc-deck-hide">
-        <div class="SRH3">Remote Control Deck
-            <button class="switch-button-hide" type="action" name="act_rc-deck-switch">Hide</button>
+    <input type="hidden" class="rigger-tabs-switch" name="attr_riggertab" value="rigger">
+    <div class="drones-list">
+        <div class="drones-table">
+            <header data-i18n="name" class="table-top-left">Name</header>
+            <header data-i18n="type" class="table-top-mid">Type</header>
+            <header data-i18n="model" class="table-top-mid">Model</header>
+            <header data-i18n="cost" class="table-top-mid">Cost</header>
+            <header data-i18n="notes" class="table-top-right">Notes</header>
         </div>
-    </div>
-    <br>
-    <div class="rcdeck-ew-border">
-        <div class="rcdeck-ew">
-            <div class="text-mid">Intrusion Factor Base:</div>
-            <span name="attr_ewarfare" class="spn-nc" />
-            <div class="text-mid">Intrusion Factor Mods:</div>
-            <input type="number" name="attr_rcdeck-intrusion-mods" />
-            <div class="text-mid">Intrusion Factor:</div>
-            <span name="attr_rcdeck-intrusion-factor" class="spn-nc"></span>
-        </div>
-    </div>
-    <div class="rc-deck">
-        <input type="hidden" name="attr_rcdeck-flux" value=2 />
-        <div class="rcdeck-flux">
-            <div class="table-top-left"></div>
-            <div class="table-top-mid"><b>Rating</div>
-            <div class="table-top-mid"><b>Roll</div>
-            <div class="table-top-mid"><b>Flux Rating</div>
-            <div class="table-top-mid"><b>Modified Flux</div>
-            <div class="table-top-right"><b>Range</div>
-            <div class="table-item-left">Deck:</div>
-            <div class="table-item"><input type="number" name="attr_rcdeck-rating" min=0 value=0></div>
-            <div class="table-item"><button class="d6-button" type="action" name="act_skilltest"
-                    id="rcdeck-rating control" title="Intrusion Detect Test">L</button></div>
-            <div class="table-item"><span name="attr_rcdeck-flux"></div>
-            <div class="table-item"><input type="number" name="attr_rcdeck-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_rcdeck-range"></div>
-            <div class="table-item-left">ECCM:</div>
-            <div class="table-item"><input type="number" name="attr_eccm-rating" min=0 value=0></div>
-            <div class="table-item"><button class="d6-button" type="action" name="act_skilltest"
-                    id="eccm-rating control" title="ECCM Test">L</button></div>
-            <div class="table-item"><span name="attr_eccm-flux"></div>
-            <div class="table-item"><input type="number" name="attr_eccm-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_eccm-range"></div>
-            <div class="table-item-left">Electrons Warfare:</div>
-            <div class="table-item"><input type="number" name="attr_ewarfare" value=0 /></div>
-            <div class="table-item"><button class="d6-button" type="action" name="act_skilltest" id="ewarfare control"
-                    title="Electronic Warfare or Signal Intercept Test">L</button></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item-left">Encryption Module:</div>
-            <div class="table-item"><input type="number" name="attr_rcdeck-encryption-rating" value=0 /></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item-left">Decryption Module:</div>
-            <div class="table-item"><input type="number" name="attr_rcdeck-decryption-rating" value=0 /></div>
-            <div class="table-item"><button class="d6-button" type="action" name="act_skilltest"
-                    id="rcdeck-decryption-rating control" title="Decryption Test">L</button></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item-left">Protocol Emulation Module:</div>
-            <div class="table-item"><input type="number" name="attr_rcdeck-pem-rating" value=0 /></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-            <div class="table-item"></div>
-        </div>
-        <input type='hidden' class='drone-list-switch' name='attr_drone-list-switch' value="show" />
-        <div class="drone-list-show">
-            <div class="SRH3">Drone Subscriber List
-                <button class="switch-button-show" type="action" name="act_drone-list-switch">Show</button>
-            </div>
-        </div>
-        <div class="drone-list-hide">
-            <div class="SRH3">Drone Subscriber List
-                <button class="switch-button-hide" type="action" name="act_drone-list-switch">Hide</button>
-            </div>
-        </div>
-        <br>
-        <div class="drones-list">
+        <fieldset class="repeating_drones">
             <div class="drones-table">
-                <div class="table-top-left"><b>Name</div>
-                <div class="table-top-mid"><b>Type</div>
-                <div class="table-top-mid"><b>Model</div>
-                <div class="table-top-mid"><b>Cost</div>
-                <div class="table-top-right"><b>Notes</div>
-            </div>
-            <fieldset class="repeating_drones">
-                <div class="drones-table">
-                    <div class="table-item-left"><input type="text" name="attr_name"></div>
-                    <div class="table-item"><input type="text" name="attr_type"></div>
-                    <div class="table-item"><input type="text" name="attr_model"></div>
-                    <div class="table-item"><input type="number" name="attr_cost"></div>
-                    <div class="table-item"><input type="text" name="attr_notes"></input>
-                    </div>
+                <div class="table-item-left"><input type="text" name="attr_name"></div>
+                <div class="table-item"><input type="text" name="attr_type"></div>
+                <div class="table-item"><input type="text" name="attr_model"></div>
+                <div class="table-item"><input type="number" name="attr_cost"></div>
+                <div class="table-item"><input type="text" name="attr_notes"></input>
                 </div>
-            </fieldset>
-        </div>
-        <input type='hidden' class='vehicle-skills-switch' name='attr_vehicle-skills-switch' value="show" />
-        <div class="vehicle-skills-show">
-            <div class="SRH3">Vehicle Skills
-                <button class="switch-button-show" type="action" name="act_vehicle-skills-switch">Show</button>
+            </div>
+        </fieldset>
+    </div>
+    <div class="rigger-rcdeck">
+        <div class="rcdeck-ew-border">
+            <div class="rcdeck-ew">
+                <div data-i18n="intrusion-factor-base" class="text-mid">Intrusion Factor Base:</div>
+                <span name="attr_ewarfare" class="spn-nc" />
+                <div data-i18n="intrusion-factor-modifier" class="text-mid">Intrusion Factor Mods:</div>
+                <input type="number" name="attr_rcdeck-intrusion-mods" />
+                <div data-i18n="intrusion-factor" class="text-mid">Intrusion Factor:</div>
+                <span name="attr_rcdeck-intrusion-factor" class="spn-nc"></span>
             </div>
         </div>
-        <div class="vehicle-skills-hide">
-            <div class="SRH3">Vehicle Skills
-                <button class="switch-button-hide" type="action" name="act_vehicle-skills-switch">Hide</button>
-            </div>
-        </div>
-        <br>
-        <div class="vehicle-skills">
-            <div class="SRH5">Update Vehicle Skill Here</div>
-            <div class="SRH5">If specializing in a specif vehicle, add modifiers to the vehicle/drone itself</div><br>
-            <div class="vehicle-skills-table">
-                <div class="table-top-left"><b>Skill</div>
-                <div class="table-top-mid"><b>Level</div>
-                <div class="table-top-mid"><b>Specialize</div>
-                <div class="table-top-right"><b>Remote Operation</div>
-                <div></div>
-                <div class="table-top-left"><b>Skill</div>
-                <div class="table-top-mid"><b>Level</div>
-                <div class="table-top-mid"><b>Specialize</div>
-                <div class="table-top-right"><b>Remote Operation</div>
-                <div></div>
-                <div class="table-item-left">Bike:</div>
-                <div class="table-item"><input type="number" name="attr_bike" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_bike-specialize" class="bike-spec-switch text-mid">
-                </div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_bike-specialize" class="bike-spec-switch hidden">
-                    <div class="bike-spec-on"><input type="number" name="attr_bike-remote" value=0></div>
-                    <div class="bike-spec-off"><span name="attr_bike"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Car:</div>
-                <div class="table-item-left"><input type="number" name="attr_car" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_car-specialize" class="car-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_car-specialize" class="car-spec-switch hidden">
-                    <div class="car-spec-on"><input type="number" name="attr_car-remote" value=0></div>
-                    <div class="car-spec-off"><span name="attr_car-remote"></span></div>
-                </div>
-
-                <div></div>
-                <div class="table-item-left">Hovercraft:</div>
-                <div class="table-item-left"><input type="number" name="attr_hovercraft" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_hovercraft-specialize" class="hovercraft-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_hovercraft-specialize" class="hovercraft-spec-switch hidden">
-                    <div class="hovercraft-spec-on"><input type="number" name="attr_hovercraft-remote" value=0></div>
-                    <div class="hovercraft-spec-off"><span name="attr_hovercraft-remote"></span></div>
-                </div>
-                <div></div>
-
-                <div class="table-item-left">LTA Aircraft:</div>
-                <div class="table-item-left"><input type="number" name="attr_lta" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_lta-specialize" class="lta-spec-switch text-mid">
-                </div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_lta-specialize" class="lta-spec-switch hidden">
-                    <div class="lta-spec-on"><input type="number" name="attr_lta-remote" value=0></div>
-                    <div class="lta-spec-off"><span name="attr_lta-remote"></span></div>
-                </div>
-                <div></div>
-
-                <div class="table-item-left">Motorboat:</div>
-                <div class="table-item-left"><input type="number" name="attr_motorboat" value=0> </div>
-                <div class="table-item"><input type="checkbox" name="attr_motorboat-specialize"
-                        class="motorboat-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_motorboat-specialize" class="motorboat-spec-switch hidden">
-                    <div class="motorboat-spec-on"><input type="number" name="attr_motorboat-remote" value=0></div>
-                    <div class="motorboat-spec-off"><span name="attr_motorboat-remote"></span></div>
-                </div>
-                <div></div>
-
-                <div class="table-item-left">Rotor Aircraft:</div>
-                <div class="table-item-left"><input type="number" name="attr_rotor" value=0> </div>
-                <div class="table-item"><input type="checkbox" name="attr_rotor-specialize" class="rotor-spec-switch text-mid">
-                </div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_rotor-specialize" class="rotor-spec-switch hidden">
-                    <div class="rotor-spec-on"><input type="number" name="attr_rotor-remote" value=0></div>
-                    <div class="rotor-spec-off"><span name="attr_rotor-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Sailboat:</div>
-                <div class="table-item"><input type="number" name="attr_sailboat" value=0> </div>
-                <div class="table-item"><input type="checkbox" name="attr_sailboat-specialize"
-                        class="sailboat-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_sailboat-specialize" class="sailboat-spec-switch hidden">
-                    <div class="sailboat-spec-on"><input type="number" name="attr_sailboat-remote" value=0></div>
-                    <div class="sailboat-spec-off"><span name="attr_sailboat-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Ship:</div>
-                <div class="table-item"><input type="number" name="attr_ship" value=0> </div>
-                <div class="table-item"><input type="checkbox" name="attr_ship-specialize" class="ship-spec-switch text-mid">
-                </div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_ship-specialize" class="ship-spec-switch hidden">
-                    <div class="ship-spec-on"><input type="number" name="attr_ship-remote" value=0></div>
-                    <div class="ship-spec-off"><span name="attr_ship-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Submarine:</div>
-                <div class="table-item"><input type="number" name="attr_submarine" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_submarine-specialize"
-                        class="submarine-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_submarine-specialize" class="submarine-spec-switch hidden">
-                    <div class="submarine-spec-on"><input type="number" name="attr_submarine-remote" value=0></div>
-                    <div class="submarine-spec-off"><span name="attr_submarine-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Vectored Thrust:</div>
-                <div class="table-item"><input type="number" name="attr_vectoredthrust" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_vectoredthrust-specialize"
-                        class="vectoredthrust-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_vectoredthrust-specialize"
-                        class="vectoredthrust-spec-switch hidden">
-                    <div class="vectoredthrust-spec-on"><input type="number" name="attr_vectoredthrust-remote" value=0>
-                    </div>
-                    <div class="vectoredthrust-spec-off"><span name="attr_vectoredthrust-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Winged Aircraft:</div>
-                <div class="table-item"><input type="number" name="attr_wingedaircraft" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_wingedaircraft-specialize"
-                        class="wingedaircraft-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_wingedaircraft-specialize"
-                        class="wingedaircraft-spec-switch hidden">
-                    <div class="wingedaircraft-spec-on"><input type="number" name="attr_wingedaircraft-remote" value=0>
-                    </div>
-                    <div class="wingedaircraft-spec-off"><span name="attr_wingedaircraft-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Mechanical Arm:</div>
-                <div class="table-item"><input type="number" name="attr_mecharm" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_mecharm-specialize"
-                        class="mecharm-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_mecharm-specialize" class="mecharm-spec-switch hidden">
-                    <div class="mecharm-spec-on"><input type="number" name="attr_mecharm-remote" value=0></div>
-                    <div class="mecharm-spec-off"><span name="attr_mecharm-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Semiballistic:</div>
-                <div class="table-item"><input type="number" name="attr_semiballistic" value=0> </div>
-                <div class="table-item"><input type="checkbox" name="attr_semiballistic-specialize"
-                        class="semiballistic-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_semiballistic-specialize"
-                        class="semiballistic-spec-switch hidden">
-                    <div class="semiballistic-spec-on"><input type="number" name="attr_semiballistic-remote" value=0>
-                    </div>
-                    <div class="semiballistic-spec-off"><span name="attr_semiballistic-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Suborbital:</div>
-                <div class="table-item"><input type="number" name="attr_suborbital" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_suborbital-specialize"
-                        class="suborbital-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_suborbital-specialize" class="suborbital-spec-switch hidden">
-                    <div class="suborbital-spec-on"><input type="number" name="attr_suborbital-remote" value=0></div>
-                    <div class="suborbital-spec-off"><span name="attr_suborbital-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Tracks:</div>
-                <div class="table-item"><input type="number" name="attr_tracks" value=0></div>
-                <div class="table-item"><input type="checkbox" name="attr_tracks-specialize" class="tracks-spec-switch text-mid">
-                </div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_tracks-specialize" class="tracks-spec-switch hidden">
-                    <div class="tracks-spec-on"><input type="number" name="attr_tracks-remote" value=0></div>
-                    <div class="tracks-spec-off"><span name="attr_tracks-remote"></span></div>
-                </div>
-                <div></div>
-                <div class="table-item-left">Walkers:</div>
-                <div class="table-item"><input type="number" name="attr_walkers" value=0> </div>
-                <div class="table-item"><input type="checkbox" name="attr_walkers-specialize"
-                        class="walkers-spec-switch text-mid"></div>
-                <div class="table-item">
-                    <input type="checkbox" name="attr_walkers-specialize" class="walkers-spec-switch hidden">
-                    <div class="walkers-spec-on"><input type="number" name="attr_walkers-remote" value=0></div>
-                    <div class="walkers-spec-off"><span name="attr_walkers-remote"></span></div>
-                </div>
-                <div></div>
+        <div class="rc-deck">
+            <input type="hidden" name="attr_rcdeck-flux" value=2 />
+            <div class="rcdeck-flux">
+                <div class="table-top-left-nc"></div>
+                <header data-i18n="rating" class="table-top-mid-nc">Rating</header>
+                <header data-i18n="roll" class="table-top-mid-nc">Roll</header>
+                <header data-i18n="flux-rating" class="table-top-mid-nc">Flux Rating</header>
+                <header data-i18n="modified-flux" class="table-top-mid-nc">Modified Flux</header>
+                <header data-i18n="range" class="table-top-right-nc">Range</header>
+                <header data-i18n="deck" class="table-item-left-nc">Deck:</header>
+                <div class="table-item-nc"><input type="number" name="attr_rcdeck-rating" min=0 value=0></div>
+                <div class="table-item-nc"><button class="d6-button" type="action" name="act_skilltest"
+                        id="rcdeck-rating control" title="Intrusion Detect Test">L</button></div>
+                <div class="table-item-nc"><span name="attr_rcdeck-flux"></div>
+                <div class="table-item-nc"><input type="number" name="attr_rcdeck-fluxmod" min=0 value=0></div>
+                <div class="table-item-nc"><span name="attr_rcdeck-range"></div>
+                <div data-i18n="eccm" class="table-item-left-nc">ECCM:</div>
+                <div class="table-item-nc"><input type="number" name="attr_eccm-rating" min=0 value=0></div>
+                <div class="table-item-nc"><button class="d6-button" type="action" name="act_skilltest"
+                        id="eccm-rating control" title="ECCM Test">L</button></div>
+                <div class="table-item-nc"><span name="attr_eccm-flux"></div>
+                <div class="table-item-nc"><input type="number" name="attr_eccm-fluxmod" min=0 value=0></div>
+                <div class="table-item-nc"><span name="attr_eccm-range"></div>
+                <div data-i18n="electronic-warfare" class="table-item-left-nc">Electronic Warfare:</div>
+                <div class="table-item-nc"><input type="number" name="attr_ewarfare" value=0 /></div>
+                <div class="table-item-nc"><button class="d6-button" type="action" name="act_skilltest"
+                        id="ewarfare control" title="Electronic Warfare or Signal Intercept Test">L</button></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div data-i18n="encryption-module" class="table-item-left-nc">Encryption Module:</div>
+                <div class="table-item-nc"><input type="number" name="attr_rcdeck-encryption-rating" value=0 /></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div data-i18n="decryption-module" class="table-item-left-nc">Decryption Module:</div>
+                <div class="table-item-nc"><input type="number" name="attr_rcdeck-decryption-rating" value=0 /></div>
+                <div class="table-item-nc"><button class="d6-button" type="action" name="act_skilltest"
+                        id="rcdeck-decryption-rating control" title="Decryption Test">L</button></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div data-i18n="protocol-emulation-module" class="table-item-left-nc">Protocol Emulation Module:</div>
+                <div class="table-item-nc"><input type="number" name="attr_rcdeck-pem-rating" value=0 /></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
+                <div class="table-item-nc"></div>
             </div>
         </div>
     </div>
+    <input type="hidden" class="rigger-tabs-switch" name="attr_riggertab" value="rigger">
+    <div class="vehicle-skills">
+        <div data-i18n="update-vehicle-skill-here" class="SRH5">Update Vehicle Skill Here</div>
+        <div data-i18n="vehicle-specialize-message" class="SRH5">If specializing in a specif vehicle, add modifiers to
+            the vehicle/drone itself</div><br>
+        <div class="vehicle-skills-table">
+            <header data-i18n="skill" class="table-top-left-nc">Skill</header>
+            <header data-i18n="level" class="table-top-mid-nc">Level</header>
+            <header data-i18n="specialize" class="table-top-mid-nc">Specialize</header>
+            <header data-i18n="remote-operation" class="table-top-right-nc">Remote Operation</header>
+            <div></div>
+            <header data-i18n="skill" class="table-top-left-nc">Skill</header>
+            <header data-i18n="level" class="table-top-mid-nc">Level</header>
+            <header data-i18n="specialize" class="table-top-mid-nc">Specialize</header>
+            <header data-i18n="remote-operation" class="table-top-right-nc">Remote Operation</header>
+            <div></div>
+            <div data-i18n="bike" class="table-item-left-nc">Bike:</div>
+            <div class="table-item-nc"><input type="number" name="attr_bike" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_bike-specialize"
+                    class="bike-spec-switch text-mid">
+            </div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_bike-specialize" class="bike-spec-switch hidden">
+                <div class="bike-spec-on"><input type="number" name="attr_bike-remote" value=0></div>
+                <div class="bike-spec-off"><span name="attr_bike"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="car" class="table-item-left-nc">Car:</div>
+            <div class="table-item-left-nc"><input type="number" name="attr_car" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_car-specialize"
+                    class="car-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_car-specialize" class="car-spec-switch hidden">
+                <div class="car-spec-on"><input type="number" name="attr_car-remote" value=0></div>
+                <div class="car-spec-off"><span name="attr_car-remote"></span></div>
+            </div>
+
+            <div></div>
+            <div data-i18n="hovercraft" class="table-item-left-nc">Hovercraft:</div>
+            <div class="table-item-left-nc"><input type="number" name="attr_hovercraft" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_hovercraft-specialize"
+                    class="hovercraft-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_hovercraft-specialize" class="hovercraft-spec-switch hidden">
+                <div class="hovercraft-spec-on"><input type="number" name="attr_hovercraft-remote" value=0></div>
+                <div class="hovercraft-spec-off"><span name="attr_hovercraft-remote"></span></div>
+            </div>
+            <div></div>
+
+            <div data-i18n="lighter-than-air-aircraft-abbreviated" class="table-item-left-nc">LTA Aircraft:</div>
+            <div class="table-item-left-nc"><input type="number" name="attr_lta" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_lta-specialize"
+                    class="lta-spec-switch text-mid">
+            </div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_lta-specialize" class="lta-spec-switch hidden">
+                <div class="lta-spec-on"><input type="number" name="attr_lta-remote" value=0></div>
+                <div class="lta-spec-off"><span name="attr_lta-remote"></span></div>
+            </div>
+            <div></div>
+
+            <div data-i18n="motorboat" class="table-item-left-nc">Motorboat:</div>
+            <div class="table-item-left-nc"><input type="number" name="attr_motorboat" value=0> </div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_motorboat-specialize"
+                    class="motorboat-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_motorboat-specialize" class="motorboat-spec-switch hidden">
+                <div class="motorboat-spec-on"><input type="number" name="attr_motorboat-remote" value=0></div>
+                <div class="motorboat-spec-off"><span name="attr_motorboat-remote"></span></div>
+            </div>
+            <div></div>
+
+            <div data-i18n="rotor-aircraft" class="table-item-left-nc">Rotor Aircraft:</div>
+            <div class="table-item-left-nc"><input type="number" name="attr_rotor" value=0> </div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_rotor-specialize"
+                    class="rotor-spec-switch text-mid">
+            </div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_rotor-specialize" class="rotor-spec-switch hidden">
+                <div class="rotor-spec-on"><input type="number" name="attr_rotor-remote" value=0></div>
+                <div class="rotor-spec-off"><span name="attr_rotor-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="sailboat" class="table-item-left-nc">Sailboat:</div>
+            <div class="table-item-nc"><input type="number" name="attr_sailboat" value=0> </div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_sailboat-specialize"
+                    class="sailboat-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_sailboat-specialize" class="sailboat-spec-switch hidden">
+                <div class="sailboat-spec-on"><input type="number" name="attr_sailboat-remote" value=0></div>
+                <div class="sailboat-spec-off"><span name="attr_sailboat-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="ship" class="table-item-left-nc">Ship:</div>
+            <div class="table-item-nc"><input type="number" name="attr_ship" value=0> </div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_ship-specialize"
+                    class="ship-spec-switch text-mid">
+            </div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_ship-specialize" class="ship-spec-switch hidden">
+                <div class="ship-spec-on"><input type="number" name="attr_ship-remote" value=0></div>
+                <div class="ship-spec-off"><span name="attr_ship-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="submarine" class="table-item-left-nc">Submarine:</div>
+            <div class="table-item-nc"><input type="number" name="attr_submarine" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_submarine-specialize"
+                    class="submarine-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_submarine-specialize" class="submarine-spec-switch hidden">
+                <div class="submarine-spec-on"><input type="number" name="attr_submarine-remote" value=0></div>
+                <div class="submarine-spec-off"><span name="attr_submarine-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="vectored-thrust" class="table-item-left-nc">Vectored Thrust:</div>
+            <div class="table-item-nc"><input type="number" name="attr_vectoredthrust" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_vectoredthrust-specialize"
+                    class="vectoredthrust-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_vectoredthrust-specialize" class="vectoredthrust-spec-switch hidden">
+                <div class="vectoredthrust-spec-on"><input type="number" name="attr_vectoredthrust-remote" value=0>
+                </div>
+                <div class="vectoredthrust-spec-off"><span name="attr_vectoredthrust-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="winged-aircraft" class="table-item-left-nc">Winged Aircraft:</div>
+            <div class="table-item-nc"><input type="number" name="attr_wingedaircraft" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_wingedaircraft-specialize"
+                    class="wingedaircraft-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_wingedaircraft-specialize" class="wingedaircraft-spec-switch hidden">
+                <div class="wingedaircraft-spec-on"><input type="number" name="attr_wingedaircraft-remote" value=0>
+                </div>
+                <div class="wingedaircraft-spec-off"><span name="attr_wingedaircraft-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="mechanical-arm" class="table-item-left-nc">Mechanical Arm:</div>
+            <div class="table-item-nc"><input type="number" name="attr_mecharm" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_mecharm-specialize"
+                    class="mecharm-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_mecharm-specialize" class="mecharm-spec-switch hidden">
+                <div class="mecharm-spec-on"><input type="number" name="attr_mecharm-remote" value=0></div>
+                <div class="mecharm-spec-off"><span name="attr_mecharm-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="semiballistic" class="table-item-left-nc">Semiballistic:</div>
+            <div class="table-item-nc"><input type="number" name="attr_semiballistic" value=0> </div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_semiballistic-specialize"
+                    class="semiballistic-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_semiballistic-specialize" class="semiballistic-spec-switch hidden">
+                <div class="semiballistic-spec-on"><input type="number" name="attr_semiballistic-remote" value=0>
+                </div>
+                <div class="semiballistic-spec-off"><span name="attr_semiballistic-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="suborbital" class="table-item-left-nc">Suborbital:</div>
+            <div class="table-item-nc"><input type="number" name="attr_suborbital" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_suborbital-specialize"
+                    class="suborbital-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_suborbital-specialize" class="suborbital-spec-switch hidden">
+                <div class="suborbital-spec-on"><input type="number" name="attr_suborbital-remote" value=0></div>
+                <div class="suborbital-spec-off"><span name="attr_suborbital-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="tracks" class="table-item-left-nc">Tracks:</div>
+            <div class="table-item-nc"><input type="number" name="attr_tracks" value=0></div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_tracks-specialize"
+                    class="tracks-spec-switch text-mid">
+            </div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_tracks-specialize" class="tracks-spec-switch hidden">
+                <div class="tracks-spec-on"><input type="number" name="attr_tracks-remote" value=0></div>
+                <div class="tracks-spec-off"><span name="attr_tracks-remote"></span></div>
+            </div>
+            <div></div>
+            <div data-i18n="walkers" class="table-item-left-nc">Walkers:</div>
+            <div class="table-item-nc"><input type="number" name="attr_walkers" value=0> </div>
+            <div class="table-item-nc"><input type="checkbox" name="attr_walkers-specialize"
+                    class="walkers-spec-switch text-mid"></div>
+            <div class="table-item-nc">
+                <input type="checkbox" name="attr_walkers-specialize" class="walkers-spec-switch hidden">
+                <div class="walkers-spec-on"><input type="number" name="attr_walkers-remote" value=0></div>
+                <div class="walkers-spec-off"><span name="attr_walkers-remote"></span></div>
+            </div>
+            <div></div>
+        </div>
+    </div>
+</div>
 </div>
 
 <div class='sheet-combat'>
     <!-- Combat Tab -->
-    <div>
-        <div class="SRH2">Combat</div>
-        <input type="text" name="attr_updateviztns" hidden=true>
-        <input type="text" name="attr_visionprofile" hidden=true>
-        <input type="text" name="attr_fulldark" hidden=true>
-        <input type="text" name="attr_minlight" hidden=true>
-        <input type="text" name="attr_partiallight" hidden=true>
-        <input type="text" name="attr_glare" hidden=true>
-        <input type="text" name="attr_mist" hidden=true>
-        <input type="text" name="attr_lightsmoke" hidden=true>
-        <input type="text" name="attr_fullsmoke" hidden=true>
-        <input type="text" name="attr_thermalsmoke" hidden=true>
 
-        <input type='hidden' class='combatskills-switch' name='attr_combatskillsswitch' value="show" />
-        <div class="combatskills-show">
-            <div class="SRH3">Combat Skills <button class="switch-button-show" type="action" name="act_combatskillsswitch">Show</button> </div>
+    <div data-i18n="combat-skills-weapons-armor-and-ammunition" class="SRH2">Combat Skills, Weapons, Armor and Ammo</div>
+    <input type="hidden" class="combat-tabs-switch" name="attr_combattab" value="combat">
+    <div class="gear-tabs">
+        <input type="hidden" class="combat-tabs-switch" name="attr_combattab" value="combat">
+        <button class="combat-tabs-combat" type="action" name="act_combat-tab" data-i8n="combat-skills-uppercase"
+            data-i18n-title="combat-skills" title="combat skills">COMBAT SKILLS</button>
+        <button class="combat-tabs-ranged" type="action" name="act_ranged-tab" data-i8n="ranged-weapons-uppercase"
+            data-i18n-title="ranged-weapons" title="ranged weapons">RANGED WEAPONS</button>
+        <button class="combat-tabs-melee" type="action" name="act_melee-tab" data-i8n="melee-weapons-uppercase"
+            data-i18n-title="melee-weapons" title="melee weapons">MELEE WEAPONS</button>
+        <button class="combat-tabs-explosives" type="action" name="act_explosives-tab" data-i8n="explosives-uppercase"
+            data-i18n-title="explosives" title="explosives weapons">EXPLOSIVES</button>
+        <button class="combat-tabs-armor" type="action" name="act_armor-tab" data-i8n="armor-uppercase"
+            data-i18n-title="armor" title="armor">ARMOR</button>
+        <button class="combat-tabs-ammo" type="action" name="act_ammo-tab" data-i8n="ammunition-uppercase"
+            data-i18n-title="ammunition" title="ammunition">AMMUNITION</button>
+    </div>
+    <div class="combat-skills">
+        <div data-i18n="update-combat-skills-here" class="SRH5">Update Combat Skill Here</div>
+        <div data-i18n="combat-skills-specialization-message" class="SRH5">If specializing in a weapon, add modifiers to
+            the weapon itself</div><br>
+        <div class="combat-skills-table">
+            <div class="combat-skills-items">
+                <header data-i18n="assualt-rifle">Assualt Rifle:</header><input type="number" name="attr_assaultrifles"
+                    value=0 />
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="pistols">Pistols:</header><input type="number" name="attr_pistols" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="rifles">Rifles:</header><input type="number" name="attr_rifles" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="shotguns">Shotguns:</header><input type="number" name="attr_shotguns" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="sub-machine-gun-abbreviation">SMGs:</header><input type="number" name="attr_smgs"
+                    value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="throwing">Throwing:</header><input type="number" name="attr_throwing" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="edged">Edged:</header><input type="number" name="attr_edged" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="clubs">Clubs:</header><input type="number" name="attr_clubs" value=0 />
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="cyber-implant">Cyper Implant:</header><input type="number" name="attr_cyberimplant"
+                    value=0 />
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="whip">Whip:</header><input type="number" name="attr_whips" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="pole-arm">Pole Arm:</header><input type="number" name="attr_poles" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="gunnery">Gunnery:</header><input type="number" name="attr_gunnery" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="heavy-weapons">Heavy Weapons:</header><input type="number" name="attr_heavyweapons"
+                    value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="lasers">Lasers:</header><input type="number" name="attr_lasers" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="launchers">Launchers:</header><input type="number" name="attr_launchers" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="spray">Spray:</header><input type="number" name="attr_spray" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="gyrojet">Gyrojet:</header><input type="number" name="attr_gyrojet" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="projectile">Projectile:</header><input type="number" name="attr_projectiles" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="demolitions">Demolitions:</header><input type="number" name="attr_demolitions"
+                    value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="under-water">Under Water:</header><input type="number" name="attr_underwatercombat"
+                    value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="blowgun">Blowgun:</header><input type="number" name="attr_blowgun" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="bracer">Bracer:</header><input type="number" name="attr_bracer" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="gun-cane">Gun Cane:</header><input type="number" name="attr_guncane" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="oral-gun">Oral Gun:</header><input type="number" name="attr_oralgun" value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="oral-strike">Oral Strike:</header><input type="number" name="attr_oralstrike"
+                    value=0>
+            </div>
+            <div class="combat-skills-items">
+                <header data-i18n="eye-gun">Eye Gun:</header><input type="number" name="attr_eyegun" value=0>
+            </div>
         </div>
-        <div class="combatskills-hide">
-            <div class="SRH3">Combat Skills <button class="switch-button-hide" type="action" name="act_combatskillsswitch">Hide</button> </div>
-        </div>
-        <br>
-        <div class="combat-skills">
-            <br>
-            <div class="SRH5">Update Combat Skill Here</div>
-            <div class="SRH5">If specializing in a weapon, add modifiers to the weapon itself</div><br>
-            <div class="combat-skills-table">
-                <div class="combat-skills-items">Assualt Rifle:</b><input type="number" name="attr_assaultrifles"
-                        value=0 /></div>
-                <div class="combat-skills-items">Pistols:</b><input type="number" name="attr_pistols" value=0> </div>
-                <div class="combat-skills-items">Rifles:</b><input type="number" name="attr_rifles" value=0> </div>
-                <div class="combat-skills-items">Shotguns:</b><input type="number" name="attr_shotguns" value=0> </div>
-                <div class="combat-skills-items">SMGs:</b><input type="number" name="attr_smgs" value=0></div>
-                <div class="combat-skills-items">Throwing:</b><input type="number" name="attr_throwing" value=0> </div>
-                <div class="combat-skills-items">Edged:</b><input type="number" name="attr_edged" value=0></div>
-                <div class="combat-skills-items">Clubs:</b><input type="number" name="attr_clubs" value=0 /></div>
-                <div class="combat-skills-items">Cyper Implant:</b><input type="number" name="attr_cyberimplant"
-                        value=0 /></div>
-                <div class="combat-skills-items">Whips:</b><input type="number" name="attr_whips" value=0></div>
-                <div class="combat-skills-items">Pole Arms:</b><input type="number" name="attr_poles" value=0> </div>
-                <div class="combat-skills-items">Gunnery:</b><input type="number" name="attr_gunnery" value=0> </div>
-                <div class="combat-skills-items">Heavy Weapons:</b><input type="number" name="attr_heavyweapons"
-                        value=0> </div>
-                <div class="combat-skills-items">Lasers:</b><input type="number" name="attr_lasers" value=0> </div>
-                <div class="combat-skills-items">Launchers:</b><input type="number" name="attr_launchers" value=0>
-                </div>
-                <div class="combat-skills-items">Spray:</b><input type="number" name="attr_spray" value=0> </div>
-                <div class="combat-skills-items">Gyrojet:</b><input type="number" name="attr_gyrojet" value=0> </div>
-                <div class="combat-skills-items">Projectile:</b><input type="number" name="attr_projectiles" value=0>
-                </div>
-                <div class="combat-skills-items">Demolitions:</b><input type="number" name="attr_demolitions" value=0>
-                </div>
-                <div class="combat-skills-items">Under Water:</b><input type="number" name="attr_underwatercombat"
-                        value=0></div>
-                <div class="combat-skills-items">Blowgun:</b><input type="number" name="attr_blowgun" value=0> </div>
-                <div class="combat-skills-items">Bracer:</b><input type="number" name="attr_bracer" value=0> </div>
-                <div class="combat-skills-items">Gun Cane:</b><input type="number" name="attr_guncane" value=0> </div>
-                <div class="combat-skills-items">Oral Gun:</b><input type="number" name="attr_oralgun" value=0> </div>
-                <div class="combat-skills-items">Oral Strike:</b><input type="number" name="attr_oralstrike" value=0></div>
-                <div class="combat-skills-items">Eye Gun:</b><input type="number" name="attr_eyegun" value=0> </div>
+        <div></div>
+        <div class="combat-unarmed">
+            <div data-i18n="unarmed">Unarmed:</div><input type="number" name="attr_unarmed" value=0>
+            <div></div>
+            <div data-i18n="martial-arts">Martial Arts:</div>
+            <div><input type="text" list="martialarts" value="Unarmed" name="attr_martialarts">
+                <datalist class="mediumselect" id="martialarts">
+                    <option data-i18n="unarmed" selected>Unarmed</option>
+                    <option data-i18n="brawling">Brawling</option>
+                    <option data-i18n="mma">MMA</option>
+                    <option data-i18n="karate">Karate</option>
+                    <option data-i18n="arnis">Arnis</option>
+                    <option data-i18n="muy-thai">Muy Thai</option>
+                    <option data-i18n="tae-kwon-do">Tae Kwon Do</option>
+                    <option data-i18n="wild-cat">Wild Cat</option>
+                </datalist>
             </div>
             <div></div>
-            <div class="combat-unarmed">
-                <div class="combat-skills-items">Unarmed:<input type="number" name="attr_unarmed" value=0></div>
-                <div class="combat-skills-items">Martial Arts:</div>
-                <div><input type="text" list="martialarts" value="Unarmed" style="width=80px;" name="attr_martialarts">
-                    <datalist class="mediumselect3" id="martialarts">
-                        <option selected>Unarmed</option>
-                        <option>Brawling</option>
-                        <option>MMA</option>
-                        <option>Karate</option>
-                        <option>Arnis</option>
-                        <option>Muy Thai</option>
-                        <option>Tae Kwon Do</option>
-                        <option>Wild Cat</option>
-                    </datalist>
-                </div>
-                <div>Notes:</div>
-                <textarea name="attr_martialartsnotes" style='width:300px;height:50%;margin-bottom:unset;'></textarea>
-            </div>
+            <div data-i18n="notes">Notes:</div>
+            <textarea name="attr_martialartsnotes" style='width:300px;height:50%;margin-bottom:unset;'></textarea>
         </div>
-
     </div>
 
-    <div>
-        <input type='hidden' class='rangedweapons-switch' name='attr_rangedweaponsswitch' value="show" />
-        <div class="rangedweapons-hide">
-            <div class="SRH3">Ranged Weapons<button class="switch-button-show" type="action" id="rangedweaponsswitch" name="act_show-hide">Show</button> </div>
-        </div>
-        <div class="rangedweapons-show">
-            <div class="SRH3">Ranged Weapons<button class="switch-button-hide" type="action" id="rangedweaponsswitch" name="act_show-hide">Hide</button> </div>
-        </div>
-        <br>
-        <div class="rangedweapons-show">
+    <div class="rangedweapons">
         <div class="ranged-table-headers">
-            <div class="table-top-left">Equip</div>
-            <div class="table-top-mid">General</div>
-            <div class="table-top-mid">Range</div>
-            <div class="table-top-mid">Fire Mode</div>
-            <div class="table-top-mid">Damage</div>
-            <div class="table-top-mid">Ammunition</div>
-            <div class="table-top-right">Show</div>
+            <div class="table-top-left-nc" data-i18n="equip">Equip</div>
+            <div class="table-top-mid-nc" data-i18n="general">General</div>
+            <div class="table-top-mid-nc" data-i18n="range">Range</div>
+            <div class="table-top-mid-nc" data-i18n="fire-mode">Fire Mode</div>
+            <div class="table-top-mid-nc" data-i18n="damage">Damage</div>
+            <div class="table-top-mid-nc" data-i18n="ammunition">Ammunition</div>
+            <div class="table-top-right-nc" data-i18n="show">Show</div>
         </div>
         <div class="ranged-table-items">
-            <div class="table-item-left" title="Primary Hand">Pri</div>
-            <div class="table-item" title="Off Hand">Sec</div>
-            <div class="table-item">Name</div>
-            <div class="table-item">Type</div>
-            <div class="table-item">Conceal</div>
-            <div class="table-item">Min</div>
-            <div class="table-item">S</div>
-            <div class="table-item">M</div>
-            <div class="table-item">L</div>
-            <div class="table-item">Ex</div>
-            <div class="table-item">SS</div>
-            <div class="table-item">SA</div>
-            <div class="table-item">BF</div>
-            <div class="table-item">FA</div>
-            <div class="table-item">Power</div>
-            <div class="table-item">Dmg</div>
-            <div class="table-item">Max</div>
-            <div class="table-item">Remain</div>
-            <div class="table-item">Reload</div>
-            <div class="table-item">Fire</div>
-            <div class="table-item">More</div>
+            <div class="table-item-left-nc" title="Primary Hand" data-i18n="primary-abbreviation">Pri</div>
+            <div class="table-item-nc" title="Off Hand" data-i18n="secondary-abbreviation">Sec</div>
+            <div class="table-item-nc" data-i18n="name">Name</div>
+            <div class="table-item-nc" data-i18n="type">Type</div>
+            <div class="table-item-nc" data-i18n="conceal">Conceal</div>
+            <div class="table-item-nc" data-i18n="minimum-abbreviation">Min</div>
+            <div class="table-item-nc" data-i18n="short-abbreviation">S</div>
+            <div class="table-item-nc" data-i18n="medium-abbreviation">M</div>
+            <div class="table-item-nc" data-i18n="long-abbreviation">L</div>
+            <div class="table-item-nc" data-i18n="extreme-abbreviation">Ex</div>
+            <div class="table-item-nc" data-i18n="single-shot-abbreviation">SS</div>
+            <div class="table-item-nc" data-i18n="semi-automatic-abbreviation">SA</div>
+            <div class="table-item-nc" data-i18n="burst-fire-abbreviation">BF</div>
+            <div class="table-item-nc" data-i18n="full-automatic-abbreviation">FA</div>
+            <div class="table-item-nc" data-i18n="power">Power</div>
+            <div class="table-item-nc" data-i18n="damage-abbreviation">Dmg</div>
+            <div class="table-item-nc" data-i18n="maximum-abbreviation">Max</div>
+            <div class="table-item-nc" data-i18n="remain">Remain</div>
+            <div class="table-item-nc" data-i18n="reload">Reload</div>
+            <div class="table-item-nc" data-i18n="fire">Fire</div>
+            <div class="table-item-nc" data-i18n="more">More</div>
         </div>
         <fieldset class="repeating_rangedweapons">
             <div class="ranged-table-row">
@@ -2651,43 +2759,43 @@
                         name="attr_secondary-ranged-equipped"></div>
                 <input type="text" name="attr_name" class="myweapontxt">
                 <select name="attr_type" class="mediumselect2">
-                    <option SELECTED>Other</option>
-                    <option>Hold-out Pistol</option>
-                    <option>Light Pistol</option>
-                    <option>Machine Pistol</option>
-                    <option>Heavy Pistol</option>
-                    <option>SMG</option>
-                    <option>Taser</option>
-                    <option>Shotgun</option>
-                    <option>Sporting Rifle</option>
-                    <option>Sniper Rifle</option>
-                    <option>Assault Rifle</option>
-                    <option value="Light Machine Gun">LMG</option>
-                    <option value="Medium Machine Gun">MMG</option>
-                    <option value="Heavy Machine Gun">HMG</option>
-                    <option>Assault Cannon</option>
-                    <option>Minigun</option>
-                    <option>Bow</option>
-                    <option>Light Crossbow</option>
-                    <option>Medium Crossbow</option>
-                    <option>Heavy Crossbow</option>
-                    <option>Sling Shot</option>
-                    <option>Sling Launcher</option>
-                    <option>Thrown Knife</option>
-                    <option>Shuriken</option>
-                    <option>Caltrops</option>
-                    <option>Nets</option>
-                    <option>Bracer</option>
-                    <option>Gun Cane</option>
-                    <option>Speargun</option>
-                    <option>Net Gun</option>
-                    <option>Laser Pistol</option>
-                    <option>Laser Rifle</option>
-                    <option>Laser Sniper</option>
-                    <option>"Gyrojet (land)</option>
-                    <option>"Gyrojet (water)</option>
-                    <option>Flamethrower</option>
-                    <option>Blowgun</option>
+                    <option data-i18n="other" value="Other" SELECTED>Other</option>
+                    <option data-i18n="hold-out-pistol " value="Hold-out Pistol">Hold-out Pistol</option>
+                    <option data-i18n="light-pistol" value="Light Pistol">Light Pistol</option>
+                    <option data-i18n="machine-pistol" value="Machine Pistol">Machine Pistol</option>
+                    <option data-i18n="heavy-pistol" value="Heavy Pistol">Heavy Pistol</option>
+                    <option data-i18n="sub-machine-gun-abbreviation" value="SMG">SMG</option>
+                    <option data-i18n="taser" value="Taser">Taser</option>
+                    <option data-i18n="shotgun" value="Shotgun">Shotgun</option>
+                    <option data-i18n="sporting-rifle" value="Sporting Rifle">Sporting Rifle</option>
+                    <option data-i18n="sniper-rifle" value="Sniper Rifle">Sniper Rifle</option>
+                    <option data-i18n="assault-rifle" value="Assault Rifle">Assault Rifle</option>
+                    <option data-i18n="light-machine-gun-abbreviation" value="Light Machine Gun">LMG</option>
+                    <option data-i18n="medium-machine-gun-abbreviation" value="Medium Machine Gun">MMG</option>
+                    <option data-i18n="heavy-machine-gun-abbreviation" value="Heavy Machine Gun">HMG</option>
+                    <option data-i18n="assualt-cannon" value="Assault Cannon">Assault Cannon</option>
+                    <option data-i18n="minigun" value="Minigun">Minigun</option>
+                    <option data-i18n="bow" value="Bow">Bow</option>
+                    <option data-i18n="light-crossbow" value="Light Crossbow">Light Crossbow</option>
+                    <option data-i18n="medium-crossbow" value="Medium Crossbow">Medium Crossbow</option>
+                    <option data-i18n="heavy-crossbow" value="Heavy Crossbow">Heavy Crossbow</option>
+                    <option data-i18n="sling-shot" value="Sling Shot">Sling Shot</option>
+                    <option data-i18n="sling-launcher" value="Sling Launcher">Sling Launcher</option>
+                    <option data-i18n="thrown-knife" value="Thrown Knife">Thrown Knife</option>
+                    <option data-i18n="shuriken" value="Shuriken">Shuriken</option>
+                    <option data-i18n="caltrops" value="Caltrops">Caltrops</option>
+                    <option data-i18n="nets" value="Nets">Nets</option>
+                    <option data-i18n="bracer" value="Bracer">Bracer</option>
+                    <option data-i18n="gun-cane" value="Gun Cane">Gun Cane</option>
+                    <option data-i18n="speargun" value="Speargun">Speargun</option>
+                    <option data-i18n="net-gun" value="Net Gun">Net Gun</option>
+                    <option data-i18n="laser-pistol" value="Laser Pistol">Laser Pistol</option>
+                    <option data-i18n="laser-rifle" value="Laser Rifle">Laser Rifle</option>
+                    <option data-i18n="laser-sniper" value="Laser Sniper">Laser Sniper</option>
+                    <option data-i18n="gyrojet-land" value="Gyrojet (land)">Gyrojet (land)</option>
+                    <option data-i18n="gyrojet-water" value="Gyrojet (water)">Gyrojet (water)</option>
+                    <option data-i18n="flamethrower" value="Flamethrower">Flamethrower</option>
+                    <option data-i18n="blowgun" value="Blowgun">Blowgun</option>
                 </select>
                 <input type="number" name="attr_conceal">
                 <input type="number" name="attr_min">
@@ -2701,20 +2809,21 @@
                 <div class="text-mid"><input type="radio" name="attr_firemode" value="fa" /></div>
                 <input type="number" name="attr_power">
                 <select name="attr_damage" title="Weapon Damage" class="mediumselect2">
-                    <option title="Light Damage" SELECTED>L</option>
-                    <option title="Light Damage">M</option>
-                    <option title="Light Damage">S</option>
-                    <option title="Light Damage">D</option>
-                    <option title="Light Stun" value="L(stun)">L(s)</option>
-                    <option title="Moderate Stun" value="M(stun)">M(s)</option>
-                    <option title="Serious Stun" value="S(stun)">S(s)</option>
-                    <option title="Deadly Stun" value="D(stun)">D(s)</option>
+                    <option data-i18n="light-damage-abbreviation" title="Light Damage" value="L" SELECTED>L</option>
+                    <option data-i18n="moderate-damage-abbreviation" title="Moderate Damage" value="M">M</option>
+                    <option data-i18n="serious-damage-abbreviation" title="Serious Damage" value="S">S</option>
+                    <option data-i18n="deadly-damage-abbreviation" title="Deadly Damage" value="D">D</option>
+                    <option data-i18n="light-stun-abbreviation" title="Light Stun" value="L(stun)">L(s)</option>
+                    <option data-i18n="moderate-stun-abbreviation" title="Moderate Stun" value="M(stun)">M(s)</option>
+                    <option data-i18n="serious-stun-abbreviation" title="Serious Stun" value="S(stun)">S(s)</option>
+                    <option data-i18n="deadly-stun-abbreviation" title="Deadly Stun" value="D(stun)">D(s)</option>
                 </select>
                 <input type="number" name="attr_ammo" value=0>
                 <input type="number" name="attr_ammoremain" value=0>
                 <div><button class="pictos-button" id="reloadbutton" type="action" name="act_reload"
                         title="Reload Weapon">0</button></div>
-                <div><button class="attack-dice" type="action" id="rangedattack" name="act_rangedattack" title="Fire Weapon"></button>
+                <div><button class="attack-dice" type="action" id="rangedattack" name="act_rangedattack"
+                        title="Fire Weapon"></button>
                 </div>
                 <div>
                     <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
@@ -2724,122 +2833,127 @@
                 <span class="show-weaponmods">
                     <div class="text-mid"
                         title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box">
-                        <b>Skill</div>
-                    <div class="text-mid" title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">+Dice</div>
-                    <div class="text-mid" title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">+TN</div>
-                    <div class="text-mid" title="Gas vents and other recoil accesories"><b>Recoil Comp</div>
-                    <div><b>Gyro Stabalization</div>
-                    <div title="accesories that improve to hit number for ranged combat"><b>Targeting Assistance</div>
-                    <div class="text-mid" title="Clip, Belt, Cylinder, Magazine or Action Break"><b>Reload Type</div>
-                    <div class="text-mid" title="number or clips, belts or individual rounds"><b>Reloads</div>
-                    <div class="text-mid"><b>Ammo Type</div>
-                    <div class="text-mid"><b>Notes:</div>
+                        <b data-i18n="skill">Skill
+                    </div>
+                    <div class="text-mid"
+                        title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)"
+                        data-i18n="plus-dice-abbreviation">+Dice</div>
+                    <div class="text-mid"
+                        title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks"
+                        data-i18n="plus-target-number-abberviation">+TN</div>
+                    <header class="text-mid" title="Gas vents and other recoil accesories"
+                        data-i18n="recoil-compensation-abbreviation">Recoil Comp</header>
+                    <header data-i18n="gyro-stabalization">Gyro Stabalization</header>
+                    <header title="accesories that improve to hit number for ranged combat"
+                        data-i18n="targeting-assistance">Targeting Assistance</header>
+                    <header class="text-mid" title="Clip, Belt, Cylinder, Magazine or Action Break"
+                        data-i18n="reload-type">Reload Type</header>
+                    <header class="text-mid" title="number or clips, belts or individual rounds" data-i18n="reloads">
+                        Reloads</header>
+                    <header class="text-mid" data-i18n="ammo-type">Ammo Type</header>
+                    <header class="text-mid" data-i18n="notes">Notes:</header>
                     <select name="attr_skill" class="mediumselect2"
                         title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box">
-                        <option SELECTED value="@{pistols}">Pistol</option>
-                        <option value="@{assaultrifles}">Assualt Rifle</option>
-                        <option value="@{heavyweapons}">Heavy Weapon</option>
-                        <option value="@{lasers}">Laser</option>
-                        <option value="@{projectiles}">Projectile</option>
-                        <option value="@{rifles}">Rifle</option>
-                        <option value="@{shotguns}">Shotgun</option>
-                        <option value="@{smgs}">SMG</option>
-                        <option value="@{throwing}">Thrown</option>
-                        <option value="@{blowgun}">Blowgun</option>
-                        <option value="@{bracer}">Bracer</option>
-                        <option value="@{guncane}">Gun Cane</option>
-                        <option value="@{oralgun}">Oral Gun</option>
-                        <option value="@{oralstrike}">Oral Strike</option>
-                        <option value="@{eyegun}">Eye Gun</option>
-                        <option value=0>Other</option>
+                        <option data-i18n="pistol" SELECTED value="@{pistols}">Pistol</option>
+                        <option data-i18n="assault-rifle" value="@{assaultrifles}">Assault Rifle</option>
+                        <option data-i18n="heavy-weapon" value="@{heavyweapons}">Heavy Weapon</option>
+                        <option data-i18n="laser" value="@{lasers}">Laser</option>
+                        <option data-i18n="projectile" value="@{projectiles}">Projectile</option>
+                        <option data-i18n="rifle" value="@{rifles}">Rifle</option>
+                        <option data-i18n="shotgun" value="@{shotguns}">Shotgun</option>
+                        <option data-i18n="sub-machine-gun-abbreviation" value="@{smgs}">SMG</option>
+                        <option data-i18n="thrown" value="@{throwing}">Thrown</option>
+                        <option data-i18n="blowgun" value="@{blowgun}">Blowgun</option>
+                        <option data-i18n="bracer" value="@{bracer}">Bracer</option>
+                        <option data-i18n="gun-cane" value="@{guncane}">Gun Cane</option>
+                        <option data-i18n="oral-gun" value="@{oralgun}">Oral Gun</option>
+                        <option data-i18n="oral-strike" value="@{oralstrike}">Oral Strike</option>
+                        <option data-i18n="eye-gun" value="@{eyegun}">Eye Gun</option>
+                        <option data-i18n="other" value=0>Other</option>
                     </select>
                     <div><input type="number" name="attr_specialized" value=0></div>
                     <div><input type="number" name="attr_tnmods" value=0></div>
                     <div><input type="number" name="attr_recoilcomp" title="Gas vents and other recoil accesories"
                             value=0></div>
                     <select class="mediumselect2" name="attr_gyro">
-                        <option value="0" SELECTED>None</option>
-                        <option value="5">Regular</option>
-                        <option value="6">Deluxe</option>
+                        <option data-i18n="none" value="0" SELECTED>None</option>
+                        <option data-i18n="regular" value="5">Regular</option>
+                        <option data-i18n="deluxe" value="6">Deluxe</option>
                     </select>
                     <select class="mediumselect2" name="attr_targeting">
-                        <option value="0" SELECTED>None</option>
-                        <option value="-2">Smartlink</option>
-                        <option value="-1">LaserSight</option>
-                        <option value="-1">Smart Goggles</option>
+                        <option data-i18n="none" value="0" SELECTED>None</option>
+                        <option data-i18n="smartlink" value="-2">Smartlink</option>
+                        <option data-i18n="laser-sight" value="-1">LaserSight</option>
+                        <option data-i18n="smart-goggles" value="-1">Smart Goggles</option>
                     </select>
                     <select name="attr_reloadmethod" class="mediumselect2">
-                        <option>clip</option>
-                        <option>break</option>
-                        <option>magazine</option>
-                        <option>speed loader</option>
-                        <option>cylinder</option>
-                        <option>belt</option>
-                        </select>
-                     <div><input type="number" name="attr_reloads" value=0></div>
-                     <select name="attr_ammotype" class="mediumselect2">
-			<option value="regular">Regular</option>
-			<option value="adps">ADPS</option>
-			<option value="explosive">Explosive</option>
-			<option value="explosive2">Explosive EX</option>
-			<option value="flechette">Flechette</option>
-			<option value="gel">Gel</option>
-			<option value="tracer">Tracer</option>
-			<option value="av">Anti-Vehicl</option>
-			<option value="capsule">Capsule</option>
-			<option value="glazer">Glazer</option>
-			<option value="hic">Hi-C</option>
-			<option value="hpoint">Hollow Point</option>
-			<option value="incendiary">Incendiary</option>
-			<option value="mercury">Mercury</option>
-			<option value="tracker">Tracker</option>
-                     </select>
-                     <textarea name="attr_notes" style='width:150px;height:22px;'></textarea>
+                        <option data-i18n="clip" value="clip">clip</option>
+                        <option data-i18n="break" value="break">break</option>
+                        <option data-i18n="magazine" value="magazine">magazine</option>
+                        <option data-i18n="speed-loader" value="speed loader">speed loader</option>
+                        <option data-i18n="cylinder" value="cylinder">cylinder</option>
+                        <option data-i18n="belt" value="belt">belt</option>
+                    </select>
+                    <div><input type="number" name="attr_reloads" value=0></div>
+                    <select name="attr_ammotype" class="mediumselect2">
+                        <option data-i18n="regular" value="regular">Regular</option>
+                        <option data-i18n="adps" value="adps">ADPS</option>
+                        <option data-i18n="explosive" value="explosive">Explosive</option>
+                        <option data-i18n="explosive-ex" value="explosive2">Explosive EX</option>
+                        <option data-i18n="flechette" value="flechette">Flechette</option>
+                        <option data-i18n="gel" value="gel">Gel</option>
+                        <option data-i18n="tracer" value="tracer">Tracer</option>
+                        <option data-i18n="anti-vehicle" value="av">Anti-Vehicl</option>
+                        <option data-i18n="capsule" value="capsule">Capsule</option>
+                        <option data-i18n="glazer" value="glazer">Glazer</option>
+                        <option data-i18n="Hi-C" value="hic">Hi-C</option>
+                        <option data-i18n="hollow-point" value="hpoint">Hollow Point</option>
+                        <option data-i18n="incendiary" value="incendiary">Incendiary</option>
+                        <option data-i18n="mercury" value="mercury">Mercury</option>
+                        <option data-i18n="tracker" value="tracker">Tracker</option>
+                    </select>
+                    <textarea name="attr_notes" style='width:150px;height:22px;'></textarea>
                 </span>
             </div>
             <div class="table-bottom" />
         </fieldset>
-	</div>
-        <input type='hidden' class='meleeweapons-switch' name='attr_meleeweaponsswitch' value="show" />
-        <div class="meleeweapons-hide">
-            <div class="SRH3">Melee Weapons<button class="switch-button-show" type="action" id="meleeweaponsswitch" name="act_show-hide">Show</button> </div>
-        </div>
-        <div class="meleeweapons-show">
-            <div class="SRH3">Melee Weapons<button class="switch-button-hide" type="action" id="meleeweaponsswitch" name="act_show-hide">Hide</button> </div>
-        </div>
-        <br>
-	<div class="meleeweapons-show">
-        <input name="attr_meleeselected" type="hidden" \>
+    </div>
+
+    <div class="meleeweapons">
         <input name="attr_armorselected" type="hidden" \>
         <input name="attr_impact" type="hidden" value=0 \>
         <input name="attr_ballistic" type="hidden" value=0 \>
         <input name="attr_meleereach" value=0 type="hidden" \>
         <input name="attr_meleereach_max" value=0 type="hidden" \>
-        <input name="attr_meleeselected" value=0 type="hidden" \>
+        <input name="attr_meleeselected" value="unarmed-equipped" type="hidden" \>
         <div class="melee-table-header">
-            <div class="table-top-left">Equip</div>
-            <div class="table-top-mid">Name</div>
-            <div class="table-top-mid">Skill</div>
-            <div class="table-top-mid">Conceal</div>
-            <div class="table-top-mid">Reach</div>
-            <div class="table-top-mid">Power</div>
-            <div class="table-top-mid">Damage</div>
-            <div class="table-top-mid"title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">+Dice</div>
-            <div class="table-top-mid"title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">+TN</div>
-            <div class="table-top-mid">Attack</div>
-            <div class="table-top-right">Notes</div>
+            <div class="table-top-left-nc" data-i18n="equip">Equip</div>
+            <div class="table-top-mid-nc" data-i18n="name">Name</div>
+            <div class="table-top-mid-nc" data-i18n="skill">Skill</div>
+            <div class="table-top-mid-nc" data-i18n="conceal">Conceal</div>
+            <div class="table-top-mid-nc" data-i18n="reach">Reach</div>
+            <div class="table-top-mid-nc" data-i18n="power">Power</div>
+            <div class="table-top-mid-nc" data-i18n="damage">Damage</div>
+            <div class="table-top-mid-nc"
+                title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)"
+                data-i18n="plus-dice-abbreviation">+Dice</div>
+            <div class="table-top-mid-nc"
+                title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks"
+                data-i18n="plus-target-number-abberviation">+TN</div>
+            <div class="table-top-mid-nc" data-i18n="attack">Attack</div>
+            <div class="table-top-right-nc" data-i18n="notes">Notes</div>
         </div>
         <div class="melee-table-row">
             <div class="text-mid"><input type="checkbox" name="attr_unarmed-equipped" checked></div>
             <input class="myweapontxt" type="text" name="attr_unarmed-name" value="Unarmed Combat" disabled>
             <select class="mediumselect2" name="attr_unarmedskill">
-                <option value="@{unarmed}" selected>Unarmed</option>
+                <option data-i18n="unarmed" value="@{unarmed}" selected>Unarmed</option>
             </select>
             <input type="number" name="attr_unarmed-conceal" value=0>
             <input type="number" name="attr_unarmed-reach" value=0>
             <div class="meleespan"><span name="attr_strength_max"></span></div>
             <select name="attr_attackdamage" class="mediumselect2">
-                <option SELECTED>M</option>
+                <option data-i18n="moderate-stun-abbreviation" value="M(stun)" SELECTED>M(stun)</option>
             </select>
             <input type="number" name="attr_unarmed-specialized" value=0 \>
             <input type="number" name="attr_unarmed-miscmods" value=0 \>
@@ -2847,271 +2961,250 @@
                     title="Melee Attack"></button></div>
             <input name="attr_notes" type="text"></input>
         </div>
-    <div class="table-bottom" />
-    <fieldset class="repeating_meleeweapons">
-        <div class="melee-table-row">
-            <div class="text-mid"><input type="checkbox" name="attr_meleeequiped"></div>
-            <input type="text" name="attr_name">
-            <select name="attr_skill" class="mediumselect2">
-                <option value="@{clubs}">Club</option>
-                <option value="@{cyberimplant}">Cyber Implant</option>
-                <option value="@{edged}">Edged</option>
-                <option value="@{poles}">Pole Arm</option>
-                <option value="@{whips}">Whip</option>
-                <option value="@{unarmed}" selected>Unarmed</option>
-            </select>
-            <input type="number" name="attr_conceal" value=0 \>
-            <input type="number" name="attr_reach" value=0 \>
-            <input type="number" name="attr_power" value=0>
-            <select name="attr_damage" class="mediumselect2">
-                <option SELECTED>L</option>
-                <option>M</option>
-                <option>S</option>
-                <option>D</option>
-                <option>L(stun)</option>
-                <option>M(stun)</option>
-                <option>S(stun)</option>
-                <option>D(stun)</option>
-            </select>
-            <input type="number" name="attr_specialized" value=0 \>
-            <input type="number" name="attr_tnmods" value=0 \>
-            <input name="attr_miscnotes" type="text" hidden=true value="Reach Bonus: ">
-            <div><button class="attack-dice" type="action" name="act_attack" title="Melee Attack"></button></div>
-            <div><input name="attr_notes" type="text"></input></div>
-        </div>
         <div class="table-bottom" />
-    </fieldset>
         <input type='hidden' class='weaponfocus-show' name='attr_weaponfocus-show' value="false" />
-        <div class="weaponfocus">
-            <div class="SRH4">Weapon Focus </div>
-            <div class="weaponfocus-header">
-                <div class="table-top-left">Equip</div>
-                <div class="table-top-mid">Name</div>
-                <div class="table-top-mid">Reach</div>
-                <div class="table-top-mid">Skill</div>
-                <div class="table-top-mid">Conceal</div>
-                <div class="table-top-mid">Force</div>
-                <div class="table-top-mid">Power</div>
-                <div class="table-top-mid">Damage</div>
-                <div class="table-top-mid">Specialize</div>
-                <div class="table-top-mid">Attack</div>
-                <div class="table-top-right">Notes</div>
-            </div>
-            <div class="weaponfocus-attributes">
+        <div class="show-weaponfocus-melee">
+            <div class="weaponfocus">
                 <div class="text-mid"><input type="checkbox" name="attr_weaponfocus-equipped" checked></div>
                 <input class="myweapontxt" type="text" name="attr_weaponfocus-name" value="Weapon Focus">
-                <input type="number" name="attr_weaponfocus-reach" value=0>
                 <select class="mediumselect2" name="attr_weaponfocus skill">
-                    <option value="@{edged}" SELECTED>Edged</option>
-                    <option value="@{clubs}">Club</option>
-                    <option value="@{poles}">Pole Arm</option>
-                    <option value="@{whips}">Whip</option>
+                    <option value="@{edged}" SELECTED data-i18n="edged">Edged</option>
+                    <option value="@{clubs}" data-i18n="club">Club</option>
+                    <option value="@{poles}" data-i18n="pole-arm">Pole Arm</option>
+                    <option value="@{whips}" data-i18n="whip">Whip</option>
                 </select>
                 <input type="number" name="attr_weaponfocus-conceal" value=0>
-                <input type="number" name="attr_weaponfocus-force" value=0>
-                <input type="number" name="attr_weaponfocus-pawer" value=0>
+                <input type="number" name="attr_weaponfocus-reach" value=0>
+                <input type="number" name="attr_weaponfocus-power" value=0>
                 <select name="attr_weaponfocus-damage" class="mediumselect2">
-                    <option>L</option>
-                    <option SELECTED>M</option>
-                    <option>S</option>
-                    <option>D</option>
+                    <option data-i18n="light-damage-abbreviation">L</option>
+                    <option data-i18n="moderate-damage-abbreviation" SELECTED>M</option>
+                    <option data-i18n="serious-damage-abbreviation">S</option>
+                    <option data-i18n="deadly-damage-abbreviation">D</option>
                 </select>
                 <input type="number" name="attr_weaponfocus-specialized" value=0 \>
+                <input type="number" name="attr_weaponfocus-tnmods" value=0 \>
                 <div><button class="attack-dice" id="weaponfocus" type="action" name="act_melee"
                         title="Melee Attack"></button></div>
                 <input class="myweapontxt" type="text" name="attr_weaponfocus-notes">
-                <br>
             </div>
+            <div class="table-bottom" />
         </div>
-    </div>
-    <input type='hidden' class='explosives-switch' name='attr_explosivesswitch' value="show" />
-    <div class="explosives-hide">
-    	<div class="SRH3">Explosives<button class="switch-button-show" type="action" id="explosivesswitch" name="act_show-hide">Show</button> </div>
-    </div>
-    <div class="explosives-show">
-    	<div class="SRH3">Explosives<button class="switch-button-hide" type="action" id="explosivesswitch" name="act_show-hide">Hide</button> </div>
-    </div>
-    <br>
-    <div class="explosives-show">
-    <div class="explosives-table-header">
-        <div class="table-top-left">Name</div>
-        <div class="table-top-mid">Type</div>
-        <div class="table-top-mid">Conceal</div>
-        <div class="table-top-mid">Min</div>
-        <div class="table-top-mid">S</div>
-        <div class="table-top-mid">M</div>
-        <div class="table-top-mid">L</div>
-        <div class="table-top-mid">Ex</div>
-        <div class="table-top-mid">Power</div>
-        <div class="table-top-mid">Damage</div>
-        <div class="table-top-mid">Intel.</div>
-        <div class="table-top-mid">Blast</div>
-        <div class="table-top-mid">Scatter</div>
-        <div class="table-top-mid">Qty.</div>
-        <div class="table-top-mid">Manual</div>
-        <div class="table-top-mid">Sensor</div>
-        <div class="table-top-right">More</div>
-    </div>
-    <fieldset class="repeating_explosives">
-        <div class="explosives-table-row">
-            <input type="text" name="attr_name" class="myweapontxt">
-            <select name="attr_exptype" class="mediumselect2">
-                <option value="Regular:O">R/O (Regular Offensive)</option>
-                <option value="Regular:D">R/D (Regular Defensive)</option>
-                <option value="Regular:C">R/C (Regular Concussion)</option>
-                <option value="Aerodynamic:O">A/O (Aerodynamic Offensive)</option>
-                <option value="Aerodynamic:D">A/D (Aerodynamic Defensive)</option>
-                <option value="Aerodynamic:C">A/C (Aerodynamic Concussion)</option>
-                <option value="Launcher:O">L/O (Launcher Offensive)</option>
-                <option value="Launcher:D">L/D (Launcher Defensive)</option>
-                <option value="Launcher:C">L/C (Launcher Concussion)</option>
-                <option selected value="Other:Other">Other</option>
-            </select>
-            <input type="number" name="attr_conceal" value=0>
-            <input type="number" name="attr_min" value=0>
-            <input type="number" name="attr_short" value=0>
-            <input type="number" name="attr_medium" value=0>
-            <input type="number" name="attr_long" value=0>
-            <input type="number" name="attr_extreme" value=0>
-            <input type="number" name="attr_power">
-            <div>
-                <select name="attr_damage" class="mediumselect2">
-                    <option SELECTED>L</option>
-                    <option>M</option>
-                    <option>S</option>
-                    <option>D</option>
-                    <option>M(stun)</option>
-                    <option>S(stun)</option>
-                    <option>D(stun)</option>
+        <fieldset class="repeating_meleeweapons">
+            <div class="melee-table-row">
+                <div class="text-mid"><input type="checkbox" name="attr_meleeequiped"></div>
+                <input type="text" name="attr_name">
+                <select name="attr_skill" class="mediumselect2">
+                    <option data-i18n="club" value="@{clubs}">Club</option>
+                    <option data-i18n="cyber-implant" value="@{cyberimplant}">Cyber Implant</option>
+                    <option data-i18n="edged" value="@{edged}">Edged</option>
+                    <option data-i18n="pole-arm" value="@{poles}">Pole Arm</option>
+                    <option data-i18n="whip" value="@{whips}">Whip</option>
+                    <option data-i18n="unarmed" value="@{unarmed}" selected>Unarmed</option>
                 </select>
+                <input type="number" name="attr_conceal" value=0 \>
+                <input type="number" name="attr_reach" value=0 \>
+                <input type="number" name="attr_power" value=0>
+                <select name="attr_damage" class="mediumselect2">
+                    <option data-i18n="light-damage-abbreviation" title="Light Damage" value="L" SELECTED>L</option>
+                    <option data-i18n="moderate-damage-abbreviation" title="Moderate Damage" value="M">M</option>
+                    <option data-i18n="serious-damage-abbreviation" title="Serious Damage" value="S">S</option>
+                    <option data-i18n="deadly-damage-abbreviation" title="Deadly Damage" value="D">D</option>
+                    <option data-i18n="light-stun-abbreviation" title="Light Stun" value="L(stun)">L(s)</option>
+                    <option data-i18n="moderate-stun-abbreviation" title="Moderate Stun" value="M(stun)">M(s)</option>
+                    <option data-i18n="serious-stun-abbreviation" title="Serious Stun" value="S(stun)">S(s)</option>
+                    <option data-i18n="deadly-stun-abbreviation" title="Deadly Stun" value="D(stun)">D(s)</option>
+                </select>
+                <input type="number" name="attr_specialized" value=0 \>
+                <input type="number" name="attr_tnmods" value=0 \>
+                <input name="attr_miscnotes" type="text" hidden=true value="Reach Bonus: ">
+                <div><button class="attack-dice" type="action" name="act_attack" id="repeatingmelee"
+                        title="Melee Attack"></button></div>
+                <div><input name="attr_notes" type="text"></input></div>
             </div>
-            <input type="number" name="attr_missleint" value=0>
-            <input type="number" name="attr_blast" value=0 step=0.05>
-            <input type="number" name="attr_scatter" value=1>
-            <input type="number" name="attr_ammoremain" value=0>
-            <div><button class="explosive-dice" type="action" name="act_rangedattack" id="explosive"
-                    title="Explosives Attack"></button></div>
-            <div><button type="action" name="act_rangedattack" id="sensorexp" title="Sensor Assisted Attack">f</button>
-            </div>
-            <div>
+            <div class="table-bottom" />
+        </fieldset>
+    </div>
+
+    <div class="explosives">
+        <div class="explosives-table-header">
+            <div class="table-top-left-nc" data-i18n="name">Name</div>
+            <div class="table-top-mid-nc" data-i18n="type">Type</div>
+            <div class="table-top-mid-nc" data-i18n="conceal">Conceal</div>
+            <div class="table-top-mid-nc" data-i18n="minimum-abbreviation">Min</div>
+            <div class="table-top-mid-nc" data-i18n="short-abbreviation">S</div>
+            <div class="table-top-mid-nc" data-i18n="medium-abbreviation">M</div>
+            <div class="table-top-mid-nc" data-i18n="long-abbreviation">L</div>
+            <div class="table-top-mid-nc" data-i18n="extreme-abbreviation">Ex</div>
+            <div class="table-top-mid-nc" data-i18n="power">Power</div>
+            <div class="table-top-mid-nc" data-i18n="damage">Damage</div>
+            <div class="table-top-mid-nc" data-i18n="intelligence-abbreviation">Intel.</div>
+            <div class="table-top-mid-nc" data-i18n="blast">Blast</div>
+            <div class="table-top-mid-nc" data-i18n="scatter">Scatter</div>
+            <div class="table-top-mid-nc" data-i18n="quantity-abbreviation">Qty.</div>
+            <div class="table-top-mid-nc" data-i18n="manual">Manual</div>
+            <div class="table-top-mid-nc" data-i18n="sensor">Sensor</div>
+            <div class="table-top-right-nc" data-i18n="more">More</div>
+        </div>
+        <fieldset class="repeating_explosives">
+            <div class="explosives-table-row">
+                <input type="text" name="attr_name" class="myweapontxt">
+                <select name="attr_exptype" class="mediumselect2">
+                    <option data-i18n="regular-offensive" value="Regular:O">R/O (Regular Offensive)</option>
+                    <option data-i18n="regular-defensive" value="Regular:D">R/D (Regular Defensive)</option>
+                    <option data-i18n="regular-concussion" value="Regular:C">R/C (Regular Concussion)</option>
+                    <option data-i18n="aerodynamic-offensive" value="Aerodynamic:O">A/O (Aerodynamic Offensive)</option>
+                    <option data-i18n="aerodynamic-defensive" value="Aerodynamic:D">A/D (Aerodynamic Defensive)</option>
+                    <option data-i18n="aerodynamic-concussion" value="Aerodynamic:C">A/C (Aerodynamic Concussion)
+                    </option>
+                    <option data-i18n="launcher-offensive" value="Launcher:O">L/O (Launcher Offensive)</option>
+                    <option data-i18n="launcher-defensive" value="Launcher:D">L/D (Launcher Defensive)</option>
+                    <option data-i18n="launcher-concussion" value="Launcher:C">L/C (Launcher Concussion)</option>
+                    <option data-i18n="other" selected value="Other:Other">Other</option>
+                </select>
+                <input type="number" name="attr_conceal" value=0>
+                <input type="number" name="attr_min" value=0>
+                <input type="number" name="attr_short" value=0>
+                <input type="number" name="attr_medium" value=0>
+                <input type="number" name="attr_long" value=0>
+                <input type="number" name="attr_extreme" value=0>
+                <input type="number" name="attr_power">
+                <div>
+                    <select name="attr_damage" class="mediumselect2">
+                        <option data-i18n="light-damage-abbreviation" title="Light Damage" value="L" SELECTED>L</option>
+                        <option data-i18n="moderate-damage-abbreviation" title="Moderate Damage" value="M">M</option>
+                        <option data-i18n="serious-damage-abbreviation" title="Serious Damage" value="S">S</option>
+                        <option data-i18n="deadly-damage-abbreviation" title="Deadly Damage" value="D">D</option>
+                        <option data-i18n="light-stun-abbreviation" title="Light Stun" value="L(stun)">L(s)</option>
+                        <option data-i18n="moderate-stun-abbreviation" title="Moderate Stun" value="M(stun)">M(s)
+                        </option>
+                        <option data-i18n="serious-stun-abbreviation" title="Serious Stun" value="S(stun)">S(s)</option>
+                        <option data-i18n="deadly-stun-abbreviation" title="Deadly Stun" value="D(stun)">D(s)</option>
+                    </select>
+                </div>
+                <input type="number" name="attr_missleint" value=0>
+                <input type="number" name="attr_blast" value=0 step=0.05>
+                <input type="number" name="attr_scatter" value=1>
+                <input type="number" name="attr_ammoremain" value=0>
+                <div><button class="explosive-dice" type="action" name="act_rangedattack" id="explosive"
+                        title="Explosives Attack"></button></div>
+                <div><button type="action" name="act_rangedattack" id="sensorexp"
+                        title="Sensor Assisted Attack">f</button>
+                </div>
+                <div>
+                    <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
+                    <button class="pictos-button" type="action" name="act_showmore" title="Show More">y</button>
+                </div>
                 <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
-                <button class="pictos-button" type="action" name="act_showmore" title="Show More">y</button>
             </div>
-            <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
-	    </div>
             <input type="hidden" name="attr_scatterredux">
             <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
             <div class="explosive-mods-switch">
-                <div>Skill</div>
-                <div title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">+Dice</div>
-                <div title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">+TN</div>
-                <div>Recoil Comp</div>
-                <div>Gyro Stabalization</div>
-                <div>Targeting Assistance</div>
-                <div>Range Finder</div>
-                <div>Notes:</div>
+                <div data-i18n="skill">Skill</div>
+                <div data-i18n="plus-dice-abbreviation"
+                    title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">
+                    +Dice</div>
+                <div data-i18n="plus-target-number-abberviation"
+                    title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">
+                    +TN</div>
+                <div data-i18n="recoil-compensation-abbreviation">Recoil Comp</div>
+                <div data-i18n="gyro-stabalization">Gyro Stabalization</div>
+                <div data-i18n="target-assistance">Targeting Assistance</div>
+                <div data-i18n="range-finder">Range Finder</div>
+                <div data-i18n="notes">Notes:</div>
                 <select name="attr_skill" class="mediumselect2">
-                    <option selected value="@{throwing}">Throw</option>
-                    <option value="@{launchers}">Launcher</option>
-                    <option value="@{demolitions}">Demolition</option>
+                    <option data-i18n="throw" selected value="@{throwing}">Throw</option>
+                    <option data-i18n="launcher" value="@{launchers}">Launcher</option>
+                    <option data-i18n="demolition" value="@{demolitions}">Demolition</option>
                 </select>
                 <div><input type="number" name="attr_specialized" value=0></div>
                 <div><input type="number" name="attr_tnmods" value=0></div>
                 <div><input type="number" name="attr_recoilcomp" value=0></div>
                 <select class="mediumselect2" name="attr_gyro">
-                    <option value="0" SELECTED>None</option>
-                    <option value="5">Regular</option>
-                    <option value="6">Deluxe</option>
+                    <option data-i18n="none" value="0" SELECTED>None</option>
+                    <option data-i18n="regular" value="5">Regular</option>
+                    <option data-i18n="deluxe" value="6">Deluxe</option>
                 </select>
                 <select class="mediumselect2" name="attr_targeting">
-                    <option value="0" SELECTED>None</option>
-                    <option value="-2">Smartlink</option>
-                    <option value="-1">LaserSight</option>
-                    <option value="-1">Smart Goggles</option>
+                    <option data-i18n="none" value="0" SELECTED>None</option>
+                    <option data-i18n="smartlink" value="-2">Smartlink</option>
+                    <option data-i18n="laser-sight" value="-1">LaserSight</option>
+                    <option data-i18n="smart-goggles" value="-1">Smart Goggles</option>
                 </select>
                 <div><input name="attr_rangefinder" type="number"></div>
                 <input name="attr_notes" type="text"></input>
             </div>
-        </div>
-    </fieldset>
+
+        </fieldset>
     </div>
-    <input type='hidden' class='armor-switch' name='attr_armorswitch' value="show" />
-    <div class="armor-hide">
-    	<div class="SRH3">Armor<button class="switch-button-show" type="action" id="armorswitch" name="act_show-hide">Show</button> </div>
-    </div>
-    <div class="armor-show">
-    	<div class="SRH3">Armor<button class="switch-button-hide" type="action" id="armorswitch" name="act_show-hide">Hide</button> </div>
-    </div>
-     <br>
-    <div class="armor-show">
-    <input type="hidden" name="attr_armor-combatpool-pen" value=0>
-    <input type="hidden" name="attr_armor-quickness-pen" value=0>
+
     <div class="armor">
-        <header>Pain Resistance: </header><input type='number' name='attr_adeptpainres' value="0" min="0">
-        <header>Ballistic: </header><input type='number' name='attr_ballistic' value="0" min="0">
-        <header>Impact: </header><input type='number' name='attr_impact' value="0" min="0" >
-        <header>Quickness Penalty: <span name="attr_armor-quickness-pen" value=0></span></header>
-        <header>Combat Pool Penalty: <span name="attr_armor-combatpool-pen" value=0></span></header>
-        <header>Dermal Armor: <input name="attr_dermal-armor" type="checkbox" value=1></header>
-    </div>
-    <div class="armorsets-table-header">
-        <div class="table-top-left">Equip</div>
-        <div class="table-top-mid">Name</div>
-        <div class="table-top-mid">Slot</div>
-        <div class="table-top-mid">Ballistic Rating</div>
-        <div class="table-top-mid">Impact Rating</div>
-        <div class="table-top-right">Notes</div>
-    </div>
-    <fieldset class="repeating_armor">
-        <div class="armorsets-table-row">
-            <div class="text-mid" ><input type="checkbox" name="attr_equipped">
-            </div>
-            <input type=text name="attr_armorname" class="myweapontxt">
-	    <div><select name="attr_slot" class="mediumselect2">
-                    <option SELECTED>body</option>
-                    <option >helmet</option>
-                    <option>shield</option>
-                    <option value="ware">cyberware</option>
-                    <option value="ware">bioware</option>
-                    <option value="ware">nanoware</option>
-                    <option value="gyro">gyro harness</option>
-                </select>
-	    </div>
-            <input type="number" value=0 name="attr_ballistic">
-            <input type="number" value=0 name="attr_impact">
-            <input name="attr_armornotes" type="text"></input>
+        <input type="hidden" name="attr_armor-combatpool-pen" value=0>
+        <input type="hidden" name="attr_armor-quickness-pen" value=0>
+        <div class="armor-headers">
+            <header data-i18n="pain-resistance">Pain Resistance: </header><input type='number' name='attr_adeptpainres'
+                value="0" min="0">
+            <header data-i18n="ballistic">Ballistic: </header><input type='number' name='attr_ballistic' value="0"
+                min="0">
+            <header data-i18n="impact">Impact: </header><input type='number' name='attr_impact' value="0" min="0">
+            <header data-i18n="quickness-penalty">Quickness Penalty:</header>
+            <div> <span name="attr_armor-quickness-pen" value=0></span></div>
+            <header data-i18n="combat-pool-penalty">Combat Pool Penalty:</header>
+            <div> <span name="attr_armor-combatpool-pen" value=0></span></div>
+            <header data-i18n="dermal-armor">Dermal Armor:</header><input name="attr_dermal-armor" type="checkbox"
+                value=1>
         </div>
-        <div class="table-bottom" />
-    </fieldset>
-    </div>
-    <input type='hidden' class='ammo-switch' name='attr_ammoswitch' value="show" />
-    <div class="ammo-hide">
-    	<div class="SRH3">Ammunition<button class="switch-button-show" type="action" id="ammoswitch" name="act_show-hide">Show</button> </div>
-    </div>
-    <div class="ammo-show">
-    	<div class="SRH3">Ammunition<button class="switch-button-hide" type="action" id="ammoswitch" name="act_show-hide">Hide</button> </div>
-    </div>
-    <div class="ammo-show">
-        <br>
-    <div class="ammunition-list">
-        <div class="ammo-table-header">
-            <div class="table-top-left">Ammo Type</div>
-            <div class="table-top-mid">Ammount</div>
-            <div class="table-top-mid">Weight</div>
-            <div class="table-top-right">Damage Modifier</div>
+        <div class="armorsets-table-header">
+            <div class="table-top-left-nc" data-i18n="equip">Equip</div>
+            <div class="table-top-mid-nc" data-i18n="name">Name</div>
+            <div class="table-top-mid-nc" data-i18n="slot">Slot</div>
+            <div class="table-top-mid-nc" data-i18n="ballistic-rating">Ballistic Rating</div>
+            <div class="table-top-mid-nc" data-i18n="impact-rating">Impact Rating</div>
+            <div class="table-top-right-nc" data-i18n="notes">Notes</div>
         </div>
-        <fieldset class="repeating_ammunition">
-            <div class="ammo-table-row">
-                <div><input type="text" name="attr_ammotype"></div>
-                <div><input type="number" name="attr_ammocount"></div>
-                <div><input type="number" name="attr_ammoweight"></div>
-                <input name="attr_ammonotes" type="text"></input>
+        <fieldset class="repeating_armor">
+            <div class="armorsets-table-row">
+                <div class="text-mid"><input type="checkbox" name="attr_equipped">
+                </div>
+                <input type=text name="attr_armorname" class="myweapontxt">
+                <div><select name="attr_slot" class="mediumselect2">
+                        <option SELECTED value="body" data-i18n="body">body</option>
+                        <option value="helmet" data-i18n="helmet">helmet</option>
+                        <option value="shield" data-i18n="shield">shield</option>
+                        <option value="ware" data-i18n="cyberware">cyberware</option>
+                        <option value="ware" data-i18n="bioware">bioware</option>
+                        <option value="ware" data-i18n="nanoware">nanoware</option>
+                        <option value="gyro" data-i18n="gyro-harness">gyro harness</option>
+                    </select>
+                </div>
+                <input type="number" value=0 name="attr_ballistic">
+                <input type="number" value=0 name="attr_impact">
+                <input name="attr_armornotes" type="text"></input>
             </div>
             <div class="table-bottom" />
         </fieldset>
-	</div>
     </div>
-</div>
+
+    <div class="ammo">
+        <div class="ammunition-list">
+            <div class="ammo-table-header">
+                <div class="table-top-left-nc" data-i18n="ammo-type">Ammo Type</div>
+                <div class="table-top-mid-nc" data-i18n="quantity">Quantity</div>
+                <div class="table-top-mid-nc" data-i18n="weight">Weight</div>
+                <div class="table-top-right-nc" data-i18n="damage-modifier">Damage Modifier</div>
+            </div>
+            <fieldset class="repeating_ammunition">
+                <div class="ammo-table-row">
+                    <div><input type="text" name="attr_ammotype"></div>
+                    <div><input type="number" name="attr_ammocount"></div>
+                    <div><input type="number" name="attr_ammoweight"></div>
+                    <input name="attr_ammonotes" type="text"></input>
+                </div>
+                <div class="table-bottom" />
+            </fieldset>
+        </div>
+    </div>
+
 
 </div>
 
@@ -3120,35 +3213,35 @@
     <input type="number" name="attr_matrixsecuritynumber" hidden="true">
     <div class="matrix-always-displayed">
         <div class="matrix-attributes">
-            <div>Type</div>
-            <div>Grid</div>
+            <div data-i18n="type">Type</div>
+            <div data-i18n="grid">Grid</div>
             <div class="matrix-rating">
-                <div class="header">Security Code</div>
+                <div class="header" data-i18n="security-code">Security Code</div>
                 <div>-</div>
-                <div class="header"> Security Value</div>
+                <div class="header" data-i18n="security-value"> Security Value</div>
                 <div>/</div>
-                <div class="header"> Acesss</div>
+                <div class="header" data-i18n="access"> Acesss</div>
                 <div>/</div>
-                <div class="header"> Control</div>
+                <div class="header" data-i18n="control"> Control</div>
                 <div>/</div>
-                <div class="header"> Index</div>
+                <div class="header" data-i18n="index"> Index</div>
                 <div>/</div>
-                <div class="header"> Files</div>
+                <div class="header" data-i18n="files"> Files</div>
                 <div>/</div>
-                <div class="header"> Slave</div>
+                <div class="header" data-i18n="slave"> Slave</div>
             </div>
             <div><select name="attr_matrixobject" class="mediumselect2">
-                    <option>Grid</option>
-                    <option>Host</option>
-                    <option>VM</option>
+                    <option data-i18n="grid" value="Grid">Grid</option>
+                    <option data-i18n="host" value="Host">Host</option>
+                    <option data-i18n="virtual-machine-abbreviation" value="VM">VM</option>
                 </select></div>
             <input type="text" name="attr_parentgrid">
             <div class="matrix-rating">
                 <div><select name="attr_matrixcode" class="mediumselect2">
-                        <option SELECTED>BLUE</option>
-                        <option>GREEN</option>
-                        <option>ORANGE</option>
-                        <option>RED</option>
+                        <option data-i18n="blue" value="BLUE" SELECTED>BLUE</option>
+                        <option data-i18n="green" value="GREEN">GREEN</option>
+                        <option data-i18n="orange" value="ORANGE">ORANGE</option>
+                        <option data-i18n="red" value="RED">RED</option>
                     </select></div>
                 <div>-</div>
                 <div><input type="number" name="attr_matrixsecurityrating"></div>
@@ -3176,37 +3269,43 @@
                     <span name="attr_matrixslaverating"></span>
                 </div>
             </div>
-	    <div></div>
-            <div>Detection Roll</div><div><button type="action" class="d6-button" name="act_matrixdetect" title="Detection Roll" id="systemdetect">L</button></div>
-            <div>Security Tally</div><input title="Security Tally for all intruding icons in the system"type="number" name="attr_matrixsecuritytally">
-	    <div></div>
-            <div title="Reset Security Tally for all icons in the system">Reset Tally</div><div><button type="action" class="pictos-button" name="act_matrixdetect" title="Detection Roll" id="resettally">0</button></div>
-            <div>Alert Status</div>
-                <select name="attr_matrixalert" class="mediumselect2">
-                    <option value=0>None</option>
-                    <option value=4>Passive</option>
-                    <option value=5>Active</option>
-                </select>
-                <input type="number" name="attr_matrixalertTN" hidden=true>
-            </div>
+            <div></div>
+            <div data-i18n="detection-roll">Detection Roll</div>
+            <div><button type="action" class="d6-button" name="act_matrixdetect" title="Detection Roll"
+                    id="systemdetect">L</button></div>
+            <div data-i18n="security-tally">Security Tally</div><input
+                title="Security Tally for all intruding icons in the system" type="number"
+                name="attr_matrixsecuritytally">
+            <div></div>
+            <div title="Reset Security Tally for all icons in the system">Reset Tally</div>
+            <div><button type="action" class="pictos-button" name="act_matrixdetect" title="Detection Roll"
+                    id="resettally">0</button></div>
+            <div data-i18n="alert-status">Alert Status</div>
+            <select name="attr_matrixalert" class="mediumselect2">
+                <option data-i18n="none" value=0>None</option>
+                <option data-i18n="passive" value=4>Passive</option>
+                <option data-i18n="active" value=5>Active</option>
+            </select>
+            <input type="number" name="attr_matrixalertTN" hidden=true>
         </div>
+    </div>
     <div class="matrixhost">
         <input type='hidden' class='securitysheaf-switch' name='attr_securitysheafswitch' value="show" />
         <div class="securitysheaf-show">
-            <div class="SRH3">Security Sheaf
-                <button class="switch-button-show" type="action" name="act_securitysheafswitch">Show</button>
-            </div>
+            <div class="SRH3">Security Sheaf</div>
+            <button class="switch-button-show" type="action" name="act_securitysheafswitch"
+                data-i18n="show">Show</button>
         </div>
         <div class="securitysheaf-hide">
-            <div class="SRH3">Security Sheaf
-                <button class="switch-button-hide" type="action" name="act_securitysheafswitch">Hide</button>
-            </div>
+            <div class="SRH3">Security Sheaf</div>
+            <button class="switch-button-hide" type="action" name="act_securitysheafswitch"
+                data-i18n="hide">Hide</button>
         </div>
         <br>
         <div class="securitysheaf">
             <div class="securitytally">
-                <header class="table-top-left">Trigger Step</header>
-                <header class="table-top-right">Event</header>
+                <header data-i18n="trigger-step" class="table-top-left">Trigger Step</header>
+                <header data-i18n="event" class="table-top-right">Event</header>
             </div>
             <fieldset class="repeating_security">
                 <div class="securitytally">
@@ -3216,110 +3315,113 @@
             </fieldset>
             <br>
             <div class="matrix-intruder-tally">
-                <header class="table-top-left">Intruder</header>
-                <header class="table-top-mid">Detection</header>
-                <header class="table-top-mid">Security Tally</header>
-                <header class="table-top-mid">Reset Tally</header>
-		<header class="table-top-right">Select Token</header>
+                <header data-i18n="intruder" class="table-top-left">Intruder</header>
+                <header data-i18n="detection" class="table-top-mid">Detection</header>
+                <header data-i18n="security-tally" class="table-top-mid">Security Tally</header>
+                <header data-i18n="rest-tally" class="table-top-mid">Reset Tally</header>
+                <header data-i18n="select-token" class="table-top-right">Select Token</header>
             </div>
             <fieldset class="repeating_intruders">
                 <div class="matrix-intruder-tally">
                     <div class="table-item-left"><input type="text" name="attr_intrudername"></div>
-                    <div class="table-item"><button type="action" class="d6-button" name="act_detect" id="systemdetect" title="Detection Roll for intruding icon">L</button></div>
+                    <div class="table-item"><button type="action" class="d6-button" name="act_detect" id="systemdetect"
+                            title="Detection Roll for intruding icon">L</button></div>
                     <div class="table-item"><input type="number" name="attr_securitytally" value=0></div>
-                    <div class="table-item"><button type="action" class="pictos-button" name="act_detect" id="resetsecuritytally" title="Reset Security Tally">0</button></div>
-                    <div class="table-item"><button type="action" class="pictos-custom-button" name="act_settokenname" id="ic" title="Set Token Name by Selecting Token">w</button></div>
+                    <div class="table-item"><button type="action" class="pictos-button" name="act_detect"
+                            id="resetsecuritytally" title="Reset Security Tally">0</button></div>
+                    <div class="table-item"><button type="action" class="pictos-custom-button" name="act_settokenname"
+                            id="ic" title="Set Token Name by Selecting Token">w</button></div>
                 </div>
             </fieldset>
 
         </div>
-    </div>  
+    </div>
     <br>
     <input type='hidden' class='ic-switch' name='attr_ic-switch' value="show" />
     <div class="ic-show">
-        <div class="SRH3">Intrusion Countermeasures
-            <button class="switch-button-show" type="action" name="act_ic-switch">Show</button>
-        </div>
+        <div class="SRH3" data-i18n="intrusion-countermeasures">Intrusion Countermeasures</div>
+        <button class="switch-button-show" type="action" name="act_ic-switch" data-i18n="show">Show</button>
     </div>
     <div class="ic-hide">
-        <div class="SRH3">Intrusion Countermeasures
-            <button class="switch-button-hide" type="action" name="act_ic-switch">Hide</button>
-        </div>
+        <div class="SRH3" data-i18n="intrusion-countermeasures">Intrusion Countermeasures</div>
+        <button class="switch-button-hide" type="action" name="act_ic-switch" data-i18n="hide">Hide</button>
     </div>
     <div class="ic">
         <input type='hidden' name='attr_deck-tn' value=0 />
         <div class="ic-attributes">
-            <header class="table-top-left">Name</header>
-            <header class="table-top-mid">Rating</header>
-            <header class="table-top-mid">Initiative</header>
-            <header class="table-top-mid">Damage</header>
-            <header class="table-top-mid">Type</header>
-            <header class="table-top-mid">Icon Status</header>
-            <header class="table-top-mid">Test Target</header>
-            <header class="table-top-mid">Sensor</header>
-            <header class="table-top-mid">Evade</header>
-            <header class="table-top-mid">Parry</header>
-            <header class="table-top-mid">Position</header>
-            <header class="table-top-mid">Execute</header>
-            <header class="table-top-right">Resist</header>
+            <header class="table-top-left" data-i18n="name">Name</header>
+            <header class="table-top-mid" data-i18n="rating">Rating</header>
+            <header class="table-top-mid" data-i18n="initiative">Initiative</header>
+            <header class="table-top-mid" data-i18n="damage">Damage</header>
+            <header class="table-top-mid" data-i18n="type">Type</header>
+            <header class="table-top-mid" data-i18n="icon-status">Icon Status</header>
+            <header class="table-top-mid" data-i18n="test-target">Test Target</header>
+            <header class="table-top-mid" data-i18n="sensor">Sensor</header>
+            <header class="table-top-mid" data-i18n="evade">Evade</header>
+            <header class="table-top-mid" data-i18n="parry">Parry</header>
+            <header class="table-top-mid" data-i18n="position">Position</header>
+            <header class="table-top-mid" data-i18n="execute">Execute</header>
+            <header class="table-top-right" data-i18n="resist">Resist</header>
         </div>
         <fieldset class="repeating_ic">
             <input type="hidden" name="attr_ic-penalty" value=0>
             <div class="ic-attributes-table">
                 <div><input type="text" name="attr_icname"></div>
                 <div><input type="number" name="attr_icrating"></div>
-                <div><span name="attr_matrixsecuritynumber"></span>d6 +<span name="attr_icrating"></span><button type="action" name="act_init" class="d6-button" title="IC Initiative Roll">L</button></div>
+                <div><span name="attr_matrixsecuritynumber"></span>d6 +<span name="attr_icrating"></span><button
+                        type="action" name="act_init" class="d6-button" title="IC Initiative Roll">L</button></div>
                 <div><input type="number" name="attr_ic-damage" value=0 min=0 max=10></div>
                 <div><select name="attr_ictype" class="mediumselect2">
-                        <option>Crippler</option>
-                        <option>Killer</option>
-                        <option>Probe</option>
-                        <option>Scramble</option>
-                        <option>Tar Baby</option>
-                        <option>Blaster</option>
-                        <option>Ripper</option>
-                        <option>Sparky</option>
-                        <option>Tar pit</option>
-                        <option>Black Ic</option>
-                        <option>Data Bomb</option>
-                        <option>Pavlov</option>
-                        <option>Scout</option>
-                        <option>Trace</option>
-                        <option>Cerebropathic</option>
-                        <option>Psychotropic</option>
+                        <option data-i18n="crippler" value="Crippler">Crippler</option>
+                        <option data-i18n="killer" value="Killer">Killer</option>
+                        <option data-i18n="probe" value="Probe">Probe</option>
+                        <option data-i18n="scramble" value="Scramble">Scramble</option>
+                        <option data-i18n="tar-baby" value="Tar Baby">Tar Baby</option>
+                        <option data-i18n="blaser" value="Blaster">Blaster</option>
+                        <option data-i18n="ripper" value="Ripper">Ripper</option>
+                        <option data-i18n="sparky" value="Sparky">Sparky</option>
+                        <option data-i18n="tar-pi" value="Tar pit">Tar pit</option>
+                        <option data-i18n="black-ic-lethal" value="blackiclethal">Black IC Lethal</option>
+                        <option data-i18n="black-ic-non-lethal" value="blackicnonlethal">Black IC Non-Lethal</option>
+                        <option data-i18n="data-bomb" value="Data Bomb">Data Bomb</option>
+                        <option data-i18n="pavlov" value="Pavlov">Pavlov</option>
+                        <option data-i18n="scout" value="Scout">Scout</option>
+                        <option data-i18n="trace" value="Trace">Trace</option>
+                        <option data-i18n="cerebropathic" value="cerebropathic">Cerebropathic</option>
+                        <option data-i18n="psychotropic" value="psychotropic">Psychotropic</option>
                     </select></div>
                 <div><select name="attr_matrix-iconstatus" class="mediumselect2">
-                        <option SELECTED>Intruder</option>
-                        <option>Legitimate</option>
+                        <option data-i18n="intruder" value="Intruder" SELECTED>Intruder</option>
+                        <option data-i18n="legitimate" value="Legitimate">Legitimate</option>
                     </select></div>
                 <div><select name="attr_ictargettest" class="mediumselect2">
-                        <option value="@{target|decker|deck-bod-final}">Bod</option>
-                        <option value="@{target|decker|deck-evasion-final}">Evasion</option>
-                        <option value="@{target|decker|deck-sensors-final}">Sensor</option>
-                        <option value="@{target|decker|deck-masking-final}">Masking</option>
-                        <option value="@{target|decker|deck-detection-final}">DetectionFactor</option>
-                        <option>Attack</option>
-                        <option value="@{target|decker|computer}">Computer Skill</option>
-                        <option value="?{Utility Rating?|4}">Utility TN</option>
-                        <option value="@{target|decker|deck-mpcp-final}">MPCP</option>
+                        <option value="@{target|decker|deck-bod-final}" data-i18n="bod">Bod</option>
+                        <option value="@{target|decker|deck-evasion-final}" data-i18n="evasion">Evasion</option>
+                        <option value="@{target|decker|deck-sensors-final}" data-i18n="sensor">Sensor</option>
+                        <option value="@{target|decker|deck-masking-final}" data-i18n="masking">Masking</option>
+                        <option value="@{target|decker|deck-detection-final}" data-i18n="detection-factor">DetectionFactor</option>
+                        <option data-i18n="attack" value="attack">Attack</option>
+                        <option value="@{target|decker|computer}" data-i18n="computer-skill">Computer Skill</option>
+                        <option value="?{Utility Rating?|4}" data-i18n="utility-target-number-abbreviation">Utility TN
+                        </option>
+                        <option value="@{target|decker|deck-mpcp-final}" data-i18n="mpcp">MPCP</option>
                     </select></div>
-		    <div><button type="action" class="d6-button" name="act_combat" title="Sensor Test" id="icsensortest">L</button></div>
-		    <div><button type="action" class="d6-button" name="act_combat" title="Evade Detection" id="icevade">L</button></div>
-		    <div><button type="action" class="d6-button" name="act_combat" title="Parry Attack" id="icparry">L</button></div>
-		    <div><button type="action" class="d6-button" name="act_combat" title="Position Attack" id="icposition">L</button></div>
-		    <div><button type="action" class="d6-button" name="act_combat" title="IC Execute" id="icattack">L</button></div>
-		    <div><button type="action" class="pictos3-button" name="act_combat" title="IC Resist" id="icresist">b</button></div>
-            <div><textarea name="attr_icnotes" style='width:275px;height:25px;'></textarea>
-            </div>
+                <div><button type="action" class="pictos-button" name="act_combat" title="Sensor Test" id="icsensortest">f</button></div>
+                <div><button type="action" class="d6-button" name="act_combat" title="Evade Detection" id="icevade">L</button></div>
+                <div><button type="action" class="d6-button" name="act_combat" title="Parry Attack" id="icparry">L</button></div>
+                <div><button type="action" class="d6-button" name="act_combat" title="Position Attack" id="icposition">L</button></div>
+                <div><button type="action" class="pictos-custom-button" name="act_combat" title="IC Execute" id="icattack">[</button></div>
+                <div><button type="action" class="pictos3-button" name="act_combat" title="IC Resist" id="icresist">b</button></div>
+                <div><textarea name="attr_icnotes" style='width:275px;height:25px;'></textarea>
+                </div>
         </fieldset>
     </div>
     <br>
 
-
-
     <div class="matrixrapid">
-        Rapid Settings System Rating<input type="text" name="attr_matrixsystemset"><button class="quicksettings"
-            type="action" name="act_matrixsystemset">Apply</button>
+        <div data-i18n="rapid-settings-system-rating">Rapid Settings System Rating</div><input type="text"
+            name="attr_matrixsystemset"><button class="quicksettings" type="action" name="act_matrixsystemset"
+            data-i18n="apply">Apply</button>
     </div>
 </div>
 
@@ -3329,48 +3431,54 @@
     <div class="vehicle-only">
         <div class="vehicle-buttons">
             <input type='hidden' class='sheet-tabstoggle' name='attr_sheetTab' />
-            <button class="vehicle-attr-button" type="action" name="act_vehicle-attr-tab">Vehicle
-                Attributes</button>
-            <button class="vehicle-combat-button" type="action" name="act_vehicle-combat-tab">Vehicle
-                Combat</button>
-            <button class="vehicle-notes-button" type="action" name="act_vehicle-notes-tab">Vehicle Notes</button>
-            <button class="vehicle-ecm-button" type="action" name="act_vehicle-ecm-tab">ECM/FLUX</button>
+            <button class="vehicle-attr-button" type="action" name="act_vehicle-attr-tab"
+                data-i18n="vehicle-attributes">Vehicle Attributes</button>
+            <button class="vehicle-combat-button" type="action" name="act_vehicle-combat-tab"
+                data-i18n="vehicle-combat">Vehicle Combat</button>
+            <button class="vehicle-notes-button" type="action" name="act_vehicle-notes-tab"
+                data-i18n="vehicle-notes">Vehicle Notes</button>
+            <button class="vehicle-ecm-button" type="action" name="act_vehicle-ecm-tab"
+                data-i18n="ecm-flux">ECM/FLUX</button>
         </div>
     </div>
     <div class="drone-only">
         <div class="vehicle-buttons">
             <input type='hidden' class='sheet-tabstoggle' name='attr_sheetTab' />
-            <button class="vehicle-attr-button" type="action" name="act_vehicle-attr-tab">Drone Attributes</button>
-            <button class="vehicle-combat-button" type="action" name="act_vehicle-combat-tab">Drone Combat</button>
-            <button class="vehicle-notes-button" type="action" name="act_vehicle-notes-tab">Drone Notes</button>
-            <button class="vehicle-ecm-button" type="action" name="act_vehicle-ecm-tab">ECM/FLUX</button>
+            <button class="vehicle-attr-button" type="action" name="act_vehicle-attr-tab"
+                data-i18n="drone-attributes">Drone Attributes</button>
+            <button class="vehicle-combat-button" type="action" name="act_vehicle-combat-tab"
+                data-i18n="drone-combat">Drone Combat</button>
+            <button class="vehicle-notes-button" type="action" name="act_vehicle-notes-tab"
+                data-i18n="drone-notes">Drone Notes</button>
+            <button class="vehicle-ecm-button" type="action" name="act_vehicle-ecm-tab"
+                data-i18n="ecm-flux">ECM/FLUX</button>
         </div>
     </div>
     <div class="vehicle-always-displayed">
         <div>
             <div class="vehicle-combat-modifiers">
                 <div class="vehicle-interface">
-                    <header class="table-close-nc">Interface</header>
+                    <header class="table-close-nc" data-i18n="interface">Interface</header>
                     <div>
                         <div class="vehicle-interface-details">
-                            <div>None</div>
+                            <div data-i18n="none">None</div>
                             <div> <input type="radio" name="attr_vehicle-interface" value="none" checked="checked">
                             </div>
-                            <div>Datajack</div>
+                            <div data-i18n="datajack">Datajack</div>
                             <div><input type="radio" name="attr_vehicle-interface" value="datajack"></div>
-                            <div>VCR</div>
+                            <div data-i18n="VCR">VCR</div>
                             <div><input type="radio" name="attr_vehicle-interface" value="vcr"></div>
-                            <div>Autonav</div>
+                            <div data-i18n="autonav">Autonav</div>
                             <div><input type="checkbox" name="attr_vehicle-autonav" value=1></div>
                         </div>
                     </div>
                 </div>
                 <div class="vehicle-speed">
-                    <header class="table-close-nc">Speed</header>
+                    <header class="table-close-nc" data-i18n="speed">Speed</header>
                     <div>
                         <div class="vehicle-speed-details">
-                            <div>Current</div>
-                            <div>Maximum</div>
+                            <div data-i18n="current">Current</div>
+                            <div data-i18n="maximum">Maximum</div>
                             <div><input type="number" name="attr_speed-current" value=0 min=0></div>
                             <div><span name="attr_speed-max"></span></div>
                         </div>
@@ -3379,16 +3487,13 @@
                     </div>
                 </div>
                 <div class="vehicle-maneuever">
-                    <header class="table-close-nc">Maneuever</header>
+                    <header class="table-close-nc" data-i18n="maneuever">Maneuever</header>
                     <div>
                         <div class="vehicle-maneuever-details">
                             <div>Score</div>
                             <div><input type="number" name="attr_maneuver-score" value=0 min=0></div>
-                            <div><button class="small-rollbutton" id="generate" title="Generate Maneuver Score"
-                                    type="action" name="act_maneuever">Generate</button></div>
-                            <div><button class="small-rollbutton" id="compare"
-                                    title="Compare Maneuver Score between two vehicles" type="action"
-                                    name="act_maneuever">Compare</button></div>
+                            <div><button class="small-rollbutton" id="generate" title="Generate Maneuver Score" type="action" name="act_maneuever" data-i18n="generate">Generate</button></div>
+                            <div><button class="small-rollbutton" id="compare" title="Compare Maneuver Score between two vehicles" type="action" name="act_maneuever" data-i18n="compare">Compare</button></div>
                         </div>
                         <br>
                         <br>
@@ -3398,16 +3503,16 @@
                     <header class="table-close-nc">Terrain</header>
                     <div>
                         <div class="vehicle-env-details">
-                            <div>Off Road:</div>
+                            <div data-i18n="off-road">Off Road:</div>
                             <div><input type="checkbox" name="attr_vehicle-offroad" value=1></div>
                         </div>
                         <div>
                             <div>Terrain</div>
                             <select name="attr_terrain" class="mediumselect2">
-                                <option SELECTED>Normal</option>
-                                <option>Open</option>
-                                <option>Restricted</option>
-                                <option>Tight</option>
+                                <option data-i18n="normal" value="Normal" SELECTED>Normal</option>
+                                <option data-i18n="open" value="Open">Open</option>
+                                <option data-i18n="restricted" value="Restricted">Restricted</option>
+                                <option data-i18n="tight" value="Tight">Tight</option>
                             </select>
                         </div>
                         <br>
@@ -3415,54 +3520,55 @@
                     </div>
                 </div>
                 <div class="vehicle-env">
-                    <header class="table-close-nc"->Environment</header>
-                    <div> 
+                    <header class="table-close-nc" data-i18n="environment">Environment</header>
+                    <div>
                         <div class="vehicle-env-details table-close-nc">
-                            <div>Urban Setting:</div>
+                            <div data-i18n="urban-setting">Urban Setting:</div>
                             <div><input type="checkbox" name="attr_vehicle-urban" value=1></div>
-                            <div>Combat Zone:</div>
+                            <div data-i18n="combat-zone">Combat Zone:</div>
                             <div><input type="checkbox" name="attr_vehicle-combatzone" value=1></div>
                         </div>
                         <div class="vehicle-env-details2">
-                            <div>Weather</div>
+                            <div data-i18n="weather">Weather</div>
                             <select name="attr_weather" class="mediumselect2">
-                                <option SELECTED>Normal</option>
-                                <option>Bad</option>
-                                <option>Terrible</option>
-                                <option>Fog</option>
-                                <option>Smog</option>
-                                <option>Rain</option>
-                                <option>Snow</option>
-                                <option>ThunderStorm</option>
-                                <option>Windy</option>
-                                <option>Heavy Wind</option>
+                                <option value="Normal" data-i18n="normal" SELECTED>Normal</option>
+                                <option value="Bad" data-i18n="bad">Bad</option>
+                                <option value="Terrible" data-i18n="terrible">Terrible</option>
+                                <option value="Fog" data-i18n="fog">Fog</option>
+                                <option value="Smog" data-i18n="smog">Smog</option>
+                                <option value="Rain" data-i18n="rain">Rain</option>
+                                <option value="Snow" data-i18n="snow">Snow</option>
+                                <option value="ThunderStorm" data-i18n="thunderstorm">ThunderStorm</option>
+                                <option value="Windy" data-i18n="windy">Windy</option>
+                                <option value="Heavy Wind" data-i18n="heavy-wind">Heavy Wind</option>
                             </select>
                         </div>
                     </div>
                 </div>
                 <div class="vehicle-sensor">
-                    <header class="table-close-nc">Sensor LOS</header>
+                    <header class="table-close-nc" data-i18n="sensor-los">Sensor LOS</header>
                     <div class="vehicle-sensor-details table-close-nc">
                         <div>Direct</div>
                         <div><input type="radio" name="attr_sensor-los" value="direct" checked="checked"></div>
                         <div>Interupted</div>
                         <div><input type="radio" name="attr_sensor-los" value="interupted"></div>
                     </div>
-                    <div class="table-close-nc">Sensor Test</div>
-                    <div><button type="action" class="pictos-button" title="Sensor Test" name="act_vehiclesensor" id="vehiclesensor">f</button></div>
+                    <div class="table-close-nc" data-i18n="sensor-test">Sensor Test</div>
+                    <div><button type="action" class="pictos-button" title="Sensor Test" name="act_vehiclesensor"
+                            id="vehiclesensor">f</button></div>
                 </div>
             </div>
             <input type='hidden' class='buttontoggle' name='attr_sheettype' />
             <div class="vehicle-combat-condition">
                 <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-                <div class="SRH4 vehicle-only">Vehicle</div>
-                <div class="SRH4 drone-only">Drone</div>
-                <div>Undamaged</div>
-                <div>Light Damage</div>
-                <div>Moderate Damage</div>
-                <div>Serious Damage</div>
-                <div>Destroyed</div>
-                <div>Condition</div>
+                <div class="SRH4 vehicle-only" data-i18n="vehicle">Vehicle</div>
+                <div class="SRH4 drone-only" data-i18n="drone">Drone</div>
+                <div data-i18n="undamaged">Undamaged</div>
+                <div data-i18n="light-damage">Light Damage</div>
+                <div data-i18n="moderate-damage">Moderate Damage</div>
+                <div data-i18n="serious-damage">Serious Damage</div>
+                <div data-i18n="destroyed">Destroyed</div>
+                <div data-i18n="condition">Condition</div>
                 <div>
                     <input type="radio" name="attr_vehicle-damage" value=0 CHECKED>
                 </div>
@@ -3486,13 +3592,13 @@
 
             <div class="rc-condition">
                 <div class="rc-combat-condition">
-                    <div class="SRH4">RC Signal</div>
-                    <div>Full Strength</div>
-                    <div>Light Degredation</div>
-                    <div>Moderate Degredation</div>
-                    <div>Serious Degredation</div>
-                    <div>Disengaged</div>
-                    <div class="text-mid-right">Command Channel</div>
+                    <div class="SRH4" data-i18n="rc-signal">RC Signal</div>
+                    <div data-i18n="full-strength">Full Strength</div>
+                    <div data-i18n="light-degredation">Light Degredation</div>
+                    <div data-i18n="moderate-degredation">Moderate Degredation</div>
+                    <div data-i18n="serious-degredation">Serious Degredation</div>
+                    <div data-i18n="disengaged">Disengaged</div>
+                    <div class="text-mid-right" data-i18n="command-channel">Command Channel</div>
                     <div>
                         <input type="radio" name="attr_rccommand-damage" value=0 CHECKED>
                     </div>
@@ -3513,7 +3619,7 @@
                     </div>
                     <div><input type="radio" name="attr_rccommand-damage" value=100></div>
 
-                    <div class="text-mid-right">Simsense Channel</div>
+                    <div class="text-mid-right" data-i18n="simsense-channel">Simsense Channel</div>
                     <div>
                         <input type="radio" name="attr_rcsimsense-damage" value=0 CHECKED>
                     </div>
@@ -3534,7 +3640,7 @@
                     </div>
                     <div><input type="radio" name="attr_rcsimsense-damage" value=100></div>
 
-                    <div class="text-mid-right">System Channel</div>
+                    <div class="text-mid-right" data-i18n="system-channel">System Channel</div>
                     <div>
                         <input type="radio" name="attr_rcsystem-damage" value=0 CHECKED>
                     </div>
@@ -3558,41 +3664,45 @@
             </div>
         </div>
         <div class="vehicle-quickstats-border">
-            	<input type='hidden' class='buttontoggle' name='attr_sheettype' />
-	   <div class="vehicle-driver">
-            	<header>Driver: </header>
-	    	<input type="text" name="attr_rigger" class="myweapontxt" />
-	    </div>
-            <div class="vehicle-quickstats">
-                <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-		<div></div>
-		<div>Max</div>
-		<div>Used</div>
-                <div>Control Pool:</div>
-                <input type="number" name="attr_control-pool" min=0 value=0>
-                <div><input type='hidden' class='controlpool-over' name='attr_controlpool-over' /><span class="controlpool-over" name="attr_controlpool-used"></span></div>
-	     </div>
-	     <br>
-             <div class="table-top-nc"><b>Skills</div>
-             <div class="vehicle-quickstats">
-                <div>Vehicle:</div>
-                <input type="number" name="attr_vehicle-skill" min=0 value=0>
-		<div></div>
-                <div>Gunnery:</div>
-                <input type="number" name="attr_gunnery" min=0 value=0>
-		<div></div>
-                <div class="drone-only">Pilot Rating:</div>
-                <div class="drone-only"><span name="attr_pilot" /></div>
-		<div></div>
+            <input type='hidden' class='buttontoggle' name='attr_sheettype' />
+            <div class="vehicle-driver">
+                <button type="action" name="act_setrigger" id="rigger"
+                    title="Set Rigger/Vehicle Operator Name by Selecting Token" data-i18n="driver">Driver</button>
+                <input type="text" name="attr_rigger" class="myweapontxt" />
+                <button type="action" class="pictos-button" name="act_setrigger" id="refresh-rigger"
+                    title="Update Control Pool and Gunnery skill for operator">0</button>
             </div>
-	    <br>
-            <div class="table-top-nc drone-only"><b>Operative Mode:</div>
             <div class="vehicle-quickstats">
                 <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-                <div class="drone-only">Primary:</div>
+                <div></div>
+                <div data-i18n="maimum-abbreviation">Max</div>
+                <div data-i18n="used">Used</div>
+                <div data-i18n="control-pool">Control Pool:</div>
+                <input type="number" name="attr_controlpool" min=0 value=0>
+                <div><input type='hidden' class='controlpool-over' name='attr_controlpool-over' /><span
+                        class="controlpool-over" name="attr_controlpool-used"></span></div>
+            </div>
+            <br>
+            <header class="table-top-nc" data-i18n="skills">Skills</header>
+            <div class="vehicle-quickstats">
+                <div data-i18n="vehicle">Vehicle:</div>
+                <input type="number" name="attr_vehicle-skill" min=0 value=0>
+                <div></div>
+                <div data-i18n="gunnery">Gunnery:</div>
+                <input type="number" name="attr_gunnery" min=0 value=0>
+                <div></div>
+                <div class="drone-only" data-i18n="pilot-rating">Pilot Rating:</div>
+                <div class="drone-only"><span name="attr_pilot" /></div>
+                <div></div>
+            </div>
+            <br>
+            <header class="table-top-nc drone-only" data-i18n="operative-mode">Operative Mode:</header>
+            <div class="vehicle-quickstats">
+                <input type='hidden' class='buttontoggle' name='attr_sheettype' />
+                <div class="drone-only" data-i18n="primary">Primary:</div>
                 <div class="drone-only"></div>
                 <div class="drone-only"><input type="radio" name="attr_drone_mode" value="primary"></div>
-                <div class="drone-only">Secondary:</div>
+                <div class="drone-only" data-i18n="secondary">Secondary:</div>
                 <div class="drone-only"></div>
                 <div class="drone-only"><input type="radio" name="attr_drone_mode" value="secondary"></div>
             </div>
@@ -3603,646 +3713,680 @@
 
     <div class="vehicle-attr-tab">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-        <div class="SRH4 vehicle-only">Vehicle Configuration</div>
-        <div class="SRH4 drone-only">Drone Configuration</div>
+        <div class="SRH4 vehicle-only" data-i18n="vehicle-configuration">Vehicle Configuration</div>
+        <div class="SRH4 drone-only" data-i18n="drone-configuration">Drone Configuration</div>
         <div class="vehicle-info">
-            <div class="text-mid-left">Name</div>
-            <div>Manual Control</div>
-            <div>Datajack Port</div>
-            <div>Rigger Adaption</div>
-            <div>Remote Control</div>
-            <div class="text-mid">Vehicle Type </div>
-            <div class="text-mid">Vehicle Size </div>
+            <div class="text-mid-left" data-i18n="name">Name</div>
+            <div data-i18n="manual-control">Manual Control</div>
+            <div data-i18n="datajack-port">Datajack Port</div>
+            <div data-i18n="rigger-adaption">Rigger Adaption</div>
+            <div data-i18n="remote-control">Remote Control</div>
+            <div class="text-mid" data-i18n="vehicle-type">Vehicle Type </div>
+            <div class="text-mid" data-i18n="vehicle-size">Vehicle Size </div>
             <input type="text" name="attr_character_name">
             <div><input type="checkbox" name="attr_vehicle-control" value=0></div>
             <div><input type="checkbox" name="attr_vehicle-datajack" value=0></div>
             <div><input type="checkbox" name="attr_vehicle-riggeradapted" value=0></div>
             <div><input type="checkbox" name="attr_vehicle-rc" value=0></div>
             <select name="attr_vehicle-type" class="mediumselect2">
-                <option SELECTED>Car/Pickup Truck</option>
-                <option>Fighter Jet</option>
-                <option>Heavy Truck</option>
-                <option>Helicopter</option>
-                <option>Hovercraft</option>
-                <option>HSCT/Suborbital</option>
-                <option>Large Airplane</option>
-                <option>LAV/T-bird</option>
-                <option>Limousine/Light Truck/Van</option>
-                <option>LTA/Zeppelin</option>
-                <option>Motorcycle</option>
-                <option>Racing Boat</option>
-                <option>Semiballistic</option>
-                <option>Small Airplane</option>
-                <option>Small Motorboat</option>
-                <option>Sports Car</option>
-                <option>Tracked Vehicle</option>
-                <option>Tractor Trailer</option>
-                <option>Train/Monorail</option>
-                <option>Ultra-light Aircraft</option>
-                <option>Yacht</option>
+                <option data-i18n="car-pickup-truck" value="cartruck" SELECTED>Car/Pickup Truck</option>
+                <option data-i18n="fighter-jet" value="jet">Fighter Jet</option>
+                <option data-i18n="heavy-truck" value="bigtruck">Heavy Truck</option>
+                <option data-i18n="helicopter" value="helicopter">Helicopter</option>
+                <option data-i18n="hovercraft" value="hovercraft">Hovercraft</option>
+                <option data-i18n="suborbital" value="suborbital">HSCT/Suborbital</option>
+                <option data-i18n="large-airplane" value="bigplane">Large Airplane</option>
+                <option data-i18n="lav" value="lav">LAV/T-bird</option>
+                <option data-i18n="limousine" value="limo">Limousine/Light Truck/Van</option>
+                <option data-i18n="lighter-than-air" value="lta">LTA/Zeppelin</option>
+                <option data-i18n="motorcycle" value="motorcycle">Motorcycle</option>
+                <option data-i18n="racing-boat" value="racingboat">Racing Boat</option>
+                <option data-i18n="semiballistic" value="semiballistic">Semiballistic</option>
+                <option data-i18n="small-airplane" value="smallplane">Small Airplane</option>
+                <option data-i18n="small-boat" value="smallboat">Small Motorboat</option>
+                <option data-i18n="sports-car" value="sportscar">Sports Car</option>
+                <option data-i18n="tracked-vehicle" value="tracked">Tracked Vehicle</option>
+                <option data-i18n="tractor-trailer" value="tractor">Tractor Trailer</option>
+                <option data-i18n="train" value="train">Train/Monorail</option>
+                <option data-i18n="ultralight" value="ultralight">Ultra-light Aircraft</option>
+                <option data-i18n="yacht" value="yacht">Yacht</option>
             </select>
             <select name="attr_vehicle-size" class="mediumselect2">
-                <option SELECTED>Normal</option>
-                <option>Large</option>
-                <option>Extra-Large</option>
+                <option data-i18n="normal" value="Normal" SELECTED>Normal</option>
+                <option data-i18n="large" value="Large">Large</option>
+                <option data-i18n="extra-large" value="Extra-Large">Extra-Large</option>
             </select>
         </div>
 
         <div class="vehicle-stats">
             <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-            <div class="SRH4 vehicle-only">Vehicle Attributes</div>
-            <div class="SRH4 drone-only">Drone Attributes</div>
+            <div class="SRH4 vehicle-only" data-i18n="vehicle-attributes">Vehicle Attributes</div>
+            <div class="SRH4 drone-only" data-i18n="drone-attributes">Drone Attributes</div>
             <div class="vehicle-stats-regular">
                 <div class="vehicle-attributes">
-                    <div>Handling:</div>
+                    <div data-i18n="handling">Handling:</div>
                     <div class="vehicle-offroad"><input type="number" name="attr_handling-street" min=0 value=0 />
                         <input type="number" name="attr_handling-offroad" min=0 value=0 />
                     </div>
-                    <div>Speed:</div>
+                    <div data-i18n="speed">Speed:</div>
                     <div class="vehicle-offroad">
                         <input type="number" name="attr_speed-rating" min=0 value=0>
                         <span name="attr_speed-max"></span>
                     </div>
-                    <div>Acceleration:</div>
+                    <div data-i18n="acceleration">Acceleration:</div>
                     <input type="number" name="attr_acceleration" min=0 value=0>
-                    <div>Body:</div>
+                    <div data-i18n="body">Body:</div>
                     <input type="number" name="attr_body" min=0 value=0>
-                    <div>Armor:</div>
+                    <div data-i18n="armor">Armor:</div>
                     <input type="number" name="attr_armor" min=0 value=0>
-                    <div>Signature:</div>
+                    <div data-i18n="signature">Signature:</div>
                     <input type="number" name="attr_signature" min=0 value=0>
-                    <div>Autonav:</div>
+                    <div data-i18n="autonav">Autonav:</div>
                     <input type="number" name="attr_autonav" min=0 value=0>
-                    <div>Pilot:</div>
+                    <div data-i18n="pilot">Pilot:</div>
                     <input type="number" name="attr_pilot" min=0 value=0>
                 </div>
                 <div class="vehicle-config">
-                    <div>Firmpoints:</div>
+                    <div data-i18n="firmpoints">Firmpoints:</div>
                     <input type="number" name="attr_firmpoints" min=0 value=0>
-                    <div>Hardpoints:</div>
+                    <div data-i18n="hardpoint">Hardpoints:</div>
                     <input type="number" name="attr_hardpoints" min=0 value=0>
-                    <div>Seating:</div>
+                    <div data-i18n="seating">Seating:</div>
                     <div><input type="text" name="attr_seating"></div>
-                    <div>Entry Points:</div>
+                    <div data-i18n="entry-points">Entry Points:</div>
                     <div><input type="text" name="attr_entry"></div>
-                    <div>Fuel:</div>
+                    <div data-i18n="fuel">Fuel:</div>
                     <input type="text" name="attr_fuel">
-                    <div>Economy:</div>
+                    <div data-i18n="economy">Economy:</div>
                     <input type="text" name="attr_economy">
-                    <div>Cargo:</div>
+                    <div data-i18n="cargo">Cargo:</div>
                     <input type="number" name="attr_cargo" min=0 value=0>
-                    <div>Load:</div>
+                    <div data-i18n="load">Load:</div>
                     <input type="number" name="attr_load" min=0 value=0>
                 </div>
                 <div class="vehicle-misc">
-                    <div>Vehicle Skill:</div>
+                    <div data-i18n="vehicle-skill">Vehicle Skill:</div>
                     <input type="number" name="attr_vehicle-skill" min=0 value=0>
-                    <div>Gunnery:</div>
+                    <div data-i18n="gunnery">Gunnery:</div>
                     <input type="number" name="attr_gunnery" min=0 value=0>
-                    <div>Walk:</div>
+                    <div data-i18n="walk">Walk:</div>
                     <div><span name="attr_walk"></span></div>
-                    <div>Run:</div>
+                    <div data-i18n="run">Run:</div>
                     <div><span name="attr_run"></span></div>
-                    <div>IVIS Pool;</div>
+                    <div data-i18n="ivis-pool">IVIS Pool;</div>
                     <input type="number" name="attr_ivis-pool" min=0 value=0>
-                    <div>Stress:</div>
+                    <div data-i18n="stress">Stress:</div>
                     <input type="number" name="attr_stress" min=0 value=0>
-                    <div>Setup/Breakdown:</div>
+                    <div data-i18n="setup-breakdown">Setup/Breakdown:</div>
                     <input type="number" name="attr_setup" min=0 value=0>
-                    <div>Total Cost:</div>
+                    <div data-i18n="total-cost">Total Cost:</div>
                     <input type="number" name="attr_totalcost" min=0 value=0>
                 </div>
             </div>
-                <div class="SRH4">Rapid Attribute Set: <input type="text" name="attr_vehicle-rapid-attributes"><button class="quicksettings" type="action" name="act_vehicleset">Apply</button></div>
+            <div class="SRH4" data-i18n="rapid-attributes-set">Rapid Attribute Set:</div><input type="text"
+                name="attr_vehicle-rapid-attributes">
+            <button class="quicksettings" type="action" name="act_vehicleset" data-i18n="apply">Apply</button>
         </div>
     </div>
-    <div class="vehicle-notes-tab">
+</div>
+<div class="vehicle-notes-tab">
+    <input type='hidden' class='buttontoggle' name='attr_sheettype' />
+    <div class="SRH3 vehicle-only" data-i18n="vehicle-notes">Vehicle Notes</div>
+    <div class="SRH3 drone-only" data-i18n="drone-notes">Drone Notes</div>
+    <textarea data-i18n="modification-notes" name="attr_vehicle-notes"
+        style='width:500px;height:200px'>Modification Notes</textarea>
+</div>
+
+<div class="vehicle-ecm-tab">
+    <input type='hidden' class='buttontoggle' name='attr_sheettype' />
+    <div class="SRH3 vehicle-only" data-i18n="vehicle-electronics-and-ecm-eccm">Vehicle Electornics and ECM/ECCM</div>
+    <div class="SRH3 drone-only" data-i18n="drone-electronics-and-ecm-eccm">Drone Electornics and ECM/ECCM</div>
+    <div class="vehicle-flux">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-        <div class="SRH3 vehicle-only">Vehicle Notes</div>
-        <div class="SRH3 drone-only">Drone Notes</div>
-        <textarea name="attr_vehicle-notes" style='width:500px;height:200px'>Modification Notes</textarea>
+
+
+        <div class="SRH4 vehicle-only" data-i18n="vehicle-flux-rating">Vehicle Flux Rating</div>
+        <div class="SRH4 drone-only" data-i18n="drone-flux-rating">Drone Flux Rating</div>
+        <span name="attr_vehicle-flux-max"></span>
+        <div class="SRH4 vehicle-only" data-i18n="vehicle-flux-used">Vehicle Flux Used</div>
+        <div class="SRH4 drone-only" data-i18n="drone-flux-used">Drone Flux Used</div>
+        <div><input type='hidden' class='vehicle-flux-overload' name='attr_vehicle-flux-overload' value=0 />
+            <span class="flux-overload" name="attr_vehicle-fluxtotal"></span>
+        </div>
+
+    </div>
+    <div class="vehicle-electronics">
+        <header class="table-top-left"></header>
+        <header class="table-top-mid" data-i18n="rating">Rating</header>
+        <header class="table-top-mid" data-i18n="flux-rating">Flux Rating</header>
+        <header class="table-top-mid" data-i18n="modified-flux">Modified Flux</header>
+        <header class="table-top-mid" data-i18n="max-flux">Max Flux</header>
+        <header class="table-top-mid" data-i18n="roll-test">Roll Test</header>
+        <header class="table-top-right" data-i18n="opposition-test">Opposition Test</header>
+        <div class="table-item-left" data-i18n="sensors">Sensors:</div>
+        <div class="table-item"><input type="number" name="attr_sensors-rating" min=0 value=0></div>
+        <div class="table-item"><span name="attr_sensors-flux"></div>
+        <div class="table-item"><input type="number" name="attr_sensors-fluxmod" min=0 value=0></div>
+        <div class="table-item"><span name="attr_sensors-fluxmax"></div>
+        <div class="table-item"><button type="action" class="pictos-button" title="Sensor Test" name="act_vehiclesensor"
+                id="vehiclesensor">f</button></div>
+        <div class="table-item"></div>
+        <div class="table-item-left" data-i18n="sonar">Sonar:</div>
+        <div class="table-item"><input type="number" name="attr_sonar-rating" min=0 value=0></div>
+        <div class="table-item"><span name="attr_sonar-flux"></div>
+        <div class="table-item"><input type="number" name="attr_sonar-fluxmod" min=0 value=0></div>
+        <div class="table-item"><span name="attr_sonar-fluxmax"></div>
+        <div class="table-item"><button type="action" class="d6-button" name="act_ewarfare" title="Sonar Test"
+                id="sonar">L</button></div>
+        <div class="table-item"></div>
+        <div class="table-item-left" data-i18n="ECM">ECM:</div>
+        <div class="table-item"><input type="number" name="attr_ecm-rating" min=0 value=0></div>
+        <div class="table-item"><span name="attr_ecm-flux"></div>
+        <div class="table-item"><input type="number" name="attr_ecm-fluxmod" min=0 value=0></div>
+        <div class="table-item"><span name="attr_ecm-fluxmax"></div>
+        <div class="table-item"><button type="action" class="d6-button" name="act_ewarfare" title="ECM Jamming"
+                id="ecmjamming">L</button></div>
+        <div class="table-item"><button type="action" class="d6-button" name="act_ewarfare" title="ECM Opposition Test"
+                id="ecmopposition">L</button></div>
+        <div class="table-item-left data-i18n=" ECCM"">ECCM:</div>
+        <div class="table-item"><input type="number" name="attr_eccm-rating" min=0 value=0></div>
+        <div class="table-item"><span name="attr_eccm-flux"></div>
+        <div class="table-item"><input type="number" name="attr_eccm-fluxmod" min=0 value=0></div>
+        <div class="table-item"><span name="attr_eccm-fluxmax"></div>
+        <div class="table-item"><button type="action" class="d6-button" name="act_ewarfare" title="ECCM Counter-Jamming"
+                id="eccmcounter">L</button></div>
+        <div class="table-item"><button type="action" class="d6-button" name="act_ewarfare" title="ECCM Opposition Test"
+                id="eccmopposition">L</button></div>
+        <div class="table-item-left" data-i18n="ED">ED:</div>
+        <div class="table-item"><input type="number" name="attr_ed-rating" min=0 value=0></div>
+        <div class="table-item"><span name="attr_ed-flux"></div>
+        <div class="table-item"><input type="number" name="attr_ed-fluxmod" min=0 value=0></div>
+        <div class="table-item"><span name="attr_ed-fluxmax"></div>
+        <header class="table-item" data-i18n="activate">Activate</header>
+        <div class="table-item"></div>
+        <div class="table-item-left" data-i18n="ECD">ECD:</div>
+        <div class="table-item"><input type="number" name="attr_ecd-rating" min=0 value=0></div>
+        <div class="table-item"><span name="attr_ecd-flux"></div>
+        <div class="table-item"><input type="number" name="attr_ecd-fluxmod" min=0 value=0></div>
+        <div class="table-item"><span name="attr_ecd-fluxmax"></div>
+        <div class="table-item"><input type="checkbox" name="attr_ecd-enabled" value=1></div>
+        <div class="table-item"></div>
+    </div>
+</div>
+
+<div class="vehicle-combat-tab">
+    <div class="vehicle-stats-mini">
+        <div class="text-mid" data-i18n="initiative">Initiative:</div>
+        <div class="center-checkbox"><button type="action" name="act_init" class="d6-button" title="Vehicle Initiative"
+                id="vehicleinit">L</button></div>
+        <div class="text-mid" data-i18n="end-turn">End Turn:</div>
+        <div class="center-checkbox"><button type="action" name="act_endturn" class="d6-button" title="End Combat Turn"
+                id="endturn">L</button></div>
+        <div class="text-mid" data-i18n="handling-abbreviation">Hand</div>
+        <div class="text-mid"><span name="attr_handling"></span><button type="action" class="d6-button"
+                title="Driving Test" name="act_vehicledriving" id="driving">L</button></div>
+        <div class="text-mid" data-i18n="accleration-abbreviation">Accel:</div>
+        <div class="text-mid"><span name="attr_acceleration"></span>
+            <button type="action" class="d6-button" title="Vehicle Acceleration Test" name="act_vehicleaction"
+                id="accelerating">L</button>
+        </div>
+        <div class="text-mid" data-i18n="body">Body:</div>
+        <div class="text-mid"><span name="attr_body"></span><button type="action" class="d6-button"
+                title="Resist Damage" name="act_resistvehicledmg" id="resistvehicledmg">L</button></div>
+        <div class="text-mid" data-i18n="armor">Armor:</div>
+        <div class="text-mid"><span name="attr_armor"></span></div>
+        <div class="text-mid" data-i18n="signature-abbreviation">Sig:</div>
+        <div class="text-mid"><span name="attr_signature"></span></div>
+        <div class="text-mid" data-i18n="auto-pilot-rating-abbreviation">Auto:</div>
+        <div class="text-mid"><span name="attr_autonav"></span></div>
+        <div class="text-mid" data-i18n="sensor">Sensor:</div>
+        <div class="text-mid"><span name="attr_sensors-rating"></span><button type="action" class="pictos-button"
+                title="Sensor Test" name="act_vehiclesensor" id="vehiclesensor">f</button></div>
     </div>
 
-    <div class="vehicle-ecm-tab">
+    <div class="vehicle-actions">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-        <div class="SRH3 vehicle-only">Vehicle Electornics and ECM/ECCM</div>
-        <div class="SRH3 drone-only">Drone Electornics and ECM/ECCM</div>
-        <div class="vehicle-flux">
-            <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-
-
-            <div class="SRH4 vehicle-only">Vehicle Flux Rating</div>
-            <div class="SRH4 drone-only">Drone Flux Rating</div>
-            <span name="attr_vehicle-flux-max"></span>
-            <div class="SRH4 vehicle-only">Vehicle Flux Used</div>
-            <div class="SRH4 drone-only">Drone Flux Used</div>
-            <div><input type='hidden' class='vehicle-flux-overload' name='attr_vehicle-flux-overload' value=0 />
-                <span class="flux-overload" name="attr_vehicle-fluxtotal"></span>
-            </div>
-
-        </div>
-        <div class="vehicle-electronics">
-            <div class="table-top-left"></div>
-            <div class="table-top-mid"><b>Rating</div>
-            <div class="table-top-mid"><b>Flux Rating</div>
-            <div class="table-top-mid"><b>Modified Flux</div>
-            <div class="table-top-mid"><b>Max Flux</div>
-            <div class="table-top-mid"><b>Roll Test</div>
-            <div class="table-top-right"><b>Opposition Test</div>
-            <div class="table-item-left">Sensors:</div>
-            <div class="table-item"><input type="number" name="attr_sensors-rating" min=0 value=0></div>
-            <div class="table-item"><span name="attr_sensors-flux"></div>
-            <div class="table-item"><input type="number" name="attr_sensors-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_sensors-fluxmax"></div>
-            <div class="table-item"><button type="action" class="pictos-button" title="Sensor Test" name="act_vehiclesensor" id="vehiclesensor">f</button></div>
-            <div class="table-item"></div>
-            <div class="table-item-left">Sonar:</div>
-            <div class="table-item"><input type="number" name="attr_sonar-rating" min=0 value=0></div>
-            <div class="table-item"><span name="attr_sonar-flux"></div>
-            <div class="table-item"><input type="number" name="attr_sonar-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_sonar-fluxmax"></div>
-            <div class="table-item"><button type="roll" class="d6-dice" name="roll_skill" title="Sonar Test"
-                    value="&{template:vehicle} {{type=Sonar Test}} {{character=@{character_name}}} {{target=@{target|Target|token_name}}} {{roll=[[ [[@{sonar-rating}]]d6>[[{2,( @{target|Target|signature} +@{wp-vehicle} +@{sensor-test-los}  +@{sensor-test-weather} +@{sensor-test-terrain} +@{vehicle-urban} +?{Additional Modifiers|0})}kh1]]!!]]  }}"></button>
-            </div>
-            <div class="table-item"></div>
-            <div class="table-item-left">ECM:</div>
-            <div class="table-item"><input type="number" name="attr_ecm-rating" min=0 value=0></div>
-            <div class="table-item"><span name="attr_ecm-flux"></div>
-            <div class="table-item"><input type="number" name="attr_ecm-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_ecm-fluxmax"></div>
-            <div class="table-item"><button type="roll" class="d6-dice" name="roll_skill" title="ECM Jamming"
-                    value="&{template:vehicle} {{type=ECM Jamming}} {{character=@{character_name}}} {{target=@{target|Target|token_name}}} {{roll=[[ [[@{ecm-fluxmod}]]d6>[[{2,(@{target|Target|sensors-rating} +?{Additional Modifiers|0})}kh1]]!!]]  }} {{notes=Roll Oposition test for @{target|Target|token_name}}}"></button>
-            </div>
-            <div class="table-item"><button type="roll" class="d6-dice" name="roll_skill" title="ECM Opposition Test"
-                    value="&{template:vehicle} {{type=ECM Opposition Test}} {{character=@{character_name}}} {{target=@{target|Target|token_name}}} {{roll=[[ [[@{sensors-fluxmod}]]d6>[[{2,(@{target|Target|ecm-rating} +?{Additional Modifiers|0})}kh1]]!!]]  }} {{notes= Compare net successes with @{target|Target|token_name}}}"></button>
-            </div>
-            <div class="table-item-left">ECCM:</div>
-            <div class="table-item"><input type="number" name="attr_eccm-rating" min=0 value=0></div>
-            <div class="table-item"><span name="attr_eccm-flux"></div>
-            <div class="table-item"><input type="number" name="attr_eccm-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_eccm-fluxmax"></div>
-            <div class="table-item"><button type="roll" class="d6-dice" name="roll_skill" title="ECCM Counter-Jamming"
-                    value="&{template:vehicle} {{type=ECCM Counter-Jamming}} {{character=@{character_name}}} {{target=@{target|Target|token_name}}} {{roll=[[ [[@{eccm-fluxmod}]]d6>[[{2,(@{target|Target|ecm-rating} +?{Additional Modifiers|0})}kh1]]!!]]  }} {{notes=Roll Oposition test for @{target|Target|token_name}}}"></button>
-            </div>
-            <div class="table-item"><button type="roll" class="d6-dice" name="roll_skill" title="ECCM Opposition Test"
-                    value="&{template:vehicle} {{type=ECCM Opposition Test}} {{character=@{character_name}}} {{target=@{target|Target|token_name}}} {{roll=[[ [[@{ecm-fluxmod}]]d6>[[{2,(@{target|Target|eccm-rating} +?{Additional Modifiers|0})}kh1]]!!]]  }} {{notes= Compare net successes with @{target|Target|token_name}}}"></button>
-            </div>
-            <div class="table-item-left">ED:</div>
-            <div class="table-item"><input type="number" name="attr_ed-rating" min=0 value=0></div>
-            <div class="table-item"><span name="attr_ed-flux"></div>
-            <div class="table-item"><input type="number" name="attr_ed-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_ed-fluxmax"></div>
-            <div class="table-item"><b>Activate</div>
-            <div class="table-item"></div>
-            <div class="table-item-left">ECD:</div>
-            <div class="table-item"><input type="number" name="attr_ecd-rating" min=0 value=0></div>
-            <div class="table-item"><span name="attr_ecd-flux"></div>
-            <div class="table-item"><input type="number" name="attr_ecd-fluxmod" min=0 value=0></div>
-            <div class="table-item"><span name="attr_ecd-fluxmax"></div>
-            <div class="table-item"><input type="checkbox" name="attr_ecd-enabled" value=1></div>
-            <div class="table-item"></div>
-        </div>
+        <div class="SRH3 vehicle-only" data-i18n="vehicle-actions">Vehicle Actions</div>
+        <div class="SRH3 drone-only" data-i18n="drone-actions">Drone Actions</div>
+        <div><button type="action" class="basic-button" title="Vehicle Acceleration Test" name="act_vehicleaction"
+                id="accelerating" data-i18n="accelerate">Accelerate</button></div>
+        <div><button type="action" class="basic-button" title="Vehicle Breaking Test" name="act_vehicleaction"
+                id="breaking" data-i18n="brake">Brake</button></div>
+        <div><button type="action" class="basic-button" title="Vehicle Positioning Test" name="act_vehicleposition"
+                id="position">Position</button></div>
+        <div><button type="action" class="basic-button" title="Vehicle Ramming Test" name="act_vehicleaction" id="ram"
+                data-i18n="ram">Ram</button></div>
+        <div><button type="action" class="basic-button" title="Vehicle Hiding Test" name="act_vehicleaction" id="hide"
+                data-i18n="hide">Hide</button></div>
+        <div><button type="action" class="basic-button" title="Vehicle Relocate Test" name="act_vehicleaction"
+                id="relocate" data-i18n="relocate">Relocate</button></div>
+        <div><button type="action" class="basic-button" title="Vehicle Crash Test" name="act_vehiclecrash" id="crash"
+                data-i18n="crash">Crash</button></div>
     </div>
 
-    <div class="vehicle-combat-tab">
-        <div class="vehicle-stats-mini">
-            <div class="text-mid">Initiative:</div>
-            <div class="center-checkbox"><button type="action" name="act_init" class="d6-button" title="Vehicle Initiative" id="vehicleinit">L</button></div>
-            <div class="text-mid">End Turn:</div>
-            <div class="center-checkbox"><button type="action" name="act_endturn" class="d6-button" title="End Combat Turn" id="endturn">L</button></div>
-            <div class="text-mid">Hand</div>
-            <div class="text-mid"><span name="attr_handling"></span><button type="action" class="d6-button" title="Driving Test" name="act_vehicledriving" id="driving">L</button></div>
-            <div class="text-mid">Accel:</div>
-            <div class="text-mid"><span name="attr_acceleration"></span>
-            <button type="action" class="d6-button" title="Vehicle Acceleration Test" name="act_vehicleaction" id="accelerating">L</button></div>
-            <div class="text-mid">Body:</div>
-            <div class="text-mid"><span name="attr_body"></span><button type="action" class="d6-button" title="Resist Damage" name="act_resistvehicledmg" id="resistvehicledmg">L</button></div>
-            <div class="text-mid">Armor:</div>
-            <div class="text-mid"><span name="attr_armor"></span></div>
-            <div class="text-mid">Sig:</div>
-            <div class="text-mid"><span name="attr_signature"></span></div>
-            <div class="text-mid">Auto:</div>
-            <div class="text-mid"><span name="attr_autonav"></span></div>
-            <div class="text-mid">Sensor:</div>
-            <div class="text-mid"><span name="attr_sensors-rating"></span><button type="action" class="pictos-button" title="Sensor Test" name="act_vehiclesensor" id="vehiclesensor">f</button></div>
+
+    <input type='hidden' class='gunnery-switch' name='attr_gunneryswitch' value="show" />
+    <div class="vehicle-manual-gunnery">
+        <div class="table-top-left" data-i18n="relative-motion">Relative Motion</div>
+        <div class="table-top-mid" data-i18n="movement">Movement</div>
+        <div class="table-top-mid" data-i18n="maneuver-score">Maneuver Score</div>
+        <div class="table-top-mid" data-i18n="visibility">Visibility</div>
+        <div class="table-top-mid" data-i18n="sensor-mode">Sensor Mode</div>
+        <div class="table-top-mid" data-i18n="target-type">Target Type</div>
+        <div class="table-top-mid" data-i18n="manual-target-nubmber-abbreviation">Manual TN</div>
+        <div class="table-top-mid" data-i18n="sensor-target-nubmber-abbreviation">Sensor TN</div>
+        <div class="table-top-right">Recoil</div>
+        <div class="table-item-left"><select name="attr_gunnerymotion" class="mediumselect2"
+                title="motion relative to target">
+                <option data-i18n="none" value=0 selected>None</option>
+                <option data-i18n="towards" value=-1>Towards</option>
+                <option data-i18n="away" value=1>Away</option>
+            </select></div>
+        <div class="table-item"><select name="attr_move" class="mediumselect2" title="relative movement target">
+                <option data-i18n="about-equal" value=0 selected>About Equal</option>
+                <option data-i18n="up-to-2x" value=2>Up to 2X</option>
+                <option data-i18n="up-to-3x" value=4>Up to 3X</option>
+                <option data-i18n="more-than-3x" value=6>More than 3X</option>
+                <option data-i18n="not-moving" value=0>Not Moving</option>
+                <option data-i18n="walk" value=1>walk</option>
+                <option data-i18n="walk-difficult-ground" value=2>walk (difficult ground)</option>
+                <option data-i18n="run" value=4>run</option>
+                <option data-i18n="run-difficult-ground" value=6>run (difficult ground)</option>s
+            </select></div>
+        <div class="table-item"><select name="attr_gunnerymaneuver" class="mediumselect2"
+                title="Maneuver score difference">
+                <option data-i18n="none" value=0 selected>None</option>
+                <option data-i18n="attacker-greater-by-10" value=-1>Attacker Greaty by 10</option>
+                <option data-i18n="target-greater-by-10" value=1>Target Greater by 10</option>
+            </select></div>
+        <div class="table-item"><select name="attr_visibility" class="mediumselect2">
+                <option data-i18n="normal" value=0 selected>Normal</option>
+                <option data-i18n="full-dark " value="@{fulldark}">Full Dark</option>
+                <option data-i18n="partial-light" value="@{partiallight}">Partail Light</option>
+                <option data-i18n="minimal-light" value="@{minlight}">Minimal Light</option>
+                <option data-i18n="glare" value="@{glare}">Glare</option>
+                <option data-i18n="mist" value="@{mist}">Mist</option>
+                <option data-i18n="light-smoke-rain" value="@{lightsmoke}">Light Smoke/Rain</option>
+                <option data-i18n="heavy-smoke-rain" value="@{fullsmoke}">Heavy Smoke/Rain</option>
+                <option data-i18n="thermal-smoke" value="@{thermalsmoke}">Thermal Smoke</option>
+            </select> </div>
+        <div class="table-item"><select name="attr_visionenhancement" class="mediumselect2">
+                <option value="None" data-i18n="none">None</option>
+                <option value="LowLight" SELECTED data-i18n="low-light">LowLight</option>
+                <option value="Thermal" data-i18n="thermal">Thermal</option>
+            </select></div>
+        <input type='hidden' name='attr_gunnermount' value=0" />
+        <div class="table-item"><select name="attr_gunnerytargettype" class="mediumselect2" title="Target type/size">
+                <option data-i18n="metahuman-sized" value=0 selected>Metahuman sized</option>
+                <option data-i18n="small-critter" value=1>Small critter</option>
+                <option data-i18n="large-critter" value=-1>Large critter</option>
+                <option data-i18n="small-drone" value=1>Small drone</option>
+                <option data-i18n="motorcycle" value=0>Motorcyle</option>
+                <option data-i18n="automobile" value=-1>Automobile</option>
+                <option data-i18n="limo-light-truck" value=-1>Limo/Light Truck</option>
+                <option data-i18n="heavy-truck-trailer" value=-3>Heavy Truck/Trailer</option>
+                <option data-i18n="boat" value=-1>Boat</option>
+                <option data-i18n="yacht" value=-3>Yacht</option>
+                <option data-i18n="freighter-tanker" value=-8>Freighter/Tanker</option>
+                <option data-i18n="ultralight-glider" value=0>Ultralight glider</option>
+                <option data-i18n="fixed-wing" value=-2>Fixed Wing</option>
+                <option data-i18n="commercial-airliner" value=-6>Commerical Airliner</option>
+                <option data-i18n="helicopter" value=-2>Helicopter</option>
+                <option data-i18n="zepplin-blimp" value=-6>Zepplin/Blimp</option>
+                <option data-i18n="lighter-than-air-aircraft-abbreviated" value=-3>LAV</option>
+                <option data-i18n="military-ground-vehicle" value=-3>Military Ground Vehicle</option>
+            </select></div>
+        <div class="table-item"><span class="text-mid" name="attr_rangedTN"></div>
+        <div class="table-item"><span class="text-mid" name="attr_sensor-gunnery-tn"></div>
+        <div class="table-item"><span class="text-mid" name="attr_recoilpen"></div>
+    </div>
+
+
+    <div class="SRH3" data-i18n="vehicle-weapons">Vehicle Weapons</div>
+    <div class="vehicles-weapons">
+        <div class="ranged-table-headers">
+            <div class="table-top-left" data-i18n="equip">Equip</div>
+            <div class="table-top-mid" data-i18n="general">General</div>
+            <div class="table-top-mid" data-i18n="range">Range</div>
+            <div class="table-top-mid" data-i18n="fire-mode">Fire Mode</div>
+            <div class="table-top-mid" data-i18n="damage">Damage</div>
+            <div class="table-top-mid" data-i18n="ammunition">Ammunition</div>
+            <div class="table-top-right" data-i18n="show">Show</div>
         </div>
-
-        <div class="vehicle-actions">
-            <input type='hidden' class='buttontoggle' name='attr_sheettype' />
-            <div class="SRH3 vehicle-only">Vehicle Actions</div>
-            <div class="SRH3 drone-only">Drone Actions</div>
-            <div><button type="action" class="basic-button" title="Vehicle Acceleration Test" name="act_vehicleaction" id="accelerating">Accelerate</button></div>
-            <div><button type="action" class="basic-button" title="Vehicle Breaking Test" name="act_vehicleaction"
-                    id="breaking">Brake</button></div>
-            <div><button type="action" class="basic-button" title="Vehicle Positioning Test"
-                    name="act_vehicleposition" id="breaking">Position</button></div>
-            <div><button type="action" class="basic-button" title="Vehicle Ramming Test" name="act_vehicleaction"
-                    id="ram">Ram</button></div>
-            <div><button type="action" class="basic-button" title="Vehicle Hiding Test" name="act_vehicleaction"
-                    id="hide">Hide</button></div>
-            <div><button type="action" class="basic-button" title="Vehicle Relocate Test" name="act_vehicleaction"
-                    id="relocate">Relocate</button></div>
-            <div><button type="action" class="basic-button" title="Vehicle Crash Test" name="act_vehiclecrash"
-                    id="crash">Crash</button></div>
+        <div class="ranged-table-items">
+            <div class="table-item-left" title="Primary Hand"></div>
+            <div class="table-item" title="Off Hand"></div>
+            <div class="table-item" data-i18n="name">Name</div>
+            <div class="table-item" data-i18n="type">Type</div>
+            <div class="table-item" data-i18n="mount">Mount</div>
+            <div class="table-item" data-i18n="minimum-abbreviation">Min</div>
+            <div class="table-item" data-i18n="short-abbreviation">S</div>
+            <div class="table-item" data-i18n="medium-abbreviation">M</div>
+            <div class="table-item" data-i18n="long-abbreviation">L</div>
+            <div class="table-item" data-i18n="extreme-abbreviation">Ex</div>
+            <div class="table-item" data-i18n="single-shot-abbreviation">SS</div>
+            <div class="table-item" data-i18n="semi-automatic-abbreviation">SA</div>
+            <div class="table-item" data-i18n="burst-fire-abbreviation">BF</div>
+            <div class="table-item" data-i18n="full-automatic-abbreviation">FA</div>
+            <div class="table-item" data-i18n="power">Power</div>
+            <div class="table-item" data-i18n="damage">Damage</div>
+            <div class="table-item" data-i18n="maximum-abbreviation">Max</div>
+            <div class="table-item" data-i18n="remain">Remain</div>
+            <div class="table-item" data-i18n="manual">Manual</div>
+            <div class="table-item" data-i18n="sensor">Sensor</div>
+            <div class="table-item" data-i18n="more">More</div>
         </div>
-
-
-        <input type='hidden' class='gunnery-switch' name='attr_gunneryswitch' value="show" />
-        <div class="vehicle-manual-gunnery">
-            <div class="table-top-left">Relative Motion</div>
-            <div class="table-top-mid">Movement</div>
-            <div class="table-top-mid">Maneuver Score</div>
-            <div class="table-top-mid">Visibility</div>
-            <div class="table-top-mid">Sensor Mode</div>
-            <div class="table-top-mid">Target Type</div>
-            <div class="table-top-mid">Manual TN</div>
-            <div class="table-top-mid">Sensor TN</div>
-            <div class="table-top-right">Recoil</div>
-            <div class="table-item-left"><select name="attr_gunnerymotion" class="mediumselect2" title="motion relative to target">
-                    <option value=0 selected>None</option>
-                    <option value=-1>Towards</option>
-                    <option value=1>Away</option>
-                </select></div>
-            <div class="table-item"><select name="attr_move" class="mediumselect2" title="relative movement target">
-                    <option value=0 selected>About Equal</option>
-                    <option value=2>Up to 2X</option>
-                    <option value=4>Up to 3X</option>
-                    <option value=6>More than 3X</option>
-                    <option value=0>Not Moving</option>
-                    <option value=1>walk</option>
-                    <option value=2>walk (difficult ground)</option>
-                    <option value=4>run</option>
-                    <option value=6>run (difficult ground)</option>s
-                </select></div>
-            <div class="table-item"><select name="attr_gunnerymaneuver" class="mediumselect2" title="Maneuver score difference">
-                    <option value=0 selected>None</option>
-                    <option value=-1>Attacker Greaty by 10</option>
-                    <option value=1>Target Greater by 10</option>
-                </select></div>
-            <div class="table-item"><select name="attr_visibility" class="mediumselect2">
-                    <option value=0 selected>Normal</option>
-                    <option value="@{fulldark}">Full Dark</option>
-                    <option value="@{partiallight}">Partail Light</option>
-                    <option value="@{minlight}">Minimal Light</option>
-                    <option value="@{glare}">Glare</option>
-                    <option value="@{mist}">Mist</option>
-                    <option value="@{lightsmoke}">Light Smoke/Rain</option>
-                    <option value="@{fullsmoke}">Heavy Smoke/Rain</option>
-                    <option value="@{thermalsmoke}">Thermal Smoke</option>
-                </select> </div>
-            <div class="table-item"><select name="attr_visionenhancement" class="mediumselect2">
-                    <option>None</option>
-                    <option selected>LowLight</option>
-                    <option>Thermal</option>
-                </select></div>
-            <input type='hidden' name='attr_gunnermount' value=0" />
-            <div class="table-item"><select name="attr_gunnerytargettype" class="mediumselect2" title="Target type/size">
-                    <option value=0 selected>Metahuman sized</option>
-                    <option value=1>Small critter</option>
-                    <option value=-1>Large critter</option>
-                    <option value=1>Small drone</option>
-                    <option value=0>Motorcyle</option>
-                    <option value=-1>Automobile</option>
-                    <option value=-1>Limo/Light Truck</option>
-                    <option value=-3>Heavy Truck/Trailer</option>
-                    <option value=-1>Boat</option>
-                    <option value=-3>Yacht</option>
-                    <option value=-8>Freighter/Tanker</option>
-                    <option value=0>Ultralight glider</option>
-                    <option value=-2>Fixed Wing</option>
-                    <option value=-6>Commerical Airliner</option>
-                    <option value=-2>Helicopter</option>
-                    <option value=-6>Zepplin/Blimp</option>
-                    <option value=-3>LAV</option>
-                    <option value=-3>Military Ground Vehicle</option>
-                </select></div>
-            <div class="table-item"><span class="text-mid" name="attr_rangedTN"></div>
-            <div class="table-item"><span class="text-mid" name="attr_sensor-gunnery-tn"></div>
-            <div class="table-item"><span class="text-mid" name="attr_recoilpen"></div>
-        </div>
-
-
-        <div class="SRH3">Vehicle Weapons</div>
-        <div class="vehicles-weapons">
-            <div class="ranged-table-headers">
-                <div class="table-top-left">Equip</div>
-                <div class="table-top-mid">General</div>
-                <div class="table-top-mid">Range</div>
-                <div class="table-top-mid">Fire Mode</div>
-                <div class="table-top-mid">Damage</div>
-                <div class="table-top-mid">Ammunition</div>
-                <div class="table-top-right">Show</div>
-            </div>
-            <div class="ranged-table-items">
-                <div class="table-item-left" title="Primary Hand">Pri</div>
-                <div class="table-item" title="Off Hand">Sec</div>
-                <div class="table-item">Name</div>
-                <div class="table-item">Type</div>
-                <div class="table-item">Mount</div>
-                <div class="table-item">Min</div>
-                <div class="table-item">S</div>
-                <div class="table-item">M</div>
-                <div class="table-item">L</div>
-                <div class="table-item">Ex</div>
-                <div class="table-item">SS</div>
-                <div class="table-item">SA</div>
-                <div class="table-item">BF</div>
-                <div class="table-item">FA</div>
-                <div class="table-item">Power</div>
-                <div class="table-item">Damage</div>
-                <div class="table-item">Max</div>
-                <div class="table-item">Remain</div>
-                <div class="table-item">Manual</div>
-                <div class="table-item">Sensor</div>
-                <div class="table-item">More</div>
-            </div>
-            <fieldset class="repeating_rangedweapons">
-                <div class="ranged-table-row">
-                    <div></div>
-                    <div></div>
-                    <input type="text" name="attr_name" class="myweapontxt">
-                    <select name="attr_type" class="mediumselect2">
-                        <option SELECTED>Other</option>
-                        <option>Hold-out Pistol</option>
-                        <option>Light Pistol</option>
-                        <option>Machine Pistol</option>
-                        <option>Heavy Pistol</option>
-                        <option>SMG</option>
-                        <option>Taser</option>
-                        <option>Shotgun</option>
-                        <option>Sporting Rifle</option>
-                        <option>Sniper Rifle</option>
-                        <option>Assault Rifle</option>
-                        <option>Light Machine Gun</option>
-                        <option>Medium Machine Gun</option>
-                        <option>Heavy Machine Gun</option>
-                        <option>Assault Cannon</option>
-                        <option>Minigun</option>
-                        <option>Bow</option>
-                        <option>Light Crossbow</option>
-                        <option>Medium Crossbow</option>
-                        <option>Heavy Crossbow</option>
-                        <option>Sling Shot</option>
-                        <option>Sling Launcher</option>
-                        <option>Thrown Knife</option>
-                        <option>Shuriken</option>
-                        <option>Caltrops</option>
-                        <option>Nets</option>
-                        <option>Bracer</option>
-                        <option>Gun Cane</option>
-                        <option>Speargun</option>
-                        <option>Net Gun</option>
-                        <option>Laser Pistol</option>
-                        <option>Laser Rifle</option>
-                        <option>Laser Sniper</option>
-                        <option>"Gyrojet (land)</option>
-                        <option>"Gyrojet (water)</option>
-                        <option>Flamethrower</option>
-                        <option>Blowgun</option>
+        <fieldset class="repeating_rangedweapons">
+            <div class="ranged-table-row-bg">
+                <div></div>
+                <div></div>
+                <input type="text" name="attr_name" class="myweapontxt">
+                <select name="attr_type" class="mediumselect2">
+                    <option SELECTED>Other</option>
+                    <option>Hold-out Pistol</option>
+                    <option>Light Pistol</option>
+                    <option>Machine Pistol</option>
+                    <option>Heavy Pistol</option>
+                    <option>SMG</option>
+                    <option>Taser</option>
+                    <option>Shotgun</option>
+                    <option>Sporting Rifle</option>
+                    <option>Sniper Rifle</option>
+                    <option>Assault Rifle</option>
+                    <option>Light Machine Gun</option>
+                    <option>Medium Machine Gun</option>
+                    <option>Heavy Machine Gun</option>
+                    <option>Assault Cannon</option>
+                    <option>Minigun</option>
+                    <option>Bow</option>
+                    <option>Light Crossbow</option>
+                    <option>Medium Crossbow</option>
+                    <option>Heavy Crossbow</option>
+                    <option>Sling Shot</option>
+                    <option>Sling Launcher</option>
+                    <option>Thrown Knife</option>
+                    <option>Shuriken</option>
+                    <option>Caltrops</option>
+                    <option>Nets</option>
+                    <option>Bracer</option>
+                    <option>Gun Cane</option>
+                    <option>Speargun</option>
+                    <option>Net Gun</option>
+                    <option>Laser Pistol</option>
+                    <option>Laser Rifle</option>
+                    <option>Laser Sniper</option>
+                    <option>"Gyrojet (land)</option>
+                    <option>"Gyrojet (water)</option>
+                    <option>Flamethrower</option>
+                    <option>Blowgun</option>
+                </select>
+                <select name="attr_weaponmont" class="mediumselect2">
+                    <option SELECTED">Hard</option>
+                    <option>Firm</option>
+                    <option>Hard</option>
+                    <option>Turret</option>
+                </select>
+                <input type="number" name="attr_min">
+                <input type="number" name="attr_short">
+                <input type="number" name="attr_medium">
+                <input type="number" name="attr_long">
+                <input type="number" name="attr_extreme">
+                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="ss" /></div>
+                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="sa" 1 /></div>
+                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="bf" /></div>
+                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="fa" /></div>
+                <input type="number" name="attr_power">
+                <select name="attr_damage" class="mediumselect2">
+                    <option data-i18n="light-damage-abbreviation" title="Light Damage" value="L" SELECTED>L</option>
+                    <option data-i18n="moderate-damage-abbreviation" title="Moderate Damage" value="M">M</option>
+                    <option data-i18n="serious-damage-abbreviation" title="Serious Damage" value="S">S</option>
+                    <option data-i18n="deadly-damage-abbreviation" title="Deadly Damage" value="D">D</option>
+                    <option data-i18n="light-stun-abbreviation" title="Light Stun" value="L(stun)">L(s)</option>
+                    <option data-i18n="moderate-stun-abbreviation" title="Moderate Stun" value="M(stun)">M(s)</option>
+                    <option data-i18n="serious-stun-abbreviation" title="Serious Stun" value="S(stun)">S(s)</option>
+                    <option data-i18n="deadly-stun-abbreviation" title="Deadly Stun" value="D(stun)">D(s)</option>
+                </select>
+                <input type="number" name="attr_ammo" value=0>
+                <input type="number" name="attr_ammoremain" value=0>
+                <div><button class="attack-dice" type="action" id="vehicleranged" name="act_rangedattack"
+                        title="Manual Gunnery"></button></div>
+                <div><button type="action" id="vehiclesensor" name="act_rangedattack"
+                        title="Sensor Enhanced Gunnery">f</button></div>
+                <div>
+                    <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
+                    <button class="pictos-button" type="action" name="act_showmore" title="Show More">y</button>
+                </div>
+                <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
+                <span class="show-weaponmods">
+                    <div class="text-mid" data-i18n="skill" class="text-mid"
+                        title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box">
+                        <b>Skill</div>
+                    <div class="text-mid" data-i18n="plus-dice-abbreviation"
+                        title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">
+                        +Dice</div>
+                    <div class="text-mid" data-i18n="plus-target-number-abberviation"
+                        title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">
+                        +TN</div>
+                    <div class="text-mid" title="Gas vents and other recoil accesories"
+                        data-i18n="recoil-compensation-abbreviation">Recoil Comp</div>
+                    <div class="text-mid" data-i18n="gyro-stabalization">Gyro Stabalization</div>
+                    <div class="text-mid" title="accesories that improve to hit number for ranged combat"
+                        data-i18n="none">Targeting Assistance </div>
+                    <div class="text-mid" title="Clip, Belt, Cylinder, Magazine or Action Break"
+                        data-i18n="reload-type">Reload Type </div>
+                    <div class="text-mid" title="number or clips, belts or individual rounds" data-i18n="reloads">
+                        Reloads</div>
+                    <div class="text-mid" data-i18n="ammo-type">Ammo Type</div>
+                    <div class="text-mid" data-i18n="notes">Notes:</div>
+                    <select name="attr_skill" class="mediumselect2"
+                        title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box">
+                        <option SELECTED value="@{gunnery}" data-i18n="gunnery">Gunnery</option>
                     </select>
-                    <select name="attr_weaponmont" class="mediumselect2">
-                        <option SELECTED">Hard</option>
-                        <option>Firm</option>
-                        <option>Hard</option>
-                        <option>Turret</option>
+                    <div><input type="number" name="attr_specialized" value=0></div>
+                    <div><input type="number" name="attr_tnmods" value=0></div>
+                    <div><input type="number" name="attr_recoilcomp" title="Gas vents and other recoil accesories"
+                            value=0></div>
+                    <select class="mediumselect2" name="attr_gyro">
+                        <option data-i18n="none" value="0" SELECTED>None</option>
+                        <option data-i18n="regular" value="5">Regular</option>
+                        <option data-i18n="deluxe" value="6">Deluxe</option>
                     </select>
-                    <input type="number" name="attr_min">
-                    <input type="number" name="attr_short">
-                    <input type="number" name="attr_medium">
-                    <input type="number" name="attr_long">
-                    <input type="number" name="attr_extreme"> 
-                    <div class="text-mid"><input type="checkbox" name="attr_firemode" value="ss"/></div>
-                    <div class="text-mid"><input type="checkbox" name="attr_firemode" value="sa"1 /></div>
-                    <div class="text-mid"><input type="checkbox" name="attr_firemode" value="bf"/></div>
-                    <div class="text-mid"><input type="checkbox" name="attr_firemode" value="fa"/></div>
-                    <input type="number" name="attr_power">
+                    <select class="mediumselect2" name="attr_targeting">
+                        <option data-i18n="none" value="0" SELECTED>None</option>
+                        <option data-i18n="smartlink" value="-2">Smartlink</option>
+                        <option data-i18n="laser-sight" value="-1">LaserSight</option>
+                        <option data-i18n="smart-goggles" value="-1">Smart Goggles</option>
+                    </select>
+                    <select name="attr_reloadmethod" class="mediumselect2">
+                        <option data-i18n="clip" value="clip">clip</option>
+                        <option data-i18n="break" value="break">break</option>
+                        <option data-i18n="magazine" value="magazine">magazine</option>
+                        <option data-i18n="speed-loader" value="speed loader">speed loader</option>
+                        <option data-i18n="cylinder" value="cylinder">cylinder</option>
+                        <option data-i18n="belt" value="belt">belt</option>
+                    </select>
+                    <div><input type="number" name="attr_reloads" value=0></div>
+                    <select name="attr_ammotype" class="mediumselect2">
+                        <option data-i18n="regular" value="regular">Regular</option>
+                        <option data-i18n="adps" value="adps">ADPS</option>
+                        <option data-i18n="explosive" value="explosive">Explosive</option>
+                        <option data-i18n="explosive-ex" value="explosive2">Explosive EX</option>
+                        <option data-i18n="flechette" value="flechette">Flechette</option>
+                        <option data-i18n="gel" value="gel">Gel</option>
+                        <option data-i18n="tracer" value="tracer">Tracer</option>
+                        <option data-i18n="anti-vehicle" value="av">Anti-Vehicl</option>
+                        <option data-i18n="capsule" value="capsule">Capsule</option>
+                        <option data-i18n="glazer" value="glazer">Glazer</option>
+                        <option data-i18n="Hi-C" value="hic">Hi-C</option>
+                        <option data-i18n="hollow-point" value="hpoint">Hollow Point</option>
+                        <option data-i18n="incendiary" value="incendiary">Incendiary</option>
+                        <option data-i18n="mercury" value="mercury">Mercury</option>
+                        <option data-i18n="tracker" value="tracker">Tracker</option>
+                    </select>
+                    <textarea name="attr_notes" style='width:150px;height:22px;'></textarea>
+                </span>
+            </div>
+            <div class="table-bottom" />
+        </fieldset>
+        <div class="SRH3">Missles/Rockets</div>
+        <div class="explosives-table-header">
+            <div class="table-top-left" data-i18n="name">Name</div>
+            <div class="table-top-mid" data-i18n="type">Type</div>
+            <div class="table-top-mid" data-i18n="mount">Mount</div>
+            <div class="table-top-mid" data-i18n="minimum-abbreviation">Min</div>
+            <div class="table-top-mid" data-i18n="short-abbreviation">S</div>
+            <div class="table-top-mid" data-i18n="medium-abbreviation">M</div>
+            <div class="table-top-mid" data-i18n="long-abbreviation">L</div>
+            <div class="table-top-mid" data-i18n="extreme-abbreviation">Ex</div>
+            <div class="table-top-mid" data-i18n="power">Power</div>
+            <div class="table-top-mid" data-i18n="damage">Damage</div>
+            <div class="table-top-mid" data-i18n="intelligence-abbreviation">Intel.</div>
+            <div class="table-top-mid" data-i18n="blast">Blast</div>
+            <div class="table-top-mid" data-i18n="scatter">Scatter</div>
+            <div class="table-top-mid" data-i18n="quantity-abbreviation">Qty.</div>
+            <div class="table-top-mid" data-i18n="manual">Manual</div>
+            <div class="table-top-mid" data-i18n="sensor">Sensor</div>
+            <div class="table-top-right" data-i18n="more">More</div>
+        </div>
+        <fieldset class="repeating_explosives">
+            <div class="explosives-table-row-bg">
+                <input type="text" name="attr_name" class="myweapontxt">
+                <select name="attr_exptype" class="mediumselect2">
+                    <option data-i18n="launcher-offensive" value="Launcher:O">L/O (Launcher Offensive)</option>
+                    <option data-i18n="launcher-defensive" value="Launcher:D">L/D (Launcher Defensive)</option>
+                    <option data-i18n="launcher-concussion" value="Launcher:C">L/C (Launcher Concussion)</option>
+                    <option data-i18n="other" selected value="Other:Other">Other</option>
+                </select>
+                <select name="attr_weaponmont" class="mediumselect2">
+                    <option data-i18n="hardpoint" value="Hardpoint" SELECTED">Hardpoint</option>
+                    <option data-i18n="firmpoint" value="Firmpoint">Firmpoint</option>
+                    <option data-i18n="turret" value="Turret">Turret</option>
+                </select>
+                <div class="weaponronum"><span name="attr_min" value=0></span></div>
+                <div class="weaponronum"><span name="attr_short" value=0></span></div>
+                <div class="weaponronum"><span name="attr_medium" value=0></span></div>
+                <div class="weaponronum"><span name="attr_long" value=0></span></div>
+                <div class="weaponronum"><span name="attr_extreme" value=0></span></div>
+                <input type="number" name="attr_power">
+                <div>
                     <select name="attr_damage" class="mediumselect2">
-                        <option SELECTED>L</option>
-                        <option>M</option>
-                        <option>S</option>
-                        <option>D</option>
-                        <option>L(stun)</option>
-                        <option>M(stun)</option>
-                        <option>S(stun)</option>
-                        <option>D(stun)</option>
+                        <option data-i18n="light-damage-abbreviation" title="Light Damage" value="L" SELECTED>L</option>
+                        <option data-i18n="moderate-damage-abbreviation" title="Moderate Damage" value="M">M</option>
+                        <option data-i18n="serious-damage-abbreviation" title="Serious Damage" value="S">S</option>
+                        <option data-i18n="deadly-damage-abbreviation" title="Deadly Damage" value="D">D</option>
+                        <option data-i18n="light-stun-abbreviation" title="Light Stun" value="L(stun)">L(s)</option>
+                        <option data-i18n="moderate-stun-abbreviation" title="Moderate Stun" value="M(stun)">M(s)
+                        </option>
+                        <option data-i18n="serious-stun-abbreviation" title="Serious Stun" value="S(stun)">S(s)</option>
+                        <option data-i18n="deadly-stun-abbreviation" title="Deadly Stun" value="D(stun)">D(s)</option>
                     </select>
-                    <input type="number" name="attr_ammo" value=0>
-                    <input type="number" name="attr_ammoremain" value=0>
-                    <div><button class="attack-dice" type="action" id="vehicleranged" name="act_rangedattack"
-                            title="Manual Gunnery"></button></div>
-                    <div><button type="action" id="vehiclesensor" name="act_rangedattack"
-                            title="Sensor Enhanced Gunnery">f</button></div>
-                    <div>
-                        <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
-                        <button class="pictos-button" type="action" name="act_showmore" title="Show More">y</button>
-                    </div>
-                    <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
-                    <span class="show-weaponmods">
-                        <div class="text-mid" title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box"> <b>Skill</div>
-                        <div class="text-mid" title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">+Dice</div>
-                        <div class="text-mid" title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">+TN</div>
-                        <div class="text-mid" title="Gas vents and other recoil accesories"><b>Recoil Comp</div>
-                        <div><b>Gyro Stabalization</div>
-                        <div title="accesories that improve to hit number for ranged combat"><b>Targeting Assistance
-                        </div>
-                        <div class="text-mid" title="Clip, Belt, Cylinder, Magazine or Action Break"><b>Reload Type
-                        </div>
-                        <div class="text-mid" title="number or clips, belts or individual rounds"><b>Reloads</div>
-                        <div class="text-mid"><b>Ammo Type</div>
-                        <div class="text-mid"><b>Notes:</div>
-                        <select name="attr_skill" class="mediumselect3"
-                            title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box">
-                            <option SELECTED value="@{gunnery}">Gunnery</option>
-                        </select>
-                        <div><input type="number" name="attr_specialized" value=0></div>
-                        <div><input type="number" name="attr_tnmods" value=0></div>
-                        <div><input type="number" name="attr_recoilcomp" title="Gas vents and other recoil accesories"
-                                value=0></div>
-                        <select class="mediumselect3" name="attr_gyro">
-                            <option value="0" SELECTED>None</option>
-                            <option value="5">Regular</option>
-                            <option value="6">Deluxe</option>
-                        </select>
-                        <select class="mediumselect3" name="attr_targeting">
-                            <option value="0" SELECTED>None</option>
-                            <option value="-2">Smartlink</option>
-                            <option value="-1">LaserSight</option>
-                            <option value="-1">Smart Goggles</option>
-                        </select>
-                        <select name="attr_reloadmethod" class="mediumselect3">
-                            <option>clip</option>
-                            <option>break</option>
-                            <option>magazine</option>
-                            <option>speed loader</option>
-                            <option>cylinder</option>
-                            <option>belt</option>
-                        </select>
-                        <div><input type="number" name="attr_reloads" value=0></div>
-                        <select name="attr_ammotype" class="mediumselect3">
-				<option value="regular">Regular</option>
-				<option value="adps">ADPS</option>
-				<option value="explosive">Explosive</option>
-				<option value="explosive2">Explosive EX</option>
-				<option value="flechette">Flechette</option>
-				<option value="gel">Gel</option>
-				<option value="tracer">Tracer</option>
-				<option value="av">Anti-Vehicl</option>
-				<option value="capsule">Capsule</option>
-				<option value="glazer">Glazer</option>
-				<option value="hic">Hi-C<option>
-				<option value="hpoint">Hollow Point</option>
-				<option value="incendiary">Incendiary</option>
-				<option value="mercury">Mercury</option>
-				<option value="tracker">Tracker</option>
-                        </select>
-                        textarea name="attr_notes" style='width:150px;height:22px;'></textarea>
-                    </span>
                 </div>
-                <div class="table-bottom" />
-            </fieldset>
-            <div class="SRH3">Missles/Rockets</div>
-            <div class="explosives-table-header">
-                <div class="table-top-left">Name</div>
-                <div class="table-top-mid">Type</div>
-                <div class="table-top-mid">Mount</div>
-                <div class="table-top-mid">Min</div>
-                <div class="table-top-mid">S</div>
-                <div class="table-top-mid">M</div>
-                <div class="table-top-mid">L</div>
-                <div class="table-top-mid">Ex</div>
-                <div class="table-top-mid">Power</div>
-                <div class="table-top-mid">Damage</div>
-                <div class="table-top-mid">Intel.</div>
-                <div class="table-top-mid">Blast</div>
-                <div class="table-top-mid">Scatter</div>
-                <div class="table-top-mid">Qty.</div>
-                <div class="table-top-mid">Manual</div>
-                <div class="table-top-mid">Sensor</div>
-                <div class="table-top-right">More</div>
-            </div>
-            <fieldset class="repeating_explosives">
-                <div class="explosives-table-row">
-                    <input type="text" name="attr_name" class="myweapontxt">
-                    <select name="attr_exptype" class="mediumselect2">
-                        <option value="Launcher:O">L/O (Launcher Offensive)</option>
-                        <option value="Launcher:D">L/D (Launcher Defensive)</option>
-                        <option value="Launcher:C">L/C (Launcher Concussion)</option>
-                        <option selected value="Other:Other">Other</option>
-                    </select>
-                    <select name="attr_weaponmont" class="mediumselect2">
-                        <option SELECTED">Hardpoint</option>
-                        <option>Firmpoint</option>
-                        <option>Turret</option>
-                    </select>
-                    <div class="weaponronum"><span name="attr_min" value=0></span></div>
-                    <div class="weaponronum"><span name="attr_short" value=0></span></div>
-                    <div class="weaponronum"><span name="attr_medium" value=0></span></div>
-                    <div class="weaponronum"><span name="attr_long" value=0></span></div>
-                    <div class="weaponronum"><span name="attr_extreme" value=0></span></div>
-                    <input type="number" name="attr_power">
-                    <div>
-                        <select name="attr_damage" class="mediumselect2">
-                            <option SELECTED>L</option>
-                            <option>M</option>
-                            <option>S</option>
-                            <option>D</option>
-                            <option>L(stun)</option>
-                            <option>M(stun)</option>
-                            <option>S(stun)</option>
-                            <option>D(stun)</option>
-                        </select>
-                    </div>
-                    <input type="number" name="attr_missleint" value=0>
-                    <input type="number" name="attr_blast" value=0 step=0.05>
-                    <input type="number" name="attr_scatter" value=1>
-                    <input type="number" name="attr_ammoremain" value=0>
-                    <div><button class="explosive-dice" type="action" name="act_rangedattack" id="vehicle-explosive"
-                            title="Explosives Attack"></button></div>
-                    <div><button type="action" name="act_rangedattack" id="vehicle-sensorexp"
-                            title="Sensor Assisted Attack" class="pictos-button">f</button></div>
-                    <div>
-                        <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
-                        <button class="pictos-button" type="action" name="act_showmore" title="Show More">y</button>
-                    </div>
+                <input type="number" name="attr_missleint" value=0>
+                <input type="number" name="attr_blast" value=0 step=0.05>
+                <input type="number" name="attr_scatter" value=1>
+                <input type="number" name="attr_ammoremain" value=0>
+                <div><button class="explosive-dice" type="action" name="act_rangedattack" id="vehicle-explosive"
+                        title="Explosives Attack"></button></div>
+                <div><button type="action" name="act_rangedattack" id="vehicle-sensorexp" title="Sensor Assisted Attack"
+                        class="pictos-button">f</button></div>
+                <div>
                     <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
-                    <input type="hidden" name="attr_scatterredux">
-                    <div class="explosive-mods-switch">
-                        <div>Skill</div>
-                        <div title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">+Dice</div>
-                        <div title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">+TN</div>
-                        <div>Recoil Comp</div>
-                        <div>Gyro Stabalization</div>
-                        <div>Targeting Assistance</div>
-                        <div>Range Finder</div>
-                        <div>Notes:</div>
-                        <select name="attr_skill" class="mediumselect3">
-                            <option selected value="@{launchers}">Launcher</option>
-                            <option value="@{demolitions}">Demolition</option>
-                        </select>
-                        <div><input type="number" name="attr_specialized" value=0></div>
-                        <div><input type="number" name="attr_tnmods" value=0></div>
-                        <div><input type="number" name="attr_recoilcomp" value=0></div>
-                        <select class="mediumselect3" name="attr_gyro">
-                            <option value="0" SELECTED>None</option>
-                            <option value="5">Regular</option>
-                            <option value="6">Deluxe</option>
-                        </select>
-                        <select class="mediumselect3" name="attr_targeting">
-                            <option value="0" SELECTED>None</option>
-                            <option value="-2">Smartlink</option>
-                            <option value="-1">LaserSight</option>
-                            <option value="-1">Smart Goggles</option>
-                        </select>
-                        <div><input name="attr_rangefinder" type="number"></div>
-                        <textarea name="attr_notes" style='width:210px;height:20px'></textarea>
+                    <button class="pictos-button" type="action" name="act_showmore" title="Show More">y</button>
+                </div>
+                <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
+                <input type="hidden" name="attr_scatterredux">
+                <div class="explosive-mods-switch">
+                    <div data-i18n="skill">Skill</div>
+                    <div data-i18n="plus-dice-abbreviation"
+                        title="add or remove dice from skill rating.  Used for defaulting (minus) or specializing (plus)">
+                        +Dice</div>
+                    <div data-i18n="plus-target-number-abberviation"
+                        title="add persistant target number modifiers. Used for defaulting or offseting modifiers based on perks">
+                        +TN</div>
+                    <div data-i18n="recoil-compensation-abbreviation">Recoil Comp</div>
+                    <div data-i18n="gyro-stabalization">Gyro Stabalization</div>
+                    <div data-i18n="target-assistance">Targeting Assistance</div>
+                    <div data-i18n="range-finder">Range Finder</div>
+                    <div data-i18n="notes">Notes:</div>
+                    <select name="attr_skill" class="mediumselect2">
+                        <option data-i18n="launcher" selected value="@{launchers}">Launcher</option>
+                        <option data-i18n="demolition" value="@{demolitions}">Demolition</option>
+                    </select>
+                    <div><input type="number" name="attr_specialized" value=0></div>
+                    <div><input type="number" name="attr_tnmods" value=0></div>
+                    <div><input type="number" name="attr_recoilcomp" value=0></div>
+                    <select class="mediumselect2" name="attr_gyro">
+                        <option data-i18n="none" value="0" SELECTED>None</option>
+                        <option data-i18n="regular" value="5">Regular</option>
+                        <option data-i18n="deluxe" value="6">Deluxe</option>
+                    </select>
+                    <select class="mediumselect2" name="attr_targeting">
+                        <option data-i18n="none" value="0" SELECTED>None</option>
+                        <option data-i18n="smartlink" value="-2">Smartlink</option>
+                        <option data-i18n="laser-sight" value="-1">LaserSight</option>
+                        <option data-i18n="smart-goggles" value="-1">Smart Goggles</option>
+                    </select>
+                    <div><input name="attr_rangefinder" type="number"></div>
+                    <textarea name="attr_notes" style='width:210px;height:20px'></textarea>
 
-                    </div>
                 </div>
-                <div class="table-bottom" />
-            </fieldset>
-            <br>
-        </div>
+            </div>
+            <div class="table-bottom" />
+        </fieldset>
+        <br>
     </div>
 </div>
+</div>
 
 </div>
 <div class="sheet-cyberware">
     <div class="cyberware-lists">
-        <div class="SRH2">Cyberware</div>
+    <div class="SRH2" data-i18n="cyberware-bioware-nanoware">Cyberware, Bioware and Nanoware</div>
+    <input type="hidden" class="ware-tabs-switch" name="attr_waretab" value="cyber">
+    <div class="ware-tabs">
+        <input type="hidden" class="ware-tabs-switch" name="attr_waretab" value="cyber">
+        <button class="ware-tabs-cyber" type="action" name="act_cyber-tab" data-i8n="cyberware-uppercase" >CYBERWARE</button>
+        <button class="ware-tabs-bio" type="action" name="act_bio-tab" data-i8n="bioware-uppercase" >BIOWARE</button>
+        <button class="ware-tabs-nano" type="action" name="act_nano-tab" data-i8n="nanoware-uppercase" >NANOWARE</button>
+	<div class="tabs-empty"></div>
+    </div>
+    <div class="cyberware">
         <div class="cyberware-list">
-            <header class="table-top-left">Name</header>
-            <header class="table-top-mid">Rating</header>
-            <header class="table-top-mid">Essence</header>
-            <header class="table-top-right">Description</header>
+            <header class="table-top-left-nc" data-i18n="name">Name</header>
+            <header class="table-top-mid-nc" data-i18n="rating">Rating</header>
+            <header class="table-top-mid-nc" data-i18n="essence">Essence</header>
+            <header class="table-top-right-nc" data-i18n="description">Description</header>
         </div>
         <fieldset class="repeating_cyberware">
             <div class="cyberware-list">
-                <div class="table-item-left"><input type="text" name="attr_cyberware-name"></div>
-                <div class="table-item"><input type="number" name="attr_cyberware-rating"></div>
-                <div class="table-item"><input type='number' name='attr_cyberware-essence' step='0.01' value=0></div>
-                <div class="table-item"><input type="text" name="attr_cyberware-notes"></div>
+                <div class="table-item-left-nc"><input type="text" name="attr_cyberware-name"></div>
+                <div class="table-item-nc"><input type="number" name="attr_cyberware-rating"></div>
+                <div class="table-item-nc"><input type='number' name='attr_cyberware-essence' step='0.01' value=0></div>
+                <div class="table-item-nc"><input type="text" name="attr_cyberware-notes"></div>
         </fieldset>
-        <div class="SRH2">Bioware</div>
+	</div>
+	<div class="bioware">
         <div class="cyberware-list">
-            <header class="table-top-left">Name</header>
-            <header class="table-top-mid">Rating</header>
-            <header class="table-top-mid">Bio Index</header>
-            <header class="table-top-right">Description</header>
+            <header class="table-top-left-nc" data-i18n="name">Name</header>
+            <header class="table-top-mid-nc" data-i18n="rating">Rating</header>
+            <header class="table-top-mid-nc" data-i18n="bio-index">Bio Index</header>
+            <header class="table-top-right-nc" data-i18n="description">Description</header>
         </div>
         <fieldset class="repeating_bioware">
             <div class="cyberware-list">
-                <div class="table-item-left"><input type="text" name="attr_bioware-name"></div>
-                <div class="table-item"><input type="number" name="attr_bioware-rating"></div>
-                <div class="table-item"><input type='number' name='attr_bioware-index' step='0.01' value=0></div>
-                <div class="table-item"><input type="text" name="attr_bioware-notes"></div>
+                <div class="table-item-left-nc"><input type="text" name="attr_bioware-name"></div>
+                <div class="table-item-nc"><input type="number" name="attr_bioware-rating"></div>
+                <div class="table-item-nc"><input type='number' name='attr_bioware-index' step='0.01' value=0></div>
+                <div class="table-item-nc"><input type="text" name="attr_bioware-notes"></div>
             </div>
         </fieldset>
-        <div class="SRH2">Nanotech</div>
+	</div>
+	<div class="nanoware">
         <div class="cyberware-list">
-            <header class="table-top-left">Name</header>
-            <header class="table-top-mid">Rating</header>
-            <header class="table-top-mid">Essence</header>
-            <header class="table-top-right">Description</header>
+            <header class="table-top-left-nc" data-i18n="name">Name</header>
+            <header class="table-top-mid-nc" data-i18n="rating">Rating</header>
+            <header class="table-top-mid-nc" data-i18n="essence">Essence</header>
+            <header class="table-top-right-nc" data-i18n="description">Description</header>
         </div>
         <fieldset class="repeating_nanotech">
             <div class="cyberware-list">
@@ -4253,29 +4397,30 @@
             </div>
         </fieldset>
     </div>
+    </div>
 </div>
 </div>
 </div>
 </div>
 <div class="sheet-contacts">
-    <div class="SRH2">Lifestyle</div>
+    <div class="SRH2" data-i18n="lifestyle">Lifestyle</div>
 
     <div>
         <div>
-            <div class="SRH3">Contacts</div>
-                <div class="contacts">
-			<header class="table-top-left">Name</header>
-			<header class="table-top-mid">Contact Type</header>
-			<header class="table-top-right">Notes Type</header>
-		</div>
+            <div class="SRH3" data-i18n="contacts">Contacts</div>
+            <div class="contacts">
+                <header class="table-top-left" data-i18n="contact-type">Name</header>
+                <header class="table-top-mid" data-i18n="contact-type">Contact Type</header>
+                <header class="table-top-right" data-i18n="notes">Notes</header>
+            </div>
             <fieldset class="repeating_contacts">
                 <div class="contacts">
-		    <input type="text" name="attr_name">
+                    <input type="text" name="attr_name">
                     <select name="attr_contacttype" class="mediumselect2">
-                        <option SELECTED>Contact</option>
-                        <option>Buddy</option>
-                        <option>Friend for Life</option>
-                        <option>Followers</option>
+                        <option SELECTED data-i18n="contact">Contact</option>
+                        <option value="Buddy" data-i18n="buddy">Buddy</option>
+                        <option value="Friend for Life" data-i18n="friend-for-life">Friend for Life</option>
+                        <option value="Followers" data-i18n="followers">Followers</option>
                     </select>
                     <input name="attr_contactdetail" type="text" value="Name Occupation Upkeep">
                 </div>
@@ -4283,25 +4428,25 @@
         </div>
     </div>
     <div>
-        <div class="SRH3">Lifestyle Class/Gear at Home</div>
-	<div class="lifestyles">
-		<header class="table-top-left">Lifestyle</header>
-		<header class="table-top-mid">Cost</header>
-		<header class="table-top-mid">Months Paid</header>
-		<header class="table-top-mid">Address</header>
-		<header class="table-top-mid">Description</header>
-		<header class="table-top-mid">Edges/Flaws</header>
-	</div>
-	<fieldset class="repeating_lifestyles">
-		<div class="lifestyles">
-			<input type="text" name="attr_lifestyle">
-			<input type="number" name="attr_cost">
-			<input type="number" name="attr_monthspaid">
-			<input type="text" name="attr_address">
-			<input type="text" name="attr_description">
-			<input type="text" name="attr_edgesflaws">
-		</div>
-	</fieldset>
+        <div class="SRH3" data-i18n="lifesytle-class-gear-at-home">Lifestyle Class/Gear at Home</div>
+        <div class="lifestyles">
+            <header class="table-top-left" data-i18n="lifestyle">Lifestyle</header>
+            <header class="table-top-mid" data-i18n="cost">Cost</header>
+            <header class="table-top-mid" data-i18n="months-paid">Months Paid</header>
+            <header class="table-top-mid" data-i18n="address">Address</header>
+            <header class="table-top-mid" data-i18n="description">Description</header>
+            <header class="table-top-mid" data-i18n="edges-flaws">Edges/Flaws</header>
+        </div>
+        <fieldset class="repeating_lifestyles">
+            <div class="lifestyles">
+                <input type="text" name="attr_lifestyle">
+                <input type="number" name="attr_cost">
+                <input type="number" name="attr_monthspaid">
+                <input type="text" name="attr_address">
+                <input type="text" name="attr_description">
+                <input type="text" name="attr_edgesflaws">
+            </div>
+        </fieldset>
 
     </div>
 </div>
@@ -4311,10 +4456,10 @@
 <div class="sheet-critter-powers">
     <div class="critter-powers">
         <div>
-            <div class="SRH4">Powers</div>
+            <div class="SRH4" data-i18n="powers">Powers</div>
             <div class="critter-powers-table">
-                <div class="table-top-left"><b>Power</div>
-                <div class="table-top-right"><b>Description</div>
+                <div class="table-top-left"><b data-i18n="power">Power</div>
+                <div class="table-top-right"><b data-i18n="description">Description</div>
             </div>
             <fieldset class='repeating_critter-powers'>
                 <div class="critter-powers-table">
@@ -4324,10 +4469,10 @@
             </fieldset>
         </div>
         <div>
-            <div class="SRH4">Weakness</div>
+            <div class="SRH4" data-i18n="weakness">Weakness</div>
             <div class="critter-powers-table">
-                <div class="table-top-left"><b>Weakness</div>
-                <div class="table-top-right"><b>Description</div>
+                <div class="table-top-left"><b data-i18n="weakness">Weakness</div>
+                <div class="table-top-right"><b data-i18n="description">Description</div>
             </div>
             <fieldset class='repeating_critter-weaknesses'>
                 <div class="critter-powers-table">
@@ -4340,21 +4485,21 @@
 </div>
 <div id="popup1" class="overlay">
     <div class="popup">
-        <h2>JSON Import</h2>
+        <h2 data-i18n="json-import">JSON Import</h2>
         <a class="close" href="#">×</a>
         <div class="content">
             <textarea name="attr_jsonnpc" style='width:500px;height:400px;resize:none; overlfow-y: scroll;'></textarea>
-            <button type="action" name="act_jsonimport-char" href="#">JSON Import</button>
+            <button type="action" name="act_jsonimport-char" href="#" data-i18n="json-import">JSON Import</button>
         </div>
     </div>
 </div>
 <div id="popup2" class="overlay">
     <div class="popup">
-        <h2>JSON Export</h2>
+        <h2 data-i18n="json-export">JSON Export</h2>
         <a class="close" href="#">×</a>
         <div class="content">
             <textarea name="attr_jsonout" style='width:500px;height:400px;resize:none; overlfow-y: scroll;'></textarea>
-            <button type="action" name="act_jsonexport-char" href="#">JSON Export</button>
+            <button type="action" name="act_jsonexport-char" href="#" data-i18n="json-export">JSON Export</button>
         </div>
     </div>
 </div>
@@ -4369,9 +4514,192 @@ buttonlist.forEach(button => {
     });
 });
 
+const geartabs = ["gear", "credsticks", "vehiclelist"];
+geartabs.forEach(tab => {
+    button=tab + "-tab";
+    console.log(button)
+    on(`clicked:${button}`, function() {
+        setAttrs({ geartab: tab });
+    });
+});
+
+const magictabs = ["astral", "sorcery", "adept", "conjuring", "geas", "totem", "initiate", "foci", "spells"];
+magictabs.forEach(magic => {
+    button=magic + "-tab";
+    console.log(button)
+    on(`clicked:${button}`, function() {
+        setAttrs({ magictab: magic });
+    });
+});
+
+const combattabs = ["combat", "ranged", "melee", "explosives", "armor", "ammo"];
+combattabs.forEach(tab => {
+    button=tab + "-tab";
+    console.log(button)
+    on(`clicked:${button}`, function() {
+        setAttrs({ combattab: tab });
+    });
+});
+
+const riggertabs = ["rcdeck", "subscriber", "rigger"];
+riggertabs.forEach(tab => {
+    button=tab + "-tab";
+    console.log(button)
+    on(`clicked:${button}`, function() {
+        setAttrs({ riggertab: tab });
+    });
+});
+
+const waretabs = ["cyber", "bio", "nano"];
+waretabs.forEach(tab => {
+    button=tab + "-tab";
+    console.log(button)
+    on(`clicked:${button}`, function() {
+        setAttrs({ waretab: tab });
+    });
+});
+
+const deckingtabs = ["decking", "frame", "cyberdeck", "utilities"];
+deckingtabs.forEach(tab => {
+    button=tab + "-tab";
+    console.log(button)
+    on(`clicked:${button}`, function() {
+        setAttrs({ deckingtab: tab });
+    });
+});
+
 </script>
 
 <script type="text/worker">
+   var lang={}
+
+   on("sheet:opened", function() {
+   	geti18n();
+   });
+
+   const geti18n = function() {
+   	console.log('calling i18n for roll query');
+   	lang["blackic"] = getTranslationByKey("black-ic");
+   	lang["blackiclethal"] = getTranslationByKey("black-ic-lethal");
+   	lang["blackicnonlethal"] = getTranslationByKey("black-ic-non-lethal");
+   	lang["cerebropathic"] = getTranslationByKey("cerebropathic");
+   	lang["psychotropic"] = getTranslationByKey("psychotropic");
+   	lang["use-reach-modifier"] = getTranslationByKey("use-reach-modifier");
+   	lang["L"] = getTranslationByKey("light-damage-abbreviation");
+   	lang["M"] = getTranslationByKey("moderate-damage-abbreviation");
+   	lang["S"] = getTranslationByKey("serious-damage-abbreviation");
+   	lang["D"] = getTranslationByKey("deadly-damage-abbreviation");
+   	lang["L(stun)"] = getTranslationByKey("light-stun-abbreviation");
+   	lang["M(stun)"] = getTranslationByKey("moderate-stun-abbreviation");
+   	lang["S(stun)"] = getTranslationByKey("serious-stun-abbreviation");
+   	lang["D(stun)"] = getTranslationByKey("deadly-stun-abbreviation");
+   	lang["decker"] = getTranslationByKey("decker");
+   	lang["evasion"] = getTranslationByKey("evasion");
+   	lang["sensors"] = getTranslationByKey("sensors");
+   	lang["masking"] = getTranslationByKey("masking");
+   	lang["bod"] = getTranslationByKey("bod");
+   	lang["none"] = getTranslationByKey("none");
+   	lang["attack"] = getTranslationByKey("attack");
+   	lang["probe"] = getTranslationByKey("probe");
+   	lang["compare"] = getTranslationByKey("compare");
+   	lang["swap-memory"] = getTranslationByKey("swap-memory");
+   	lang["damage-resistance-test"] = getTranslationByKey("damage-resistance-test");
+   	lang["maneuver-score"] = getTranslationByKey("maneuver-score");
+   	lang["accelerate"] = getTranslationByKey("accelerate");
+   	lang["position"] = getTranslationByKey("position");
+   	lang["crash"] = getTranslationByKey("crash");
+   	lang["driving"] = getTranslationByKey("driving");
+   	lang["drain-damage"] = getTranslationByKey("drain-damage");
+   	lang["drain-modifiers"] = getTranslationByKey("drain-modifiers");
+   	lang["cover-modifiers"] = getTranslationByKey("cover-modifiers");
+   	lang["spirit-focus-dice"] = getTranslationByKey("spirit-focus-dice");
+   	lang["are-you-the-summoner"] = getTranslationByKey("are-you-the-summoner");
+   	lang["additional-modifiers"] = getTranslationByKey("additional-modifiers");
+   	lang["successes-from-hiding-test"] = getTranslationByKey("successes-from-hiding-test");
+   	lang["urban-setting"] = getTranslationByKey("urban-setting");
+   	lang["icon"] = getTranslationByKey("icon");
+   	lang["range"] = getTranslationByKey("range");
+   	lang["ic-rating"] = getTranslationByKey("ic-rating");
+   	lang["light-stun"] = getTranslationByKey("light-stun");
+   	lang["light"] = getTranslationByKey("light");
+   	lang["moderate"] = getTranslationByKey("moderate");
+   	lang["moderate-stun"] = getTranslationByKey("moderate-stun");
+   	lang["serious"] = getTranslationByKey("serious");
+   	lang["serious-stun"] = getTranslationByKey("serious-stun");
+   	lang["deadly"] = getTranslationByKey("deadly");
+   	lang["deadly-stun"] = getTranslationByKey("deadly-stun");
+   	lang["damage"] = getTranslationByKey("damage");
+   	lang["wound-level"] = getTranslationByKey("wound-level");
+   	lang["system-operation-with"] = getTranslationByKey("system-operation-with");
+   	lang["utility"] = getTranslationByKey("utility");
+   	lang["utility-test"] = getTranslationByKey("utility-test");
+   	lang["utility-rating"] = getTranslationByKey("utility-rating");
+   	lang["yes"] = getTranslationByKey("yes");
+   	lang["no"] = getTranslationByKey("no");
+   	lang["miscellaneous-modifiers"] = getTranslationByKey("miscellaneous-modifiers");
+   	lang["out-of-ammo"] = getTranslationByKey("out-of-ammo");
+   	lang["simple"] = getTranslationByKey("simple");
+   	lang["complex"] = getTranslationByKey("complex");
+   	lang["rounds-already-fired-in-combat-phase"] = getTranslationByKey("rounds-already-fired-in-combat-phase");
+   	lang["rounds"] = getTranslationByKey("rounds");
+   	lang["spell-defense"] = getTranslationByKey("spell-defense");
+   	lang["ally"] = getTranslationByKey("ally");
+   	lang["resist-spell"] = getTranslationByKey("resist-spell");
+   	lang["resist-banish"] = getTranslationByKey("resist-banish");
+   	lang["result"] = getTranslationByKey("result");
+   	lang["force"] = getTranslationByKey("force");
+   	lang["dispell"] = getTranslationByKey("dispell");
+   	lang["force-of-spell"] = getTranslationByKey("force-of-spell");
+   	lang["modifiers"] = getTranslationByKey("modifiers");
+   	lang["astral"] = getTranslationByKey("astral");
+   	lang["attack"] = getTranslationByKey("attack");
+   	lang["combat"] = getTranslationByKey("combat");
+   	lang["task-pool"] = getTranslationByKey("task-pool");
+   	lang["task-pool-dice"] = getTranslationByKey("task-pool-dice");
+   	lang["modifiers"] = getTranslationByKey("modifiers");
+   	lang["attacks-msg"] = getTranslationByKey("attacks-msg");
+   	lang["astral-pool"] = getTranslationByKey("astral-pool");
+   	lang["astral-pool-dice"] = getTranslationByKey("astral-pool-dice");
+   	lang["spell-pool"] = getTranslationByKey("spell-pool");
+   	lang["spell-pool-dice"] = getTranslationByKey("spell-pool-dice");
+   	lang["spell-pool-dice-for-drain"] = getTranslationByKey("spell-pool-dice-for-drain");
+   	lang["conjuring-dice-for-drain"] = getTranslationByKey("conjuring-dice-for-drain");
+   	lang["sorcery-dice"] = getTranslationByKey("sorcery-dice");
+   	lang["sorcery-dice-for-drain"] = getTranslationByKey("sorcery-dice-for-drain");
+   	lang["control-pool"] = getTranslationByKey("control-pool");
+   	lang["control-pool-dice"] = getTranslationByKey("control-pool-dice");
+   	lang["hacking-pool"] = getTranslationByKey("hacking-pool");
+   	lang["hacking-pool-dice"] = getTranslationByKey("hacking-pool-dice");
+   	lang["combat-pool"] = getTranslationByKey("combat-pool");
+   	lang["combat-pool-dice"] = getTranslationByKey("combat-pool-dice");
+   	lang["attack-power"] = getTranslationByKey("attack-power");
+   	lang["attack-type"] = getTranslationByKey("attack-type");
+   	lang["distance-from-explosive-in-meters"] = getTranslationByKey("distance-from-explosive-in-meters");
+   	lang["how-many-additional-enemy-vehicles"] = getTranslationByKey("how-many-additional-enemy-vehicles");
+   	lang["normal"] = getTranslationByKey("normal");
+   	lang["elemental"] = getTranslationByKey("elemental");
+   	lang["adps"] = getTranslationByKey("adps");
+   	lang["half"] = getTranslationByKey("half");
+   	lang["double"] = getTranslationByKey("double");
+   	lang["dodge"] = getTranslationByKey("dodge");
+   	lang["target-number"] = getTranslationByKey("target-number");
+   	lang["target"] = getTranslationByKey("target");
+   	lang["spellbocked-msg"] = getTranslationByKey("spellblocked-msg");
+   	lang["missed-msg"] = getTranslationByKey("missed-msg");
+   	lang["verification-system-rating"] = getTranslationByKey("verification-system-rating");
+   	lang["operator"] = getTranslationByKey("operator");
+   	lang["short"] = getTranslationByKey("short");
+   	lang["medium"] = getTranslationByKey("medium");
+   	lang["long"] = getTranslationByKey("long");
+   	lang["extreme"] = getTranslationByKey("extreme");
+   	lang["rigger"] = getTranslationByKey("rigger");
+   	lang["spell-resistance-test"] = getTranslationByKey("spell-resistance-test");
+   	lang["set-vehicle-operator"] = getTranslationByKey("set-vehicle-operator");
+   	lang["update-gunnery-and-control-pool"] = getTranslationByKey("update-gunnery-and-control-pool");
+   	lang["set-decker-for-security-tally"] = getTranslationByKey("set-decker-for-security-tally");
+	console.log(lang);
+   };
+
    console.log('loading rangedweapons stats');
    const rangedstats = { 
    "Hold-out Pistol": { short: 5, medium: 15, long: 30, extreme: 50, skill: "@{pistols}", wfamily: "Firearms"},
@@ -4432,6 +4760,22 @@ buttonlist.forEach(button => {
 	}
     };
 
+	on('clicked:jackin', function(info) {
+		if (!("yes" in lang)) geti18n();
+		console.log(info);
+		getAttrs(["matrix-status"], function(myval) {
+			var sets={};
+			const mstatus=myval["matrix-status"];
+			var myroll="/w gm &{template:info}{{character=@{character_name}}}";
+			myroll+= (mstatus == "out")? "{{type=Jack In}}": "{{type=Jack Out}}";
+			myroll += "{{action=" + lang["complex"] + "}}";
+			sets["matrix-status"]= (mstatus == "out")? "in" : "out";
+                	startRoll(myroll, (results) => {
+				setAttrs(sets);
+				finishRoll( results.rollId);
+			});
+		});
+	});
 
    on("change:repeating_rangedweapons:type", function() {
    	console.log('updating range based on weapon type');
@@ -4451,17 +4795,18 @@ buttonlist.forEach(button => {
 	});
    });
 
-      const matrixtn={BLUE: {Intruder: 3, Legitimate: 6, secrating: 1}, GREEN: {Intruder: 4, Legitimate: 5, secrating: 2}, ORANGE: {Intruder: 5, Legitimate: 4, secrating: 3}, RED: {Intruder: 6, Legitimate: 3, secrating: 4}};
+      const matrixtn={BLUE: {Intruder: 3, Legitimate: 6, secrating: 1, wdmg: 2}, GREEN: {Intruder: 4, Legitimate: 5, secrating: 2, wdmg: 2}, ORANGE: {Intruder: 5, Legitimate: 4, secrating: 3, wdmg: 3}, RED: {Intruder: 6, Legitimate: 3, secrating: 4, wdmg: 3}};
       const matrixsecnumber={1: "BLUE", 2: "GREEN", 3: "ORANGE",4: "RED"};
       const attributes=[ "body", "quickness", "strength", "charisma", "willpower", "intelligence", "force" ];
       const quicknesslinked=["@{blowgun}", "@{bracer}", "@{guncane}", "@{gyrojet}", "@{eyegun}", "@{oralgun}", "@{oralstrike}", "@{pistols}", "@{smgs}", "@{rifles}", "@{assaultrifles}", "@{lasers}", "@{whips}", "@{stealth}", "@{shotguns}"]
       const damagetable = {
-   		"N/A": 0,
+   		"None": 0,
    		"L": 1,
    		"M": 2,
    		"S": 3,
    		"D": 4,
-		0: "N/A",
+		0: "None",
+		9: "None",
 		1: "L",
 		2: "M",
 		3: "S",
@@ -4491,7 +4836,26 @@ buttonlist.forEach(button => {
 
    });
 
+   on('clicked:missed', (info) => {
+	if (!("yes" in lang)) geti18n();
+	payload=rollEscape.unescape(info["originalRollId"]);
+   	myroll="/w gm &{template:info}{{character=" + payload["target"] +"}}{{action=" + lang["missed-msg"]+"}}";
+        startRoll(myroll, (results) => {
+		finishRoll( results.rollId);
+	});
+   });
+
+   on('clicked:spellblocked', (info) => {
+	if (!("yes" in lang)) geti18n();
+	payload=rollEscape.unescape(info["originalRollId"]);
+   	myroll="/w gm &{template:info}{{character=" + payload["target"] +"}}{{action=" + lang["spellblocked-msg"] +"}}";
+        startRoll(myroll, (results) => {
+		finishRoll( results.rollId);
+	});
+   });
+
    on('clicked:repeating_gear:usegear', (info) => {
+	if (!("yes" in lang)) geti18n();
 	var atts=[];
 	var source=info['sourceAttribute'].split('_');
 	var sourceattr=source.pop();
@@ -4511,12 +4875,12 @@ buttonlist.forEach(button => {
 		let myname=myval[myrepeat.concat("name")];
 		let mytype=myval[myrepeat.concat("type")];
 		calcDice=rating;
-		if ( mypool != "none" ) calcDice += " + ?{" + poolname + " Pool Dice?}";
+		if ( mypool != "none" ) calcDice += " + ?{" + lang[mypool + "-pool-dice"] + "?}";
 		var myroll="&{template:item} {{item=" + myname +"}}{{myname=@{character_name}}}";
-		myroll += "{{targetnumber=[[?{Target Number?|4}]]}}";
-		if ( mypool != "none" ) myroll += "{{poolname=" + poolname + " Pool}}{{pooldice=[[?{" + poolname + " Pool Dice?|0}]]}}";
+		myroll += "{{targetnumber=[[?{" + lang["target-number"] +"?|4}]]}}";
+		if ( mypool != "none" ) myroll += "{{poolname=" + lang[mypool + "-pool"] + "}}{{pooldice=[[?{" + lang[mypool + "-pool-dice"] + "?|0}]]}}";
 		myroll += "{{rolldice=[[" + calcDice  + " ]]}}";
-		myroll += "{{result=[[ [[ " + calcDice + " ]]d6>[[?{Target Number?}]]!! ]]}}";
+		myroll += "{{result=[[ [[ " + calcDice + " ]]d6>[[?{" + lang["target-number"] +"?}]]!! ]]}}";
 		if ( ( mytype == "onetime" ) && ( qty < 1 ) ) myroll="/w gm &{template:info}{{character=@{character_name}}}{{action=You are out of  " + myname + "}}";
 		console.log(myroll);
                 startRoll(myroll, (results) => {
@@ -4531,6 +4895,7 @@ buttonlist.forEach(button => {
 			
    });
 	on('clicked:repeating_credsticks:checkcredstick', (info) => {
+		if (!("yes" in lang)) geti18n();
 		var atts=[];
 		var source=info['sourceAttribute'].split('_');
 		var sourceattr=source.pop();
@@ -4540,9 +4905,9 @@ buttonlist.forEach(button => {
    		getAttrs(atts, function(myval) {
 			let rating=parseInt(myval[myrepeat.concat("rating")]);
 			let myid=myval[myrepeat.concat("id")];
-			var myroll="&{template:item} {{item=" + myid + " credstick}}{{myname=@{character_name}}}{{poolname=Task Pool}}{{targetnumber=[[?{Verification System Rating?|4}]]}}";
-			myroll += "{{pooldice=[[?{Task Pool Dice?|0}]]}}{{rolldice=[["  + rating + " + ?{Task Pool Dice?} ]]}}";
-			myroll += "{{result=[[ [[ " + rating + " + ?{Task Pool Dice?} ]]d6>[[?{Verification System Rating?}]]!! ]]}}";
+			var myroll="&{template:item} {{item=" + myid + " credstick}}{{myname=@{character_name}}}{{poolname=" + lang["task-pool"] +"}}{{targetnumber=[[?{" + lang["verification-system-rating"]  + "?|4}]]}}";
+			myroll += "{{pooldice=[[?{" + lang["task-pool-dice"] +"?|0}]]}}{{rolldice=[["  + rating + " + ?{" + lang["task-pool-dice"] +"?} ]]}}";
+			myroll += "{{result=[[ [[ " + rating + " + ?{" + lang["task-pool-dice"] +"?} ]]d6>[[?{" + lang["verification-system-rating"]  + "?}]]!! ]]}}";
 			console.log(myroll);
                 	startRoll(myroll, (results) => {
 				updatepoolused("taskpool", results.results.pooldice.result);	
@@ -4553,6 +4918,7 @@ buttonlist.forEach(button => {
 	});
 
     	on('clicked:repeating_skills:skills', (info) => {
+		if (!("yes" in lang)) geti18n();
 		const attrlist=["skillname", "skillrating", "pool"];
 		var atts=["character_name"];
 		var source=info['sourceAttribute'].split('_');
@@ -4569,10 +4935,10 @@ buttonlist.forEach(button => {
 			const pool=mypool + "pool";
 			console.log('start roll for ' + skill);
 			var calcDice= rating;
-			if ( mypool != "none" ) calcDice += " + ?{" + poolname + " Pool Dice?}";
-			const calcTN="?{What is the Target Number?|4} + @{stun_pen} + @{wound_pen}";
+			if ( mypool != "none" ) calcDice += " + ?{" + lang[mypool + "-pool-dice"] + "?}";
+			const calcTN="?{" + lang["target-number"] +"?|4} + @{stun_pen} + @{wound_pen}";
 			var myroll="&{template:skill} {{skill=" + skill + "}}{{myname=" + myval["character_name"] +  "}}";
-			if ( mypool != "none" ) myroll += "{{pooldice=[[?{" + poolname + " Pool Dice?|0}]]}}{{poolname=" + poolname + " Pool}}";
+			if ( mypool != "none" ) myroll += "{{pooldice=[[?{" + lang[mypool + "-pool-dice"] + "?|0}]]}}{{poolname=" + lang[mypool + "-pool"] + "}}";
 			myroll +="{{targetnumber=[[ " + calcTN + " ]]}}{{rolldice=[[ " + calcDice + " ]]}}";
 			myroll += "{{result=[[ [[ " + calcDice + " ]]d6>[[{2,( " + calcTN + " )}kh1]]!!} ]]}}";
                 	startRoll(myroll, (results) => {
@@ -4583,13 +4949,14 @@ buttonlist.forEach(button => {
 		});
 	});
     	on('clicked:skilltest', (info) => {
+		if (!("yes" in lang)) geti18n();
 		    var [myskill,mypool]=info["htmlAttributes"]["id"].split(" ");
 		    var skill = myskill.charAt(0).toUpperCase() + myskill.slice(1);
 		    var pool = mypool.charAt(0).toUpperCase() + mypool.slice(1);
 		    console.log('skill: ' + myskill + ' pool: ' + mypool);
-		    const calcDice="@{" + myskill + "} + ?{" + pool + " Pool Dice?}";
-		    const calcTN="?{Target Number?|4} + @{stun_pen} + @{wound_pen}";
-                    var myroll="&{template:skill} {{myname=@{character_name}}}{{skill=" + skill  + "}}{{poolname=" + pool + " Pool}}{{pooldice=[[?{" + pool  + " Pool Dice?|0}]]}}"
+		    const calcDice="@{" + myskill + "} + ?{" + lang[mypool + "-pool-dice"] + "?}";
+		    const calcTN="?{" + lang["target-number"] +"?|4} + @{stun_pen} + @{wound_pen}";
+                    var myroll="&{template:skill} {{myname=@{character_name}}}{{skill=" + skill  + "}}{{poolname=" + lang[mypool + "-pool"] + "}}{{pooldice=[[?{" + lang[mypool  + "-pool-dice"] +"?|0}]]}}"
 		    myroll+="{{targetnumber=[[" + calcTN + "]]}}{{rolldice=[[" + calcDice + "]]}}";
 		    myroll+="{{result= [[ [[" + calcDice + "]]d6>[[{2,(" + calcTN +")}kh1]]!! ]] }}";
 		    console.log(myroll);
@@ -4599,7 +4966,7 @@ buttonlist.forEach(button => {
 			});
 	});
 
-      	var updatepoolused = function(pool, used) {
+      	const updatepoolused = function(pool, used) {
 		poolused=pool.concat("-used");
 		sets={}
 		getAttrs([poolused], function (myval) {
@@ -4611,6 +4978,7 @@ buttonlist.forEach(button => {
 
 
     	on('clicked:repeating_defensiveutils:matrixrepeatingtest clicked:repeating_offensiveutils:matrixrepeatingtest clicked:repeating_deck-utilities:matrixrepeatingtest', (info) => {
+		if (!("yes" in lang)) geti18n();
 		var atts=[];
 		var source=info['sourceAttribute'].split('_');
 		const myid=info["htmlAttributes"]["id"]
@@ -4635,22 +5003,22 @@ buttonlist.forEach(button => {
 			const myutiltarget=myval[utiltarget];
 			if ( myid == "matrixrepeatingattack" ) {
 				action = "{{action=" + myutilvalue + " Attack}}";
-				target = "{{target=@{target|Target|token_name}}}";
-				calcTN="@{deck-tn} + @{wound_pen} + @{stun_pen} +@{matrix-penalty} +?{Miscellaneous Modifiers|0}";
-				calcDice="@{decking} + ?{Hacking Pool Dice}";
+				target = "{{target=@{target|" + lang["target"] +"|token_name}}}";
+				calcTN="@{deck-tn} + @{wound_pen} + @{stun_pen} +@{matrix-penalty} +?{" + lang["miscellaneous-modifiers"] + "|0}";
+				calcDice="@{decking} + ?{" + lang["hacking-pool-dice"] + "}";
 			} else if ( myid == "matrixrepeatingexec" ) {
 				console.log('utiltarget ' + myutiltarget);
-				action="{{action=System Operation with " + myutilvalue + " Utility}}";
-				target = "{{target=@{target|Target|token_name}}}";
-				calcTN= myutiltarget + " + floor(@{target|Target|matrixalert}/2) + @{wound_pen} + @{stun_pen} +@{matrix-penalty} - " + myratingvalue;
-				calcDice="@{decking} + ?{Hacking Pool Dice}";
+				action="{{action=" + lang["system-operation-with"] + " " + myutilvalue + " }}";
+				target = "{{target=@{target|" + lang["target"] +"|token_name}}}";
+				calcTN= myutiltarget + " + floor(@{target|" + lang["target"] +"|matrixalert}/2) + @{wound_pen} + @{stun_pen} +@{matrix-penalty} - " + myratingvalue;
+				calcDice="@{decking} + ?{" + lang["hacking-pool-dice"] + "}";
 			} else {
 				action="{{action=" + myutilvalue + " Test}}";
-				target ="{{target=?{Target Number?|4}}}";
-				calcTN="?{Target Number?} + @{wound_pen} + @{stun_pen} + @{wp-matrix}"; 
-				calcDice=myratingvalue + " + ?{Hacking Pool Dice}";
+				target ="{{target=?{" + lang["target-number"] +"?|4}}}";
+				calcTN="?{" + lang["target-number"] +"?} + @{wound_pen} + @{stun_pen} + @{matrix-penalty}"; 
+				calcDice=myratingvalue + " + ?{" + lang["hacking-pool-dice"] + "}";
 			}
-                	var myroll="&{template:matrix}{{myname=@{character_name}}}{{hackingpool=[[?{Hacking Pool Dice|0}]]}}";
+                	var myroll="&{template:matrix}{{myname=@{character_name}}}{{hackingpool=[[?{" + lang["hacking-pool-dice"] + "|0}]]}}";
 			myroll+= target + action;
 		        myroll+="{{utilitylevel=" + myratingvalue + "}}" 
 			myroll+="{{rolldice=[[" + calcDice + "]]}}{{targetnumber=[[" + calcTN + "]]}}";
@@ -4664,30 +5032,49 @@ buttonlist.forEach(button => {
 
 
 	});
-        on('clicked:taric', (info) => {
+	on("clicked:setrigger", function(info) {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
-		console.log('sup dude');
+		const myid=info["htmlAttributes"]["id"]
+		var myroll="/w gm &{template:info}{{character=@{character_name}}}";
+		var designator;
+		var sets={};
+		getAttrs(["sheettype", "rigger"], function(myval) {
+			console.log(myval);
+			if ((myid == "refresh-rigger") && (myval["rigger"])) {
+				myroll+="{{action=" + lang["update-gunnery-and-control-pool"] + "}}";
+				designator="@{" + myval["rigger"];	
+			} else if (myval["sheettype"] == "Drone")  {
+				myroll+="{{action=Set " + lang["rigger"] + "}}";
+				designator="@{target|" + lang["rigger"];	
+			} else  {
+				myroll+="{{action=" + lang["set-vehicle-operator"] + "}}";
+				designator="@{target|" + lang["operator"];	
+			}
+			myroll+="{{name=[[0[" + designator + "|character_name}]]]}}";
+			myroll+="{{gunnery=[[" + designator + "|gunnery}]]}}";
+			myroll+="{{controlpool=[[" + designator + "|controlpool}]]}}";
+			console.log(myroll);
+                	startRoll(myroll, (results) => {
+				sets["rigger"]=results.results.name.expression.match(/\[(.*)\]/)[1];
+				sets["controlpool"]=results.results.controlpool.result;
+				sets["gunnery"]=results.results.gunnery.result;
+				console.log(sets);
+				finishRoll( results.rollId);
+				setAttrs(sets);
+			});
+		});
 	});
 
-
-
-        on('clicked:mytst1', (info) => {
-		console.log(info);
-		mytstfunc('sup mo fo');
-	});
-
-        var mytstfunc = function (info) {
-		console.log(info);
-
-	};
 	on("clicked:repeating_intruders:settokenname", function(info) {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		const source=info['sourceAttribute'].split('_');
 		const sourceattr=source.pop();
 		const myrepeat=source.join('_').concat('_');
 		const intrudername=myrepeat + "intrudername";
 		var sets={};
-		const myroll="/w gm &{template:info}{{character=@{character_name}}}{{action=Set Decker for Security Tally}}{{target=[[0[@{target|Icon|token_name}]]]}}";
+		const myroll="/w gm &{template:info}{{character=@{character_name}}}{{action=" + lang["set-decker-for-security-tally"] +"}}{{target=[[0[@{target|" + lang["icon"] + "|token_name}]]]}}";
 
                 startRoll(myroll, (results) => {
 			sets[intrudername]=results.results.target.expression.match(/\[(.*)\]/)[1];
@@ -4707,6 +5094,7 @@ buttonlist.forEach(button => {
 	});
 
 	on('clicked:matrixdetect', (info) => {
+		if (!("yes" in lang)) geti18n();
 		sets={};
 		console.log(info);
 		const myid=info["htmlAttributes"]["id"];
@@ -4714,10 +5102,10 @@ buttonlist.forEach(button => {
 		getAttrs(["matrixsecuritytally"], function (myval) {
 			var mytally=parseInt(myval["matrixsecuritytally"]); 
 			if ( myid == "systemdetect" ) {
-        			var myroll="&{template:matrix}{{target=@{target|Target|token_name}}}{{myname=@{character_name}}}{{action=Detection Roll}}" ;
-				myroll+="{{targetnumber=@{target|Target|deck-detection-final}}}";
+        			var myroll="&{template:matrix}{{target=@{target|" + lang["target"] +"|token_name}}}{{myname=@{character_name}}}{{action=Detection Roll}}" ;
+				myroll+="{{targetnumber=@{target|" + lang["target"] +"|deck-detection-final}}}";
 				myroll+="{{rolldice=[[@{matrixsecurityrating}]]}}";
-				myroll+="{{roll=[[@{matrixsecurityrating}d6>[[{2,(@{target|Target|deck-detection-final})}kh1]]!! ]]}}";
+				myroll+="{{roll=[[@{matrixsecurityrating}d6>[[{2,(@{target|" + lang["target"] +"|deck-detection-final})}kh1]]!! ]]}}";
 				console.log(myroll);
                 		startRoll(myroll, (results) => {
 					mytally += results.results.roll.result;
@@ -4734,6 +5122,7 @@ buttonlist.forEach(button => {
 	});
 	
 	on('clicked:repeating_intruders:detect', (info) => {
+		if (!("yes" in lang)) geti18n();
 		sets={};
 		console.log(info);
 		const myid=info["htmlAttributes"]["id"];
@@ -4767,7 +5156,8 @@ buttonlist.forEach(button => {
 	});
 	
         on('clicked:matrixresist', (info) => {
-		var payload, myid;
+		if (!("yes" in lang)) geti18n();
+		var payload, myid, attacktest, wdmg;
 	 	if ( info["htmlAttributes"]["id"] != undefined)  {
 			myid=info["htmlAttributes"]["id"];
 		} else if ( info["originalRollId"] != undefined ) {
@@ -4780,63 +5170,94 @@ buttonlist.forEach(button => {
 		if ( payload ) {
 			console.log(payload);
 			power=payload["power"];
+			wdmg=payload["wdmg"];
 			basetn=payload["basetn"];
 			attribute=payload["attribute"];
+			const myattr=attribute.split("-")[1];
 			attacktype=payload["attacktype"];
+			attacktest=payload["attacktest"];	
 			attacker=payload["attacker"];
-			if (( attacktype == "Tar Baby") || (attacktype == "Tar pit" )) {
-				calcDice="?{Utility Rating?|" + basetn  + "} + ?{Hacking Pool Dice|0}";
-				calcTN= "?{IC Rating?|" + power + "}";
-			} else {
-				calcDice="@{deck-bod-final} + ?{Hacking Pool Dice|0}";
-				calcTN= "?{Power of Attack?|" + power + "} - @{deckarmor-rating-final}";
+			calcDice="@{deck-bod-final} + ?{" + lang["hacking-pool-dice"] + "|0}";
+			calcTN= "?{" + lang["attack-power"] +"?|" + power + "}";
+			myroll+="{{finaldamage=[[0]]}}{{attackdmg=[[0]]}}{{payload=[[0]]}}";
+			if  (iclist["attack"].includes(attacktype)) calcTN += " - @{deckarmor-rating-final}";
+			if  (iclist["blackic"].includes(attacktype)) { 
+				myroll+="{{blackic=" + lang[attacktype] + "}}";
+				payload["ammotype"]=attacktype;
+	   			payload["wdmg"]=damagetable[wdmg];
+	   			payload["dodge"]=0;
+				payload["range"]="touch";
 			}
 			myroll+="{{target=" + attacker + "}}";
+			console.log('tst myattr: ' + myattr + ' lang: ' + lang[myattr]);
+			myroll+= (iclist["debuff"].includes(attacktype))? "{{debuff=" + lang[myattr] +"}}": "{{resist=yes}}";
 		} else {
-			calcTN="?{Power of Attack?|0} - @{deckarmor-rating-final}";
-			calcDice="@{deck-bod-final} + ?{Hacking Pool Dice|0}";
-			myroll+="{{target=?{Power of Attack?}}}";
+			calcTN="?{" + lang["attack-power"] +"?|0} - @{deckarmor-rating-final}";
+			calcDice="@{deck-bod-final} + ?{" + lang["hacking-pool-dice"] + "|0}";
+			myroll+="{{target=?{" + lang["attack-power"] +"?}}}";
 		}
-		myroll+="{{action=Damage Resistance Test}}";
+		myroll+="{{action=" + lang["damage-resistance-test"] + "}}";
 		myroll+="{{rolldice=[[" + calcDice + "]]}}";
 		myroll+="{{targetnumber=[[" + calcTN + "]]}}";
 		myroll+="{{utilitylevel=Armor Rating @{deckarmor-rating-final}}}"; 
-		myroll+="{{myname=@{character_name}}}{{hackingpool=[[?{Hacking Pool Dice|0}]]}}";
+		myroll+="{{myname=@{character_name}}}{{hackingpool=[[?{" + lang["hacking-pool-dice"] + "|0}]]}}";
 		myroll+="{{roll= [[ [[ " + calcDice + "]]d6>[[ {2,( " + calcTN + ")}kh1 ]]!! ]] }}";
 		console.log(myroll);
                 startRoll(myroll, (results) => {
 			updatepoolused("hackingpool", results.results.hackingpool.result);	
-			finishRoll( results.rollId);
+			if ( payload ) {
+				const resistroll=results.results.roll.result;
+				const delta=attacktest - resistroll;
+				console.log('delta: ' + delta);
+				console.log('wdmg: ' + wdmg);
+				const finaldmg=(iclist["debuff"].includes(attacktype))? calcFinalDebuff(delta) : calcFinalDmg(wdmg, delta);
+				console.log('final dmg: ' + finaldmg);
+			   	finishRoll( results.rollId,
+                		{
+					finaldamage: finaldmg,
+					payload: rollEscape.escape(payload),
+
+                		});
+
+			}
+			else finishRoll( results.rollId);
 		});
 	});
 
 const iclist = {
-	proactive: ["Crippler", "Ripper", "Killer", "Blaster", "Sparky", "Scout", "Black Ic", "Cerebropathic", "Psychotropic", "Trace"],
+	blackic: ["blackiclethal", "cerebropathic", "psychotropic", "blackicnonlethal", "deckblackhammer", "deckkilljoy"],
+	debuff: ["Crippler", "Ripper"],
+	attack: ["Killer", "Blaster", "Sparky", "blackiclethal", "cerebropathic", "psychotropic", "blackicnonlethal"],
+	proactive: ["Crippler", "Ripper", "Killer", "Blaster", "Sparky", "Scout", "blackiclethal", "cerebropathic", "psychotropic", "blackicnonlethal", "Trace"],
 	reactive: ["Probe", "Scramble", "Tar Baby", "Tar pit", "Data Bomb", "Pavlov"]
 };
 
 on('clicked:matrixattack', (info) => {
+		if (!("yes" in lang)) geti18n();
 		const myid=info["htmlAttributes"]["id"]
 		const mytitle=info["htmlAttributes"]["title"]
 		console.log(info);
-		getAttrs(["deck-systemrating", "character_name"], function (myval) {
-			var calcTN="0 + @{wound_pen} + @{stun_pen} + @{matrix-penalty} + ?{Miscellaneous Modifiers|0}";
+		getAttrs(["deck-systemrating", "character_name", "deckattacklevel"], function (myval) {
+			const myammo=(myid=="deckattack")? myval["deckattacklevel"] : myid;
+			var calcTN="0 + @{wound_pen} + @{stun_pen} + @{matrix-penalty} + ?{" + lang["miscellaneous-modifiers"] + "|0}";
 			const systemrating=myval["deck-systemrating"].toUpperCase();
-			var calcDice="@{decking} + ?{Hacking Pool Dice|0}"
+			var calcDice="@{decking} + ?{" + lang["hacking-pool-dice"] + "|0}"
 			var myaction="{{action=" + mytitle + "}}";
 			if (myid == "deckattack") myaction="{{action=Attack @{deckattacklevel}}}" 
         		var myroll="&{template:matrix}"
+			myroll+="{{roll=[[[[" + calcDice + "]]d6>[[ {2,( " + calcTN + ")}kh1]]!!]]}}";
 			myroll+= myaction;
+			myroll+="{{senddata=[[0]]}}";
+			myroll+="{{wdmg=[[0]]}}";
 			myroll+="{{rolldice=[[" + calcDice + "]]}}"
 			myroll+="{{targetnumber=[[" + calcTN + "]]}}";
-			myroll+="{{utilitylevel=[[@{" + myid  + "-rating-final}]]}}" 
-			myroll+="{{senddata=[[0]]}}";
-			myroll+="{{iconstatus=[[@{target|Target|iconstatuscode}]]}}";
 			if  ( systemrating == "UNKNOWN" )  myroll+="{{systemrating=[[@{target|Host|matrixsecuritynumber}]]}}";
 			else  myroll+="{{systemrating=[[" + matrixtn[systemrating]["secrating"]  + "]]}}";
-			myroll+="{{myname=@{character_name}}} {{target=@{target|Target|token_name}}}{{hackingpool=[[?{Hacking Pool Dice|0}]]}}";
+			myroll+="{{iconstatus=[[@{target|" + lang["target"] +"|iconstatuscode}]]}}";
+			myroll+="{{myname=@{character_name}}} {{target=@{target|" + lang["target"] +"|token_name}}}{{hackingpool=[[?{" + lang["hacking-pool-dice"] + "|0}]]}}";
 			myroll+="{{utilitylevel=@{deckattack-rating-final}}}"; 
-			myroll+="{{roll= [[ [[ " + calcDice + "]]d6>[[ {2,( " + calcTN + ")}kh1 ]]!! ]] }}";
+			myroll+="{{utilitylevel=[[@{" + myid  + "-rating-final}]]}}" 
+			myroll+="{{hackingpool=[[?{" + lang["hacking-pool-dice"] + "}]]}}" 
 			console.log(myroll);
                 	startRoll(myroll, (results) => {
 				if ( results.results.iconstatus.result == 0)  myicon="Legitimate";
@@ -4845,43 +5266,72 @@ on('clicked:matrixattack', (info) => {
 				const mysystem=matrixsecnumber[results.results.systemrating.result];
 				const myhosttn=matrixtn[mysystem][myicon];
 				finaltn += myhosttn;
+				console.log('final tn: ' + finaltn);
 				const finaldice = (results.results.roll.dice.filter(mydice=> mydice >= finaltn )).length;
+				console.log('dice : ' + results.results.roll.dice);
+				console.log('finaldice : ' + finaldice);
 				updatepoolused("hackingpool", results.results.hackingpool.result);	
+				const mydamage=(myid=="deckattack")? damagetable[myval["deckattacklevel"]] : matrixtn[mysystem]["wdmg"];
 				let payload= {
+					ammotype: myammo,
+					wdmg: mydamage,
 					attacker: myval["character_name"],
+					attacktest: finaldice,
 					power: results.results.utilitylevel.result,
-					attacktype: "cybercombat",
+					attacktype: myammo,
 					attribute: "deck-bod-final"
 				}
 			   	finishRoll( results.rollId,
                 		{
+					wdmg: damagetable[mydamage],
 					senddata: rollEscape.escape(payload),
                     			targetnumber: finaltn,
 					roll: finaldice,
+					finalroll: finaldice,
                 		});
 			});
 	        });
 	});
         on('clicked:matrixmedic', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		const myid=info["htmlAttributes"]["id"]
 		const mytitle=info["htmlAttributes"]["title"]
-		var calcTN="?{Wound Level?|Light,4|Moderate,5|Serious,6}";
-		var calcDice="@{deckmedic-rating-final}" 
-        	var myroll="&{template:matrix}"
-		myroll+="{{action=Medic Utility}}" 
-		myroll+="{{rolldice=[[" + calcDice + "]]}}"
-		myroll+="{{targetnumber=[[" + calcTN + "]]}}";
-		myroll+="{{myname=@{character_name}}}{{target=?{Wound Level?} Damage}}{{hackingpool=Not Available}}"
-		myroll+="{{utilitylevel=@{deckmedic-rating-final}}}" 
-		myroll+="{{roll= [[ [[ " + calcDice + "]]d6>[[ {2,( " + calcTN + ")}kh1 ]]!! ]] }}"
-		console.log(myroll);
-                startRoll(myroll, (results) => {
-			finishRoll( results.rollId);
+		getAttrs(["matrix-damage", "matrix-penalty", "deckmedic-rating-final"], function(myval) { 
+			const pentn=parseInt(myval["matrix-penalty"]) + 3;	
+			const dmg=myval["matrix-damage"];	
+			var medicrating=parseInt(myval["deckmedic-rating-final"]);
+			var calcTN=pentn;
+			var calcDice=medicrating + " + ?{" + lang["hacking-pool-dice"] + "|0}"
+        		var myroll="&{template:matrix}"
+			myroll+="{{action=Medic Utility}}" 
+			myroll+="{{matrixdmg=[[" + dmg + "]]}}";
+			myroll+="{{rolldice=[[" + calcDice + "]]}}"
+			myroll+="{{targetnumber=[[" + calcTN + "]]}}";
+			myroll+="{{myname=@{character_name}}}{{target=" + pentn +"}}";
+			myroll+="{{utilitylevel=@{deckmedic-rating-final}}}" 
+			myroll+="{{roll= [[ [[ " + calcDice + "]]d6>[[ {2,( " + calcTN + ")}kh1 ]]!! ]] }}"
+			myroll+="{{hackingpool=[[?{" + lang["hacking-pool-dice"] + "}]]}}" 
+			console.log(myroll);
+                	startRoll(myroll, (results) => {
+				sets={};
+				updatepoolused("hackingpool", results.results.hackingpool.result);	
+				medicrating -= 1;
+				var finaldmg = dmg - results.results.roll.result;
+				finaldmg = (finaldmg < 1 )? 0: finaldmg;
+				sets["matrix-damage"]=finaldmg;
+				sets["deckmedic-rating-final"]=medicrating;
+				setAttrs(sets);
+			   	finishRoll( results.rollId,
+                		{
+                    			matrixdmg: finaldmg, 
+                		});
+			});
 		});
 	});
 
     	on('clicked:swapmemory clicked:repeating_defensiveutils:swapmemory clicked:repeating_offensiveutils:swapmemory clicked:repeating_deck-utilities:swapmemory', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		var sets={};
 		var atts=[];
@@ -4911,7 +5361,7 @@ on('clicked:matrixattack', (info) => {
 			if ( myutil == null ) myutil=myval[myrepeat + "utility"];
 			console.log(sets);
 			setAttrs(sets);
-			myroll="&{template:info}{{character=@{character_name}}}{{action=Swap Memory}}{{type=Simple}}{{info1=Reloading Utility " + myutil + " into Memory}}";
+			myroll="&{template:info}{{character=@{character_name}}}{{action=" + lang["swap-memory"] + "}}{{type=" + lang["simple"] + "}}{{info1=Reloading Utility " + myutil + " into Memory}}";
                 	startRoll(myroll, (results) => {
 				finishRoll( results.rollId);
 			});
@@ -4919,6 +5369,7 @@ on('clicked:matrixattack', (info) => {
 	});
 
     	on('clicked:matrixtest', (info) => {
+		if (!("yes" in lang)) geti18n();
 		var atts=[];
 		if ( info['sourceAttribute'] ) console.log(' got ' + info['sourceAttribute'] );
 		/* var source=info['sourceAttribute'].split('_');
@@ -4927,9 +5378,9 @@ on('clicked:matrixattack', (info) => {
 		console.log(info);
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
-		var calcTN="?{Target Number?} + @{wp-matrix}"; 
-		var calcDice="@{" + myid + "} + ?{Hacking Pool Dice}"
-                var myroll="&{template:matrix}{{myname=@{character_name}}}{{target=?{Target Number?|4}}}{{hackingpool=[[?{Hacking Pool Dice|0}]]}}"
+		var calcTN="?{" + lang["target-number"] +"?} + @{wp-matrix}"; 
+		var calcDice="@{" + myid + "} + ?{" + lang["hacking-pool-dice"] + "}"
+                var myroll="&{template:matrix}{{myname=@{character_name}}}{{target=?{" + lang["target-number"] +"?|4}}}{{hackingpool=[[?{" + lang["hacking-pool-dice"] + "|0}]]}}"
 		myroll+= "{{action=" + mytitle + "}}{{rolldice=[[" + calcDice + "]]}}{{targetnumber=[[" + calcTN + "]]}}";
 		myroll+= "{{roll= [[ [[ " + calcDice + "]]d6>[[{2,(" + calcTN + ")}kh1]]!!]] }}"
                 startRoll(myroll, (results) => {
@@ -4940,26 +5391,70 @@ on('clicked:matrixattack', (info) => {
 	});
 
     	on('clicked:matrixmaneuvers', (info) => {
-		const mytitle=info["htmlAttributes"]["title"]
-		const myid=info["htmlAttributes"]["id"]
-		var myutil="@{deckcloak-rating-final}";
-		var myatt="deck-evasion-final";
-		if ( mytitle == "Evade Detection" ) myatt = "deck-sensors-final";
-                if ( mytitle == "Parry Attack" ) myutil = "@{decklockon-rating-final}";
-                if ( mytitle == "Sensor Test" ) myutil = "@{decklockon-rating-final}";
-		var calcTN="@{target|Target|" + myatt + "} + @{wp-matrix} +?{Miscellaneous Modifiers|0} - " + myutil;
-		var calcDice="@{decking} + ?{Hacking Pool Dice}"
-                var myroll="&{template:matrix}{{myname=@{character_name}}}{{target=@{target|Target|token_name}}}{{hackingpool=[[?{Hacking Pool Dice|0}]]}}"
-		myroll+="{{rolldice=[[" + calcDice + "]]}}{{targetnumber=[[" + calcTN + "]]}}";
-		myroll+="{{action=" + mytitle + "}}"
-		myroll+="{{roll= [[ [[" + calcDice + "]]d6>[[ {2,(" + calcTN + ")}kh1]]!! ]] }}"
-		myroll+="{{detect=[Detect](~@{target|Target|token_name}|detection)}}"
-                startRoll(myroll, (results) => {
-			updatepoolused("hackingpool", results.results.hackingpool.result);	
-			finishRoll( results.rollId);
+		if (!("yes" in lang)) geti18n();
+		atts=["character_name", "deck-evasion-final", "deck-sensors-final", "decklockon-rating-final", "deckcloak-rating-final", "wp-matrix", "decking"];
+		getAttrs(atts, function(myval) {
+			const myid=info["htmlAttributes"]["id"]
+			var mytitle=info["htmlAttributes"]["title"]
+			const evasion=myval["deck-evasion-final"];
+			const sensors=myval["deck-sensors-final"];
+			const cloak=myval["deckcloak-rating-final"];
+			const lockon=myval["decklockon-rating-final"];
+			const wpmatrix=myval["wp-matrix"];
+			const decking=myval["decking"];
+			if ( info["originalRollId"] != undefined ) var payload=rollEscape.unescape(info["originalRollId"]);
+			var calcDice=evasion + " + ?{" + lang["hacking-pool-dice"] + "}";
+			var calcTN="@{target|" + lang["target"] +"|deck-sensors-final} + " + wpmatrix + " +?{" + lang["miscellaneous-modifiers"] + "|0} - " + cloak;
+			if (payload != null ) {
+				console.log('payload');
+				console.log(payload);
+				mytitle=payload["attacktype"];
+				calcDice=sensors + " + ?{" + lang["hacking-pool-dice"] + "}";
+				calcTN="@{target|" + lang["target"] +"|deck-evasion-final} + " + wpmatrix + " +?{" + lang["miscellaneous-modifiers"] + "|0} - " + lockon;
+			} 
+                	var myroll="&{template:matrix}";
+			if (payload == null) myroll+="{{senddata2=[[0]]}}";
+			else myroll+="{{testresult=[[0]]}}{{winner=[[0]]}}";
+			myroll+="{{mytoken=[[0[@{selected|token_name}]]]}}";
+			myroll+="{{myname=@{selected|token_name}}}";
+			myroll+="{{target=@{target|" + lang["target"] +"|token_name}}}{{hackingpool=[[?{" + lang["hacking-pool-dice"] + "|0}]]}}";
+			myroll+="{{rolldice=[[" + calcDice + "]]}}{{targetnumber=[[" + calcTN + "]]}}";
+			myroll+="{{action=" + mytitle + "}}";
+			myroll+="{{targetname=@{target|" + lang["target"] + "|character_name}}}";
+			myroll+="{{roll= [[ [[" + calcDice + "]]d6>[[ {2,(" + calcTN + ")}kh1]]!! ]] }}";
+			console.log(myroll);
+                	startRoll(myroll, (results) => {
+				const mytoken=results.results.mytoken.expression.match(/\[(.*)\]/)[1];
+				updatepoolused("hackingpool", results.results.hackingpool.result);	
+				if ( payload == null) {  
+					payload={
+						successes: results.results.roll.result, 
+						attacker: mytoken,
+						attacktype: mytitle + " Oppose"
+					};
+					finishRoll( results.rollId,
+                			{ 
+						senddata2: rollEscape.escape(payload), 
+					});
+				} else {
+					console.log('payload success is ' + payload["successes"]);
+					var delta = payload["successes"] - results.results.roll.result;
+					console.log('delta is ' + delta);
+					const mywinner=(delta > 0)? payload["attacker"]: (delta < 0)? mytoken : "none";
+					console.log('winner is ' + mywinner);
+					delta=(delta < 0)? (delta * -1) : delta;
+					console.log('delta is ' + delta);
+					finishRoll( results.rollId,
+                			{ 
+						testresult: delta, 
+						winner: mywinner, 
+					});
+				}
+			});
 		});
 	});
 	on('clicked:adeptpower', (info) => {
+		if (!("yes" in lang)) geti18n();
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
 		const uppermyid=myid.charAt(0).toUpperCase() + myid.slice(1);
@@ -4979,13 +5474,12 @@ on('clicked:matrixattack', (info) => {
 			console.log('2x: ' + my2x);
 			console.log('Drain: ' + drainlvl);
 		
-			var calcDice="@{magic} + ?{Spell Pool Dice}";
+			var calcDice="@{magic}";
 			var calcTN="ceil(@{" + myid + "}/2 )";
 			var calcDrainTN="ceil((@{" + myid + "} + @{adept" + myid + "boost} ) /2 )";
-			var calcDrainDice="@{willpower|max} + ?{Drain Pool Dice}";
+			var calcDrainDice="@{willpower|max}";
 
 			var myroll="&{template:adept}{{myname=@{character_name}}}";
-			myroll+="{{spellpool=[[?{Spell Pool Dice|0} + ?{Drain Pool Dice|0}]]}}";
 			myroll+="{{rolldice=[[" + calcDice + "]]}}";
 			myroll+="{{targetnumber=[[" + calcTN + "]]}}";
 			myroll+="{{targetofspell=@{" + uppermyid + "}}}";
@@ -5013,13 +5507,14 @@ on('clicked:matrixattack', (info) => {
 		atts["combatpool-used"]=0; 
 		atts["spellpool-used"]=0;
 		atts["sorcery-used"]=0;
-		atts["spelldefense-used"]=0;
+		atts["spelldefensedice-used"]=0;
 		atts["taskpool-used"]=0;
 		setAttrs(atts);
 	};
 
 	on('clicked:repeating_spells:cast', (info) => {
-		var atts=["magic", "spellpool-used", "sorcery-used"];
+		if (!("yes" in lang)) geti18n();
+		var atts=["character_name", "magic", "spellpool-used", "sorcery-used", "astralstate"];
 		var source=info['sourceAttribute'].split('_');
 		const myid=info["htmlAttributes"]["id"]
 		var sourceattr=source.pop();
@@ -5034,6 +5529,8 @@ on('clicked:matrixattack', (info) => {
 			console.log('vals');
 			console.log(myval);
 			const magic=myval["magic"];
+			const myname=myval["character_name"];
+			const plane=(myval["astralstate"]=="astral-projection")? "astral" : "physical";
 			const range=myval[myrepeat + "range"];
 			const spellcat=myval[myrepeat + "spellcategory"];
 			const force=myval[myrepeat + "force"];
@@ -5045,18 +5542,19 @@ on('clicked:matrixattack', (info) => {
 			const name=myval[myrepeat + "name"];
 			const description=myval[myrepeat + "description"];
 			const damage=myval[myrepeat + "damage"];
-			var resistattr;
+			var resistattr, resisttype;
 			var targetofspell=target;
 			if  (target.includes("@{target")) { 
-				targetofspell="@{target|Target|token_name}";
+				targetofspell="@{target|" + lang["target"] +"|token_name}";
 				resistattr=target.split("|")[2];
 			}
-			var myroll="&{template:spell}{{myname=@{character_name}}}";
+			var myroll="&{template:spell}";
 			if ( range == "AoE" ) {
 				targetofspell="AoE";
 				if ( spellcat == "Elemental" ) {
 					calcTN = "4 + @{rangedTN} + (2*(@{spellstack}+@{spellsus})) +@{spellmisc} + @{move}";
 					myroll+="{{targetnumber=[[" + calcTN + "]] + Cover & Target Movement}}";
+					resisttype="resistroll";
 				} else {
 					if ( resistattr != null )  {
 						calcTN= " (2*(@{spellstack}+@{spellsus})) + @{spellmisc} + @{stun_pen} + @{wound_pen} + @{rangedvizTN}";
@@ -5065,96 +5563,150 @@ on('clicked:matrixattack', (info) => {
 						calcTN= target + " + (2*(@{spellstack}+@{spellsus})) + @{spellmisc} + @{stun_pen} + @{wound_pen} + @{rangedvizTN}";
 						myroll+="{{targetnumber=[[" + calcTN + "]] + Cover}}";
 					}
+					resisttype="resistspell";
 				}
 
 			} else {
 				if ( spellcat == "Elemental" ) {
 					calcTN = target + " + 4 + @{rangedTN} + (2*(@{spellstack}+@{spellsus})) +@{spellmisc} + @{move}";
-					myroll+="{{targetnumber=[[" + calcTN + "]]}}";
+					myroll+="{{targetnumber=[[" + calcTN + "]]}}{{dodge=yes}}";
+					resisttype="resistroll";
 				} else {
 					calcTN= target + " + (2*(@{spellstack}+@{spellsus})) + @{spellmisc} + @{stun_pen} + @{wound_pen} + @{rangedvizTN} + @{cover}";
 					myroll+="{{targetnumber=[[" + calcTN + "]]}}";
+					resisttype="resistspell";
 				}
 
 			}
-			var calcDice="?{Sorcery Dice?} + ?{Spell Pool Dice?}";
-			var calcDrainTN="floor(?{Force?}/2) + " + drain + " + ( 2 * @{spellsus} )";
-			var calcDrainDice="@{willpower|max} + ?{Sorcery Dice for Drain?} + ?{Spell Pool Dice for Drain?}";
-			myroll+="{{draindamage=[[0]]}}";
-			myroll+="{{sorcerydice=[[?{Sorcery Dice?|@{spellcasting}} + ?{Sorcery Dice for Drain?|0}]]}}";
-			myroll+="{{spellpool=[[?{Spell Pool Dice?|0} + ?{Spell Pool Dice for Drain?|0}]]}}";
-			myroll+="{{spellname=" + name + "}}";
-			myroll+="{{description=" + description +"}}";
+			var calcDice="?{" + lang["sorcery-dice"] +"?} + ?{"+ lang["spell-pool-dice"] +"?}";
+			var calcDrainTN="floor(?{" + lang["force"] + "?}/2) + " + drain + " + ( 2 * @{spellsus} )";
+			var calcDrainDice="@{willpower|max} + ?{" + lang["sorcery-dice-for-drain"] + "?} + ?{"+ lang["spell-pool-dice-for-drain"] +"?}";
+			myroll+="{{senddata=[[0]]}}";
+			myroll+="{{draindamage=[[0]]}}{{finaldrain=[[0]]}}";
+			myroll+="{{cast=[[0]]}}{{draintnfinal=[[0]]}}";
+			myroll+="{{sorcerydice=[[?{"+ lang["sorcery-dice"] +"?|@{spellcasting}} + ?{" + lang["sorcery-dice-for-drain"] + "?|0}]]}}";
+			myroll+="{{spellpool=[[?{"+ lang["spell-pool-dice"] +"?|0} + ?{"+ lang["spell-pool-dice-for-drain"] +"?|0}]]}}";
 			myroll+="{{spelldamage=[[" + damage + "]]}}"
-			myroll+="{{castforce=?{Force?|" + force + "}}}";
-			myroll+="{{targetofspell=" + targetofspell + "}}";
+			myroll+="{{castforce=[[?{" + lang["force"] + "?|" + force + "}]]}}";
 			myroll+="{{rolldice=[[" + calcDice + "]]}}";
-			myroll+="{{draintest= [[ [[" + calcDrainDice + "]]d6>[[ {2, ( " + calcDrainTN + ")}kh1 ]]!! ]] }}";
+			myroll+="{{draintest=[[[[" + calcDrainDice + "]]d6>[[ {2, ( " + calcDrainTN + ")}kh1]]!!]]}}";
 			if ( range == "AoE" ) {
-				myroll+="{{cast=[[0]]}}";
 				myroll+="{{roll=[[ [[" + calcDice + "]]d6>[[" + calcTN + "]]!! ]] }}";
 			} else {
+				myroll+="{{targetname=[[0[@{target|" + lang["target"] +"|token_name}]]]}}";
 				myroll+="{{casttest=[[ [[" + calcDice + "]]d6>[[{2,(" + calcTN + ")}kh1]]!! ]] }}";
 			}
+			myroll+="{{resisttype=" + resisttype + "}}";
+			myroll+="{{targetofspell=" + targetofspell + "}}";
+			myroll+="{{draintn=[[ " + calcDrainTN + "]]}}";
+			myroll+="{{spellname=" + name + "}}";
+			myroll+="{{description=" + description +"}}";
+			myroll+="{{myname=@{character_name}}}";
 			if (target.includes("@{target"))  {
 				console.log('attr split: ' + resistattr);
-				myroll += "{{spelldefense=[Spell Defense](~selected|spelldefense)}}";
 				if ( range != "AoE" ) {
-					if (spellcat == "Elemental" ) myroll += "{{resistspell=[Resist Spell with 1/2 Impact ](~@{target|Target|character_name}|resist-impact-half)}}";
-					else if ( resistattr == "force" ) myroll += "{{resistspell=[Resist Spell with force](~@{target|Target|character_name}|attrib-force)}}";
-					else myroll += "{{resistspell=[Resist Spell](~@{target|Target|character_name}|attrib-" + resistattr  +"-max)}}";
+					myroll += "{{spelldefense=[" + lang["spell-defense"] + "](~selected|spelldefense)}}";
+					if (spellcat == "Elemental" ) myroll += "{{resistspell=[" + lang["resist-spell"] + "](~@{target|" + lang["target"] +"|character_name}|resist-impact-half)}}";
+					else if ( resistattr == "force" ) myroll += "{{resistspell=[" + lang["resist-spell"] + "](~@{target|" + lang["target"] +"|character_name}|attrib-force)}}";
+					else myroll += "{{resistspell=[" + lang["resist-spell"] + "](~@{target|" + lang["target"] +"|character_name}|attrib-" + resistattr  +"-max)}}";
 
 				} else {
-					if ( spellcat == "Elemental" ) myroll += "{{resistspell=[Resist Spell with 1/2 Impact ](~selected|resist-impact-half)}}"
-					else if ( resistattr == "force" ) myroll += "{{resistspell=[Resist Spell with force](~selected|attrib-force)}}"
-					else  myroll += "{{resistspell=[Resist Spell](~selected|attrib-" + resistattr  +"-max)}}"
+					if ( spellcat == "Elemental" ) myroll += "{{resistspell=[" + lang["resist-spell"] + " ](~selected|resist-impact-half)}}"
+					else if ( resistattr == "force" ) myroll += "{{resistspell=[" + lang["resist-spell"] + "](~selected|attrib-force)}}"
+					else  myroll += "{{resistspell=[" + lang["resist-spell"] + "](~selected|resistspell||}}"
 
 				}
 			}
 			console.log(myroll);
+			payload={
+				wdmg: damage,
+				rounds: 1,
+				ammotype: spellcat.toLowerCase(),
+				dodge: 0,
+				armortype: "impact",
+				plane: plane,
+				attacker: myname,
+				range: range,
+				attribute: resistattr,
+				weapon: name
+			}
                 	startRoll(myroll, (results) => {
 				atts=[];
 				console.log(results.results.spelldamage.result);
-				const finaldmg=damagetable[results.results.spelldamage.result];
-				var draindmg;
-				var finalcast;
+				const finaldmg=payload["wdmg"]=damagetable[results.results.spelldamage.result];
+				payload["targetnumber"]=results.results.targetnumber.result;
+				var draindmg, finalcast;
+				var draintn=results.results.draintn.result;
+				console.log('draintn before: ' + draintn);
 				if (drainlvl.includes("dmglvl")) {
 					let dmglvl=parseInt(results.results.spelldamage.result);
 					draindmg=eval(drainlvl);
+					draintn += ( draindmg > 4 )?  2*(draindmg - 4) : 0;
 					console.log('drdmg calc: ' + draindmg);
-					var dmgmax=4;
-					var dmgmin=1;
-					if (draindmg >= 10) dmgmax=13;
-					if (draindmg >= 10) dmgmin=10;
-					if (draindmg > dmgmax) draindmg=dmgmax;
-					if (draindmg < dmgmin) draindmg=dmgmin;
 
 				} else {
+					console.log('drain straight');
 					draindmg = parseInt(drainlvl);
 					console.log('drdmg stright: ' + damagetable[draindmg]);
 				}
+				console.log('draintn after: ' + draintn);
+				console.log('drain damage base ' + draindmg);
+				var dmgmax=4;
+				var dmgmin=0;
+				if (draindmg > dmgmax) draindmg=dmgmax;
+				if (draindmg < dmgmin) draindmg=dmgmin;
+				console.log('dmgmin ' + dmgmin + ' dmgmax ' + dmgmax);
 				/* set drain damage to stun damage if force of spell is less than magic rating*/
-				if ( (draindmg < 10 ) && ( force <= magic  )) draindmg = draindmg + 9;
+				const finalforce = payload["power"] = results.results.castforce.result
+				if ( (draindmg < 10 ) && ( finalforce <= magic  )) {
+					draindmg = draindmg + 9;
+					dmgmax=13;
+					dmgmin=9;
+				} 
 				/* set drain damage to physical damage if force of spell is greater than magic rating*/
-				if ( (draindmg >= 10 ) && ( force > magic  )) draindmg = draindmg - 9;
+				if ( (draindmg >= 10 ) && ( finalforce > magic  )) {
+					draindmg = draindmg - 9;
+					dmgmax=4;
+					dmgmin=0;
+				}
+				const draintest=results.results.draintest.dice;
+				const finaldraintest = (results.results.draintest.dice.filter(mydice=> mydice >= draintn )).length;
+				var drainstaged=draindmg - Math.floor(finaldraintest/2);
+				console.log(' drain staged ' + drainstaged);
+				drainstaged=(drainstaged < dmgmin)? dmgmin :(drainstaged > dmgmax)? dmgmax : drainstaged;
+				console.log(' drain staged check min/max ' + drainstaged);
+				myfinaldrain=damagetable[drainstaged];
 				draindmg=damagetable[draindmg];
 				console.log('drdmg : ' + draindmg);
+				console.log('finaldrain : ' + myfinaldrain);
+				console.log('finaldrain test : ' + finaldraintest);
 				atts["sorcery-used"]= sorceryused + parseInt(results.results.sorcerydice.result);
 				atts["spellpool-used"]= spused + parseInt(results.results.spellpool.result);
-				console.log('finalcast: ' + finalcast);
 				if ( range == "AoE" )  { 
-					finalcast=results.results.roll.dice;
+					finalcast=payload["attackdice"]=results.results.roll.dice;
+					console.log('finalcast ' + finalcast);
+					payload["attacktest"]=0;
 					finishRoll( results.rollId,
                 				{
+                    				draintest: finaldraintest,
                     				spelldamage: finaldmg,
                     				draindamage: draindmg,
+                    				finaldrain: myfinaldrain,
                     				cast: finalcast,
+                    				draintnfinal: draintn,
+						senddata: rollEscape.escape(payload),
                 			});
 				} else  { 
-					finishRoll( results.rollId,
-                				{
+					payload["target"]=results.results.targetname.expression.match(/\[(.*)\]/)[1];
+					payload["attacktest"]=results.results.casttest.result;
+					payload["attackdice"]=results.results.casttest.dice;
+					finishRoll( results.rollId, {
+						senddata: rollEscape.escape(payload),
+                    				draintest: finaldraintest,
                     				spelldamage: finaldmg,
+                    				finaldrain: myfinaldrain,
                     				draindamage: draindmg,
+                    				draintnfinal: draintn,
                 			});
 
 				}
@@ -5164,7 +5716,22 @@ on('clicked:matrixattack', (info) => {
 		});
 	});
 
+	const calcFinalDebuff = function(delta) {
+		delta=floor(delta/2);	
+		return debuff=(delta <= 0)? 0 : delta;
+	};
+
+	const calcFinalDmg = function(dmgstart, resist) {
+		const dmgmax=(dmgstart >= 10)? 13 : 4;
+		const dmgmin=(dmgstart >= 10)? 9 : 0;
+		var dmgstaged=dmgstart + floor(resist/2);
+		console.log('dmgstaged: ' + dmgstaged);
+		dmgstaged = (dmgstaged > dmgmax)? dmgmax : (dmgstaged < dmgmin)? dmgmin : dmgstaged;
+		return(damagetable[dmgstaged]);
+	};
+
    var initiative = function (init, reaction, dmgpen, mytitle, character) {
+		if (!("yes" in lang)) geti18n();
        console.log('init ' + init + ' reaction ' + reaction + ' dmgpen ' + dmgpen + ' mytitle ' + mytitle + ' character ' + character );
         penatts=["stun_pen", "wound_pen", "matrix-penalty", "vehicle-penalty", "rccommand-penalty", "rcsimsense-penalty", "rcsystem-penalty"];
         getAttrs(penatts, function (myval) { 
@@ -5200,6 +5767,7 @@ on('clicked:matrixattack', (info) => {
 
 
 	on('clicked:repeating_ic:init', (info) => {
+		if (!("yes" in lang)) geti18n();
 		gets=[];
 		var source=info['sourceAttribute'].split('_');
 		var sourceattr=source.pop();
@@ -5222,6 +5790,7 @@ on('clicked:matrixattack', (info) => {
 	});
 
     	on('clicked:init', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
@@ -5239,7 +5808,7 @@ on('clicked:matrixattack', (info) => {
 		} else if ( myid == "matrixinit" ) {
 			init="@{deck-initiative}";
 			reaction="@{deck-reaction-final}";
-			var dmgpen=" - ( @{wp-char} + @{wp-matrix})";
+			var dmgpen=" - ( @{wp-char} + @{matrix-penalty})";
 		} else if ( myid == "vehicleinit" ) {
 			init="(@{vehicle-driver}initiative} + @{vehicle-initbonus})";
 			reaction="@{vehicle-driver}reaction} + @{vehicle-reactbonus}";
@@ -5257,6 +5826,7 @@ on('clicked:matrixattack', (info) => {
  	});
 
 	on('clicked:endturn', (info) => {
+		if (!("yes" in lang)) geti18n();
         	var myroll="&{template:init} {{character=@{character_name}}}{{type=End Combat Pass}}"
 		myroll += "{{setinit=[[10 &{tracker:-}]]}}"
 		console.log(myroll);
@@ -5266,14 +5836,16 @@ on('clicked:matrixattack', (info) => {
 		});
 	});
 
+
 	on('clicked:resistbanish', (info) => {
+		if (!("yes" in lang)) geti18n();
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
 	        var calcDice= "@{force}";
-		calcTN="@{target|Target|magic}";
-		var myroll="&{template:spell}{{myname=@{character_name}}}";
-		myroll+="{{targetofspell=@{target|Target|character_name}}}";
-		myroll+="{{spellname=Resist Banish}}";
+		calcTN="@{target|" + lang["target"] +"|magic}";
+		var myroll="&{template:conjure}{{myname=@{character_name}}}";
+		myroll+="{{targetofspell=@{target|" + lang["target"] +"|character_name}}}";
+		myroll+="{{spellname=" + lang["resist-banish"] + "}}";
 		myroll+="{{rolldice=[[" + calcDice + "]]}}";
 		myroll+="{{targetnumber=[[" + calcTN + "]]}}";
 		myroll+="{{casttest=[[ [[" + calcDice + "]]d6>[[{2,(" + calcTN + ")}kh1]]!! ]] }}";
@@ -5287,39 +5859,53 @@ on('clicked:matrixattack', (info) => {
 	}
 
 	const ammomods = { 
-		regular: { armor: "ballistic", av: 0, power: 0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1 , amsg: ""},
-		adps: { armor: "Math.floor(ballistic * 0.5)", av: 0, power: 0, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 0.5, knockdown: 1, amsg: "" },
-		explosive: { armor: "ballistic", av: 0, power: 1, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
-		explosive2: { armor: "ballistic", av: 0, power: 2, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
-		flechette: { armor: "(Math.max(ballistic, (impact * 2)))", av: -0.5, power: 0, rpower:0, dmg:0, rdmg: "(dermalarmor==1)? 0 :((ballistic + impact) ==0)? 1 : 0;", recoil: 1, barrier: 2, knockdown: 1, amsg: "Final Damage Level depends on Armor" },
-		gel: { armor: "impact", av: 0, power: -2, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 2, amsg: "" },
-		tracer: { armor: "ballistic", av: 0, power: 0, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
-		av: { armor: "Math.floor(ballistic * 0.5)", av: 1, power: 0, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 0.5, knockdown: 1, amsg: "" },
-		capsule: { armor: "impact", av: 0, power: -2, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
-		glazer: { armor: "Math.max((ballistic * 2), (impact * 2))", av: -0.5, power: 2, rpower:0, dmg:0, rdmg: "((ballistic + impact) ==0)? 1 : 0;", recoil: 1, barrier: 2, knockdown: 1, amsg: "Final Damage Level depends on Armor" },
-		hic: { armor: "Math.max(ballistic,impact)", av: 0, power: "(range==6)? -1 : (range==9)? -1", rpower:0, dmg: 0, rdmg:0, recoil: 2, barrier: 1, knockdown: 1, amsg: "" },
-		hpoint: { armor: "ballistic + impact", av: 0, power:0, rpower: "((ballistic + impact ==0)? 3 : 1", dmg: 0, rdmg:0, recoil: 2, barrier: 1, knockdown: 1, amsg: "Final Power Rating depends on Armor" },
-		incendiary: { armor: "ballistic", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
-		mercury: { armor: "Math.max((ballistic * 2), (impact * 2))", av: -0.5, power: 0, rpower: 0, dmg: 0, rdmg: "((ballistic + impact) ==0)? 1 : 0;", recoil: 1, barrier: 2, knockdown: 1, amsg: "Final Damage Level depends on Armor" },
-		tracker: { armor: "ballistic", av: 0, power: 0, rpower: 0, dmg: 0, rdmg: 0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" }
+		deckblackhammer: { armorname: "'hardening'", armor: "hardening", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		deckkilljoy: { armorname: "'hardening'", armor: "hardening", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:9, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		blackiclethal: { armorname: "'hardening'", armor: "hardening", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		blackicnonlethal: { armorname: "'hardening'", armor: "hardening", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:9, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		cerebropathic: { armorname: "'hardening'", armor: "hardening", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		psychotropic: { armorname: "'hardening'", armor: "hardening", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		d: { armorname: "'impact'", armor: "impact", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		c: { armorname: "'impact'", armor: "impact", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		o: { armorname: "'impact'", armor: "impact", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		elemental: { armorname: "'half impact'", armor: "Math.floor(impact/2)", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		melee: { armorname: "'impact'", armor: "impact", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 0, barrier: 0, knockdown: 0 , amsg: ""},
+		regular: { armorname: "'ballistic'", armor: "ballistic", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1 , amsg: ""},
+		adps: { armorname: "'half Ballistic'", armor: "Math.floor(ballistic * 0.5)", av: 0, power: 0, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 0.5, knockdown: 1, amsg: "" },
+		explosive: { armorname: "'ballistic'", armor: "ballistic", av: 0, power: 1, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
+		explosive2: { armorname: "'ballistic'", armor: "ballistic", av: 0, power: 2, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
+		flechette: { armorname: "(ballistic >(2*impact))? 'ballistic' : 'impact';", armor: "(Math.max(ballistic, (impact * 2)))", av: -0.5, power: 0, rpower:0, dmg:0, rdmg: "(armoron == 0)? 1 : 0;", recoil: 1, barrier: 2, knockdown: 1, amsg: "Final Damage Level depends on Armor" },
+		gel: { armorname: "'impact'", armor: "impact", av: 0, power: -2, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 2, amsg: "" },
+		tracer: { armorname: "'ballistic'", armor: "ballistic", av: 0, power: 0, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
+		av: { armorname: "'half Ballistic'", armor: "Math.floor(ballistic * 0.5)", av: 1, power: 0, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 0.5, knockdown: 1, amsg: "" },
+		capsule: { armorname: "'impact'", armor: "impact", av: 0, power: -2, rpower:0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
+		glazer: { armorname: "(ballistic > impact)? 'ballistic' : 'impact';", armor: "Math.max((ballistic * 2), (impact * 2))", av: -0.5, power: 2, rpower:0, dmg:0, rdmg: "( armoron == 0)? 1 : 0;", recoil: 1, barrier: 2, knockdown: 1, amsg: "Final Damage Level depends on Armor" },
+		hic: { armorname: "(ballistic > impact)? 'ballistic' : 'impact';", armor: "Math.max(ballistic,impact)", av: 0, power: "(range==6)? -1 : (range==9)? -1", rpower:0, dmg: 0, rdmg:0, recoil: 2, barrier: 1, knockdown: 1, amsg: "" },
+		hpoint: { armorname: "'ballistic + Impact'", armor: "ballistic + impact", av: 0, power:0, rpower: "(armoron == 0)? 3 : 1", dmg: 0, rdmg:0, recoil: 2, barrier: 1, knockdown: 1, amsg: "Final Power Rating depends on Armor" },
+		incendiary: { armorname: "'ballistic'", armor: "ballistic", av: 0, power: 0, rpower: 0, dmg: 0, rdmg:0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" },
+		mercury: { armorname: "(ballistic > impact)? 'ballistic' : 'impact';", armor: "Math.max((ballistic * 2), (impact * 2))", av: -0.5, power: 0, rpower: 0, dmg: 0, rdmg: "( armoron == 0)? 1 : 0;", recoil: 1, barrier: 2, knockdown: 1, amsg: "Final Damage Level depends on Armor" },
+		tracker: { armorname: "'ballistic'", armor: "ballistic", av: 0, power: 0, rpower: 0, dmg: 0, rdmg: 0, recoil: 1, barrier: 1, knockdown: 1, amsg: "" }
 	}
 	
    	const resistdmg = function (myid, mods) {
-	   atts=["ballistic", "impact", "dermal-armor"];
+		if (!("yes" in lang)) geti18n();
+	   atts=["ballistic", "impact", "armor-on", "deck-hardening"];
 	   getAttrs(atts, function (myval) {
 	   	const ballistic=myval["ballistic"];
 	   	const impact=myval["impact"];
-	   	const dermalarmor=myval["dermal-armor"];
+	   	const armoron=myval["armor-on"];
+	   	const hardening=myval["deck-hardening"];
+		var armorname;
 		var wdmg;
 		var dmgcode=0;
 		var weapondmg="none";
 		var dodge=0;
-         	myroll="&{template:resistance}";
 		if ( mods=="regular" ) mods=1;	
 		if ( mods=="normal" ) mods=1;	
 		if ( mods=="double" ) mods=2;	
 		if ( mods=="half" ) mods=0.5;	
 		if ( typeof mods === 'object' && mods !== null ) {
+         	        myroll="&{template:resistadv}";
 			const ammo=mods["ammotype"].toLowerCase();
 	   		weapondmg = mods["wdmg"];
 	   		dodge = mods["dodge"];
@@ -5327,42 +5913,49 @@ on('clicked:matrixattack', (info) => {
 			const armorval = eval(ammomods[ammo]["armor"]);
 			const powermod = eval(ammomods[ammo]["rpower"]);
 			const dmgmod = eval(ammomods[ammo]["rdmg"]);
-			console.log('dmgmod at resist ' + dmgmod);
-			console.log('ball ' + ballistic + ' imp ' + impact);
 			dmgcode = damagetable[weapondmg] + dmgmod;
-			console.log ('armorval ' + armorval + ' powermod ' + powermod + ' dmgmod ' + dmgmod + ' range ' + range);
-			myroll +="{{Power=?{Attack Power|" + mods.power + "}}}";
+			myroll +="{{Power=?{" + lang["attack-power"] + "|" + mods.power + "}}}";
 			myroll+="{{wpndmg=" + weapondmg + "}}";
 			myroll +="{{attacktest=[[" + mods["attacktest"] + "]]}}";
 			myroll+="{{dodge=[[" + mods["dodge"] + "]]}}";
 	 		myroll +="{{AttackType=" + ammo  + "}}";
-			calcTN="?{Attack Power} + " +  powermod + " - " + armorval;
+			calcTN="?{" + lang["attack-power"] + "} + " +  powermod + " - " + armorval;
+			if ( mods["blast"] ) { 
+				myroll+="{{distance=[[?{" + lang["distance-from-explosive-in-meters"] +"|0}]]}}"
+				myroll+="{{blastredux=[[?{" + lang["distance-from-explosive-in-meters"] +"|0} / " + mods["blast"] + "]]}}"
+				calcTN+=" - ( ?{" + lang["distance-from-explosive-in-meters"] +"} / " + mods["blast"] + ")";
+			}
+			myid=eval(ammomods[ammo]["armorname"]);
+			console.log('test 1 ' + myid);
+			myroll += "{{armorvalue=" + armorval + "}}";
 		} else { 
-			myroll +="{{Power=?{Attack Power|4}}}"; 
+         		myroll="&{template:resist}";
+			myroll +="{{Power=?{" + lang["attack-power"] + "|4}}}"; 
+			myroll +="{{attacktest=[[0}]]}}";
+			myroll+="{{dodge=[[0]]}}";
 	 		myroll +="{{AttackType=" + mods  + "}}";
-			calcTN="?{Attack Power} - (floor(@{" + myid + "} * " + mods + "))";
+			calcTN="?{" + lang["attack-power"] + "} - (floor(@{" + myid + "} * " + mods + "))";
+			myroll += "{{armorvalue=@{" + myid + "}}}"
 		}
 	 	let actionname = myid.charAt(0).toUpperCase() + myid.slice(1);
-	        var calcDice= "@{body|max} + ?{Combat Pool Dice}";
-	 	myroll +="{{name=" + actionname + " Armor}}{{character=@{character_name}}}{{armorvalue=@{" + myid + "}}}{{combatpool=[[?{Combat Pool Dice|0}]]}}";
-	 	myroll +="{{action=Resistance Test}}";
+	        var calcDice= "@{body|max} + ?{" + lang["combat-pool-dice"] + "}";
 	 	myroll +="{{finaldmg=[[0]]}}{{netresult=[[0]]}}";
+	 	myroll +="{{name=" + actionname + " Armor}}{{character=@{character_name}}}{{combatpool=[[?{" + lang["combat-pool-dice"] + "|0}]]}}";
+	 	myroll +="{{action=" + lang["damage-resistance-test"] + "}}";
 		myroll +="{{rolldice=[[" + calcDice + "]]}}";
 		myroll +="{{targetnumber=[[" + calcTN + "]]}}";
 	 	myroll +="{{roll= [[ [[" + calcDice  + " ]]d6>[[ {2,(" + calcTN  + ")}kh1 ]]!! ]]}}";
 		console.log(myroll);
 		console.log(' unmod weapons code ' + dmgcode);
         	startRoll(myroll, (results) => {
-			console.log('dmgcode ' + dmgcode);
 			const netresult=results.results.attacktest.result - ( results.results.roll.result + dodge );
-			console.log('netresult ' + netresult);
+			console.log('debug netresult ' + netresult);
 			const stage=floor(netresult/2);
 			var finaldmg=dmgcode + stage;
-			console.log('finaldmg ' + finaldmg);
 			var dmgmax=4;
-			var dmgmin=1;
+			var dmgmin=0;
 			if (dmgcode >= 10) dmgmax=13;
-			if (dmgcode >= 10) dmgmin=10;
+			if (dmgcode >= 10) dmgmin=9;
 			if (finaldmg > dmgmax) finaldmg=dmgmax;
 			if (finaldmg < dmgmin) finaldmg=dmgmin;
 			updatepoolused("combatpool", results.results.combatpool.result);	
@@ -5377,13 +5970,102 @@ on('clicked:matrixattack', (info) => {
 	};
 
 	on('clicked:resistdmg', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
-		mods="?{Attack Type|Normal,1|Elemental,0.5|ADPS,0.5|Half,0.5|Double,2}";
+		mods="?{" + lang["attack-type"] + "|" + lang["normal"] + ",1|" + lang["elemental"] + ",0.5|" + lang["adps"] + ",0.5|" + lang["half"] + ",0.5|" + lang["double"] + ",2}";
 		resistdmg(myid, mods); 
 	});
 
+        on('clicked:checkaoe', (info) => {
+		if (!("yes" in lang)) geti18n();
+		const payload=rollEscape.unescape(info.originalRollId);
+		const attacktype=payload["ammotype"].toLowerCase();
+		const basetn=payload["targetnumber"];
+		const attacktest=payload["attacktest"];
+		const attackdice=payload["attackdice"];
+		const attribute=payload["attribute"] + "_max";
+		console.log(payload);
+		var myresisttype;
+         	myroll="&{template:aoe}{{senddata=[[0]]}}{{resisttype=[[0]]}}";
+		getAttrs(["character_name", "targetMove", "body_max", "willpower_max", "intelligence_max", "force"], function(myval) {
+			payload["target"]=myval["character_name"];
+			if ( attacktype == "elemental") {
+				myroll+="{{dodge=yes}}";
+				calcTN=basetn + " + " + myval["targetMove"] + " + ?{" + lang["cover-modifiers"] + "|0}";
+				myresisttype="resistroll";
+		
+			} else {
+				calcTN=basetn + " + " + myval[attribute] + " + ?{" + lang["cover-modifiers"] + "|0}";
+				myresisttype="resistspell";
+			}
+			myroll+="{{targetnumber=[[" + calcTN + "]]}}{{dice=" + attackdice + "}}";
+			myroll+="{{attacktest=[[0]]}}{{character=" + myval["character_name"] + "}}{{weapon=" + payload["weapon"] + "}}";
+			console.log('calcTN: ' + calcTN);
+			var attackresult;
+                	startRoll(myroll, (results) => {
+				finaltn=results.results.targetnumber.result;
+				attackresult=payload["attacktest"]= (attackdice.filter(mydice=> mydice >= finaltn )).length;
+				if  (attackresult < 1 ) { 
+					attackresult="MISSED";
+					myresisttype="missed";
+				}
+				console.log('finaltn: ' + finaltn);
+				console.log('attackresult: ' + attackresult);
+				console.log('myresisttype: ' + myresisttype);
+			   	finishRoll( results.rollId,
+                		{
+					resisttype: myresisttype,
+					attacktest: attackresult,
+					senddata: rollEscape.escape(payload),
+                		});
+			});
+		});
+	});
+
+        on('clicked:resistspell', (info) => {
+		if (!("yes" in lang)) geti18n();
+		const payload=rollEscape.unescape(info.originalRollId);
+		console.log(payload);
+		const attribute=payload["attribute"] + "_max";
+		var wdmg=payload["wdmg"];
+		var dmgnumber= damagetable[wdmg];
+		var dmgmax=4; dmgmin=0;
+		if (dmgnumber >= 10) dmgmax=13, dmgmin=9; 
+		const attacktest=payload["attacktest"] + "_max";
+		if (payload["attacktest"] < 1) missedattack(info);
+		else {
+			getAttrs(["character_name", "body_max", "willpower_max", "intelligence_max", "force"], function(myval) {
+         			myroll="&{template:resistadv}{{character=" + myval["character_name"] + "}}{{target=" + payload["attacker"] + "}}";
+				myroll+="{{Power=" + payload["power"] + "}}{{wpndmg=" + payload["wdmg"] + "}}{{name=" + payload["attribute"] + "}}";
+				myroll+="{{armorvalue=" + myval[attribute] + "}}";
+				myroll +="{{attacktest=[[" + payload["attacktest"] + "]]}}";
+				calcDice=parseInt(myval[attribute])
+				calcTN=payload["power"];
+	 			myroll +="{{action=" + lang["spell-resistance-test"] + "}}";
+	 			myroll +="{{spelldmg=[[0]]}}{{netresult=[[0]]}}";
+				myroll +="{{rolldice=[[" + calcDice + "]]}}";
+				myroll +="{{targetnumber=[[" + calcTN + "]]}}";
+	 			myroll +="{{roll= [[ [[" + calcDice  + " ]]d6>[[ {2,(" + calcTN  + ")}kh1 ]]!! ]]}}";
+				console.log(myroll);
+                		startRoll(myroll, (results) => {
+					const mynet=payload["attacktest"]-results.results.roll.result;
+					var delta = dmgnumber + floor(mynet/2);
+					delta = (delta > dmgmax)? dmgmax : delta;
+					delta = (delta < dmgmin)? dmgmin : delta;
+					finaldmg=damagetable[delta];
+					console.log('finaldmg ' + finaldmg);
+			   		finishRoll( results.rollId, { 
+						netresult: mynet,
+						spelldmg: finaldmg,
+					});
+				});
+				
+			});
+		}
+	});
+
         on('clicked:resistroll', (info) => {
 		const payload=rollEscape.unescape(info.originalRollId);
 		console.log(payload);
@@ -5407,14 +6089,15 @@ on('clicked:matrixattack', (info) => {
 	});
 
 	on('clicked:resistvehicledmg', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
-	        var calcDice= "@{body|max} +  ?{Control Pool Dice}";
-		calcTN="?{Adjuted Attack Power}";
-         	myroll="&{template:resistance}";
-	 	myroll +="{{name=Vehicle Damage Test}}{{character=@{character_name}}}{{armorvalue=@{armor}}}{{controlpool=[[?{Control Pool Dice|0}]]}}";
-	 	myroll +="{{action=Resistance Test}}";
+	        var calcDice= "@{body|max} +  ?{" + lang["control-pool-dice"] + "}";
+		calcTN="?{" + lang["attack-power"] + "}";
+         	myroll="&{template:resist}";
+	 	myroll +="{{name=" + lang["damage-resistance-test"] + "}}{{character=@{character_name}}}{{armorvalue=@{armor}}}{{controlpool=[[?{" + lang["control-pool-dice"] + "|0}]]}}";
+	 	myroll +="{{action=" + lang["damage-resistance-test"] + "}}";
 		myroll +="{{rolldice=[[" + calcDice + "]]}}";
 		myroll +="{{targetnumber=[[" + calcTN + "]]}}";
 	 	myroll +="{{roll= [[ [[" + calcDice  + " ]]d6>[[ {2,(" + calcTN  + ")}kh1 ]]!! ]]}}";
@@ -5426,20 +6109,23 @@ on('clicked:matrixattack', (info) => {
 	});
 
 
-   	var dodge = function (mods) {
-         	myroll="&{template:resistance}";
+   	const dodge = function (mods) {
+		if (!("yes" in lang)) geti18n();
+         	myroll="&{template:resistadv}";
+		console.log('debug ' + mods);
 		if ( typeof mods === 'object' && mods !== null ) {
 			payload=mods;
 			console.log(payload);
-			mods="?{Modifiers?|" + Math.floor(payload["rounds"] / 3 ) + "}";
+			mods=(payload["rounds"])? "?{" + lang["modifiers"] + "?|" + Math.floor(payload["rounds"] / 3 ) + "}" : parseInt(payload["meleetn"] - 4);
 			myroll +="{{senddata=[[0]]}}";
-		}
+		} else payload={rounds: mods};
 		console.log('mods: ' + mods);
-	       	var calcDice= "?{Combat Pool Dice}";
-		calcTN="4 + " + mods;
-	 	myroll +="{{name=Dodge}}{{character=@{character_name}}}"
-		myroll +="{{combatpool=[[?{Combat Pool Dice|0}]]}}";
-	 	myroll +="{{action=Dodge Test}}";
+	       	var calcDice= "?{" + lang["combat-pool-dice"] + "}";
+		calcTN="4 + " + mods; 
+		calcTN +=(payload["rounds"])? " + @{wp-char}" : "";
+	 	myroll +="{{name=" + lang["dodge"] + "}}{{character=@{character_name}}}"
+		myroll +="{{combatpool=[[?{" + lang["combat-pool-dice"] + "|0}]]}}";
+	 	myroll +="{{action=" + lang["dodge"] + "}}";
 		myroll +="{{targetnumber=[[" + calcTN + "]]}}";
 		myroll +="{{rolldice=[[" + calcDice + "]]}}";
 	 	myroll +="{{roll= [[ [[" + calcDice  + " ]]d6>[[ {2,(" + calcTN  + ")}kh1 ]]!! ]]}}";
@@ -5458,9 +6144,10 @@ on('clicked:matrixattack', (info) => {
 	};
 
 	on('clicked:dodge', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		if ( info["htmlAttributes"]["id"] != undefined)  { 
-			mods="?{Modifiers?|0}";
+			mods="?{" + lang["modifiers"] + "?|0}";
 		}
 		else if ( info["originalRollId"] != undefined ) {
 			mods=rollEscape.unescape(info["originalRollId"]);
@@ -5468,59 +6155,87 @@ on('clicked:matrixattack', (info) => {
 		dodge(mods); 
 	});
 
-   	var conjuring = function (myid) {
+   	const conjuring = function (myid, spirittype="spirit", force="ask", name="none") {
+		if (!("yes" in lang)) geti18n();
+		console.log('spirittype: ' + spirittype);
 		const atts=["charisma_max", "magic-type", "magic", "summoning", "banishing", "spiritcontrol", "character_name"]
 		getAttrs(atts, function(myval) {
-			const mycharisma=myval["charisma_max"];
-		 	var calcTN;
-		 	var calcDrainTN;
-			var calcDice= parseInt(myval[myid]) + " + ?{Spell Pool Dice} + ?{Spirit Focus Dice}";
-			if (myid != "summoning") calcDice+= " + ?{Are you the summoner of the spirit?|Yes," + mycharisma + "|No,0}"
-			var action;
-			if (myid == "summoning" ) {
-				calcTN="?{Force?}";
-				var calcDice="?{Conjuring Dice?|" +  parseInt(myval[myid]) + "} + ?{Spirit Focus Dice}";
-				calcDrainTN="?{Force?}";
-				action="Conjure Force ?{Force?} Spirit";
-
-			} else {
-				calcTN="@{target|Target|force}";
-		    		let actionname = myid.charAt(0).toUpperCase() + myid.slice(1);
-				action= actionname + " Force @{target|Target|force} Spirit";
+			if ( name == "none" ) { 
+				name = (spirittype)? spirittype : "spirit";
 			}
-			var calcDrainDice=mycharisma + " + ?{Conjuring Dice for Drain?|0} + ?{Spirit Focus Dice}";
-			var myroll="&{template:spell}{{myname=" + myval["character_name"] + "}}";
-			myroll+="{{draindamage=[[0]]}}"
-			if (myid == "summoning" ) myroll+="{{spiritforce=[[?{Force?|1}]]}}"
-			else  myroll+="{{spiritforce=[[  @{target|Target|force} ]]}}"
-			myroll+="{{spellpool=[[?{Spell Pool Dice|0} + ?{Drain Pool Dice|0}]]}}";
-			myroll+="{{spellname=" + action + "}}";
-			myroll+="{{spiritdice=[[?{Spirit Focus Dice|0}]]}}";
-			myroll+="{{rolldice=[[" + calcDice + "]]}}";
+			const mycharisma=myval["charisma_max"];
+		    	const actionname = myid.charAt(0).toUpperCase() + myid.slice(1);
+			const calcDrainDice=mycharisma + " + ?{" + lang["conjuring-dice-for-drain"] + "?|0} + ?{" + lang["spirit-focus-dice"] +"}";
+			const myskill = parseInt(myval[myid]);
+		 	var calcDrainTN = (force=="ask")? "?{" + lang["force"] + "?}" : force;
+			var calcDice= myskill + " + ?{" + lang["spirit-focus-dice"] +"} + ?{" + lang["are-you-the-summoner"] +"?|" + lang["yes"] + "," + mycharisma + "|" + lang["no"] + ",0}"
+		 	var calcTN;
+			if (myid == "summoning" ) {
+				calcDice= myskill + " - ?{" + lang["conjuring-dice-for-drain"] + "?} + ?{" + lang["spirit-focus-dice"] +"}";
+				calcTN = (force=="ask")? "?{" + lang["force"] + "?}" : force;
+			} else {
+				calcTN="@{target|" + lang["target"] +"|force}";
+			}
+			var myroll="&{template:conjure}{{myname=" + myval["character_name"] + "}}";
+			myroll+="{{draindamage=[[0]]}}{{finaldrain=[[0]]}}";
+			if (myid == "summoning" )  {
+				if (force=="ask") myroll+="{{spiritforce=[[?{" + lang["force"] + "?|1}]]}}"
+				else myroll+="{{spiritforce=[[" + force + "]]}}";
+				myroll+="{{spirittype=" + spirittype + "}}";
+				myroll+="{{spiritname=" + name + "}}";
+			}
+			else  { 
+				myroll+="{{spiritforce=[[  @{target|" + lang["target"] +"|force} ]]}}"
+				myroll+="{{spirittype=Spirit}}";
+			}
+			myroll+="{{spellname=" + actionname + "}}{{skill=[[" + myskill + "]]}}";
+			myroll+="{{spiritdice=[[?{" + lang["spirit-focus-dice"] +"|0}]]}}";
 			myroll+="{{targetnumber=[[" + calcTN + "]]}}";
 			if (myid == "summoning" ) { 
 				myroll+="{{draintn=[[" + calcDrainTN + "]]}}";
 			 	myroll+="{{draindice=[[" + calcDrainDice + "]]}}";
+				myroll+="{{conjuredicedrain=[[?{" + lang["conjuring-dice-for-drain"] + "?}]]}}";
+				myroll+="{{conjuredice=[[" + myskill + " - ?{" + lang["conjuring-dice-for-drain"] + "?}]]}}";
 				myroll+="{{draintest= [[ [[" + calcDrainDice + "]]d6>[[ {2, ( " + calcDrainTN + ")}kh1 ]]!! ]] }}";
 			}
+			myroll+="{{rolldice=[[" + calcDice + "]]}}";
 			myroll+="{{casttest=[[ [[" + calcDice + "]]d6>[[{2,(" + calcTN + ")}kh1]]!! ]] }}";
-			if (myid == "banishing" ) myroll += "{{resist=[Resist Banish](~@{target|Target|character_name}|resistbanish)}}"
+			if (myid == "banishing" ) myroll += "{{resist=[" + lang["resist-banish"] + "](~@{target|" + lang["target"] +"|character_name}|resistbanish)}}"
 			console.log(myroll);
         		startRoll(myroll, (results) => {
-			const spiritforce=results.results.spiritforce.result;
-			var finaldrain;
-			if ( spiritforce <= (mycharisma/2)) finaldrain="L";
-			else if ( spiritforce <= mycharisma ) finaldrain="M";
-			else if ( spiritforce >= ( mycharisma * 1.5 ) ) finaldrain="D";
-			else finaldrain="S";
-			if (  spiritforce <= myval["magic"] ) finaldrain.concat("(s)");
-			console.log('roll')
-			console.log(results.results.rolldice.result);
-			console.log('tn')
-			console.log(results.results.targetnumber.result);
-			finishRoll( results.rollId, {
-				draindamage: finaldrain,
-			});
+			if (myid == "summoning") {
+				var dmgmin=0, dmgmax=4;
+				const spiritforce=results.results.spiritforce.result;
+				var basedrain;
+				if ( spiritforce <= (mycharisma/2)) basedrain="L";
+				else if ( spiritforce <= mycharisma ) basedrain="M";
+				else if ( spiritforce >= ( mycharisma * 1.5 ) ) basedrain="D";
+				else basedrain="S";
+				if (  spiritforce <= myval["magic"] ) { 
+				        console.log('set to stun');
+					basedrain=basedrain.concat("(stun)");
+					dmgmin=9;
+					dmgmax=13;
+				}
+				console.log('debug base drain ' + basedrain);
+				var dmgnumber = damagetable[basedrain];
+				console.log('dmgnumber: ' + dmgnumber);
+				const staging = Math.floor(results.results.draintest.result / 2)
+				console.log('staging: ' + staging);
+				const conjuredicefinal=results.results.skill.result - results.results.conjuredicedrain.result;
+				dmgnumber -= staging;
+				console.log('debug dmgnumber unmodified: ' + dmgnumber + " dmgmax " + dmgmax + " dmgmin " + dmgmin);
+				dmgnumber = (dmgnumber > dmgmax)? dmgmax : (dmgnumber < dmgmin)? dmgmin : dmgnumber;
+				console.log('debug dmgnumber conjure: ' + dmgnumber);
+				const stageddrain=damagetable[dmgnumber];
+				console.log('debug finaldrain ' + stageddrain);
+				finishRoll( results.rollId, {
+					draindamage: basedrain,
+					finaldrain: stageddrain,
+				});
+			} else {
+				finishRoll( results.rollId, {});
+			}
 		});
 	});
 
@@ -5531,6 +6246,29 @@ on('clicked:matrixattack', (info) => {
     		on(`clicked:${action}`, conjuring(action) );
 	});
 
+	on('clicked:repeating_conjuring:conjure-spirit', (info) => {
+		if (!("yes" in lang)) geti18n();
+		var atts=[];
+		console.log(info);
+		var source=info['sourceAttribute'].split('_');
+		var sourceattr=source.pop();
+		const myrepeat=source.join('_').concat('_');
+		const attributes=["name", "force", "type"];
+		attributes.forEach( attr=> {
+			atts.push(myrepeat + attr);
+		});
+		console.log(atts);
+		getAttrs(atts, function(myval) {
+			console.log(myval);
+			var name=myval[myrepeat + "name"];
+			if (!name) name="none";
+			const force=parseInt(myval[myrepeat + "force"]);
+			const spirittype=myval[myrepeat + "type"];
+			console.log('spirit-type: ' + spirittype);
+			conjuring("summoning", spirittype, force, name);
+		});
+	});
+
 	on('clicked:conjure', (info) => {
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
@@ -5539,50 +6277,101 @@ on('clicked:matrixattack', (info) => {
 	});
 
 	on('clicked:dispell', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log("clicked dispell");
-		var calcDice="?{Sorcery Dice?} + ?{Spell Pool Dice?}";
-		var calcTN="?{Force of Spell?}";
-		var calcDrainTN="floor( ?{Force of Spell?}/2) + ( 2 * @{spellsus} )";
-		var calcDrainDice="@{willpower|max} + ?{Sorcery Dice for Drain?} + ?{Spell Pool Dice for Drain?} +?{Drain Modifier?|0}";
-		var myroll="&{template:spell}{{myname=@{character_name}}}";
-		myroll+="{{sorcerydice=[[?{Sorcery Dice?|@{spellcasting}} + ?{Sorcery Dice for Drain?|0}]]}}";
-		myroll+="{{spellpool=[[?{Spell Pool Dice?|0} + ?{Spell Pool Dice for Drain?|0}]]}}";
-		myroll+="{{spellname=DISPELL}}";
-		myroll+="{{castforce=[[?{Force of Spell?|0}]]}}";
+		var calcDice="?{" + lang["sorcery-dice"] +"?} + ?{"+ lang["spell-pool-dice"] +"?}";
+		var calcTN="?{" + lang["force-of-spell"] + "?}";
+		var calcDrainTN="floor( ?{" + lang["force-of-spell"] + "?}/2) + ( 2 * @{spellsus} + ?{" + lang["drain-modifiers"] + "?})";
+		var calcDrainDice="@{willpower|max} + ?{" + lang["sorcery-dice-for-drain"] + "?} + ?{"+ lang["spell-pool-dice-for-drain"] +"?} +?{" + lang["drain-modifiers"] + "?|0}";
+		var myroll="&{template:spell}{{myname=@{character_name}}}{{finaldrain=[[0]]}}";
+		myroll+="{{sorcerydice=[[?{"+ lang["sorcery-dice"] +"?|@{spellcasting}} + ?{" + lang["sorcery-dice-for-drain"] + "?|0}]]}}";
+		myroll+="{{draindamage=[[?{" + lang["drain-damage"] + "?|" + lang["light"] + ",1|" + lang["moderate"] + ",2|" + lang["serious"] + ",3|" + lang["deadly"] + ",4|"; 
+		myroll+= lang["light-stun"] + ",10|" + lang["moderate-stun"] + ",11|" + lang["serious-stun"] + ",12|" + lang["deadly-stun"] + ",13|" + lang["none"] + ",0}]]}}";
+		myroll+="{{spellpool=[[?{"+ lang["spell-pool-dice"] +"?|0} + ?{"+ lang["spell-pool-dice-for-drain"] +"?|0}]]}}";
+		myroll+="{{spellname=" + lang["dispell"] + "}}";
+		myroll+="{{castforce=[[?{" + lang["force-of-spell"] + "?|0}]]}}";
 		myroll+="{{rolldice=[[" + calcDice + "]]}}";
 		myroll+="{{targetnumber=[[" + calcTN + "]]}}";
 		myroll+="{{draintest= [[ [[" + calcDrainDice + "]]d6>[[ {2, ( " + calcDrainTN + ")}kh1 ]]!! ]] }}";
 		myroll+="{{casttest=[[ [[" + calcDice + "]]d6>[[{2,(" + calcTN + ")}kh1]]!! ]] }}";
 		console.log(myroll);
         	startRoll(myroll, (results) => {
-		finishRoll( results.rollId);
+			updatepoolused("sorcery", results.results.sorcerydice.result);	
+			updatepoolused("spellpool", results.results.spellpool.result);	
+			const drainbase = damagetable[results.results.draindamage.result];
+			const finaldraintxt=calcFinalDmg(( -1 * results.results.draindamage.result), results.results.draintest.result);
+			finishRoll( results.rollId, {
+				draindamage: drainbase,
+				finaldrain: finaldraintxt,
+			});
 		});
 	});
         
 	on('clicked:spelldefense', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log("clicked spelldefense");
-		var calcDice="?{Sorcery Dice?} + ?{Spell Pool Dice?}";
-		var calcTN="?{Force of Spell?}";
-		var myroll="&{template:spell}{{myname=@{character_name}}}";
-		myroll+="{{sorcerydice=[[?{Sorcery Dice?|@{spelldefense}}]]}}";
-		myroll+="{{castforce=[[?{Force of Spell?|0}]]}}";
+		const payload=( info["originalRollId"] != undefined )? rollEscape.unescape(info["originalRollId"]) : "none";
+		var myforce=0;
+		var mytarget="@{target|" + lang["ally"] + "|token_name}";
+		var myroll="&{template:spell}{{myname=@{character_name}}}{{resisttype=[[0]]}}";
+		if (payload != "none" ) { 
+			console.log(payload);
+			myforce=(payload["power"])? payload["power"] : 0;
+			mytarget=payload["target"];
+			if ( payload["ammotype"].toLowerCase()=="elemental" ) myroll+="{{dodge=yes}}";
+			myroll+="{{defensetest=[[0]]}}";
+			myroll+="{{senddata=[[0]]}}";
+			myroll+="{{attacks=[[" + payload["attacktest"] + "]]}}";
+			myresist = (payload["ammotype"].toLowerCase() == "elemental")? "resistroll" : "resistspell";
+		}
+		var calcDice="?{"+ lang["sorcery-dice"] +"?} + ?{"+ lang["spell-pool-dice"] +"?}";
+		var calcTN="?{" + lang["force-of-spell"] + "?}";
+		myroll+="{{sorcerydice=[[?{" + lang["sorcery-dice"] +"?|@{sorcery-defense}}]]}}";
+		myroll+="{{castforce=[[?{" + lang["force-of-spell"] + "?|" + myforce + "}]]}}";
 		myroll+="{{targetnumber=[[" + calcTN + "]]}}";
-		myroll+="{{spellpool=[[?{Spell Pool Dice?|0}]]}}";
-		myroll+="{{spellname=SPELL DEFENSE}}";
+		myroll+="{{spellpool=[[?{"+ lang["spell-pool-dice"] +"?|@{spellpool-defense}}]]}}";
+		myroll+="{{spellname=" + lang["spell-defense"] + "}}";
 		myroll+="{{rolldice=[[" + calcDice + "]]}}";
-		myroll+="{{targetofspell=@{target|Ally|token_name}}}";
+		myroll+="{{targetofspell=" + mytarget  + "}}";
 		myroll+="{{casttest=[[ [[" + calcDice + "]]d6>[[{2,(" + calcTN + ")}kh1]]!! ]] }}";
 		console.log(myroll);
-        	startRoll(myroll, (results) => {
-		finishRoll( results.rollId);
+		if (payload != "none" ) {
+                startRoll(myroll, (results) => {
+			updatepoolused("sorcery", results.results.sorcerydice.result);	
+			updatepoolused("spellpool", results.results.spellpool.result);	
+			updatepoolused("spelldefensedice", results.results.sorcerydice.result + results.results.spellpool.result);	
+			const delta=parseInt(payload["attacktest"]) - results.results.casttest.result;
+			console.log(' delta ' + delta);
+			var finalattack=delta;
+			if (delta < 1) {
+			 	finalattack="SPELL BLOCKED";	
+				myresist="spellblocked"
+				payload["attacktest"]=0;
+			} else {
+				payload["attacktest"]=finalattack;
+			}
+			console.log(' result ' + finalattack);
+			finishRoll( results.rollId, {
+				resisttype: myresist,
+				defensetest: finalattack,
+				senddata: rollEscape.escape(payload),
+			})
 		});
+		} else {
+                    startRoll(myroll, (results) => {
+			updatepoolused("spellpool", results.results.spellpool.result);	
+			updatepoolused("spelldefensedice", results.results.sorcerydice.result);	
+			finishRoll( results.rollId, { })
+		    });
+		}
 	});
 
 	
 	on('clicked:vehicledriving', (info) => {
-		    calcTN="@{handling} + @{vehicle-driver}stun_pen} +@{vehicle-driver}wound_pen} +@{wp-vehicle} - @{driving-test-interface} +@{driving-test-weather} +@{driving-test-terrain} +@{driving-test-size} +?{Additional Modifiers|0}";
-		    calcDice="[[@{vehicle-skill-final} + @{driving-test-autonav} + ?{Control Pool Dice?}]]"
-		    var myroll="&{template:vehicle}{{type=Driving Test}}{{controlpool=[[?{Control Pool Dice?|0}]]}}{{character=@{character_name}}}"
+		if (!("yes" in lang)) geti18n();
+		    calcTN="@{handling} + @{vehicle-driver}stun_pen} +@{vehicle-driver}wound_pen} +@{wp-vehicle} - @{driving-test-interface} +@{driving-test-weather} +@{driving-test-terrain} +@{driving-test-size} +?{" + lang["miscellaneous-modifiers"] + "|0}";
+		    calcDice="[[@{vehicle-skill-final} + @{driving-test-autonav} + ?{" + lang["control-pool-dice"] + "?}]]"
+		    var myroll="&{template:vehicle}{{type=" + lang["driving"] + "}}{{controlpool=[[?{" + lang["control-pool-dice"] + "?|0}]]}}{{character=@{character_name}}}"
 		    myroll += "{{targetnumber=[[" + calcTN + "]]}}"
 		    myroll += "{{roll=[[ " + calcDice + "d6>[[{2,(" + calcTN + ")}kh1]]!! ]] }}"
 		    console.log(myroll);
@@ -5594,7 +6383,8 @@ on('clicked:matrixattack', (info) => {
 	});
 
 	on('clicked:vehiclesensor', (info) => {
-		    calcTN="[[{2,(@{target|Target|signature} +@{wp-vehicle} +@{sensor-test-los}  +@{sensor-test-weather} +@{sensor-test-terrain} +@{vehicle-urban} +?{Additional Modifiers|0})}kh1]]";
+		if (!("yes" in lang)) geti18n();
+		    calcTN="[[{2,(@{target|" + lang["target"] +"|signature} +@{wp-vehicle} +@{sensor-test-los}  +@{sensor-test-weather} +@{sensor-test-terrain} +@{vehicle-urban} +?{" + lang["miscellaneous-modifiers"] + "|0})}kh1]]";
 		    calcDice="[[@{sensors-rating}]]";
 		    calcDiceECD="[[@{ecd-rating} * @{ecd-enabled} ]]";
 		    var myroll="&{template:vehicle}{{type=Sensor Test}}{{character=@{character_name}}}";
@@ -5609,9 +6399,10 @@ on('clicked:matrixattack', (info) => {
 	});
 
 	on('clicked:vehicleposition', (info) => {
+		if (!("yes" in lang)) geti18n();
 		    calcTN="[[{2,(@{handling} + @{speed-exceeding} +  @{driving-position-terrain} - @{vehicle-actionbonus} + (@{vehicle-autonav} * @{autonav}) + @{vehicle-driver}stun_pen} +@{vehicle-driver}wound_pen} + @{wp-vehicle} )}kh1]]";
-		    calcDice="[[@{vehicle-skill-final} + ?{Control Pool Dice?}]]"
-		    var myroll="&{template:vehicle}{{type=Position Maneuever}}{{controlpool=[[?{Control Pool Dice?|0}]]}}{{character=@{character_name}}}"
+		    calcDice="[[@{vehicle-skill-final} + ?{" + lang["control-pool-dice"] + "?}]]"
+		    var myroll="&{template:vehicle}{{type=" + lang["position"] + "}}{{controlpool=[[?{" + lang["control-pool-dice"] + "?|0}]]}}{{character=@{character_name}}}"
 		    myroll += "{{targetnumber=" + calcTN + "}}{{position=[[0]]}}"
 		    myroll += "{{roll=[[ " + calcDice + "d6>" + calcTN + "!! ]] }}"
 		    console.log(myroll);
@@ -5630,9 +6421,10 @@ on('clicked:matrixattack', (info) => {
 		    });
 	});
 	on('clicked:vehiclecrash', (info) => {
+		    if (!("yes" in lang)) geti18n();
 		    calcTN="[[{2,(@{handling} + @{driving-crash-terrain} + @{vehicle-driver}stun_pen} +@{vehicle-driver}wound_pen} +@{wp-vehicle} )}kh1]]"
-		    calcDice="[[@{vehicle-skill-final} + ?{Control Pool Dice?} + (@{vehicle-autonav} * @{autonav})]]"
-		    var myroll="&{template:vehicle}{{type=Crash Test}}{{controlpool=[[?{Control Pool Dice?|0}]]}}{{character=@{character_name}}}"
+		    calcDice="[[@{vehicle-skill-final} + ?{" + lang["control-pool-dice"] + "?} + (@{vehicle-autonav} * @{autonav})]]"
+		    var myroll="&{template:vehicle}{{type=" + lang["crash"] + "}}{{controlpool=[[?{" + lang["control-pool-dice"] + "?|0}]]}}{{character=@{character_name}}}"
 		    myroll += "{{targetnumber=" + calcTN + "}}{{speed=[[@{speed-current}]]}}{{reaction=[[@{vehicle-driver}reaction|max}]]}}"
 		    myroll += "{{roll=[[ " + calcDice + "d6>" + calcTN + "!! ]] }}"
 		    console.log(myroll);
@@ -5660,17 +6452,18 @@ on('clicked:matrixattack', (info) => {
 		    });
 	});
 	on('clicked:vehicleaction', (info) => {
+		    if (!("yes" in lang)) geti18n();
 		    var myaction=info["htmlAttributes"]["id"];
 		    var myterrain="driving-ab-terrain";
 		    var myaction = myaction.charAt(0).toUpperCase() + myaction.slice(1);
 		    var autonav="@{autonav}";
 		    var vcr = "@{vehicle-actionbonus}";
-		    var miscmods="?{How many additional enemy vehicles?";
+		    var miscmods="?{" + lang["how-many-additional-enemy-vehicles"] + "?";
 		    var speeding=1;
 		    var vmbelow10=4;
 		    var vmbelow00=2;
 		    var baseTN="@{handling}";
-		    var calcDice="[[@{vehicle-skill-final} + ?{Control Pool Dice?}]]";
+		    var calcDice="[[@{vehicle-skill-final} + ?{" + lang["control-pool-dice"] + "?}]]";
 		    if ( myaction =="Ram" ) {
 		    	myterrain="driving-ram-terrain";
 		    	autonav="(@{autonav} + 2)";
@@ -5684,21 +6477,21 @@ on('clicked:matrixattack', (info) => {
 	            }
 		    else if ( myaction =="Relocate" ) {
 		    	myterrain="driving-relocate-terrain";
-		    	miscmods="?{Successes from Hiding Test?";
+		    	miscmods="?{" + lang["successes-from-hiding-test"] + "?";
 		    	speeding=2;
 			vcr=0;
 		        autonav="( @{autonav} * -1)";
-		        calcDice="[[@{sensors-rating} + ?{Control Pool Dice?}]]";
-		    	baseTN="@{target|Target|signature}";
+		        calcDice="[[@{sensors-rating} + ?{" + lang["control-pool-dice"] + "?}]]";
+		    	baseTN="@{target|" + lang["target"] +"|signature}";
 		    }
 		    var vmsmod=0;	
 		    var calcTN="[[{2,(" + baseTN + " + " + miscmods + "} + ( @{speed-exceeding} * " + speeding  +  ") +  @{" + myterrain + "} - " + vcr  + " + (@{vehicle-autonav} * "
 		    calcTN += autonav + ") + @{vehicle-driver}stun_pen} +@{vehicle-driver}wound_pen} +@{wp-vehicle} )}kh1]]"
-                    var myroll="&{template:vehicle} {{type=Accelerating Action}}{{controlpool=[[?{Control Pool Dice?|0}]]}} {{character=@{character_name}}} {{miscmods=" + miscmods  + "|0}}}" 
+                    var myroll="&{template:vehicle} {{type=" + lang["accelerate"] + "}}{{controlpool=[[?{" + lang["control-pool-dice"] + "?|0}]]}} {{character=@{character_name}}} {{miscmods=" + miscmods  + "|0}}}" 
 		    myroll += "{{rolldice=" + calcDice + "}}"
-		    myroll += "{{target=vs. @{target|Target|token_name}}}{{type=" + myaction + "}}"
+		    myroll += "{{target=vs. @{target|" + lang["target"] +"|token_name}}}{{type=" + myaction + "}}"
 		    myroll += "{{targetnumber=" + calcTN  +  "}}"
-		    myroll += "{{delta=[[@{maneuver-score} - @{target|Target|maneuver-score} ]]}}"
+		    myroll += "{{delta=[[@{maneuver-score} - @{target|" + lang["target"] +"|maneuver-score} ]]}}"
 		    myroll += "{{roll=[[ " + calcDice + "d6>" + calcTN + "!! ]] }}"
 		    console.log(myroll);
                     startRoll(myroll, (results) => {
@@ -5725,7 +6518,8 @@ on('clicked:matrixattack', (info) => {
 	});
 
 
-   	var rollattribute = function (attrib) {
+   	const rollattribute = function (attrib) {
+		if (!("yes" in lang)) geti18n();
 		console.log(attrib);
 		var mymode="";
 		var mybase=attrib.toUpperCase();
@@ -5734,12 +6528,13 @@ on('clicked:matrixattack', (info) => {
 			mybase=attrib.split("|")[0].toUpperCase();
 		} 
 		console.log(attrib);
-                const attroll="&{template:attribute} {{character=@{character_name}}}{{Attribute=" + mybase + " " + mymode + "}} {{targetnumber=[[?{Target Number?|4}]]}}{{combatpool= [[?{Combat Dice Pool?|0}]]}}{{result= [[ [[@{" + attrib +"} + ?{Combat Dice Pool?}]]d6>[[{2,(?{Target Number?} + @{stun_pen} + @{wound_pen})}kh1]]!! ]] }}"
+                const attroll="&{template:attribute} {{character=@{character_name}}}{{Attribute=" + mybase + " " + mymode + "}} {{targetnumber=[[?{" + lang["target-number"] +"?|4}]]}}{{combatpool= [[?{" + lang["combat-pool-dice"] + "?|0}]]}}{{result= [[ [[@{" + attrib +"} + ?{" + lang["combat-pool-dice"] + "?}]]d6>[[{2,(?{" + lang["target-number"] +"?} + @{stun_pen} + @{wound_pen})}kh1]]!! ]] }}"
                 startRoll(attroll, (results) => {
 			console.log(results.results.combatpool.result)
 			finishRoll( results.rollId);
 		});
 	};
+
 	attributes.forEach(myatt => {
 		var myevent="attrib-" + myatt;
 		var myeventmax="attrib-" + myatt + "-max";
@@ -5762,23 +6557,54 @@ on('clicked:matrixattack', (info) => {
 		rollattribute(attrib);
 	});
 
+	on('clicked:ewarfare', (info) => {
+		if (!("yes" in lang)) geti18n();
+		console.log(info);
+		var mytype=info["htmlAttributes"]["id"]
+		var mytitle=info["htmlAttributes"]["title"]
+		const mymap={
+			sonar: {dice: "sonar-rating", target: "signature", notes: ""},
+			ecmjamming: {dice: "ecm-fluxmod", target: "sensors-rating", notes: "Roll Oposition test for @{target|" + lang["target"] +"|token_name}"},
+			ecmopposition: {dice: "sensors-fluxmod", target: "ecm-rating", notes: "Compare net successes with @{target|" + lang["target"] +"|token_name}"},
+			eccmcounter: {dice: "eccm-fluxmod", target: "ecm-rating", notes: "Roll Oposition test for @{target|" + lang["target"] +"|token_name}"},
+			eccmopposition: {dice: "ecm-fluxmod", target: "eccm-rating", notes: "Compare net successes with @{target|" + lang["target"] +"|token_name}"}
+		};
+		var calcDice="@{" + mymap[mytype]["dice"]  + "}";
+		calcTN="@{target|" + lang["target"] +"|" + mymap[mytype]["target"] + "}";
+		if (mytype=="sonar" ) calcTN+=" +@{wp-vehicle} +@{sensor-test-los}  +@{sensor-test-weather} +@{sensor-test-terrain} +@{vehicle-urban}";
+		calcTN += "+?{" + lang["miscellaneous-modifiers"] + "|0}";
+		myroll="&{template:vehicle}{{type=" + mytitle + "}}{{character=@{character_name}}}{{target=@{target|" + lang["target"] +"|token_name}}}";
+		myroll+="{{rolldice=[[" + calcDice + "]]}}{{targetnumber=[[" + calcTN  + "]]}}";
+		myroll+="{{roll=[[ [[ " + calcDice + "]]d6>[[{2,(" + calcTN + ")}kh1]]!!]]}}";
+		myroll+="{{notes=" + mymap[mytype]["notes"] + "}}";
+		console.log(myroll);
+                startRoll(myroll, (results) => {
+			finishRoll( results.rollId);
+		});
+
+	});
 
     	on('clicked:maneuever', (info) => {
+		if (!("yes" in lang)) geti18n();
 		var mytype=info["htmlAttributes"]["id"]
 		if ( mytype == "generate") {
-			var manroll="&{template:vehicle} {{type=Maneuver Score}} {{character=@{character_name}}}{{controlpool=[[?{Control Pool Dice?|0}]]}} {{roll=[[ [[@{vehicle-skill-final} + ?{Control Pool Dice?}]]d6KH1 + @{terrain-points} + @{speed-points} + @{vehicle-points}  ]] }}"
-		} else {
-                 	var manroll="&{template:vehicle} {{type=Compare Maneuver Score}} {{character=@{character_name}}} {{target=@{target|Target|character_name}}} {{charscore=[[@{maneuver-score}]]}} {{targetscore=[[@{target|Target|maneuver-score}]]}} {{roll=[[@{maneuver-score} - @{target|Target|maneuver-score} ]]}} "
-		}
+			var manroll="&{template:vehicle} {{type=" + lang["maneuver-score"] + "}} {{character=@{character_name}}}{{controlpool=[[?{" + lang["control-pool-dice"] + "?|0}]]}} {{roll=[[ [[@{vehicle-skill-final} + ?{" + lang["control-pool-dice"] + "?}]]d6KH1 + @{terrain-points} + @{speed-points} + @{vehicle-points}  ]] }}"
                 startRoll(manroll, (results) => {
 			updatepoolused("controlpool", results.results.controlpool.result);	
 			console.log('results: ' + results.results.roll.result)			
 			finishRoll( results.rollId);
 			setAttrs({"maneuver-score": results.results.roll.result});
 		});
+		} else {
+                 	var manroll="&{template:vehicle} {{type=" + lang["compare"] + " " + lang["maneuver-score"] + "}} {{character=@{character_name}}} {{target=@{target|" + lang["target"] +"|character_name}}} {{charscore=[[@{maneuver-score}]]}} {{targetscore=[[@{target|" + lang["target"] +"|maneuver-score}]]}} {{roll=[[@{maneuver-score} - @{target|" + lang["target"] +"|maneuver-score} ]]}} "
+                	startRoll(manroll, (results) => {
+			finishRoll( results.rollId);
+			});
+		}
 
 	});
     	on('clicked:repeating_rangedweapons:reload', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log("reloading");
 		var setatts={};
 		var atts=[];
@@ -5795,6 +6621,8 @@ on('clicked:matrixattack', (info) => {
 		atts.push("quickness_max");
 		console.log(atts);
    		getAttrs(atts, function(myval) {
+			console.log('myval');
+			console.log(myval);
 			const max=parseInt(myval[myrepeat.concat("ammo")]);
 			const myweapon=myval[myrepeat.concat("name")];
 			const myreload=myval[myrepeat.concat("reloadmethod")];
@@ -5809,27 +6637,31 @@ on('clicked:matrixattack', (info) => {
 			if (myreload=="clip") acttype="simple";
 			if ( ( myreload == "cylinder" ) || ( myreload == "magazine" ) || ( myreload=="break" ) ) {
 				if ( quick > maxload ) {
+					console.log('loading max' );
 					ammoused = maxload;
 				} else {
+					console.log('too many');
 					ammoused = quick;
 				}
 				if ( ammoused > myreloads ) ammoused = myreloads;	
 				rounds = ammoused + remain;
+				reloadtxt=ammoused + " rounds into " + myreload;
 			}
 			const reloadsleft=myreloads - ammoused;
 			if (myreloads < 1) {
 				console.log('out of ammo');
 				ammoused=0;
-				myroll="/w gm &{template:info}{{character=@{character_name}}}{{action=Reload: " + myweapon + "}}{{type=" + acttype +"}}{{info1=Out of Ammo }}";
+				myroll="/w gm &{template:info}{{character=@{character_name}}}{{action=Reload: " + myweapon + "}}{{type=" + lang[acttype] +"}}{{info1=" + lang["out-of-ammo"] + " }}";
 			} else { 
 				console.log('ammo okay');
-				myroll="/w gm &{template:info}{{character=@{character_name}}}{{action=Reload: " + myweapon + "}}{{type=" + acttype + "}}{{info1=Loaded " + reloadtxt + "}}";
+				myroll="/w gm &{template:info}{{character=@{character_name}}}{{action=Reload: " + myweapon + "}}{{type=" + lang[acttype] + "}}{{info1=Loaded " + reloadtxt + "}}";
 				if ( ( myreload == "cylinder" ) || ( myreload == "magazine" ) || ( myreload=="break" ) ) {
 					myroll += "{{info2=" + reloadsleft + " Spare Rounds Remaining}}";
 				} else {
 					myroll += "{{info2=" + reloadsleft +" Spare " + myreload + "s Remaining}}";
 				}
 			}
+			console.log(myroll);
 			setatts[myrepeat.concat("ammoremain")]=rounds;
 			setatts[myrepeat.concat("reloads")]=reloadsleft;
 			setAttrs(setatts);
@@ -5839,6 +6671,7 @@ on('clicked:matrixattack', (info) => {
 		});
 	});
     	on('clicked:repeating_rangedweapons:showmore clicked:repeating_explosives:showmore', (info) => {
+		if (!("yes" in lang)) geti18n();
 		var source=info['sourceAttribute'];
 		console.log('attribute is ' + source);
                 getAttrs([source], function(myval){
@@ -5851,6 +6684,7 @@ on('clicked:matrixattack', (info) => {
                 });
 	});
     	on('clicked:repeating_rangedweapons:rangedattack', (info) => {
+		if (!("yes" in lang)) geti18n();
 		var setatts={};
 		var atts=["sensors-rating", "combatpool-used", "controlpool-used", "gyro-on", "armor-quickness-pen", "rounds-phase", "character_name"];
 	    	var recoilx=1;
@@ -5865,7 +6699,7 @@ on('clicked:matrixattack', (info) => {
 		});
    		getAttrs(atts, function(myval) {
 			if ( (myval[myrepeat.concat("wfamily")] == "Heavy" )  && ( ( mymode != "vehiclesensor" )  || ( mymode != "vehicleranged" )) ) recoilx=2;
-			var vehiclesensors=0, armorpen=0, armorpenroll="", pool, poolname, dmgmin=0, dmgmax=4, finalrounds;
+			var vehiclesensors=0, armorpen=0, armorpenroll="", pool, mypool, poolname, dmgmin=0, dmgmax=4, finalrounds;
 			if ( myval["sensors-rating"] ) vehiclesensors=myval["sensors-rating"] ;
 			const tnmods= myval[myrepeat.concat("tnmods")];
 			const myname= myval["character_name"];
@@ -5874,7 +6708,7 @@ on('clicked:matrixattack', (info) => {
 			const controlused=parseInt(myval["controlpool-used"]);
 			var wdmg= myval[myrepeat.concat("damage")];
 			const ammoremain= myval[myrepeat.concat("ammoremain")];
-			const ammotype= myval[myrepeat.concat("ammotype")];
+			const ammotype= myval[myrepeat.concat("ammotype")].toLowerCase();
 			const targetaim= myval[myrepeat.concat("targeting")];
 			const myskill=myval[myrepeat.concat("skill")];
 			var gyro= myval[myrepeat.concat("gyro")];
@@ -5885,23 +6719,23 @@ on('clicked:matrixattack', (info) => {
 				dmgnumber += 9;
 				wdmg=damagetable[dmgnumber];
 			}
-			if (dmgnumber >= 10) dmgmax=13, dmgmin=10; 
+			if (dmgnumber >= 10) dmgmax=13, dmgmin=9; 
 			var wpower= myval[myrepeat.concat("power")];
 			var ammoleft=myval[myrepeat.concat("ammoremain")];
 			const prevrounds=myval["rounds-phase"];
 			var recoilcomp= myval[myrepeat.concat("recoilcomp")];
-			if (( firemode == "bf") && ( ammoleft <= 3))  rounds ="?{Rounds|" + ammoleft + "}";
-			else if (( firemode == "bf") && ( ammoleft > 3)) rounds ="?{Rounds|3}";
-			else if (( firemode == "fa") && ( ammoleft <= 10)) rounds ="?{Rounds|" + ammoleft + "}";
-			else if (( firemode == "fa") && ( ammoleft > 10)) rounds ="?{Rounds|" + ( 10 - prevrounds ) +"}";
+			if (( firemode == "bf") && ( ammoleft <= 3))  rounds ="?{" + lang["rounds"] + "|" + ammoleft + "}";
+			else if (( firemode == "bf") && ( ammoleft > 3)) rounds ="?{" + lang["rounds"] + "|3}";
+			else if (( firemode == "fa") && ( ammoleft <= 10)) rounds ="?{" + lang["rounds"] + "|" + ammoleft + "}";
+			else if (( firemode == "fa") && ( ammoleft > 10)) rounds ="?{" + lang["rounds"] + "|" + ( 10 - prevrounds ) +"}";
 			var recoil="";
 			if (( firemode == "bf") || (firemode == "fa")) {
-				recoil="{0,(" + recoilx + " * (( ?{Rounds Already Fired in Combat Phase|" + prevrounds + "} +  ?{Rounds} ) - (" + recoilcomp + " + " + gyro + ")))}kh1";
+				recoil="{0,(" + recoilx + " * (( ?{" + lang["rounds-already-fired-in-combat-phase"] + "|" + prevrounds + "} +  ?{" + lang["rounds"] + "} ) - (" + recoilcomp + " + " + gyro + ")))}kh1";
 			} else if (firemode == "sa" ) {
-				recoil="{0,(" + recoilx + " * ( ?{Rounds Already Fired in Combat Phase|" + prevrounds + "}  - (" + recoilcomp + " + " + gyro + ")))}kh1";
+				recoil="{0,(" + recoilx + " * ( ?{" + lang["rounds-already-fired-in-combat-phase"] + "|" + prevrounds + "}  - (" + recoilcomp + " + " + gyro + ")))}kh1";
 			}
 			if (ammoleft <= 0 ) {
-				roll="&{template:info}{{character=@{character_name}}}{{action=Attack: " + myweapon + "}}{{type=Simple}}{{info1=Out of Ammo }}";
+				roll="&{template:info}{{character=@{character_name}}}{{action=" + lang["attack"] + ": " + myweapon + "}}{{type=" + lang["simple"] + "}}{{info1=" + lang["out-of-ammo"] + " }}";
                 		startRoll(roll, (results) => {
 					finishRoll( results.rollId,{});
 				});
@@ -5916,33 +6750,37 @@ on('clicked:matrixattack', (info) => {
 			   calcTN += "@{sensor-gunnery-tn}  + @{vehicle-driver}wp-char} + @{wp-vehicle}"
 			   poolname="Control";
 			   pool="controlpool";
+			   mypool="control"
 
 			} else if ( mymode == "vehicleranged" ) { 
-			   calcTN += " ?{Range} + @{rangedTN} + @{target|Target|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + @{wp-vehicle}";
+			   calcTN += " ?{" + lang["range"] + "} + @{rangedTN} + @{target|" + lang["target"] +"|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + @{wp-vehicle}";
 			   poolname="Control";
 			   pool="controlpool";
+			   mypool="control"
 			} else {
-			   calcTN += " ?{Range} + @{rangedTN} + @{target|Target|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + " + armorpen;
+			   calcTN += " ?{" + lang["range"] + "} + @{rangedTN} + @{target|" + lang["target"] +"|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + " + armorpen;
 			   poolname="Combat";
 			   pool="combatpool";
+			   mypool="combat"
 			}
 
-			calcTN += " + ?{Additional Modifiers|" + tnmods + "} + " + recoil;
+			calcTN += " + ?{" + lang["miscellaneous-modifiers"] + "|" + tnmods + "} + " + recoil;
 			calcTN += " ]]"
 
-			var calcDice = "[[ " + myskill + " + " + specialized + " + ?{" + poolname + " Pool Dice|0}"
+			var calcDice = "[[ " + myskill + " + " + specialized + " + ?{" + lang[mypool + "-pool-dice"]+"|0}"
 			if ( mymode == "vehiclesensor" ) calcDice += " + " + Math.floor(vehiclesensors / 2 )
 			calcDice += " ]]"
 
 
-                	var roll="&{template:attack}{{myname=@{character_name}}}{{target=@{target|Target|token_name}}}";
-			roll += "{{rounds=[[" + rounds + "]]}}{{range=[[@{ask-range}]]}}"; 
+                	var roll="&{template:attack}{{myname=@{character_name}}}{{target=@{target|" + lang["target"] +"|token_name}}}";
+			roll += "{{rounds=[[" + rounds + "]]}}{{range=[[?{" + lang["range"] + "|" + lang["short"] + ",4|" + lang["medium"] + ",5|" + lang["long"] + ",6|" + lang["extreme"] + ",9}]]}}";
+
 			roll += "{{targetnumber=" + calcTN + " }}{{rolldice=" + calcDice + "}}";
 			roll += "{{weaponname=" + myweapon + "}}{{weapondamage=[[" + dmgnumber  + "]]}}{{weaponpower=[[" + wpower + "]]}}";
-			roll += "{{" + pool + "=[[?{" + poolname + " Pool Dice}]]}}{{weaponname=" + myweapon + "}}{{ammotype=" + ammotype  + "}}";
+			roll += "{{" + pool + "=[[?{" + lang[mypool + "-pool-dice"] +"}]]}}{{weaponname=" + myweapon + "}}{{ammotype=" + ammotype  + "}}";
 			roll += "{{attacktest=[[ " + calcDice + "d6>[[ {2, " + calcTN + "}kh1 ]]!! ]] }}";
 			if ( mymode == "rangedattack" )  {
-				roll += "{{dodge=[Dodge](~@{target|Target|token_name}|dodge)}}";
+				roll += "{{dodge=[Dodge](~@{target|" + lang["target"] +"|token_name}|dodge)}}";
 				roll += "{{senddata=[[0]]}}"
 			}
 			roll += armorpenroll;
@@ -5974,6 +6812,7 @@ on('clicked:matrixattack', (info) => {
 				finaldamage=damagetable[dmgnumber];
 				let payload= {
 					attacker: myname,
+					weapon: myweapon,
 					armortype: "ballistic",
 					range: results.results.range.result,
 					wdmg: finaldamage,
@@ -5998,54 +6837,90 @@ on('clicked:matrixattack', (info) => {
 			}
 		});
        });
-    	on('clicked:melee', (info) => {
-		console.log(info);
+
+   	const meleecombat = function (mymode, payload) {
+		if (!("yes" in lang)) geti18n();
+		console.log(payload);
+		var plane=(payload["plane"])? payload["plane"] : "physical";
+		const askreach=(payload["reachmode"])? payload["reachmode"] : 0;
 		var atts=[];
-		const mymode=info["htmlAttributes"]["id"];
 		console.log(mymode);
 		var myfocus = 0;
 		var focus="";
 		var force="";
-		var mydamage;
-		var myskill;
-		var myweapon;
-		var mypower;
+		var mydamage, myskill, myweapon, mypower, defroll;
 		var pool="combatpool";
-		var defaultmsg="";
+		var defaultmsg=" ";
 		var defaultpen=0;
 		var myspec=0;
-		const meleeattrs=["unarmed", "unarmed-specialized", "cyberimplant", "weaponfocus-equipped", "weaponfocus-damage", "gyro-on"];
+		const repeatatts=["damage", "power", "name", "skill", "reach", "specialized", "notes", "tnmods"] ;
+		var meleeattrs=["sheettype", "character_name","strength_max", "martialarts", "attackdamage", "attackpower", "reaction_max", "charisma_max", "unarmed", "unarmed-specialized", "cyberimplant", "weaponfocus-equipped", "weaponfocus-damage", "gyro-on", "armor-quickness-pen",  "unarmed-miscmods", "weaponfocus-specialized", "metatype", "meleeselected"];
+		if ( mymode.includes("repeating" )) {
+			console.log('using repeating');
+			repeatatts.forEach(myatt=>{
+				meleeattrs.push(mymode.concat(myatt));
+			});
+		};
+		console.log('ask reach ' + askreach);
 		getAttrs(meleeattrs, function(myval) {
-			if ( mymode == "astralattack" ) {
-				pool="astralpool";
-				myweapon="Astral Attack";
-				var myskill="@{astralcombat}";
-				myskill="@{astralcombat} + @{weaponfocus-force}"
-				var mydamage="M"
-				if ( myval["weaponfocus-equipped"]=="on" ) { 
-					myskill += "( " + myskill + " +  @{weaponfocus-force} )"
-					mydamage=myval["weaponfocus-damage"];
-				}
-				mypower="@{charisma|max}";
-				focus="{{weaponfocus=@{weaponfocus-name}}}"
-				force="{{focusforce=@{weaponfocus-force}}}"
-			}
-			else if ( mymode == "unarmedattack" ) {
-			   var gyropen=0;
-			   var gyropenroll="";
-			   if ( myval["gyro-on"] == 1 ) {
+			const strmax=parseInt(myval["strength_max"]);
+			const attackdamage=myval["attackdamage"];
+			const attackpower=parseInt(myval["attackpower"]);
+			const myname=myval["character_name"];
+			const sheettype=myval["sheettype"];
+			var mynotes="";
+			var myspec=0;
+			var mytnmod=0;
+			var myreach="@{meleereach|max}";
+			var gyropenroll="";
+			var gyropen=0;
+			if (( myval["gyro-on"] == 1 ) && ( mymode != "astralattack" )) {
 			   	gyropen=4;
 				gyropenroll = "{{gyropen=" + gyropen + "}}";
-			   }
-			   mydamage=myval["@{attackdamage}"];
+			} if (( mymode == "astralattack" ) || (plane=="astral")) {;
+				pool="astralpool";
+				plane="astral";
+				myweapon="Astral Attack";
+				var myskill="@{astralcombat}";
+				var mydamage="M"
+				if ( myval["weaponfocus-equipped"]=="on" ) { 
+					myskill = "( " + myskill + " +  @{weaponfocus-force} )"
+					myspec=myval["weaponfocus-specialized"];
+					mydamage=myval["weaponfocus-damage"];
+				}
+				mypower=parseInt(myval["charisma_max"]);
+				focus="{{weaponfocus=@{weaponfocus-name}}}"
+				force="{{focusforce=@{weaponfocus-force}}}"
+			} 
+			else if (mymode.includes("repeating")) {
+				myrepeat=mymode;
+				console.log('repeating melee');
+				mynotes=myval[myrepeat.concat("mynotes")];
+				myweapon=myval[myrepeat.concat("name")];
+				mydamage=myval[myrepeat.concat("damage")];
+				mypower=parseInt(myval[myrepeat.concat("power")]);
+				myskill=myval[myrepeat.concat("skill")];
+				myspec=myval[myrepeat.concat("specialized")];
+				mytnmod=myval[myrepeat.concat("tnmods")];
+				if ( myval["metatype"] == "Troll" )  myreach=myval[myrepeat.concat("reach")] + 1;
+				else myreach=myval[myrepeat.concat("reach")];
+			} else if (( sheettype == "Critter" ) || (sheettype=="Spirit")) {
+				myskill=myval["reaction_max"];
+				mydamage=myval["attackdamage"];
+				mypower=parseInt(myval["attackpower"]);
+				myweapon=sheettype + " Attack";
+			} else {
+			   console.log('unarmed melee');
+			   mydamage=attackdamage;
 			   myskill=myval["unarmed"];
 			   myspec=myval["unarmed-specialized"];
-			   myweapon="@{martialarts}";
-			   mypower="@{strength|max}";
+			   mytnmod=myval["unarmed-miscmods"];
+			   myweapon=myval["martialarts"];
+			   mypower=strmax;
 			   if ( myval["unarmed"] == 0 ) {
 			   	console.log('unarmed is 0');
 				if (myval["cyberimplant"] == 0) { 
-					myskill="@{strength|max}";
+					myskill=strmax;
 					defaultpen=4;
 					pool="false";
 					var defaultmsg="{{default=Skill Defaulted to Strength Attribute with +" + defaultpen + " to hit}}";
@@ -6055,52 +6930,160 @@ on('clicked:matrixattack', (info) => {
 					var defaultmsg="{{default=Skill Defaulted to Cyber Implant skill with +" + defaultpen + " to hit}}";
 				}
 			   }
-			}
-			else if ( mymode == "critterattack" ) {
-				myskill="@{reaction|max}";
-				mydamage="@{attackdamage}";
-				mypower="@{attackpower}";
-				myweapon="Attack";
-			} else {
-				console.log(' id ' + mymode + ' does not match');
-			}
-			var calcTN="4 + @{meleeTN} + ( ( @{target|Target|meleereach|max} - @{meleereach|max} ) * ?{Use Reach Modifier?} ) + " + defaultpen + " + " + gyropen;
+			} 
+			var calcTN="4 + @{meleeTN} + " + mytnmod + " + " + defaultpen + " + " + gyropen;
+			if (askreach==0) calcTN += " + ( ( @{target|" + lang["target"] +"|meleereach|max} - " + myreach + " ) * ?{" + lang["use-reach-modifier"] +"?} )"; 
 			var calcDice=myskill + " + " + myspec ;
-                        var myroll="&{template:attack}{{myname=@{character_name}}}{{target=@{target|Target|token_name}}}{{weapondamage="
+                        var myroll="&{template:melee}{{myname=" + myname + "}}{{target=@{target|" + lang["target"] +"|token_name}}}{{weapondamage=[[0]]}}{{finalwinner=[[0]]}}{{weaponpower=[[" + mypower + "]]}}"
+			if ( quicknesslinked.includes(myskill) ) {
+				console.log('quick pen');
+				armorpen=myval["armor-quickness-pen"];
+				console.log(armorpen);
+				myroll+= "{{armorpen=@{armor-quickness-pen}}}";
+			}
 			console.log('pool name is ' + pool);
-			myroll+= mydamage + "}}{{weaponpower=[[" + mypower + "]]}}"
 			if ( pool == "combatpool" ) {
-				calcDice += " + ?{Combat Pool Dice}"
-				myroll += "{{pooldice=[[?{Combat Pool Dice|0}]]}}"
-				myroll += "{{pooltype=Combat}}";
+				calcDice += " + ?{" + lang["combat-pool-dice"] + "}"
+				myroll += "{{pooldice=[[?{" + lang["combat-pool-dice"] + "|0}]]}}"
+				myroll += "{{pooltype=" + lang["combat"] +"}}";
 			} else if ( pool == "astralpool" ) {
-				calcDice += " + ?{Astral Pool Dice}"
-				myroll += "{{pooldice=[[?{Astral Pool Dice|0}]]}}"
-				myroll += "{{pooltype=Astral}}";
+				calcDice += " + ?{" + lang["astral-pool-dice"] +"}"
+				myroll += "{{pooldice=[[?{" + lang["astral-pool-dice"] +"|0}]]}}"
+				myroll += "{{pooltype=" + lang["astral"] +"}}";
 			} else  {
 				myroll += "{{pooldice=[[0]]}}"
 			}
-			myroll+= "{{charreach=[[@{meleereach|max}]]}}{{targetreach=[[@{target|Target|meleereach|max}]]}}"
-			myroll+="{{weaponname=" + myweapon + "}}{{reachmod=[[?{Use Reach Modifier?|Yes,1|No,0}]]}}"
-			myroll+="{{reachbonus=[[(@{target|Target|meleereach|max} - @{meleereach|max} ) * ?{Use Reach Modifier?}]]}}"
+			myroll+="{{senddata=[[0]]}}";
+			myroll+= "{{charreach=[[" + myreach + "]]}}{{targetreach=[[@{target|" + lang["target"] +"|meleereach|max}]]}}"
+			myroll+="{{weaponname=" + myweapon + "}}"
+			myroll+= (askreach==0)? "{{reachmod=[[?{" + lang["use-reach-modifier"] +"?|" + lang["yes"] + ",1|" + lang["no"] + ",0}]]}}{{reachbonus=[[(@{target|" + lang["target"] +"|meleereach|max} - @{meleereach|max} ) * ?{" + lang["use-reach-modifier"] +"?}]]}}" : "{{reachmod=[[0]]}}";
 			myroll+="{{rolldice=[[" + calcDice + "]]}}{{targetnumber=[[" + calcTN + "]]}}"
-			myroll+="{{attacktest=[[ [[" + calcDice + "]]d6>[[ {2,[[ " + calcTN + "]]}kh1]]!!  ]] }}" 
+			if ( payload == "none" ) { 
+				myroll+="{{attacktest=[[ [[" + calcDice + "]]d6>[[ {2,[[ " + calcTN + "]]}kh1]]!!  ]] }}" 
+			   	myroll += "{{attackmode=Attack}}{{defend=yes}}";
+		 		payload={		
+					dodge: 0,
+					weapon: myweapon,
+					armortype: "impact",
+					attacker: myname,
+					strength: strmax,
+					power: mypower,
+					wdmg: mydamage,
+					plane: plane,
+					maxd: 4 - damagetable[mydamage]
+				};
+			} else { 
+			   	myroll += "{{attacknumber=[[" + payload["attacktest"] + "]]}}{{win=[[1]]}}{{attacker=" + payload["attacker"] + "}}{{defender=" + myname + "}}";
+				myroll += "{{defensetest=[[ [[" + calcDice + "]]d6>[[ {2,[[ " + calcTN + "]]}kh1]]!!  ]] }}";
+				myroll += (payload["defmode"]=="regular")? "{{attackmode=Defend}}" : "{{attackmode=Full Defense}}{{dodge=yes}}";
+				payload["dmaxd"]= 4 - damagetable[mydamage];
+			}
 			myroll+=defaultmsg;
 			myroll+=gyropenroll;
+			console.log('wdmg ' + mydamage);
 			console.log(myroll);
                 	startRoll(myroll, (results) => {
+				var delta, finalpower, finaldmg, mywinner, mylooser;
 				var reachmodtxt="Reach Bonus Applied" ;
 				if ( results.results.reachmod.result == 0 ) reachmodtxt="Reach Bonus Not Applied";
+				payload["reachmode"]=results.results.reachmod.result;
+				if (payload["attacktest"]) {
+					console.log('defense run');
+					defroll=results.results.defensetest.result;
+					payload["ammotype"]="melee";
+					payload["range"]="melee";
+					payload["meleetn"]=results.results.targetnumber.result;
+					if (payload["attacktest"] >= defroll ) {
+						mywinner=payload["attacker"];
+						mylooser=myname;
+						delta=Math.floor((payload["attacktest"] - defroll)/2);
+						payload["wdmg"]=finaldmg=damagetable[(delta >= payload["maxd"])? 4 : damagetable[payload["wdmg"]] + delta];
+						payload["power"]=finalpower=(delta >= payload["maxd"])? payload["power"] + (delta - payload["maxd"]) : payload["power"];
+						console.log('attacker wins');
+					} else {
+						console.log('defender wins');
+						mywinner=myname;
+						mylooser=payload["attacker"];
+						delta=Math.floor((defroll - payload["attacktest"])/2);
+						payload["weapon"]=myweapon;
+						if ( payload["defmode"] == "regular" ) {
+							payload["wdmg"]=finaldmg=damagetable[(delta >= payload["dmaxd"])? 4 : damagetable[mydamage] + delta];
+							payload["power"]=finalpower=(delta >= payload["dmaxd"])? mypower + (delta - payload["dmaxd"]) : mypower;
+							payload["strength"]=strmax;
+						} else {
+							console.log('full defense mode');
+							payload["wdmg"]="Attack";
+							payload["power"]="Parried";
+						}
+					}
+					payload["attacktest"]=0;
+				} else {
+					console.log('attack run');
+					payload["attacktest"]=results.results.attacktest.result;
+				}
+				console.log(payload);
+				if (defroll != null) {
+					console.log('finish dmg ' + finaldmg + ' power ' + finalpower + ' winner: ' + typeof mywinner + ' looser: ' + mylooser);
+					let testmsg='brad';
+					finishRoll( results.rollId, {
+						finalwinner: mylooser,
+						reachmod: reachmodtxt,
+						weapondamage: mydamage,
+						weapondamage: finaldmg,
+						weaponpower: finalpower,
+						senddata: rollEscape.escape(payload),
+					});
+				} else {
+					finishRoll( results.rollId, {
+						reachmod: reachmodtxt,
+						weapondamage: mydamage,
+						senddata: rollEscape.escape(payload),
+					});
+
+				}
 				if ( pool != "none" ) updatepoolused(pool, results.results.pooldice.result );
-				finishRoll( results.rollId, {
-					reachmod: reachmodtxt,
-				});
 
 			});
 		});
-
+	};
+        on('clicked:meleedefend', (info) => {
+		if (!("yes" in lang)) geti18n();
+		console.log(info);
+		payload=rollEscape.unescape(info["originalRollId"]); 
+		getAttrs(["meleeselected"], function(myval) {
+			payload["defmode"]="regular";
+			const mselect=myval["meleeselected"];
+			mymode = (mselect == "unarmed-equipped")? "unarmedattack" : mselect.slice(0, -12);
+			meleecombat(mymode, payload);
+		});	
 	});
-    	on('clicked:repeating_meleeweapons:attack', (info) => {
+        on('clicked:meleedefendfull', (info) => {
+		if (!("yes" in lang)) geti18n();
+		console.log(info);
+		payload=rollEscape.unescape(info["originalRollId"]); 
+		getAttrs(["meleeselected"], function(myval) {
+			payload["defmode"]="full";
+			const mselect=myval["meleeselected"];
+			mymode = (mselect == "unarmed-equipped")? "unarmedattack" : mselect.slice(0, -12);
+			meleecombat(mymode, payload);
+		});	
+	});
+
+        on('clicked:repeating_meleeweapons:attack', (info) => {
+		if (!("yes" in lang)) geti18n();
+		var source=info['sourceAttribute'].split('_');
+		var sourceattr=source.pop();
+		var myrepeat=source.join('_').concat('_');
+		payload="none";
+		meleecombat(myrepeat, payload);
+	});
+        on('clicked:melee', (info) => {
+		payload="none";
+		const mymode=info["htmlAttributes"]["id"];
+		meleecombat(mymode, payload);
+	});
+    	on('clicked:repeating_meleeweapons2:attack', (info) => {
+		if (!("yes" in lang)) geti18n();
 		console.log(info);
 		var atts=["combatpool-used", "gyro-on", "armor-quickness-pen"];
 		var rounds=1;
@@ -6128,19 +7111,19 @@ on('clicked:matrixattack', (info) => {
 			const myspec= myval[myrepeat.concat("specialized")];
 			const mynotes= myval[myrepeat.concat("notes")];
 			var armorpen=0;
-                        var myroll="&{template:attack}{{myname=@{character_name}}}{{target=@{target|Target|token_name}}}{{weapondamage=" + mydamage + "}}";
+                        var myroll="&{template:attack}{{myname=@{character_name}}}{{target=@{target|" + lang["target"] +"|token_name}}}{{weapondamage=" + mydamage + "}}";
 			if ( quicknesslinked.includes(myskill) ) {
 				console.log('quick pen');
 				armorpen=myval["armor-quickness-pen"];
 				console.log(armorpen);
 				myroll+= "{{armorpen=@{armor-quickness-pen}}}";
 			}
-			calcDice="[[ " + myskill + " + " + myspec + " + ?{Combat Pool Dice}]]";
-			calcTN="[[ {2,(4 + @{meleeTN} + " + gyropen + " +  ( ( @{target|Target|meleereach|max} - " + myreach + ") * ?{Use Reach Modifier?} ) + " + armorpen + ")}kh1 ]]";
-			myroll+= "{{weaponpower=[[" + mypower + "]]}}{{combatpool=[[?{Combat Pool Dice|0}]]}}"
-			myroll+= "{{charreach=[[@{meleereach|max}]]}}{{targetreach=[[@{target|Target|meleereach|max}]]}}"
-			myroll+="{{weaponname=" + myweapon + "}}{{reachmod=[[?{Use Reach Modifier?|Yes,1|No,0}]]}}"
-			myroll+="{{reachbonus=[[(@{target|Target|meleereach|max} - " + myreach + ") * ?{Use Reach Modifier?}]]}}"
+			calcDice="[[ " + myskill + " + " + myspec + " + ?{" + lang["combat-pool-dice"] + "}]]";
+			calcTN="[[ {2,(4 + @{meleeTN} + " + gyropen + " +  ( ( @{target|" + lang["target"] +"|meleereach|max} - " + myreach + ") * ?{" + lang["use-reach-modifier"] +"?} ) + " + armorpen + ")}kh1 ]]";
+			myroll+= "{{weaponpower=[[" + mypower + "]]}}{{combatpool=[[?{" + lang["combat-pool-dice"] + "|0}]]}}"
+			myroll+= "{{charreach=[[@{meleereach|max}]]}}{{targetreach=[[@{target|" + lang["target"] +"|meleereach|max}]]}}"
+			myroll+="{{weaponname=" + myweapon + "}}{{reachmod=[[?{" + lang["use-reach-modifier"] +"?|" + lang["yes"] + ",1|" + lang["no"] + ",0}]]}}"
+			myroll+="{{reachbonus=[[(@{target|" + lang["target"] +"|meleereach|max} - " + myreach + ") * ?{" + lang["use-reach-modifier"] +"?}]]}}"
 			myroll+="{{rolldice=" + calcDice + "}}{{targetnumber=" + calcTN + "}}"
 			myroll+="{{attacktest=[[" + calcDice + "d6>" + calcTN + "!!  ]] }}" 
 			myroll += "{{meleemods=@{meleeTN}}}";
@@ -6159,9 +7142,10 @@ on('clicked:matrixattack', (info) => {
 	});
 
     	on('clicked:repeating_explosives:rangedattack', (info) => {
+		if (!("yes" in lang)) geti18n();
 		var setatts={};
 		var scatter="";
-		var atts=["combatpool-used", "controlpool-used"];
+		var atts=["combatpool-used", "controlpool-used", "character_name"];
 		var rounds=1;
 		var expint=0;
 		var source=info['sourceAttribute'].split('_');
@@ -6169,45 +7153,52 @@ on('clicked:matrixattack', (info) => {
 		var myrepeat=source.join('_').concat('_');
 		var mymode=info["htmlAttributes"]["id"]
 		const scatimg="https://raw.githubusercontent.com/bahornbeck/img/master/images/scatterdiagram";
-		const weaponattrs=["damage", "power", "name", "ammoremain", "skill", "wfamily", "specialized", "targeting", "recoilcomp", "gyro", "ammo", "scatter", "blast","scatterredux", "missleint", "tnmods"] ;
+		const weaponattrs=["damage", "power", "name", "exptype", "ammoremain", "skill", "wfamily", "specialized", "targeting", "recoilcomp", "gyro", "ammo", "scatter", "blast","scatterredux", "missleint", "tnmods"] ;
 		weaponattrs.forEach(myatt=>{
 			atts.push(myrepeat.concat(myatt));
 		});
    		getAttrs(atts, function(myval) {
 			const combatused= parseInt(myval["combatpool-used"]);
 			const controlused= parseInt(myval["controlpool-used"]);
+			const myname= myval["character_name"];
 			const myweapon= myval[myrepeat.concat("name")];
 			const wdmg= myval[myrepeat.concat("damage")];
+			const [grenadeshape,grenadetype]= myval[myrepeat.concat("exptype")].split(":");
+			const wpower= myval[myrepeat.concat("power")];
 			const ammoremain= myval[myrepeat.concat("ammoremain")];
 			const gyro= myval[myrepeat.concat("gyro")];
 			const targetaim= myval[myrepeat.concat("targeting")];
 			const tnmods= myval[myrepeat.concat("tnmods")];
 			var dmgnumber= damagetable[wdmg];
-			var range="{{range=?{Range|Short,4|Medium,5|Long,6|Extreme,9}}}";
+			var range="{{range=[[?{" + lang["range"] + "|" + lang["short"] + ",4|" + lang["medium"] + ",5|" + lang["long"] + ",6|" + lang["extreme"] + ",9}]]}}";
 			var missleintel=0;
 			var calcTN;
 			if ( mymode=="sensorexp") { 
 				range="";
 				missleintel=myval[myrepeat.concat("missleint")] || 0;
 				expint="{{expint=[[" + missleintel + "]]}}"
-				calcTN="[[ @{target|Target|signature} + ?{Urban Environment?|Yes,2|No,0} + @{wp-char}";
+				calcTN="[[ @{target|" + lang["target"] +"|signature} + ?{" + lang["urban-setting"] + "?|" + lang["yes"] + ",2|" + lang["no"] + ",0} + @{wp-char}";
 				poolname="Combat";
 				pool="combatpool";
+				mypool="combat";
 			} else if ( mymode=="vehicle-sensorexp" )  {
 				range="";
 				missleintel=myval[myrepeat.concat("missleint")] || 0;
 				expint="{{expint=[[" + missleintel + "]]}}"
-				calcTN="[[ @{target|Target|signature} + ?{Urban Environment?|Yes,2|No,0} + @{wp-vehicle} + @{gunnery-test-los}";
+				calcTN="[[ @{target|" + lang["target"] +"|signature} + ?{" + lang["urban-setting"] + "?|" + lang["yes"] + ",2|" + lang["no"] + ",0} + @{wp-vehicle} + @{gunnery-test-los}";
 				poolname="Control";
 				pool="controlpool";
+				mypool="control";
 			} else if ( mymode=="vehicle-explosive" ) {
-			   	calcTN = "[[ ?{Range} + @{rangedTN} + @{target|Target|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + @{wp-vehicle}";
+			   	calcTN = "[[ ?{" + lang["range"] + "} + @{rangedTN} + @{target|" + lang["target"] +"|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + @{wp-vehicle}";
 			   	poolname="Control";
 			   	pool="controlpool";
+				mypool="control";
 			} else {
 				poolname="Combat";
 				pool="combatpool";
-			   	calcTN = "[[ ?{Range} + @{rangedTN} + @{target|Target|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + @{wp-char}";
+				mypool="combat";
+			   	calcTN = "[[ ?{" + lang["range"] + "} + @{rangedTN} + @{target|" + lang["target"] +"|targetMove} + {0,( @{move} - " + gyro + ") }kh1 + " + targetaim + " + @{wp-char}";
 			}
 			let direction=getRandomInt(1, 7);
 			const myskill=myval[myrepeat.concat("skill")];
@@ -6216,25 +7207,25 @@ on('clicked:matrixattack', (info) => {
 			const myredux=myval[myrepeat.concat("scatterredux")];
 			const specialized=myval[myrepeat.concat("specialized")] || 0;
 			if (ammoremain <= 0 ) {
-				roll="&{template:info}{{character=@{character_name}}}{{action=Attack: " + myweapon + "}}{{type=Simple}}{{info1=Out of Explosives }}";
+				roll="&{template:info}{{character=@{character_name}}}{{action=Attack: " + myweapon + "}}{{type=" + lang["simple"] + "}}{{info1=Out of Explosives }}";
                 		startRoll(roll, (results) => {
 					finishRoll( results.rollId,{});
 				});
 			} else {
-			   var calcDice = "[[ " + myskill + " + " + specialized + " + ?{" + poolname + " Pool Dice|0} + " + missleintel + " ]]"
-			   calcTN += " + ?{Additional Modifiers|" + tnmods + "} ]]"
-                	   var roll="&{template:explosive}{{myname=@{character_name}}}{{target=@{target|Target|token_name}}}" + range
+			   var calcDice = "[[ " + myskill + " + " + specialized + " + ?{" + lang[mypool + "-pool-dice"] + "|0} + " + missleintel + " ]]"
+			   calcTN += " + ?{" + lang["miscellaneous-modifiers"] + "|" + tnmods + "} ]]"
+                	   var roll="&{template:explosive}{{mytoken=@{selected|token_id}}}{{myname=@{character_name}}}{{target=@{target|" + lang["target"] +"|token_name}}}{{targettoken=@{target|" + lang["target"] +"|token_id}}}" + range
 			   roll += "{{rolldice=" + calcDice + "}}{{targetnumber=[[{2,( " + calcTN + ")}kh1]]}}";
-			   roll += "{{weapondamage=" + myval[myrepeat.concat("damage")] + "}}";
-			   roll += "{{weaponpower=" + myval[myrepeat.concat("power")]  + "}}" + expint;
-			   if (  ( mymode=="vehicle-explosive" ) || ( mymode=="vehicle-sensorexp") ) roll += "{{controlpool=[[?{Control Pool Dice|0}]]}}";
-			   else roll += "{{combatpool=[[?{Combat Pool Dice|0}]]}}";
+			   roll += "{{weapondamage=" + wdmg + "}}{{senddata=[[0]]}}";
+			   roll += "{{weaponpower=" + wpower + "}}" + expint;
+			   if (  ( mymode=="vehicle-explosive" ) || ( mymode=="vehicle-sensorexp") ) roll += "{{controlpool=[[?{" + lang["control-pool-dice"] + "|0}]]}}";
+			   else roll += "{{combatpool=[[?{" + lang["combat-pool-dice"] + "|0}]]}}";
 			   roll += "{{weaponname=" + myval[myrepeat.concat("name")] + "}}";
 			   roll += "{{attacktest=[[ " + calcDice + "d6>[[ {2, ( " + calcTN + ")}kh1 ]]!! ]] }}";
 			   roll += "{{scatdir=[[1d6]]}}{{scatter=[[" + myscat + "d6]]}}{{blastradius=" + myblast ;
 			   roll += "}}{{scatterredux=" + myredux + "}}{{scatdirnumber=[[" + direction ; 
 			   roll += "]]}}{{scatdir=" + scatimg + direction  + ".png}}";
-			   roll += "{{resist=[Resist Explosive](~selected|resist-impact-normal)}}";
+			   roll += "{{expresist=yes}}";
 			   console.log(roll);
                 	   startRoll(roll, (results) => {
 			   	var myscatter = results.results.scatter.result;
@@ -6242,10 +7233,27 @@ on('clicked:matrixattack', (info) => {
 				console.log('start scatter: ' + myscatter);
 				console.log('successes: ' + mysuccess);
 				myscatter = myscatter - ( mysuccess * myredux) - missleintel;
+				console.log('myscatter ' + myscatter);
 				if ( myscatter < 0 ) myscatter=0;
+				let payload= {
+					attacker: myname,
+					weapon: myweapon,
+					armortype: "impact",
+					wdmg: wdmg,
+					rounds: 1,
+					dodge: 0,
+					attacktest: results.results.attacktest.result,
+					power:  wpower,
+					scatter: myscat,
+					blast: myblast,
+					ammotype: grenadetype.toLowerCase(),
+				}
+				if (( mymode=="sensorexp") || ( mymode=="vehicle-sensorexp")) payload["range"]="sensor";
+				else payload["range"]=results.results.range.result;
 			   	finishRoll( results.rollId,
                 		{
                     			scatter: myscatter, 
+					senddata: rollEscape.escape(payload),
                 		}
 				);
 			   	if (( mymode=="vehicle-explosive" ) || ( mymode=="vehicle-sensorexp")) setatts["controlpool-used"] = results.results.controlpool.result + controlused;
@@ -6656,6 +7664,8 @@ on('clicked:matrixattack', (info) => {
 	myonchange = myonchange.concat("-rating");
         changelist += myonchange;
     });
+    console.log('changelist');
+    console.log(changelist);
     on(changelist, function(eventinfo) {
     	let myutil=eventinfo["sourceAttribute"].split("-")[0];
 	var myrating=myutil.concat("-rating");
@@ -6737,9 +7747,15 @@ on(utilsizechange, function(info) {
 
 on("change:matrixsecurityrating", function() {
 	console.log('change of sec rating');
+	const atlist=["deck-bod-max", "deck-evasion-max", "deck-masking-max", "deck-sensors-max", "deck-mpcp-max", "deck-detection-max", "decking"];
 	getAttrs(["matrixsecurityrating"], function(myval) {
+		sets={};
 		let sr = parseInt(myval["matrixsecurityrating"]);
-		setAttrs({"deck-bod-max":sr, "deck-evasion-max":sr, "deck-masking-max":sr, "deck-sensors-max":sr, "deck-mpcp-max":sr, "deck-detection-max":sr});
+		atlist.forEach(at=> {
+			sets[at]=sr;
+		});
+		console.log(sets);
+		setAttrs(sets);
 	});
 });
 
@@ -6887,6 +7903,7 @@ on("change:deckattacklevel", function() {
 });
 
 	on('clicked:repeating_ic:combat', (info) => {
+		if (!("yes" in lang)) geti18n();
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
 		gets=["matrixcode"];
@@ -6900,7 +7917,7 @@ on("change:deckattacklevel", function() {
 		gets.push(myrepeat.concat("ic-penalty"));
 		gets.push(myrepeat.concat("matrix-iconstatus"));
 		getAttrs(gets, function (myval) {
-			var myatt="@{target|Target|deck-evasion-final}";
+			var myatt="@{target|" + lang["target"] +"|deck-evasion-final}";
 			const name=myval[myrepeat.concat("icname")];
 			const ictype=myval[myrepeat.concat("ictype")];
 			const penalty=parseInt(myval[myrepeat.concat("ic-penalty")]);
@@ -6915,53 +7932,61 @@ on("change:deckattacklevel", function() {
 			const attacktn =matrixtn[code][targeticon];
 			var senddata="{{senddata=[[0]]}}";
                 	var myroll="&{template:matrix}{{myname=" + name + "}}";
+			var action=lang["attack"];
 			if ( icmode=="proactive" ) {
 				ictest=attacktn;
 			} else if ( ictype == "Probe" ) {
-				ictest="@{target|decker|deck-detection-final}";
+				ictest="@{target|" + lang["decker"] + "|deck-detection-final}";
 				senddata="";
+				action=lang["probe"];
 			} else {
-				ictest="?{Utility Rating?|6}";
+				ictest="?{" + lang["utility-rating"] + "?|6}";
 			}
 			const payload = {
+				wdmg: matrixtn[code]["wdmg"],
 				attacker: name,
 				power: rating,
 				attribute: "deck-" + targetatt + "-final",
 				attacktype: ictype
 			};
-			var target="{{target=@{target|Target|token_name}}}";
-			if ( mytitle == "Evade Detection" ) myatt = "@{target|Target|deck-sensors-final}";
-			if ( mytitle == "IC Resist" ) myatt = "?{Power of Attack?|2}";
+			var target="{{target=@{target|" + lang["target"] +"|token_name}}}";
+			if ( mytitle == "Evade Detection" ) myatt = "@{target|" + lang["target"] +"|deck-sensors-final}";
+			if ( mytitle == "IC Resist" ) myatt = "?{" + lang["attack-power"] +"?|2}";
 			if ( mytitle == "IC Resist" ) target = "{{target=" + name + "}}";
 			if ( mytitle == "IC Execute" ) { 
 				myatt = ictest;
-				target="{{target=@{target|decker|token_name}}}";
+				target="{{target=@{target|" + lang["decker"] + "|token_name}}}";
 			}
-			var calcTN= myatt + " +?{Miscellaneous Modifiers|0} + " + penalty;
+			var calcTN= myatt + " +?{" + lang["miscellaneous-modifiers"] + "|0} + " + penalty;
 			var calcDice="@{matrixsecurityrating}"
 			if (( ictype == "Probe") || (ictype == "Scramble"))  calcDice=rating;
 			myroll+=target;
 			myroll+=senddata;
 			myroll+="{{rolldice=[[" + calcDice + "]]}}{{targetnumber=[[" + calcTN + "]]}}";
 			myroll+="{{basetn=[[" + myatt + "]]}}";
-			myroll+="{{action=" + mytitle + "}}"
+			myroll+="{{action=" + action + "}}"
 			myroll+="{{roll= [[ [[" + calcDice + "]]d6>[[ {2,(" + calcTN + ")}kh1]]!! ]] }}"
+			if ( icmode=="proactive" ) myroll+="{{wdmg=[[" + matrixtn[code]["wdmg"] + "]]}}";
 			if (( ictype == "Tar Baby") || (ictype == "Tar pit")) {
                 		myroll="/w gm &{template:matrix}{{myname=" + name + "}}";
-				myroll += "{{target=@{target|decker|token_name}}}";
-				myroll += "{{targetnumber=[[?{Utility Rating?|4}]]}}";
+				myroll += "{{target=@{target|" + lang["decker"] + "|token_name}}}";
+				myroll += "{{targetnumber=[[?{" + lang["utility-rating"] + "?|4}]]}}";
 				myroll += "{{action=" + name + " Test}}";
 				myroll += "{{basetn=[[0]]}}";
 				myroll += "{{rolldice=[[ " + rating + "]]}}";
-				myroll += "{{roll=[[[[" + rating +" ]]d6>[[?{Utility Rating?} + " + penalty +"]]!!]]}}";
-				myroll += "{{oppose=[[[[?{Utility Rating?}]]d6>[[" + rating + " @{target|decker|matrix-penalty}]]!!]]}}";
-				myroll += "{{sensor=[[[[@{target|decker|deck-sensors-final}]]d6>[[" + rating + " + @{target|decker|matrix-penalty} ]]!!]]}}";
+				myroll += "{{roll=[[[[" + rating +" ]]d6>[[?{" + lang["utility-rating"] + "?} + " + penalty +"]]!!]]}}";
+				myroll += "{{oppose=[[[[?{" + lang["utility-rating"] + "?}]]d6>[[" + rating + " @{target|" + lang["decker"] + "|matrix-penalty}]]!!]]}}";
+				myroll += "{{sensor=[[[[@{target|" + lang["decker"] + "|deck-sensors-final}]]d6>[[" + rating + " + @{target|" + lang["decker"] + "|matrix-penalty} ]]!!]]}}";
 			}
 			console.log(myroll);
+			const finalwdmg=(iclist["attack"].includes(ictype))? damagetable[matrixtn[code]["wdmg"]] : "";
+			console.log('finalwdmg: ' + finalwdmg);
                 	startRoll(myroll, (results) => {
 				payload["basetn"]=results.results.basetn.result;
+				payload["attacktest"]=results.results.roll.result;
 			   	finishRoll( results.rollId,
                 		{
+					wdmg: finalwdmg,
 					senddata: rollEscape.escape(payload),
                 		});
 			});
@@ -7148,19 +8173,18 @@ on("change:speed-current change:speed-rating change:vehicle-penalty", function()
   });
 
   on("change:sensor-los", function(){
+     const sensorlosmods={
+     	direct: {sensor: -1, gunnery: -3 },
+	interupted: {sensor: 0, gunnery: 0}
+     };
      getAttrs(["sensor-los"], function (myval) {
-	var st=0;
-        switch (myval["sensor-los"]) {
-        	case "direct":
-			var st=-2;
-			var gt=-3;
-			break;
-        	case "interupted":
-			var st=0;
-			var gt=0;
-			break;
-	}
-	setAttrs({"sensor-test-los": st, "gunnery-test-los": gt});
+     	var sets={};
+	const los=myval["sensor-los"].toLowerCase();
+	console.log('los is: ' + los);
+	sets["sensor-test-los"]=sensorlosmods[los]["sensor"];
+	sets["gunnery-test-los"]=sensorlosmods[los]["gunnery"];
+	console.log(sets);
+	setAttrs(sets);
 	});
 });
 
@@ -7202,136 +8226,68 @@ on("change:speed-current change:speed-rating change:vehicle-penalty", function()
 
   on("sheet:opened change:vehicle-interface", function(){
      getAttrs(["vehicle-interface"], function (myval) {
-	var react=0;
-	var init=0;
-	var action=0;
-	var dt=0;
 	const vi=myval["vehicle-interface"];
-	console.log(vi);
+	var sets={};
 	const interfaces={ 
-		none: { react: 0, init: 0, action: 0, dt: 0}, 
-		datajack: { react: 1, init: 0, action: 0, dt: 1 }, 
-		vcr: { react: "(@{vehicle-driver}vcr} * 2)", init: "@{vehicle-driver}vcr}", action: "(@{vehicle-driver}vcr} * 2)", dt: "@{vehicle-driver}vcr}" }
+		none: { react: 0, init: 0, action: 0, driving: 0}, 
+		datajack: { react: 1, init: 0, action: 0, driving: 1 }, 
+		vcr: { react: "(@{vehicle-driver}vcr} * 2)", init: "@{vehicle-driver}vcr}", action: "(@{vehicle-driver}vcr} * 2)", driving: "@{vehicle-driver}vcr}" }
 	};
 	console.log('interfaces test: ' + interfaces[vi]["react"]);
-        switch (myval["vehicle-interface"]) {
-        	case "none":
-			var react=0;
-			var init=0;
-			var action=0;
-			var dt=0;
-			break;
-        	case "datajack":
-			var react=1;
-			var init=0;
-			var dt=1;
-			break;
-        	case "vcr":
-			var react="(@{vehicle-driver}vcr} * 2)";
-			var init="@{vehicle-driver}vcr}";
-			var action="(@{vehicle-driver}vcr} * 2)";
-			var dt="@{vehicle-driver}vcr}";
-			break;
-	}
-	setAttrs({"vehicle-reactbonus":react, "vehicle-initbonus":init, "vehicle-actionbonus":action, "driving-test-interface": dt});
+	sets["vehicle-reactbonus"]=interfaces[vi]["react"]
+	sets["vehicle-initbonus"]=interfaces[vi]["init"];
+	sets["vehicle-actionbonus"]=interfaces[vi]["action"];
+	sets["driving-test-interface"]=interfaces[vi]["driving"];
+	console.log(sets);
+	setAttrs(sets)
 	});
 });
 
   on("sheet:opened change:weather", function(){
      getAttrs(["weather"], function (myval) {
-	var dt=0;
-	var st=0;
-        switch (myval["weather"]) {
-        	case "Bad":
-			var dt=2;
-			var st=1;
-			break;
-        	case "Terrible":
-			var dt=4;
-			var st=1;
-			break;
-        	case "Windy":
-			var dt=2;
-			break;
-        	case "Snow":
-			var dt=2;
-			var st=1;
-			break;
-        	case "Rain":
-			var dt=2;
-			var st=1;
-			break;
-        	case "Fog":
-			var dt=2;
-			var st=1;
-			break;
-        	case "Smog":
-			var dt=2;
-			var st=1;
-			break;
-        	case "Heavy Wind":
-			var dt=4;
-			break;
-        	case "ThunderStorm":
-			var dt=4;
-			var st=1;
-			break;
-	}
-	setAttrs({"driving-test-weather": dt, "sensor-test-weather": st});
+     	var sets={};
+	const weather=myval["weather"].toLowerCase();
+	const weathermod={
+		normal: { driving:0, sensor:0}, 
+		bad: { driving:2, sensor:1}, 
+		terrible: { driving:4, sensor:1}, 
+		windy: { driving:2, sensor:0}, 
+		snow: { driving:2, sensor:1}, 
+		rain: { driving:2, sensor:1}, 
+		fog: { driving:2, sensor:1}, 
+		smog: { driving:2, sensor:1}, 
+		"heavy wind": { driving:4, sensor:0}, 
+		"thunderstorm": { driving:4, sensor:1}
+	};
+	sets["driving-test-weather"]=weathermod[weather]["driving"];
+	sets["sensor-test-weather"]=weathermod[weather]["sensor"];
+	console.log(sets);
+	setAttrs(sets);
 	});
 });
 
   on("change:terrain", function(){
+     sets={};
+     const terrainmods={
+     	open: { driving: -1, sensor: 0, terrainpoints: 0, accelerate: -1, position: -1, ram: -1, hide: 4, relocate: -3, crash: -1, gunnery: 0},
+     	normal: { driving: 0, sensor: 0, terrainpoints: -2, accelerate: 0, position: 0, ram: 0, hide: 2, relocate: -1, crash: 0, gunnery: 0},
+     	restricted: { driving: 1, sensor: 0, terrainpoints: -4, accelerate: 1, position: 1, ram: 1, hide: 0, relocate: 0, crash: 2, gunnery: 2},
+     	tight: { driving: 3, sensor: 1, terrainpoints: -10, accelerate: 3, position: 3, ram: 2, hide: -2, relocate: 3, crash: 4, gunnery: 3}
+     };
      getAttrs(["terrain"], function (myval) {
-	var [dt, st, tp, ab, pos, ram, hide, relo, crash]=[0,0,0,0,0,0,0,0,0];
-        switch (myval["terrain"]) {
-        	case "Open":
-			var dt=-1;
-			var tp=0;
-			var ab=-1;
-			var pos=-1;
-			var ram=-1;
-			var hide=4;
-			var relo=-3;
-			var crash=-1;
-			var mg=0;
-			break;
-        	case "Normal":
-			var dt=0;
-			var tp=-2;
-			var ab=0;
-			var pos=0;
-			var ram=0;
-			var hide=2;
-			var relo=-1;
-			var crash=0;
-			var mg=0;
-			break;
-        	case "Restricted":
-			var dt=1;
-			var tp=-4;
-			var ab=1;
-			var pos=1;
-			var ram=1;
-			var hide=0;
-			var relo=0;
-			var crash=2;
-			var mg=2;
-			break;
-        	case "Tight":
-			var dt=3;
-			var st=1;
-			var tp=-10;
-			var ab=3;
-			var pos=3;
-			var ram=2;
-			var hide=-2;
-			var relo=3;
-			var crash=4;
-			var mg=3;
-			break;
-	}
-	setAttrs({"driving-test-terrain": dt, "sensor-test-terrain": st, "driving-ab-terrain": ab, "driving-position-terrain": pos, "driving-ram-terrain": ram, "driving-hide-terrain": hide, "driving-relocate-terrain": relo, "driving-crash-terrain": crash, "terrain-points": tp, "terrain-manual-gunnery": mg});
+        const terrain=myval["terrain"].toLowerCase();
+	sets["driving-test-terrain"]=terrainmods[terrain]["driving"];
+	sets["sensor-test-terrain"]=terrainmods[terrain]["sensor"];
+	sets["driving-ab-terrain"]=terrainmods[terrain]["accelerate"];
+	sets["driving-position-terrain"]=terrainmods[terrain]["position"];
+	sets["driving-ram-terrain"]=terrainmods[terrain]["ram"];
+	sets["driving-hide-terrain"]=terrainmods[terrain]["hide"];
+	sets["driving-relocate-terrain"]=terrainmods[terrain]["relocate"];
+	sets["driving-crash-terrain"]=terrainmods[terrain]["crash"];
+	sets["terrain-points"]=terrainmods[terrain]["terrainpoints"];
+	sets["terrain-manual-gunnery"]=terrainmods[terrain]["gunnery"];
+	console.log(sets);
+	setAttrs(sets);
 	});
 });
 
@@ -7371,14 +8327,12 @@ var setmatrixsystem = function (rating) {
         setAttrs(atts);
 };
 
-    on("sheet:opened", function(){
+    on("sheet:opened changed:api-newsheet", function(){
         getAttrs(["first_time"], function(myval){
             if (myval.first_time != "false") {
                 console.log('running firstime');
-                updatevisionmods("Human");
                 updateWoundPenalty();
                 updateStunPenalty();
-                updateVisionTNs();
                 updatepools();
 		updatePenalty("vehicle");
 		updatePenalty("rccommand");
@@ -7419,27 +8373,39 @@ var setmatrixsystem = function (rating) {
      });
     });
 
+const visionmods = {
+	elf: {normal: 0, fulldark: 8, minlight: 2, partiallight: 0, glare: 2, mist: 0, lightsmoke: 2, fullsmoke: 4, thermalsmoke: 4},
+	ork: {normal: 0, fulldark: 8, minlight: 2, partiallight: 0, glare: 2, mist: 0, lightsmoke: 2, fullsmoke: 4, thermalsmoke: 4},
+	troll: {normal: 0, fulldark: 2, minlight: 2, partiallight: 1, glare: 2, mist: 0, lightsmoke: 0, fullsmoke: 0, thermalsmoke: 6},
+	dwarf: {normal: 0, fulldark: 2, minlight: 2, partiallight: 1, glare: 2, mist: 0, lightsmoke: 0, fullsmoke: 0, thermalsmoke: 6},
+	human: {normal: 0, fulldark: 8, minlight: 6, partiallight: 2, glare: 2, mist: 2, lightsmoke: 4, fullsmoke: 6, thermalsmoke: 4},
+	lowlight: {normal: 0, fulldark: 8, minlight: 4, partiallight: 1, glare: 4, mist: 2, lightsmoke: 4, fullsmoke: 6, thermalsmoke: 4},
+	thermal: {normal: 0, fulldark: 4, minlight: 4, partiallight: 2, glare: 4, mist: 0, lightsmoke: 0, fullsmoke: 1, thermalsmoke: 8}
+};
+
+    on("change:metatype change:visionenhancement change:visibility", function() {
+    	getAttrs(["metatype", "visionenhancement", "visibility"], function(myval){
+		sets={};
+		const metatype=myval["metatype"].toLowerCase();
+		const vision=myval["visionenhancement"].toLowerCase();
+		const visattr=myval["visibility"];
+		const visibility = (visattr == 0)? "normal" : visattr.match(/{(.*)}/)[1];
+		const rangedvizmods=(vision != "none")? visionmods[vision][visibility] : visionmods[metatype][visibility];
+		const meleevizmods=(rangedvizmods !=8 )? Math.floor(rangedvizmods/2) : 8;
+		sets["rangedvizTN"]=rangedvizmods;
+		sets["meleevizTN"]=meleevizmods;
+		console.log(sets);
+		setAttrs(sets);
+    	});
+    });
 
     on("change:metatype", function(){
         getAttrs(["metatype"], function(myval){
             console.log(myval.metatype)
-            updatevisionmods(myval.metatype);
             setattributelimits(myval.metatype);
         }); 
     });
 
-    on("change:visionenhancement", function(){
-        getAttrs(["metatype", "visionenhancement"], function(myval){
-            console.log(myval.visionenhancement)
-            if (myval.visionenhancement == "None" ) {
-                var vision=(myval.metatype)
-            } else {
-                var vision=(myval.visionenhancement)
-            }
-            updatevisionmods(vision);
-        }); 
-    });
-
     on("change:body change:body-mods", function(){
         getAttrs([ "body","body-mods"], function(myval) {
                 let final_body = parseInt(myval.body) + parseInt(myval["body-mods"])
@@ -7493,7 +8459,7 @@ on("change:repeating_rangedweapons:firemode", function(eventinfo){
 		const targeting=myval["repeating_rangedweapons_targeting"];
 		var myroll="/w gm &{template:info}{{character=@{character_name}}}{{type=Switched Weapon " + weapon + " to " + firemode + " firing mode }}";
 		if ( targeting == -2 ) myroll += "{{action=Free}}";
-		else myroll += "{{action=Simple}}";
+		else myroll += "{{action=" + lang["simple"] + "}}";
                 startRoll(myroll, (results) => {
 			finishRoll( results.rollId);
 		});
@@ -7554,7 +8520,7 @@ on("change:repeating_meleeweapons:meleeequiped change:repeating_meleeweapons:2nd
     const myweapon=eventinfo.sourceAttribute
     console.log(myweapon);
     setatts=[];
-    var getatts=["meleeselected", "melee2selected"]
+    var getatts=["meleeselected"]
     if ( myweapon == "unarmed-equipped" )  {
     	console.log('defualt unarmed' );
 	getatts.push("unarmed-equipped");
@@ -7562,12 +8528,9 @@ on("change:repeating_meleeweapons:meleeequiped change:repeating_meleeweapons:2nd
 	        const ue = myval["unarmed-equipped"];
 		console.log('ue: ' + ue);
 		const m1 = myval["meleeselected"];
-		const m2 = myval["melee2selected"];
 		if ( ue == "on" ) { 
 			if ( m1 != "unarmed-equipped" ) setatts[m1]=0;
-			if ( m2 != "unarmed-equipped" ) setatts[m2]=0;
 			setatts["meleeselected"]="unarmed-equipped";
-			setatts["melee2selected"]="unarmed-equipped";
 			setatts["meleereach"]=0;
 			setAttrs(setatts);
 		}
@@ -7580,12 +8543,9 @@ on("change:repeating_meleeweapons:meleeequiped change:repeating_meleeweapons:2nd
 	        const ue = myval["weaponfocus-equipped"];
 		console.log('ue: ' + ue);
 		const m1 = myval["meleeselected"];
-		const m2 = myval["melee2selected"];
 		if ( ue == "on" ) { 
 			if ( m1 != "weaponfocus-equipped" ) setatts[m1]=0;
-			if ( m2 != "weaponfocus-equipped" ) setatts[m2]=0;
 			setatts["meleeselected"]="weaponfocus-equipped";
-			setatts["melee2selected"]="weaponfocus-equipped";
 			setatts["meleereach"]=myval["weaponfocus-reach"];
 			setAttrs(setatts);
 		}
@@ -7597,32 +8557,18 @@ on("change:repeating_meleeweapons:meleeequiped change:repeating_meleeweapons:2nd
 	const myrepeat=mybase.join('_'); 
 	const reach=myrepeat.concat("_reach");	
 	const m1equipped=myrepeat.concat("_meleeequiped");	
-	const m2equipped=myrepeat.concat("_2ndmeleeequiped");	
-        getatts.push(myweapon, reach, m1equipped, m2equipped);
+        getatts.push(myweapon, reach, m1equipped);
 	getAttrs(getatts, function(myval) {
 		console.log('myatt ' + myattr);
 		console.log('values');
 		console.log(myval);
             	const lastused=myval["meleeselected"];
-            	const lastused2=myval["melee2selected"];
         	if (myval[myweapon] == "on") {
 	    		if ( myattr == "meleeequiped" ) {
 	        		console.log('in melee1');
-	    			if ( myval[m2equipped] == "on" ) { 
-					console.log('equipeed as secondary');
-					setatts[m2equipped]=0;
-				}
 				setatts["meleeselected"]=myweapon;
 				setatts[lastused]=0;
 				setatts["meleereach"]=myval[reach];
-	    		} else if ( myattr == "2ndmeleeequiped" ) {
-	        		console.log('in melee2');
-	    			if ( myval[m1equipped] == "on" ) {
-					console.log('equipeed as primary');
-					setatts[m1equipped]=0;
-				}
-				setatts["melee2selected"]=myweapon;
-				setatts[lastused2]=0;
 	    		} else 	{
 	    			console.log('wrong event for ' + myattr);
 	    		}
@@ -7631,10 +8577,9 @@ on("change:repeating_meleeweapons:meleeequiped change:repeating_meleeweapons:2nd
 			console.log(' weapon unselected');
 			if (( myattr == "meleeequiped" ) && ( lastused == myweapon )) {
 				setatts["meleereach"]=0;
-				setatts["meleeselected"]="None";
-			} else if ( ( myattr == "2ndmeleeequiped" ) && ( lastused2 == myweapon )) {
-				setatts["melee2selected"]="None";
-			}
+				setatts["meleeselected"]="unarmed-equipped";
+				setatts["unarmed-equipped"]="on";
+			} 
 		}
             	setAttrs(setatts);
     	});
@@ -7649,7 +8594,7 @@ on("change: change:repeating_meleeweapons:reach", function(eventinfo){
     });
 });
 
-on("change:repeating_armor:equipped change:repeating_armor:ballistic change:repeating_armor:impact", function(eventinfo){
+on("change:dermal-armor change:repeating_armor:equipped change:repeating_armor:ballistic change:repeating_armor:impact", function(eventinfo){
 	var sets={};
 	var ballistic=0;
 	var impact=0;
@@ -7657,12 +8602,13 @@ on("change:repeating_armor:equipped change:repeating_armor:ballistic change:repe
 	fields=["equipped", "ballistic", "impact", "slot"];
 	getSectionIDs("repeating_armor", idArray => {
 		var attrArray = idArray.reduce((m, id) => [ ...m, ...(fields.map(field => `repeating_armor_${id}_${field}`))], []); 
-		attrArray.push("quickness_max");
+		attrArray.push("quickness_max","dermal-armor");
 		getAttrs(attrArray, function(myval) {
 			console.log('myval');
 			console.log(myval);
 			console.log(idArray);
 			const myquick=parseInt(myval["quickness_max"]);
+			const mydermal=parseInt(myval["dermal-armor"]);
 			idArray.forEach(m => {
 				if (myval["repeating_armor_" + m + "_equipped"] == "on" ) {
 					let bal=myval["repeating_armor_" + m + "_slot"] + "-bal";
@@ -7693,6 +8639,8 @@ on("change:repeating_armor:equipped change:repeating_armor:ballistic change:repe
 			let combatpen= -1 * (Math.floor((ballover + impactover) / 2 ));
 			if ( gyro_bal > 0 ) sets["gyro-on"]=1;
 			else sets["gyro-on"]=0;
+			if (((ballistic + impact) >= 1 ) || (mydermal == 1)) sets["armor-on"]=1;
+			else sets["armor-on"]=0;
 			sets["ballistic"]=ballistic + ware_bal + gyro_bal;
 			sets["impact"]=impact + ware_im + gyro_bal;;
 			sets["armor-quickness-pen"]=ballover;
@@ -7705,7 +8653,7 @@ on("change:repeating_armor:equipped change:repeating_armor:ballistic change:repe
 });
 
 
-on("sheet:opened change:updateviztns change:cover change:move change:dualwield change:calledshot change:aim change:enemies change:friends change:meleetargets change:position change:misccombatmods change:stun_pen change:wound_pen change:manualgunneryTN", function() {
+on("sheet:opened change:rangedvizTN change:meleevizTN change:cover change:move change:dualwield change:calledshot change:aim change:enemies change:friends change:meleetargets change:position change:misccombatmods change:stun_pen change:wound_pen change:manualgunneryTN", function() {
     updateRangeTNs();
     updateMeleeTNs();
 });
@@ -7726,11 +8674,8 @@ on("change:wounds change:adeptpainres", function() {
     updateWoundPenalty();
 });
 
-on("change:visionprofile change:visibility", function() {
-    updateVisionTNs();
-});
-
 on("change:repeating_ic:ictype", function(eventinfo) {
+	if (!("yes" in lang)) geti18n();
 	console.log(eventinfo);
 	var mybase=eventinfo["sourceAttribute"].split("_");
 	var myattr=mybase.pop();
@@ -7740,14 +8685,14 @@ on("change:repeating_ic:ictype", function(eventinfo) {
 	const ictarget=myrepeat + "_ictargettest"
 	gets=[ictype];
 	console.log(gets);
-	attackic=["Killer", "Blaster", "Sparky", "Black Ic", "Scout", "Cerebropathic", "Psychotropic"]
+	attackic=["Killer", "Blaster", "Sparky", "blackiclethal", "Scout", "cerebropathic", "psychotropic", "blackicnonlethal"]
 	getAttrs(gets, function(myval) {
 		console.log(gets);
 		const mytype=myval[ictype];	
 		console.log(mytype);
-		if (mytype=="Probe") sets[ictarget]="@{target|decker|deck-detection-final}";
+		if (mytype=="Probe") sets[ictarget]="@{target|" + lang["decker"] + "|deck-detection-final}";
 		else if (attackic.includes(mytype)) sets[ictarget]="Attack"; 
-		else if ((mytype=="Tar Baby") || (mytype=="Tar pit")) sets[ictarget]="?{Utility Rating?|4}";
+		else if ((mytype=="Tar Baby") || (mytype=="Tar pit")) sets[ictarget]="?{" + lang["utility-rating"] + "?|4}";
 		console.log(sets);
 		setAttrs(sets);
 	});
@@ -7830,15 +8775,23 @@ on("change:deck-dni change:intelligence_max change:reaction change:deck-asist ch
     });
 });
 
+on("change:spelldefense", function() {
+	getAttrs(["sorcery", "spelldefense"], function (myval) {
+		spd=parseInt(myval["spelldefense"]) - parseInt(myval["sorcery"]);
+		if ( spd  < 0 ) spd=0;
+		setAttrs({spelldefmin: spd});
+	});
+});
 
-on("change:sorcery-defense change:spellpool-defense change:sorcery-used change:spellpool-used", function() {
-	getAttrs(["sorcery-defense", "spellpool", "sorcery", "spellpool-defense", "spellpool-used", "sorcery-used"], function (myval) {
+on("change:sorcery-defense change:spellpool-defense change:sorcery-used change:spellpool-used change:spelldefmin", function() {
+	getAttrs(["sorcery-defense", "spellpool", "sorcery", "spellpool-defense", "spellpool-used", "sorcery-used", "spelldefmin"], function (myval) {
 		atts=[];
 	        console.log('updating defense dice');
 		var poolover=0;
 		var sorceryover=0;
 		let sorcery=parseInt(myval["sorcery"]);
 		let pool=parseInt(myval["spellpool"]);
+		let spd=parseInt(myval["spelldefmin"]);
 		let md=parseInt(myval["spellpool-defense"]);
 		let sd=parseInt(myval["sorcery-defense"]);
 		let mpu=parseInt(myval["spellpool-used"]);
@@ -7849,7 +8802,7 @@ on("change:sorcery-defense change:spellpool-defense change:sorcery-used change:s
 		if ( pooltotal > pool ) poolover=1;
 		atts["sorcery-over"]=sorceryover;
 		atts["spellpool-over"]=poolover;
-		atts["spelldefensedice"]=md + sd;
+		atts["spelldefensedice"]=spd + md + sd;
 		atts["sorcery-used-total"]=sd + su;
 		atts["spellpool-used-total"]=md + mpu;
 		console.log(atts);
@@ -7971,10 +8924,12 @@ on("change:repeating_explosives:exptype", function(eventinfo){
     });
 };
 
-on("change:combatpool-mods change:armor-combatpool-pen change:combatpool-base change:spellpool-mods change:spellpool-base change:hackingpool-mods change:hackingpool-base change:controlpool-mods change:controlpool-base change:astralpool-mods change:astralpool-base change:gyro-on", function () {
+on("sheet:opened change:combatpool-mods change:armor-combatpool-pen change:combatpool-base change:spellpool-mods change:spellpool-base change:hackingpool-mods change:hackingpool-base change:controlpool-mods change:controlpool-base change:astralpool-mods change:astralpool-base change:gyro-on", function () {
 	sets={};
 	atts=["combatpool-mods", "combatpool-base", "armor-combatpool-pen","spellpool-mods", "spellpool-base", "hackingpool-mods", "hackingpool-base", "controlpool-mods", "controlpool-base", "astralpool-mods", "astralpool-base", "gyro-on"]
 	getAttrs(atts, function (myval) {
+		console.log('pool setup atts');
+		console.log(myval);
 		if ( myval["gyro-on"] == 1 ) sets["combatpool"] = Math.floor(( parseInt(myval["combatpool-mods"]) + parseInt(myval["combatpool-base"]) + parseInt(myval["armor-combatpool-pen"]) ) / 2);
 		else sets["combatpool"] = parseInt(myval["combatpool-mods"]) + parseInt(myval["combatpool-base"]) + parseInt(myval["armor-combatpool-pen"]);
 		sets["spellpool"] = parseInt(myval["spellpool-mods"]) + parseInt(myval["spellpool-base"]);
@@ -8002,7 +8957,7 @@ var updatepools = function() {
         var myint = parseInt(myval.intelligence_max);
         var mychar = parseInt(myval.charisma_max);
         var mybody = parseInt(myval.body_max);
-	
+	console.log('combat pool agil ' + myagil + ' int ' + Math.max(myint,myperception) + ' will ' + mywill);	
         myatts["combatpool-base"]= Math.floor((myagil + Math.max(myint,myperception) + mywill)/2);
 
         if (myval.sheettype != "Spirit" ) myatts["reaction"] = Math.floor((myagil + myint)/2);
@@ -8032,13 +8987,14 @@ var updatepools = function() {
 	} else {
 	    	myatts["controlpool-base"] = 0;
 	}
-
+	console.log('setting update pool');
+	console.log(myatts);
         setAttrs(myatts);
     });
 };
 
 var setupdefaults = function() {
-    setAttrs({sheettype: "Character", targetMove: -1, charisma_max: 1, strength_max: 1, willpower_max: 1, body_max: 1, quickness_max: 1, intelligence_max: 1, attr_rangedTN: 0, attr_meleeTN: 0, attr_misccombatmods: 0, signature: 4 })
+    setAttrs({ targetMove: -1, charisma_max: 1, strength_max: 1, willpower_max: 1, body_max: 1, quickness_max: 1, intelligence_max: 1, attr_rangedTN: 0, attr_meleeTN: 0, attr_misccombatmods: 0, signature: 4 })
 };
 
 var updatePenalty = function(attribute) {
@@ -8117,113 +9073,40 @@ var setattributelimits = function(metatype) {
     	setAttrs(atts);
 };
 
-var updateVisionTNs = function() {
-    getAttrs(["visibility","fulldark", "minlight", "partiallight", "glare", "mist", "lightsmoke", "fullsmoke", "thermalsmoke", "updateviztns"], function(myval) {
-        switch (myval.visibility) {
-            case "0":
-                var myvisibilityRangeTn=0;
-                break;
-            case "@{fulldark}":
-                var myvisibilityRangeTn=parseInt(myval.fulldark);
-                break;
-            case "@{partiallight}":
-                var myvisibilityRangeTn=parseInt(myval.partiallight);
-                break;
-            case "@{minlight}":
-                var myvisibilityRangeTn=parseInt(myval.minlight);
-                break;
-            case "@{glare}":
-                var myvisibilityRangeTn=parseInt(myval.glare);
-                break;
-            case "@{mist}":
-                var myvisibilityRangeTn=parseInt(myval.mist);
-                break;
-            case "@{lightsmoke}":
-                var myvisibilityRangeTn=parseInt(myval.lightsmoke);
-                break;
-            case "@{fullsmoke}":
-                var myvisibilityRangeTn=parseInt(myval.fullsmoke);
-                break;
-            case "@{thermalsmoke}":
-                var myvisibilityRangeTn=parseInt(myval.thermalsmoke);
-                break;
-        }
-        if ( myvisibilityRangeTn == 8) {
-            var myvisibilityMeleeTn = 8
-        } else {
-            var myvisibilityMeleeTn = Math.floor(myvisibilityRangeTn / 2)
-        }
-        if ( myval.updateviztns == "flip" ) {
-            var updateflag = "flop"
-        } else {
-            var updateflag = "flip"
-        }
-        console.log(myvisibilityRangeTn)
-        console.log(myvisibilityMeleeTn)
-        setAttrs({updateviztns:updateflag, rangedvizTN: myvisibilityRangeTn, meleevizTN: myvisibilityMeleeTn});
-    });
-};
-
-var updatevisionmods = function(myval) {
-    console.log ('updating vision')
-    console.log(myval)
-    if ( (myval) == "Elf" ) {
-        console.log("Setting Elf")
-        setAttrs({visionprofile: myval, fulldark: 8, minlight: 2, partiallight: 0, glare: 2, mist: 0, lightsmoke: 2, fullsmoke: 4, thermalsmoke: 4});
-    } else if ( (myval) == "Ork" ) {
-        console.log("Setting Ork")
-        setAttrs({visionprofile: myval, fulldark: 8, minlight: 2, partiallight: 0, glare: 2, mist: 0, lightsmoke: 2, fullsmoke: 4, thermalsmoke: 4});
-    } else if ( (myval) == "Dwarf" ) {
-        console.log("Setting Dwarf")
-        setAttrs({visionprofile: myval, fulldark: 2, minlight: 2, partiallight: 1, glare: 2, mist: 0, lightsmoke: 0, fullsmoke: 0, thermalsmoke: 6});
-    } else if ( (myval) == "Troll" ) {
-        console.log("Setting Troll")
-        setAttrs({visionprofile: myval, fulldark: 2, minlight: 2, partiallight: 1, glare: 2, mist: 0, lightsmoke: 0, fullsmoke: 0, thermalsmoke: 6});
-    } else if ((myval) == "Human" ) {
-        console.log("Setting Human")
-        setAttrs({visionprofile: myval, fulldark: 8, minlight: 6, partiallight: 2, glare: 2, mist: 2, lightsmoke: 4, fullsmoke: 6, thermalsmoke: 4});
-    } else if ( (myval) == "LowLight" ) {
-        console.log("Setting LowLight")
-        setAttrs({visionprofile: myval, fulldark: 8, minlight: 4, partiallight: 1, glare: 4, mist: 2, lightsmoke: 4, fullsmoke: 6, thermalsmoke: 4});
-    } else if ( (myval) == "Thermal" ) {
-        console.log("Setting Thermal")
-        setAttrs({visionprofile: myval, fulldark: 4, minlight: 4, partiallight: 2, glare: 4, mist: 0, lightsmoke: 0, fullsmoke: 1, thermalsmoke: 8});
-    }
-};
-
 var updateMeleeTNs = function() {
-    getAttrs(["rangedvizTN", "meleevizTN", "cover", "move", "dualwield", "calledshot", "aim", "enemies", "friends", "meleetargets", "position", "misccombatmods", "stun_pen","wound_pen"], function(myval) {
+    getAttrs(["meleevizTN", "cover", "move", "dualwield", "calledshot", "aim", "enemies", "friends", "meleetargets", "position", "misccombatmods", "stun_pen","wound_pen"], function(myval) {
         console.log("updateMeleeTN")
+	console.log(myval);
         targetNumberMelee = parseInt(myval.calledshot) + parseInt(myval.meleevizTN) + parseInt(myval.enemies) - parseInt(myval.friends) + parseInt(myval.misccombatmods) + ( 2 * parseInt(myval.meleetargets) ) - parseInt(myval.position) + parseInt(myval.stun_pen) + parseInt(myval.wound_pen);
-        console.log(targetNumberMelee)
+        console.log('meleeTN ' + targetNumberMelee)
         setAttrs({meleeTN: targetNumberMelee});
     });
 };
   
 
 var updateRangeTNs = function() {
-    getAttrs(["rangedvizTN", "meleevizTN", "cover", "move", "dualwield", "calledshot", "aim", "enemies", "friends", "meleetargets", "position", "misccombatmods", "stun_pen","wound_pen", "manualgunneryTN" ], function(myval) {
-        console.log("updateRangeTN")
-        targetNumberRange = parseInt(myval.calledshot) + parseInt(myval.rangedvizTN) + parseInt(myval.cover) + parseInt(myval.dualwield) + (2 * parseInt(myval.enemies)) - parseInt(myval.aim) + parseInt(myval.misccombatmods) + parseInt(myval.stun_pen) + parseInt(myval.wound_pen) + parseInt(myval.manualgunneryTN);
-        switch (parseInt(myval.move)) {
-            case 0:
-                var mytargetMove=-1;
-                break;
-            case 1:
-                var mytargetMove=0;
-                break;
-            case 2:
-                var mytargetMove=0;
-                break;
-            case 4:
-                var mytargetMove=2;
-                break;
-            case 6:
-                var mytargetMove=2;
-                break;
-        }
-        console.log(targetNumberRange)
-        setAttrs({rangedTN: targetNumberRange, targetMove:mytargetMove });
+    getAttrs(["rangedvizTN", "cover", "move", "dualwield", "calledshot", "aim", "enemies", "friends", "meleetargets", "position", "misccombatmods", "stun_pen","wound_pen", "manualgunneryTN" ], function(myval) {
+	console.log(myval);
+        var sets={};
+	console.log('updating ranged tn');
+    	const move=parseInt(myval.move);
+    	const called=parseInt(myval.calledshot);
+    	const viz=parseInt(myval.rangedvizTN);
+    	const cover=parseInt(myval.cover);
+    	const dual=parseInt(myval.dualwield);
+    	const enemies=parseInt(myval.enemies);
+    	const aim=parseInt(myval.aim);
+    	const misc=parseInt(myval.misccombatmods);
+    	const stun=parseInt(myval.stun_pen);
+    	const wound=parseInt(myval.wound_pen);
+    	const gunnery=parseInt(myval.manualgunneryTN);
+        targetNumberRange = called + viz + cover + dual + (2 * enemies) - aim + misc + stun + wound + gunnery;
+	mytargetMove = (move == 0)? -1 : (move ==4)? 2: (move ==6)? 2: 0;
+	sets["rangedTN"]=targetNumberRange;
+	sets["targetMove"]=mytargetMove;
+	console.log('sets');
+	console.log(sets);
+        setAttrs(sets);
 
     });
 };
@@ -8367,7 +9250,7 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
    
    on("change:spirit-type change:force", function() {
    	getAttrs(["spirit-type", "sheettype", "force"], function(myval) {
-		var atts=[];
+		var atts={};
 		const sheettype=myval["sheettype"];
 		const spirittype=myval["spirit-type"];
 		const F=parseInt(myval["force"]);
@@ -8395,7 +9278,11 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
 			atts["astralreaction"]=eval(spirits[spirittype]["astral_init"]); 
 			atts["attackpower"]=eval(spirits[spirittype]["attackpower"]); 
 			atts["attackdamage"]=spirits[spirittype]["attackdmg"]; 
+			atts["ballistic"]=F * 2;
+			atts["impact"]=F * 2;
+
 			const powers=spirits[spirittype]["powers"];
+			console.log(atts);
 			getSectionIDs("critter-powers", function(idarray) {
 				idarray.forEach(id=>{
 					removeRepeatingRow("repeating_critter-powers_" + id);
@@ -8420,7 +9307,8 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
 					atts["repeating_critter-powers_" + newrowid + "_name"  ] = power;
 				});
 			};
-			console.log(atts);
+			console.log('setting atts ');
+			console.log(JSON.stringify(atts));
 			setAttrs(atts);
 
 		}
@@ -8446,10 +9334,10 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
 		if (myattrib == "remove" ) {
 			let cat = eventinfo["removedInfo"][myrepeat.concat("_category")];
 			let type = eventinfo["removedInfo"][myrepeat.concat("_type")];
-			if ( type == "Power Focus" ) atts["power-focus"]=0;
-			else if ( type == "Spirit Focus")  atts[cat]=0;
-			else if ( type == "Expendable" ) atts["exp-" + cat]=0;
-			else if ( type == "Reusable" ) atts["reusable-" + cat]=0;
+			if ( type == "power" ) atts["power-focus"]=0;
+			else if ( type == "spirit")  atts[cat]=0;
+			else if ( type == "expendable" ) atts["exp-" + cat]=0;
+			else if ( type == "reusable" ) atts["reusable-" + cat]=0;
 			else return;
 			console.log(atts);
 			setAttrs(atts);
@@ -8490,6 +9378,7 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
 	});
 
 	on("change:repeating_spells:range change:repeating_spells:spellcategory", function(myval) {
+		if (!("yes" in lang)) geti18n();
 		getAttrs(["repeating_spells_spellcategory", "repeating_spells_range"], function(myval) {
 		const spellcategory=myval["repeating_spells_spellcategory"];
 		const range=myval["repeating_spells_range"];
@@ -8497,114 +9386,204 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
 		console.log(range)
 		atts=[];
 		if ( spellcategory == "Elemental" ) {
-			atts["repeating_spells_target"]="@{target|Target|targetMove}";
+			atts["repeating_spells_target"]="@{target|" + lang["target"] +"|targetMove}";
 			console.log(atts);
 			setAttrs(atts);
 		}
 		});
 	});
 
-
-
-    
 </script>
 
-<rolltemplate class="sheet-rolltemplate-spell">
+<rolltemplate class="sheet-rolltemplate-conjure">
     <div class="sheet-rtcontainer">
-        <div class="sheet-rtheader">{{myname}}: {{spellname}} {{castforce}} vs. {{targetofspell}}</div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{computed::rolldice}}d6 vs. {{targetnumber}} </div>
-        {{#spelldamage}}<div class="sheet-rtrow"><b>Damage:</b> {{computed::spelldamage}} </div>{{/spelldamage}}
-        {{#sorcerydice}}<div class="sheet-rtrow"><b>Sorcery Dice Used:</b> {{sorcerydice}}</div>{{/sorcerydice}}
-        {{#spellpool}}<div class="sheet-rtrow"><b>Spell Pool Used:</b> {{spellpool}}</div>{{/spellpool}}
-        {{#cast}}<div class="sheet-rtrow"><b>Casting Test:</b> {{computed::cast}}</div>{{/cast}}
-        {{#casttest}}<div class="sheet-rtrow"><b>Casting Test:</b> {{casttest}}</div>{{/casttest}}
-        {{#draintest}}<div class="sheet-rtrow"><b>Drain Test:</b> {{draintest}} vs. {{computed::draindamage}}</div>
+        <div class="sheet-rtheader">{{myname}}: {{spellname}} {{spiritforce}} {{spirittype}}</div>
+        <div class="sheet-rtrow">Rolling: {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} = {{casttest}}</div>
+        {{#conjuredice}}
+        <div class="sheet-conjure-resist-table">
+            <div data=i18n="total">Total</div>
+            <div></div>
+            <div data=i18n="summon">Summon</div>
+            <div></div>
+            <div data=i18n="drain">Drain</div>
+            <div>{{skill}}</div>
+            <div></div>
+            <div>{{conjuredice}}</div>
+            <div></div>
+            <div>{{conjuredicedrain}}</div>
+        </div>{{/conjuredice}}
+        {{#roll}}<div class="sheet-rtrow">Casting Test: {{computed::cast}} {{computed::roll}}</div>{{/roll}}
+        {{#draintest}}
+        <div class="sheet-conjure-resist-table">
+            <div data=i18n="drain">Drain</div>
+            <div></div>
+            <div data=i18n="resist-test">Resist Test</div>
+            <div></div>
+            <div data=i18n="final">Final</div>
+            <div>{{computed::draindamage}}</div>
+            <div></div>
+            <div>{{draintest}}</div>
+            <div></div>
+            <div>{{computed::finaldrain}}</div>
+        </div>
         {{/draintest}}
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
         {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
-        {{#resist}}<div class="sheet-rtrow"><b>{{targetofspell}}:</b> {{resist}}</div>{{/resist}}
-        {{#spelldefense}}<div class="sheet-rtrow">{{spelldefense}} Target of <b>{{castforce}}</b> </div>
-        {{/spelldefense}}
-        {{#resistspell}}<div class="sheet-rtrow">{{resistspell}} Target of {{castforce}}</div>{{/resistspell}}
+    </div>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-spell">
+    <div class="sheet-rtcontainer">
+        <div class="sheet-rtheader">{{myname}}: {{spellname}} <span data=i18n="versus">vs.</span> {{targetofspell}}</div>
+        <div class="sheet-rtrow"><span data-i18n="rolling">Rolling</span>: {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} = {{casttest}}</div>
+        {{#spelldamage}}<div class="sheet-rtrow"><span data-i18n="force">Force</span>: {{castforce}} <span data-i18n="damage">Damage</span>: {{computed::spelldamage}} </div> {{/spelldamage}}
+        {{#sorcerydice}}<div><b data-i18n="sorcery-dice">Sorcery Dice</b>: {{sorcerydice}} {{#spellpool}} <b data-i18n="spell-pool">Spell Pool</b>: {{spellpool}}{{/spellpool}}</div>{{/sorcerydice}}
+        {{#roll}}<div class="sheet-rtrow"><span data-i18n="casting-test">Casting Test</span>: {{computed::cast}} {{computed::roll}}</div>{{/roll}}
+        {{#draintest}}
+        <div class="sheet-spell-resist-table">
+            <div data-i18n="drain">Drain</div>
+            <div></div>
+            <div data-i18n="resist-test">Resist Test</div>
+            <div></div>
+            <div data-i18n="final">Final</div>
+            <div>{{computed::draindamage}}</div>
+            <div></div>
+            <div>{{draintest}}</div>
+            <div></div>
+            <div>{{computed::finaldrain}}</div>
+        </div>
+        {{/draintest}}
+        {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
+        {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
+        {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
+        {{#resist}}<div class="sheet-rtrow">{{targetofspell}}: {{resist}}</div>{{/resist}}
+        {{#defensetest}}<div class="sheet-spell-resist-table">
+            <div data-i18n="attack">Attack</div>
+            <div></div>
+            <div data-i18n="defense">Defense</div>
+            <div></div>
+            <div data-i18n="result">Result</div>
+            <div>{{attacks}}</div>
+            <div>-</div>
+            <div>{{casttest}}</div>
+            <div>=</div>
+            <div>{{computed::defensetest}}</div>
+        </div>{{/defensetest}}
+        <div class="sheet-rtrow">{{#spelldefense}}[<span data-i18n="spell-defense">Spell Defense</span>](~selected|spelldefense||{{computed::senddata}}){{/spelldefense}}
+            {{#casttest}}{{targetofspell}}:
+            {{#dodge}}[Dodge](~{{targetofspell}}|dodge||{{computed::senddata}}){{/dodge}}
+            {{#resisttype}}[<span data-i18n="resist">Resist</span>](~{{targetofspell}}|{{computed::resisttype}}||{{computed::senddata}}){{/resisttype}}
+        </div>{{/casttest}}
+        {{#roll}}<div class="sheet-rtrow">{{targetofspell}}: [<span data-i18n="area-of-effect-acronym">AOE</span>](~selected|checkaoe||{{computed::senddata}})</div>
+        {{/roll}}
     </div>
 </rolltemplate>
 <rolltemplate class="sheet-rolltemplate-adept">
     <div class="sheet-rtcontainer">
-        <div class="sheet-rtheader">{{myname}}: {{spellname}} {{powerlevel}} vs. {{targetofspell}}</div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{rolldice}}d6 vs. {{targetnumber}} </div>
+        <div class="sheet-rtheader">{{myname}}: {{spellname}} {{powerlevel}} <span data=i18n="versus">vs.</span> {{targetofspell}}</div>
+        <div class="sheet-rtrow"><b data-i18n="rolling">Rolling</b>: {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} </div>
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
-        <div class="sheet-rtrow"><span>Spell Pool Used: </span>{{spellpool}}</div>
-        <div class="sheet-rtrow"><span>Casting Test: </span>{{casttest}}</div>
-        <div class="sheet-rtrow"><span>Drain Test: </span>{{draintest}} vs. {{computed::draindamage}}</div>
+        <div class="sheet-rtrow"><span data-i18n="spell-pool-used">Spell Pool Used</span>: {{spellpool}}</div>
+        <div class="sheet-rtrow"><span data-i18n="casting-test">Casting Test</span>: {{casttest}}</div>
+        <div class="sheet-rtrow"><span data-i18n="drain-test">Drain Test</span>: {{draintest}} <span data=i18n="versus">vs.</span> {{computed::draindamage}}</div>
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
         {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
     </div>
 </rolltemplate>
+<rolltemplate class="sheet-rolltemplate-melee">
+    <div class="sheet-rtcontainer">
+        <div class="sheet-rtheader"><b>{{myname}}:</b> {{weaponname}} <span data=i18n="versus">vs.</span> {{target}}</div>
+        <div class="sheet-rtrow"><b data-i18n="mode">Mode</b>: {{attackmode}}</div>
+        <div class="sheet-rtrow"><b data-i18n="rolling">Rolling:</b> {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} </div>
+        {{#attacktest}}<div class="sheet-rtrow"><b>Attack Test:</b> {{attacktest}}</div>{{/attacktest}}
+        {{#defensetest}}<div class="sheet-rtrow"><b>{{attacker}}:</b> {{attacknumber}} <span data=i18n="versus">vs.</span>
+            <b>{{defender}}</b>:{{defensetest}}</div>{{/defensetest}}
+        <div class="sheet-rtrow"><b data-i18n="weapon-damage">Weapon Damage:</b> {{computed::weaponpower}} <b>{{computed::weapondamage}}</div>
+        {{#combatpool}}<div class="sheet-rtrow"><b data-i18n="combat-pool">Combat Pool Used:</b> {{combatpool}} </div>{{/combatpool}}
+        {{#pooldice}}<div class="sheet-rtrow"><b data-i18n="pool-used">{{pooltype}} Pool Used:</b> {{pooldice}}</div>{{/pooldice}}
+        {{#weaponfocus}}<div class="sheet-rtrow"><b data-i18n="weapon-focus">Weapon Focus:</b> {{weaponfocus}} {{focusforce}}</div>
+        {{/weaponfocus}}
+        {{#attacktest}}<div class="sheet-rtrow"><b>{{target}}:</b> [<span data-i18n="defend">Defend</span>](~{{target}}|meleedefend||{{computed::senddata}}) 
+	[<span data-i18n="full-defense">Full Defense</span>](~selected|meleedefendfull||{{computed::senddata}})</div>{{/attacktest}}
+        {{#defensetest}}<div class="sheet-rtrow"><b>Loser:</b> {{computed::finalwinner}}
+            {{#dodge}}[<span data-i18n="dodge">Dodge</span>](~{{computed::finalwinner}}|dodge||{{computed::senddata}}){{/dodge}}
+            [<span data-i18n="resist">Resist</span>](~{{computed::finalwinner}}|resistroll||{{computed::senddata}})</div>{{/defensetest}}
+        <div class="sheet-rtrow"><b data-i18n="reach">Reach: </b>{{myname}}: {{charreach}} <span data=i18n="versus">vs.</span> {{target}}: {{targetreach}}</div>
+        <div class="sheet-rtrow"><b data-i18n="mods">Mods:</b>
+            {{#reachmod}} <span data-i18n="reach">Reach</span>:{{computed::reachmod}}{{/reachmod}}
+            {{#meleemods}} <span data-i18n="reach">Melee</span>:{{meleemods}}{{/meleemods}}
+            {{#armorpen}} <span data-i18n="reach">Armor Penalty</span>:{{armorpen}}{{/armorpen}}
+            {{#gyropen}} <span data-i18n="reach">Gyro Penalty</span>:{{gyropen}}{{/gyropen}} 
+	    {{#movemods}} <span data-i18n="move-penalty">Move Penalty</span>:{{movemods}}{{/movemods}}</div>
+        {{#default}}<div class="sheet-rtrow">{{default}}</div>{{/default}}
+        {{#info}}<div class="sheet-rtrow">{{info}}</div>{{/info}}
+    </div>
+</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-attack">
     <div class="sheet-rtcontainer">
-        <div class="sheet-rtheader"><b>{{myname}}:</b> {{weaponname}} vs. {{target}}</div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{rolldice}}d6 vs. {{targetnumber}} </div>
-        <div class="sheet-rtrow"><b>Attack Test:</b> {{attacktest}}</div>
-        {{#combatpool}}<div class="sheet-rtrow"><b>Combat Pool Used:</b> {{combatpool}} </div>{{/combatpool}}
-        {{#controlpool}}<div class="sheet-rtrow"><b>Control Pool Used:</b> {{controlpool}} </div>{{/controlpool}}
-        <div class="sheet-rtrow"><b>Weapon Damage:</b> {{computed::weaponpower}} <b>{{computed::weapondamage}}</div>
-        {{#rounds}}<div class="sheet-rtrow">{{ammotype}} <b>Rounds:</b> {{computed::rounds}}</div>{{/rounds}}
-        {{#weaponfocus}}<div class="sheet-rtrow"><b>Weapon Focus:</b> {{weaponfocus}} {{focusforce}}</div>{{/weaponfocus}}
-        {{#charreach}}<div class="sheet-rtrow"><b>{{myname}} Reach:</b> {{charreach}}</div>{{/charreach}}
-        {{#targetreach}}<div class="sheet-rtrow"><b>{{target}} Reach:</b> {{targetreach}}</div>{{/targetreach}}
+        <div class="sheet-rtheader"><b>{{myname}}</b>: {{weaponname}} <span data=i18n="versus">vs.</span> {{target}}</div>
+        <div class="sheet-rtrow"><b data-i18n="rolling">Rolling</b>: {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} </div>
+        <div class="sheet-rtrow"><b data-i18n="attack-test">Attack Test</b>: {{attacktest}}</div>
+        {{#combatpool}}<div class="sheet-rtrow"><b data-i18n="combat-pool-used">Combat Pool Used</b>: {{combatpool}} </div>{{/combatpool}}
+        {{#controlpool}}<div class="sheet-rtrow"><b data-i18n="control-pool-used">Control Pool Used</b>: {{controlpool}} </div>{{/controlpool}}
+        <div class="sheet-rtrow"><b data-i18n="weapon-damage">Weapon Damage</b>: {{computed::weaponpower}} <b>{{computed::weapondamage}}</div>
+        {{#rounds}}<div class="sheet-rtrow">{{ammotype}} <b data-i18n="rounds">Rounds</b>: {{computed::rounds}}</div>{{/rounds}}
+        {{#weaponfocus}}<div class="sheet-rtrow"><b data-i18n="weapon-focus">Weapon Focus</b>: {{weaponfocus}} {{focusforce}}</div>
+        {{/weaponfocus}}
+        {{#charreach}}<div class="sheet-rtrow"><b>{{myname}} <span data-i18n="reach">Reach</span></b>: {{charreach}}</div>{{/charreach}}
+        {{#targetreach}}<div class="sheet-rtrow"><b>{{target}} <span data-i18n="reach">Reach</span></b>: {{targetreach}}</div>{{/targetreach}}
         {{#default}}<div class="sheet-rtrow">{{default}}</div>{{/default}}
-        {{#senddata}}<div class="sheet-rtrow"><b>{{target}}:</b> [Dodge](~selected|dodge||{{computed::senddata}}) [Resist](~selected|resistroll||{{computed::senddata}})</div>{{/senddata}}
-	<div class="sheet-rtrow"><b>Mods:</b>{{#rangedmods}}Ranged: {{rangedmods}}
-	{{/rangedmods}}{{#meleemods}} Melee: {{meleemods}}
-	{{/meleemods}}{{#armorpen}} Armor Penalty: {{armorpen}}{{/armorpen}}
-	{{#gyropen}} Gyro Penalty: {{gyropen}}
-	{{/gyropen}} {{#movemods}} Move Penalty: {{movemods}}{{/movemods}}
-	{{#targetmods}} aim assit {{targetmods}}{{/targetmods}}
-	{{#reachmod}}{{computed::reachmod}}{{/reachmod}}
-	</div>
-	{{#info}}<div class="sheet-rtrow">{{info}}</div>{{/info}}
+        {{#senddata}}<div class="sheet-rtrow"><b>{{target}}:</b> [<span data-i18n="dodge">dodge</span>](~selected|dodge||{{computed::senddata}})
+            [<span data-i18n="resist">Resist</span>](~selected|resistroll||{{computed::senddata}})</div>{{/senddata}}
+        <div class="sheet-rtrow"><b data-i18n="mods">Mods:</b>{{#rangedmods}}Ranged: {{rangedmods}} {{/rangedmods}}
+            {{#meleemods}} <span data-i18n="reach">Melee</span>:{{meleemods}}{{/meleemods}}
+            {{#armorpen}} <span data-i18n="reach">Armor Penalty</span>:{{armorpen}}{{/armorpen}}
+            {{#gyropen}} <span data-i18n="reach">Gyro Penalty</span>:{{gyropen}}{{/gyropen}} 
+	    {{#movemods}} <span data-i18n="move-penalty">Move Penalty</span>:{{movemods}}{{/movemods}}</div>
+            {{#targetmods}} <span data-i18n="aim-assist">aim assit</span> {{targetmods}}{{/targetmods}}
+        </div>
+        {{#info}}<div class="sheet-rtrow">{{info}}</div>{{/info}}
     </div>
 </rolltemplate>
 <rolltemplate class="sheet-rolltemplate-explosive">
     <div class="sheet-rtcontainer">
-        <div class="sheet-rtheader"><b>{{myname}}:</b> {{weaponname}} vs. {{target}}</div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{rolldice}}d6 vs. {{targetnumber}} </div>
-        <div class="sheet-rtrow"><b>Attack Test:</b> {{attacktest}}</div>
-        {{#combatpool}}<div class="sheet-rtrow"><b>Combat Pool Used:</b> {{combatpool}} </div>{{/combatpool}}
-        {{#controlpool}}<div class="sheet-rtrow"><b>Control Pool Used:</b> {{controlpool}} </div>{{/controlpool}}
-        <div class="sheet-rtrow"><b>Weapon Damage:</b> {{weaponpower}}{{weapondamage}}</div>
-        <div class="sheet-rtrow"><b>Scatter:</b> {{computed::scatter}}m in {{scatdirnumber}} Direction</div>
+        <div class="sheet-rtheader"><b>{{myname}}:</b> {{weaponname}} <span data=i18n="versus">vs.</span> {{target}}</div>
+        <div class="sheet-rtrow"><b data-i18n="rolling">Rolling</b>: {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} </div>
+        <div class="sheet-rtrow"><b data-i18n="attack-test">Attack Test</b>: {{attacktest}}</div>
+        {{#combatpool}}<div class="sheet-rtrow"><b data-i18n="combat-pool-used">Combat Pool Used</b>: {{combatpool}} </div>{{/combatpool}}
+        {{#controlpool}}<div class="sheet-rtrow"><b data-i18n="control-pool-used">Control Pool Used</b>: {{controlpool}} </div>{{/controlpool}}
+        <div class="sheet-rtrow"><b data-i18n="weapon-damage">Weapon Damage</b>: {{weaponpower}}{{weapondamage}}</div>
+        <div class="sheet-rtrow"><b data-i18n="scatter">Scatter</b>: {{computed::scatter}}m in {{scatdirnumber}} <span data-i18n="direction">Direction</span></div>
         {{#scatdir}}[img]({{scatdir}}){{/scatdir}}
-        <div class="sheet-rtrow">Power reduces by 1 each {{blastradius}}m away</div>
+        <div class="sheet-rtrow"><span data-i18n="power-reduced-by-1-each">Power reduces by 1 each</span> {{blastradius}}<span data-i18n="meters-away">m away</span></div>
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
         {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
-        {{#resist}}<div class="sheet-rtrow"><b>{{target}}:</b> {{resist}}</div>{{/resist}}
+        {{#senddata}}<div class="sheet-rtrow"><b>{{target}}:</b> [<span data-i18n="resist-explosive">Resist Explosive</span>](~selected|resistroll||{{computed::senddata}})</div>{{/senddata}}
     </div>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-item">
     <div class="sheet-rtcontainer">
-        <div class="sheet-rtheader">{{myname}} uses {{item}}</div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{rolldice}}d6 vs. {{targetnumber}} </div>
-        <div class="sheet-rtrow"><span>Item Test: </span>{{result}}</div>
+        <div class="sheet-rtheader">{{myname}} <span data-i18n="uses">uses</span> {{item}}</div>
+        <div class="sheet-rtrow"><b data-i18n="rolling">Rolling:</b> {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} </div>
+        <div class="sheet-rtrow"><span data-i18n="item-test">Item Test</span>: {{result}}</div>
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
         {{#poolname}}<div class="sheet-rtrow">{{poolname}}: {{pooldice}}</div>{{/poolname}}
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
-        {{#dicepool}}<div class="sheet-rtrow">Dice Pool Used: {{dicepool}}</div>{{/dicepool}}
+        {{#dicepool}}<div class="sheet-rtrow"><span data-i18n="dice-pool-used">Dice Pool Used</span>: {{dicepool}}</div>{{/dicepool}}
     </div>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-skill">
     <div class="sheet-rtcontainer">
         <div class="sheet-rtheader">{{myname}}: {{skill}}</div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{rolldice}}d6 vs. {{targetnumber}} </div>
+        <div class="sheet-rtrow"><b data-i18n="rolling">Rolling:</b> {{rolldice}}d6 <span data=i18n="versus">vs.</span> {{targetnumber}} </div>
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
-        <div class="sheet-rtrow"><span>Skill Test: </span>{{result}}</div>
+        <div class="sheet-rtrow"><span data-i18n="skill-test">Skill Test</span>: {{result}}</div>
         {{#poolname}}<div class="sheet-rtrow">{{poolname}}: {{pooldice}}</div>{{/poolname}}
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
-        {{#dicepool}}<div class="sheet-rtrow">Dice Pool Used: {{dicepool}}</div>{{/dicepool}}
+        {{#dicepool}}<div class="sheet-rtrow"><span data-i18n="dice-pool-used">Dice Pool Used</span>: {{dicepool}}</div>{{/dicepool}}
     </div>
 </rolltemplate>
 
@@ -8612,9 +9591,9 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
     <div class="sheet-rtcontainer">
         <div class="sheet-rtheader">{{character}}: {{Attribute}}</div>
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
-        <div class="sheet-rtrow"><span>Success Test: </span>{{result}}</div>
-        <div class="sheet-rtrow"><span>Target Number: </span>{{targetnumber}}</div>
-        <div class="sheet-rtrow"><span>Combat Pool: </span>{{combatpool}}</div>
+        <div class="sheet-rtrow"><span data-i18n="success-test">Success Test</span>: {{result}}</div>
+        <div class="sheet-rtrow"><span data-i18n="target-number">Target Number</span>: {{targetnumber}}</div>
+        <div class="sheet-rtrow"><span data-i18n="combat-pool">Combat Pool</span>: {{combatpool}}</div>
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
         {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
     </div>
@@ -8624,24 +9603,77 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
     <div class="sheet-rtcontainer">
         <div class="sheet-rtheader">{{character}} {{type}}</div>
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
-        {{#roll}}<div class="sheet-rtrow"><b>Roll:</b> {{roll}}</div>{{/roll}}
-        <div class="rtrow">All pools refreshed</div>
+        {{#roll}}<div class="sheet-rtrow"><b data-i18n="roll">Roll</b>: {{roll}}</div>{{/roll}}
+        <div class="rtrow" data-i18n="all-pools-refreshed">All pools refreshed</div>
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
         {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
-        {{#rollGreater() roll 10}}<div></div> {{character}} has qualified for multiple combat phases!
+        {{#rollGreater() roll 10}}<div></div> {{character}} <span data-i18n="multi-combat-phase-message">has qualified for multiple combat phases!</span>
     </div> {{/rollGreater() roll 10}}
 </rolltemplate>
 
-<rolltemplate class="sheet-rolltemplate-resistance">
+<rolltemplate class="sheet-rolltemplate-aoe">
     <div class="sheet-rtcontainer">
-        <div class="sheet-rtheader">{{character}}: {{Power}}{{wpndmg}} vs {{name}} {{armorvalue}}</div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{rolldice}}d6 vs. {{targetnumber}} </div>
-        <div class="sheet-rtrow"><b>Result:</b> {{roll}} </div>
-        {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
-	{{#finaldmg}}<div class="rtrow-small">Attack:{{attacktest}} - (resist:{{roll}} + dodge:{{dodge}})</div>
-	<div class="rtrow"><b>Final Damage:</b> staged to <b>{{computed::finaldmg}}</b></div>{{/finaldmg}}
+        <div class="sheet-rtheader">{{character}}  <span data=i18n="versus">vs.</span> {{weapon}} </div>
+        <div class="sheet-rtrow"><b data-i18n="target-number">Target Number:</b> {{targetnumber}}</div>
+        <div class="sheet-rtrow"><b data-i18n="dice">Dice</b>: {{dice}}</div>
+        <div class="sheet-rtrow"><b data-i18n="result">Result</b>: {{computed::attacktest}} </div>
+        {{#senddata}}<div class="sheet-rtrow"><b>{{character}}:</b>
+            [<span data-i18n="spell-defense">Spell Defense</span>](~selected|spelldefense||{{computed::senddata}})
+            {{#dodge}} [<span data-i18n="dodge">Dodge</span>](~{{character}}|dodge||{{computed::senddata}}){{/dodge}}
+            [<span data-i18n="resist">Resist</span>](~{{character}}|{{computed::resisttype}}||{{computed::senddata}})
+        </div>{{/senddata}}
+    </div>
+</rolltemplate>
+
+<rolltemplate class="sheet-rolltemplate-resist">
+        <div class="sheet-rtheader">{{character}}: {{Power}}{{wpndmg}} <span data=i18n="versus">vs</span> {{name}} {{armorvalue}}</div>
+        <div class="sheet-rtrow"><span data-i18n="rolling">Rolling</span>: {{rolldice}}d6 vs. {{targetnumber}} = {{roll}}</div>
         <div class="sheet-rtrow">Combat Pool Used: {{combatpool}}</div>
-        {{#senddata}}<div class="sheet-rtrow"><b>{{character}}:</b> [Resist](~selected|resistroll||{{computed::senddata}})</div>{{/senddata}}
+</rolltemplate>
+
+
+<rolltemplate class="sheet-rolltemplate-resistadv">
+    <div class="sheet-rtcontainer">
+        <div class="sheet-rtheader">{{character}}: {{Power}}{{wpndmg}} <span data=i18n="versus">vs</span> {{name}} {{armorvalue}}</div>
+        <div class="sheet-rtrow"><span data-i18n="rolling">Rolling</span>: {{rolldice}}d6 vs. {{targetnumber}} = {{roll}}</div>
+        {{#distance}}<div class="rtrow"><span data-i18n="distance-from-explosion">Distance from Explosion</span>: {{distance}}<span data-i18n="meters-power-reduced-by">meter(s) Power Reduced by</span> {{blastredux}}
+        </div>{{/distance}}
+        {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
+        {{#finaldmg}}
+        <div class="sheet-resist-table">
+            <div data-i18n="attack">Attack</div>
+            <div></div>
+            <div data-i18n="resist">Resist</div>
+            <div></div>
+            <div data-i18n="dodge">Dodge</div>
+            <div></div>
+            <div data-i18n="result">Result</div>
+            <div>{{attacktest}}</div>
+            <div>-</div>
+            <div>({{roll}}</div>
+            <div>+</div>
+            <div>{{dodge}})</div>
+            <div>=</div>
+            <div>{{computed::netresult}}</div>
+        </div>
+        <div class="rtrow"><span data-i18n="final-damage-staged-to">Final Damage: staged to</span> {{computed::finaldmg}}</div>{{/finaldmg}}
+        {{#spelldmg}}
+        <div class="sheet-spell-resist-table">
+            <div data-i18n="attack">Attack</div>
+            <div></div>
+            <div data-i18n="resist">Resist</div>
+            <div></div>
+            <div data-i18n="result">Result</div>
+            <div>{{attacktest}}</div>
+            <div>-</div>
+            <div>{{roll}}</div>
+            <div>=</div>
+            <div>{{computed::netresult}}</div>
+        </div>
+        <div class="rtrow"><span data-i18n="final-damage-staged-to">Final Damage: staged to </span>{{computed::spelldmg}}</div>{{/spelldmg}}
+        <div class="sheet-rtrow">Combat Pool Used: {{combatpool}}</div>
+        {{#senddata}}<div class="sheet-rtrow">{{character}}: [Resist](~selected|resistroll||{{computed::senddata}})
+        </div>{{/senddata}}
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
         {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
     </div>
@@ -8650,17 +9682,23 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
 <rolltemplate class="sheet-rolltemplate-matrix">
     <div class="sheet-rtcontainer">
         <div class="sheet-rtheader"><b>{{myname}} vs. {{target}}</b></div>
-        <div class="sheet-rtrow"><b>Rolling:</b> {{rolldice}}d6 vs. {{computed::targetnumber}} </div>
-        {{#hackingpool}}<div class="rtrow"><b>Hacking Pool Dice:</b> {{hackingpool}}</div>{{/hackingpool}}
+        <div class="sheet-rtrow"><b data-i18n="rolling">Rolling</b>: {{rolldice}}d6 vs. {{computed::targetnumber}} </div>
+        {{#hackingpool}}<div class="rtrow"><b data-i18n="hacking-pool-dice">Hacking Pool Dice:</b> {{hackingpool}}</div>{{/hackingpool}}
         {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
-        <div class="sheet-rtrow"><b>{{action}}:</b> {{computed::roll}}</div>
-        {{#senddata}}<div class="sheet-rtrow"><b>{{target}}:</b> [Resist](~selected|matrixresist||{{computed::senddata}})</div>{{/senddata}}
-	{{#oppose}}<div class="sheet-rtrow"><b>Utility Test</b> {{oppose}}</div>{{/oppose}}
-	{{#sensor}}<div class="sheet-rtrow"><b>Sensor Test</b> {{sensor}}</div>{{/sensor}}
+        <div class="sheet-rtrow"><b>{{action}} {{utilitylevel}}:</b> {{computed::roll}} {{computed::wdmg}}</div>
+        {{#resist}}<div class="sheet-rtrow"><b data-i18n="final-damage-staged-to">Final Damage staged to</b> {{computed::finaldamage}}</div>{{/resist}}
+        {{#debuff}}<div class="sheet-rtrow"><b>{{debuff}}</b> <span data-i18n="reduce-by">Reduce by</span> {{computed::finaldamage}}</div>{{/debuff}}
+        {{#senddata}}<div class="sheet-rtrow"><b>{{target}}:</b> [<span data-i18n="resist">Resist</span>](~selected|matrixresist||{{computed::senddata}})</div>{{/senddata}}
+        {{#senddata2}}<div class="sheet-rtrow"><b>{{target}}:</b> [<span data-i18n="oppose">Oppose</span>](~{{targetname}}|matrixmaneuvers||{{computed::senddata2}})</div>{{/senddata2}}
+        {{#oppose}}<div class="sheet-rtrow"><b data-i18n="utility-test">Utility Test</b> {{oppose}}</div>{{/oppose}}
+        {{#sensor}}<div class="sheet-rtrow"><b data-i18n="sensor-test">Sensor Test</b> {{sensor}}</div>{{/sensor}}
+        {{#blackic}}<div class="sheet-rtrow">[{{blackic}} <span data-i18n="resist">Resist</span>](~selected|resistroll||{{computed::payload}})</div>{{/blackic}}
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
-        {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
+	{{#winner}}<div class="sheet-rtrow"><b data-i18n="winner">Winner</b> {{computed::winner}} : {{computed::testresult}} </div>{{/winner}}
         {{#detect}}<div class="sheet-rtrow"><b>{{target}}:</b> {{detect}}</div>{{/detect}}
         {{#clickme}}<div class="sheet-rtrow">{{clickme}}</div>{{/clickme}}
+	{{#matrixdmg}}<div class="sheet-rtrow">{{matrixdmg}} <span data-i18n="damage-reduced-by"></span>{{computed::roll}}{{/matrixdmg}}
+	{{#matrixdmg}}<div class="sheet-rtrow"><b>{{utilitylevel}}</b> <span data-i18n="utility-rating-reduced-by"></span><b> 1</b></div>{{/matrixdmg}}
     </div>
 </rolltemplate>
 <rolltemplate class="sheet-rolltemplate-silent">
@@ -8671,22 +9709,22 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
     <div class="sheet-rtcontainer">
         <div class="sheet-rtheader"><b>{{character}}</b>: {{target}}</div>
         <div class="sheet-rtrow"><span><b>{{type}}:</b> </span>{{computed::roll}}</div>
-        {{#controlpool}}<div class="sheet-rtrow"><b>Control Pool Dice Used:</b> {{controlpool}}</div>{{/controlpool}}
-        {{#targetnumber}}<div class="sheet-rtrow"><b>Target Number</b> {{computed::targetnumber}}</div>{{/targetnumber}}
+        {{#controlpool}}<div class="sheet-rtrow"><b data-i18n="control-pool-dice-used">Control Pool Dice Used:</b> {{controlpool}}</div>{{/controlpool}}
+        {{#targetnumber}}<div class="sheet-rtrow"><b data-i18n="target-number">Target Number</b> {{computed::targetnumber}}</div>{{/targetnumber}}
         {{#description}}<div class="sheet-rtrow">{{description}}</div>{{/description}}
-        {{#charscore}}<div class="sheet-rtrow"><b>{{character}} score:</b> {{charscore}}</div>{{/charscore}}
-        {{#targetscore}}<div class="sheet-rtrow"><b>{{target}} score:</b> {{targetscore}}</div>{{/targetscore}}
-        {{#delta}}<div class="sheet-rtrow">Maneuever Score Difference: {{delta}}</div>{{/delta}}
-        {{#ecd}}<div class="sheet-rtrow">ECD Test: {{ecd}}</div>{{/ecd}}
+        {{#charscore}}<div class="sheet-rtrow"><b>{{character}} <span data-i18n="score">score:</b> {{charscore}}</div>{{/charscore}}
+        {{#targetscore}}<div class="sheet-rtrow"><b>{{target}} <span data-i18n="score">score:</b> {{targetscore}}</div>{{/targetscore}}
+        {{#delta}}<div class="sheet-rtrow"><b data-i18n="maneuever-score-difference">Maneuever Score Difference</b>: {{delta}}</div>{{/delta}}
+        {{#ecd}}<div class="sheet-rtrow"><span data-i18n="ecd-test">ECD Test</span>: {{ecd}}</div>{{/ecd}}
         {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
-        {{#position}}<div class="sheet-rtrow"><b>New Position Score:</b> {{computed::position}}</div>{{/position}}
+        {{#position}}<div class="sheet-rtrow"><b data-i18n="new-position-score">New Position Score:</b> {{computed::position}}</div>{{/position}}
     </div>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-info">
     <div class="sheet-rtcontainer">
         <div class="sheet-rtheader">{{character}}: Info</div>
-        <div class="sheet-rtrow">Action: {{action}}</div>
+        <div class="sheet-rtrow"><span data-i18n="action">Action</span>: {{action}}</div>
         {{#type}}<div class="sheet-rtrow">Type: {{type}}</div>{{/type}}
         {{#info1}}<div class="sheet-rtrow">{{info1}}</div>{{/info1}}
         {{#info2}}<div class="sheet-rtrow">{{info2}}</div>{{/info2}}
diff --git a/Shadowrun3e/translation.json b/Shadowrun3e/translation.json
new file mode 100644
index 0000000000..8f9c20e446
--- /dev/null
+++ b/Shadowrun3e/translation.json
@@ -0,0 +1,945 @@
+{
+    "general-info": "General Information",
+    "name": "Name",
+    "sheet-type": "Sheet Type",
+    "character": "Character",
+    "npc": "NPC",
+    "critter": "Critter",
+    "spirit": "Spirit",
+    "drone": "Drone",
+    "vehicle": "Vehicle",
+    "matrix": "Matrix",
+    "frame": "Frame",
+    "import": "Import",
+    "export": "Export",
+    "metatype": "MetaType",
+    "human": "Human",
+    "dwarf": "Dwarf",
+    "efl": "Elf",
+    "ork": "Ork",
+    "troll": "Troll",
+    "age": "Age",
+    "height": "Height",
+    "weight": "Weight",
+    "winner": "Winner",
+    "spirit-type": "Spirit Type",
+    "watcher": "Watcher",
+    "air-elemental": "Air Elemental",
+    "water-elemental": "Water Elemental",
+    "earth-elemental": "Earth Elemental",
+    "fire-elemental": "Fire Elemental",
+    "city-spirit": "City Spirit",
+    "field-spirit": "Field Spirit",
+    "hearth-spirit": "Hearth Spirit",
+    "desert-spirit": "Desert Spirit",
+    "forest-spirit": "Forest Spirit",
+    "mountain-spirit": "Mountain Spirit",
+    "prairie-spirit": "Prairie Spirit",
+    "mist-spirit": "Mist Spirit",
+    "storm-spirit": "Storm Spirit",
+    "wind-spirit": "Wind Spirit",
+    "lake-spirit": "Lake Spirit",
+    "river-spirit": "River Spirit",
+    "sea-spirit": "Sea Spirit",
+    "gnome": "Gnome",
+    "manitous": "Manitous",
+    "salamander": "Salamander",
+    "sylph": "Sylphs",
+    "ancestor": "Ancestor",
+    "force": "Force",
+    "attributes": "Attributes",
+    "skills": "Skills",
+    "magic": "Magic",
+    "adept": "Adept",
+    "decking": "Decking",
+    "gear": "Gear",
+    "mode": "mode",
+    "resist-explosive": "Resist Explosive",
+    "direction": "Direction",
+    "meters-away": "Meter Away",
+    "power-reduced-by-1-each": "Power Reduced by 1 Each",
+    "reduce-by": "Reduce by",
+    "rigger": "Rigger",
+    "combat": "Combat",
+    "cyberware": "cyberware",
+    "contacts-lifesytle": "Contacts/Lifestyle",
+    "karma": "Karma",
+    "powers": "Powers",
+    "condition-monitor": "Condition Monitor",
+    "uninjured": "Uninjured",
+    "moderate-stun": "Moderate Stun",
+    "unconscious": "Unconscious",
+    "stun": "Stun",
+    "physical": "Physical",
+    "wound-level": "Wound Level",
+    "light-wound": "Light Wound",
+    "moderate-wound": "Moderate Wound",
+    "serious-wound": "Serious Wound",
+    "deadly-wound": "Deadly Wound",
+    "dice-pools": "Dice Pools",
+    "maxiumum-abreviation": "Max",
+    "used": "Used",
+    "uses": "Uses",
+    "item-test": "Equipment Test",
+    "combat-pool": " Combat Pool",
+    "combat-pool-dice": "Combat Pool Dice",
+    "combat-pool-used": "Combat Pool Used",
+    "spell-pool": "Spell Pool",
+    "hacking-pool": "Hacking Pool",
+    "control-pool": "Control Pool",
+    "astral-pool": " Astral Pool",
+    "task-pool": " Task Pool",
+    "spell-pool-dice": "Spell Pool",
+    "spell-pool-dice-for-drain": "Spell Pool Dice for Drain",
+    "hacking-pool-dice": "Hacking Pool",
+    "control-pool-dice": "Control Pool",
+    "astral-pool-dice": " Astral Pool",
+    "task-pool-dice": " Task Pool Dice",
+    "physical-damage-overflow": "Physical Damage Overflow",
+    "damage-reduced-by": "Damage Reduced by",
+    "initiative-natural": "Init Nat.",
+    "initiative-augmented": "Init. Aug.",
+    "initiative-physical": "Init. Phy.",
+    "initiative-astral": "Init. Astr. ",
+    "end-turn": "End Turn",
+    "body-abbreviation": "B",
+    "quickness-abbreviation": "Q",
+    "strength-abbreviation": "S",
+    "charisma-abbreviation": "C",
+    "intelligence-abbreviation": "Intel.",
+    "willpower-abbreviation": "W",
+    "reaction-abbreviation": "R",
+    "combat-conditions": "Combat conditions",
+    "ranged-modifiers": "Ranged Modifiers",
+    "melee-modifiers": "Melee Modifiers",
+    "rounds-fired": "Rounds Fired",
+    "dodge": "Dodge",
+    "ballistic": "Ballistic: ",
+    "impact": "Impact: ",
+    "show-manual-gunnery": "Show Manual Gunnery",
+    "hide-manual-gunnery": "Hide Manual Gunnery",
+    "visibility": "Visibility",
+    "vision-enhacement": "Vision Enhacement",
+    "target-cover": "Target Cover",
+    "movement": "Movement",
+    "dual-wield": "Dual Wield",
+    "called-shot": "Called Shot",
+    "aim-actions": "Aim Actions",
+    "melee-foes": "Melee Foes",
+    "melee-friends": "Melee Friends",
+    "targets": "Targets",
+    "position": "Position",
+    "miscellaneous-modifiers": "Misc Modifiers",
+    "normal": "Normal",
+    "full-dark": "Full Dark",
+    "partial-light": "Partail Light",
+    "minimal-light": "Minimal Light",
+    "glare": "Glare",
+    "mist": "Mist",
+    "light-smoke-rain": "Light Smoke/Rain",
+    "heavy-smoke-rain": "Heavy Smoke/Rain",
+    "thermal-smoke": "Thermal Smoke",
+    "none": "None",
+    "low-light": "LowLight",
+    "thermal": "Thermal",
+    "partial": "Partial",
+    "blind-fire": "Blind Fire",
+    "not-moving": "Not Moving",
+    "walk": "walk",
+    "walk-difficult-ground": "walk (difficult ground)",
+    "run": "run",
+    "run-difficult-ground": "run (difficult ground)",
+    "superior-position": "Superior Position",
+    "target-prone": "Target Prone",
+    "relative-motion": "Relative Motion",
+    "relative-speed": "Relative Speed",
+    "maneuver-score": "Maneuver Score",
+    "vehicle-damage": "Vehicle Damage",
+    "Weapon-mount": "Weapon Mount",
+    "terrain": "Terrain",
+    "target-type": "Target Type",
+    "towards": "Towards",
+    "away": "Away",
+    "utility-test": "Utility Test",
+    "attacker-greater": "Attacker Greaty by 10",
+    "target-greater": "Target Greater by 10",
+    "light-damage-abbreviation": "L",
+    "moderate-damage-abbreviation": "M",
+    "serious-damage-abbreviation": "S",
+    "unmounted": "Unmounted",
+    "mounted": "mounted",
+    "restricted": "Restricted",
+    "tight": "Tight",
+    "combat-zone": "Combat Zone",
+    "metahuman-sized": "Metahuman sized",
+    "small-critter": "Small critter",
+    "large-critter": "Large critter",
+    "small-drone": "Small drone",
+    "motorcyle": "Motorcyle",
+    "automobile": "Automobile",
+    "limo-Light-truck": "Limo/Light Truck",
+    "heavy-truck-trailer": "Heavy Truck/Trailer",
+    "boat": "Boat",
+    "yacht": "Yacht",
+    "freighter-tanker": "Freighter/Tanker",
+    "ultralight-glider": "Ultralight glider",
+    "fixed-wing": "Fixed Wing",
+    "commerical-airliner": "Commerical Airliner",
+    "helicopter": "Helicopter",
+    "zepplin-blimp": "Zepplin/Blimp",
+    "lav": "LAV/T-bird",
+    "military-ground-vehicle": "Military Ground Vehicle",
+    "attribute": "Attribute",
+    "base": "Base",
+    "mods": "Mods",
+    "final": "Final",
+    "body": "Body",
+    "body-test-natural": "Body Test without augmentation",
+    "body-test-aug": "Body Test with augmentation",
+    "quickness": "Quickness",
+    "quickness-test-natural": "Quickness Test witht augmentation",
+    "strength": "Strength",
+    "strength-test-natural": "Strength Test with augmentation",
+    "charisma": "Charisma",
+    "charisma-test-natural": "Charisma Test with augmentation",
+    "intelligence": "Intelligence",
+    "intelligence-test-natural": "Intelligence Test with augmentation",
+    "willpower": "Willpower",
+    "willpower-test-natural": "Willpower Test with augmentation",
+    "essence": "Essence",
+    "essence-test": "Essence Test",
+    "magic-test": "Magic Test",
+    "level": "Level",
+    "perception": "Perception",
+    "perception-test": "Perception Test",
+    "reach": "Reach",
+    "attacks": "Attacks",
+    "deadly-damage-abbreviation": "D",
+    "light-stun-abbreviation": "L(s)",
+    "moderate-stun-abbreviation": "M(s)",
+    "serious-stun-abbreviation": "S(s)",
+    "deadly-stun-abbreviation": "D(s)",
+    "reaction-init-speed": "Reaction, Init &amp; Speed",
+    "natural": "Natural",
+    "reaction": "Reaction",
+    "initiative": "Initiative",
+    "astral": "Astral",
+    "walking-rate": "Walking Rate",
+    "meters-per-combat-turn": "meters per combat turn",
+    "running-rate": "Running Rate",
+    "pool": "Pool",
+    "calculated": "Calculated",
+    "spell": "Spell",
+    "hacking": "Hacking",
+    "control": " Control",
+    "task": "Task",
+    "karma-pool": "Karma Pool",
+    "good-karma": "Good Karma",
+    "professional-rating": "Professional Rating",
+    "skills-edges-flaws": "Skills/Edges/Flaws",
+    "rating": "Rating",
+    "roll": "Roll",
+    "type": "Type",
+    "stacked": "Stacked",
+    "sustained": "Sustained",
+    "max": "Max",
+    "defense": "Defense",
+    "spells": "Spells",
+    "spell-defense": "Spell Defense",
+    "sorcery": "Sorcery",
+    "conjuring": "Conjuring",
+    "conjuring-dice-for-drain": "Conjuring Dice for Drain",
+    "misc-modifiers": "Misc. Modifiers",
+    "modifiers": "Modifiers",
+    "defend": "Defend: ",
+    "dispell": "Dispell: ",
+    "summon": "Summon",
+    "banish": "Banish",
+    "spells-stacked": "Spells Stacked",
+    "spells-sustained": "Spells Sustained",
+    "resist-banish": "Resist Banish: ",
+    "resist-spell": "Resist Spell",
+    "astral-state-combat": "Astral State and Combat",
+    "magic-skills-configuration": "Magic Skills and Configuration",
+    "adept-powers": "Adept Powers",
+    "astral-perception": "Astral Perception",
+    "astral-projection": "Astral Projection",
+    "astral-reaction": "Astral Reaction",
+    "astral-initiative": "Astral Initiative",
+    "astral-combat": "Astral Combat",
+    "weapon-focus": "Weapon Focus",
+    "enabled": "Enabled",
+    "mage": "Mage",
+    "shaman": "Shaman",
+    "aspected-mage": "Aspected Mage",
+    "sorcer": "Sorcery",
+    "specialize": "Specialize",
+    "spellcasting": "Spellcasting",
+    "dispelling": "Dispelling",
+    "ritual-magic": "Ritual Magic",
+    "summoning": "Summoning",
+    "banishing": "Banishing",
+    "controlling": "Controlling",
+    "aura-reading": "Aura Reading",
+    "auras": "Auras",
+    "signatures": "Signatures",
+    "drain": "Drain",
+    "enchanting": "Enchanting",
+    "divining": "Divining",
+    "centering": "Centering",
+    "creative-skill": "Creative Skill",
+    "power": "Power",
+    "cost": "Cost",
+    "activate": "Activate",
+    "notes": "Notes",
+    "improved-reflexes": "Improved Reflexes: ",
+    "body-boost": "Body Boost: ",
+    "strength-boost": "Strength Boost: ",
+    "agility-boost": "Agility Boost: ",
+    "pain-resistance": "Pain Resistance: ",
+    "category": "Category",
+    "specialization-abbreviation": "Spec.",
+    "foci": "Foci",
+    "expendable-abbreviation": "Exp.",
+    "range": "Range",
+    "target": "Target",
+    "damage-abbreviation": "Dmg",
+    "durration-abbreviation": "Dur.",
+    "drain-damage": "Drain Damage",
+    "description": "Description",
+    "health": "Health",
+    "detection": "Detection",
+    "illusion": "Illusion",
+    "elemental": "Elemental",
+    "telekinetic": "Telekinetic",
+    "transformation": "Transformation",
+    "mana": "Mana",
+    "line-of-sight-acronym": "LoS",
+    "area-of-effect-acronym": "AoE",
+    "touch": "Touch",
+    "casting-test": "Casting Test",
+    "target-number": "Target Number",
+    "light": "Light",
+    "medium": "Medium",
+    "serious": "Serious",
+    "deadly": "Deadly",
+    "light-stun": "Light Stun",
+    "medium-stun": "Medium Stun",
+    "serious-stun": "Serious Stun",
+    "deadly-stun": "Deadly Stun",
+    "instant-abbreviation": "I",
+    "sustained-abbreviation": "S",
+    "permanent-abbreviation": "P",
+    "damage-level": "Damage Lvl",
+    "damage-level-add-1": "Damage +1",
+    "damage-level-add-2": "Damage +2",
+    "damage-level-subtract-1": "Damage -1",
+    "damage-level-subtract-2": "Damage -2",
+    "quantity": "Quantity",
+    "expendable": "Expendable",
+    "reusable": "Reusable",
+    "power-focus": "Power Focus",
+    "spirit-focus": "Spirit Focus",
+    "fire": "Fire",
+    "water": "Water",
+    "earth": "Earth",
+    "air": "Air",
+    "city-sprit": "City Spirit",
+    "field-sprit": "Field Spirit",
+    "hearth-sprit": "Hearth Spirit",
+    "desert-sprit": "Desert Spirit",
+    "forest-sprit": "Forest Spirit",
+    "mountain-sprit": "Mountain Spirit",
+    "prairie-sprit": "Prairie Spirit",
+    "mist-sprit": "Mist Spirit",
+    "storm-sprit": "Storm Spirit",
+    "wind-sprit": "Wind Spirit",
+    "lake-sprit": "Lake Spirit",
+    "river-sprit": "River Spirit",
+    "sea-sprit": "Sea Spirit",
+    "sylphs": "Sylphs",
+    "equip": "Equip",
+    "skill": "Skill",
+    "conceal": "Conceal",
+    "damage": "Damage",
+    "plus-dice-abbreviation": "+Dice",
+    "plus-target-number-abberviation": "+TN",
+    "attack": "Attack",
+    "edged": "Edged",
+    "club": "Club",
+    "pole-arm": "Pole Arm",
+    "whip": "Whip",
+    "initiate-grade": "Initiate Grade",
+    "metamagic": "Metamagic",
+    "geas-type": "Geas Type",
+    "geas-notes": "Geas Notes",
+    "totem": "Totem",
+    "environment": "Environment",
+    "advantages": "Advantages",
+    "disadvantages": "Disadvantages",
+    "spirit-name": "Spirit Name",
+    "fetish": "Fetish",
+    "summon-spirit": "summon spirit",
+    "banish-spirit": "banish spirit",
+    "cyberdecks-and-utilities": "Cyberdecks and Utilities",
+    "smart-frames-and-agents": "Smart Frames and Agents",
+    "cyber-combat": "Cyber Combat",
+    "persona": "Persona",
+    "core": "Core",
+    "undamaged": "Undamaged",
+    "light-damage": "Light Damage",
+    "moderate": "Moderate",
+    "moderate-damage": "Moderate Damage",
+    "serious-damage": "Serious Damage",
+    "crashed": "Crashed",
+    "condition": "Condition",
+    "hot-asist": "Hot ASIST",
+    "reality-filter": "Reality Filter",
+    "ic-suppressed": "IC Suppressed",
+    "icon-status": "Icon Status",
+    "host-grid-rating": "Host/Grid Rating",
+    "intruder": "Intruder",
+    "legitimate": "Legitimate",
+    "unknown": "Unknown",
+    "blue": "BLUE",
+    "green": "GREEN",
+    "orange": "ORANGE",
+    "red": "RED",
+    "pilot-rating": "Pilot Rating",
+    "utility-payload": "Utility Payload",
+    "sensor": "Sensor",
+    "evade": "Evade",
+    "parry": "Parry",
+    "combat-tn": "Combat TN",
+    "resist": "Resist",
+    "medic": "Medic",
+    "use-hacking-pool-for-ic-supression": "Use Hacking Pool for IC supression",
+    "full": "Full",
+    "bod": "Bod",
+    "evasion": "Evasion",
+    "masking": "Masking",
+    "sensors": "Sensors",
+    "detection-factor-abbreviation": "Detect.F",
+    "jack-in": "Jack In",
+    "memory-in-use": "Memory In Use",
+    "reset": "Reset",
+    "hacking-pool-used": "Hacking Pool Used",
+    "penalties": "Penalties",
+    "cyberdeck-configuration": "Cyberdeck Configuration",
+    "computer-skills": "Computer Skills",
+    "frame-configuration": "Frame Configuration",
+    "utilities-configuration": "Utilities Configuration",
+    "computer": "Computer",
+    "hardware": "Hardware",
+    "programming": "Programming",
+    "deck-name": "Deck Name",
+    "hardening": "Hardening",
+    "active-memory": "Active Memory",
+    "storage-memory": "Storage Memory",
+    "io-speed": "I/O Speed",
+    "response-increase": "Response Increase",
+    "offline-storage": "Offline Storage",
+    "smart-frame": "Smart Frame",
+    "agent": "Agent",
+    "core-rating": "Core Rating",
+    "pilot": "Pilot",
+    "utility-rating-sum": "Utility Rating Sum",
+    "utility-rating": "Utility Rating",
+    "utility-rating-reduced-by": "Utility Rating Reduced by",
+    "special-utilities": "Special Utilities",
+    "utility": "Utility",
+    "multiple": "Multiplier",
+    "size": "Size",
+    "loaded": "Loaded",
+    "effective-rating": "Effective Rating",
+    "test": "Test",
+    "swap-memory": "Swap Memory",
+    "sleaze": "Sleaze",
+    "track": "Track",
+    "defensive-utilities": "Defensive Utilities",
+    "multiplier": "Multiplier",
+    "armor": "Armor",
+    "cloak": "Cloak",
+    "lock-on": "Lock-On",
+    "offensive-utilities": "Offensive Utilities",
+    "execute": "Execute",
+    "attack-light-damage-abbreviation": "Attack (L)",
+    "attack-moderate-damage-abbreviation": "Attack (M)",
+    "attack-serious-damage-abbreviation": "Attack (S)",
+    "attack-deadly-damage-abbreviation": "Attack (D)",
+    "black-hammer": "Black Hammer",
+    "killjoy": "Killjoy",
+    "slow": "Slow",
+    "additional-utilities": "Additional Utilities",
+    "access": " Acesss",
+    "index": " Index",
+    "files": " Files",
+    "slave": " Slave",
+    "karma-total": "Karma Total",
+    "attribute-skill-spell-etc": "Attribute/Skill/Spell/etc.",
+    "ammount-of-karma": "Ammount of Karma",
+    "date": "Date",
+    "credsticks": "Credsticks ¥",
+    "vehilces-owned-by-character": "Vehicles Owned by Character",
+    "consumeable": "Consumeable",
+    "id": "ID",
+    "balance": "Balance ¥",
+    "permits": "Permits",
+    "certified": "Certified",
+    "standard": "Standard",
+    "silver": "Silver",
+    "gold": "Gold",
+    "platinum": "Platinum",
+    "ebony": "Ebony",
+    "forged": "Forged",
+    "vehicles-list": "Vehicles List",
+    "vehicles-skill-message": "Vehicle Details and Skill rating go on sepperate Vehicle Character Sheet",
+    "model": "Model",
+    "vcr-rating": "VCR Rating",
+    "vehicle-reaction": "Vehicle Reaction",
+    "vehicle-initiative": "Vehicle Initiative",
+    "ivis-master-unit": "IVIS Master Unit",
+    "fddm-master-unit": "FDDM Master Unit",
+    "remote control deck": "Remote Control Deck Configuration",
+    "drone-subscriber-list": "Drone Subscriber List",
+    "intrusion-factor-base": "Intrusion Factor Base",
+    "intrusion-factor-modifier": "Intrusion Factor Mods",
+    "intrusion-factor": "Intrusion Factor",
+    "flux-rating": "Flux Rating",
+    "modified-flux": "Modified Flux",
+    "deck": "Deck",
+    "eccm": "ECCM",
+    "electronic-warfare": "Electronic Warfare",
+    "encryption-module": "Encryption Module",
+    "decryption-module": "Decryption Module",
+    "protocol-emulation-module": "Protocol Emulation Module",
+    "update-vehicle-skill-here": "Update Vehicle Skill Here",
+    "vehicle-specialize-message": "If specializing in a specif vehicle, add modifiers to the vehicle/drone itself",
+    "remote-operation": "Remote Operation",
+    "bike": "Bike",
+    "car": "Car",
+    "hovercraft": "Hovercraft",
+    "lighter-than-air-aircraft-abbreviated": "LAV",
+    "motorboat": "Motorboat",
+    "rotor-aircraft": "Rotor Aircraft",
+    "sailboat": "Sailboat",
+    "ship": "Ship",
+    "submarine": "Submarine",
+    "vectored-thrust": "Vectored Thrust",
+    "winged-aircraft": "Winged Aircraft",
+    "mechanical-arm": "Mechanical Arm",
+    "semiballistic": "Semiballistic",
+    "suborbital": "HSCT/Suborbital",
+    "tracks": "Tracks",
+    "walkers": "Walkers",
+    "combat-skills-weapons-armor-and-ammunition": "Combat Skills, Weapons, Armor and Ammo",
+    "combat-skills": "combat skills",
+    "ranged-weapons": "ranged weapons",
+    "melee-weapons": "melee weapons",
+    "explosives": "explosives weapons",
+    "ammunition": "Ammunition",
+    "update-combat-skills-here": "Update Combat Skill Here",
+    "combat-skills-specialization-message": "If specializing in a weapon, add modifiers to the weapon itself",
+    "assualt-rifle": "Assualt Rifle",
+    "pistols": "Pistols",
+    "rifles": "Rifles",
+    "shotguns": "Shotguns",
+    "sub-machine-gun-abbreviation": "SMG",
+    "throwing": "Throwing",
+    "clubs": "Clubs",
+    "cyber-implant": "Cyber Implant",
+    "gunnery": "Gunnery",
+    "heavy-weapons": "Heavy Weapons",
+    "lasers": "Lasers",
+    "launchers": "Launchers",
+    "spray": "Spray",
+    "gyrojet": "Gyrojet",
+    "projectile": "Projectile",
+    "demolitions": "Demolitions",
+    "under-water": "Under Water",
+    "blowgun": "Blowgun",
+    "bracer": "Bracer",
+    "gun-cane": "Gun Cane",
+    "oral-gun": "Oral Gun",
+    "oral-strike": "Oral Strike",
+    "eye-gun": "Eye Gun",
+    "unarmed": "Unarmed",
+    "martial-arts": "Martial Arts",
+    "brawling": "Brawling",
+    "mma": "MMA",
+    "karate": "Karate",
+    "arnis": "Arnis",
+    "muy-thai": "Muy Thai",
+    "tae-kwon-do": "Tae Kwon Do",
+    "wild-cat": "Wild Cat",
+    "general": "General",
+    "fire-mode": "Fire Mode",
+    "show": "Show",
+    "primary-abbreviation": "Pri",
+    "secondary-abbreviation": "Sec",
+    "minimum-abbreviation": "Min",
+    "short-abbreviation": "S",
+    "medium-abbreviation": "M",
+    "long-abbreviation": "L",
+    "extreme-abbreviation": "Ex",
+    "single-shot-abbreviation": "SS",
+    "semi-automatic-abbreviation": "SA",
+    "burst-fire-abbreviation": "BF",
+    "full-automatic-abbreviation": "FA",
+    "maximum-abbreviation": "Max",
+    "remain": "Remain",
+    "reload": "Reload",
+    "more": "More",
+    "other": "Other",
+    "hold-out-pistol ": "Hold-out Pistol",
+    "light-pistol": "Light Pistol",
+    "machine-pistol": "Machine Pistol",
+    "heavy-pistol": "Heavy Pistol",
+    "taser": "Taser",
+    "shotgun": "Shotgun",
+    "sporting-rifle": "Sporting Rifle",
+    "sniper-rifle": "Sniper Rifle",
+    "assault-rifle": "Assault Rifle",
+    "light-machine-gun-abbreviation": "LMG",
+    "medium-machine-gun-abbreviation": "MMG",
+    "heavy-machine-gun-abbreviation": "HMG",
+    "assualt-cannon": "Assault Cannon",
+    "minigun": "Minigun",
+    "bow": "Bow",
+    "light-crossbow": "Light Crossbow",
+    "medium-crossbow": "Medium Crossbow",
+    "heavy-crossbow": "Heavy Crossbow",
+    "sling-shot": "Sling Shot",
+    "sling-launcher": "Sling Launcher",
+    "thrown-knife": "Thrown Knife",
+    "shuriken": "Shuriken",
+    "caltrops": "Caltrops",
+    "nets": "Nets",
+    "speargun": "Speargun",
+    "net-gun": "Net Gun",
+    "laser-pistol": "Laser Pistol",
+    "laser-rifle": "Laser Rifle",
+    "laser-sniper": "Laser Sniper",
+    "gyrojet-land": "Gyrojet (land)",
+    "gyrojet-water": "Gyrojet (water)",
+    "flamethrower": "Flamethrower",
+    "recoil-compensation-abbreviation": "Recoil Comp",
+    "gyro-stabalization": "Gyro Stabalization",
+    "targeting-assistance": "Targeting Assistance",
+    "reload-type": "Reload Type ",
+    "reloads": "Reloads",
+    "ammo-type": "Ammo Type",
+    "pistol": "Pistol",
+    "heavy-weapon": "Heavy Weapon",
+    "laser": "Laser",
+    "rifle": "Rifle",
+    "thrown": "Thrown",
+    "regular": "Regular",
+    "deluxe": "Deluxe",
+    "smartlink": "Smartlink",
+    "laser-sight": "LaserSight",
+    "smart-goggles": "Smart Goggles",
+    "clip": "clip",
+    "break": "break",
+    "magazine": "magazine",
+    "speed-loader": "speed loader",
+    "cylinder": "cylinder",
+    "belt": "belt",
+    "adps": "ADPS",
+    "explosive": "Explosive",
+    "explosive-ex": "Explosive EX",
+    "flechette": "Flechette",
+    "gel": "Gel",
+    "tracer": "Tracer",
+    "anti-vehicle": "Anti-Vehicl",
+    "capsule": "Capsule",
+    "glazer": "Glazer",
+    "Hi-C": "Hi-C",
+    "hollow-point": "Hollow Point",
+    "incendiary": "Incendiary",
+    "mercury": "Mercury",
+    "tracker": "Tracker",
+    "blast": "Blast",
+    "scatter": "Scatter",
+    "quantity-abbreviation": "Qty.",
+    "manual": "Manual",
+    "regular-offensive": "R/O (Regular Offensive)",
+    "regular-defensive": "R/D (Regular Defensive)",
+    "regular-concussion": "R/C (Regular Concussion)",
+    "aerodynamic-offensive": "A/O (Aerodynamic Offensive)",
+    "aerodynamic-defensive": "A/D (Aerodynamic Defensive)",
+    "aerodynamic-concussion": "A/C (Aerodynamic Concussion)",
+    "launcher-offensive": "L/O (Launcher Offensive)",
+    "launcher-defensive": "L/D (Launcher Defensive)",
+    "launcher-concussion": "L/C (Launcher Concussion)",
+    "target-assistance": "Targeting Assistance",
+    "range-finder": "Range Finder",
+    "throw": "Throw",
+    "launcher": "Launcher",
+    "demolition": "Demolition",
+    "quickness-penalty": "Quickness Penalty",
+    "combat-pool-penalty": "Combat Pool Penalty",
+    "dermal-armor": "Dermal Armor",
+    "slot": "Slot",
+    "ballistic-rating": "Ballistic Rating",
+    "impact-rating": "Impact Rating",
+    "helmet": "helmet",
+    "shield": "shield",
+    "bioware": "bioware",
+    "nanoware": "nanoware",
+    "gyro-harness": "gyro harness",
+    "damage-modifier": "Damage Modifier",
+    "grid": "Grid",
+    "security-code": "Security Code",
+    "security-value": " Security Value",
+    "host": "Host",
+    "virtual-machine-abbreviation": "VM",
+    "detection-roll": "Detection Roll",
+    "security-tally": "Security Tally",
+    "alert-status": "Alert Status",
+    "passive": "Passive",
+    "active": "Active",
+    "hide": "Hide",
+    "trigger-step": "Trigger Step",
+    "event": "Event",
+    "rest-tally": "Reset Tally",
+    "select-token": "Select Token",
+    "intrusion-countermeasures": "Intrusion Countermeasures",
+    "test-target": "Test Target",
+    "crippler": "Crippler",
+    "killer": "Killer",
+    "probe": "Probe",
+    "scramble": "Scramble",
+    "tar-baby": "Tar Baby",
+    "blaser": "Blaster",
+    "ripper": "Ripper",
+    "sparky": "Sparky",
+    "tar-pi": "Tar pit",
+    "black-ic": "Black IC",
+    "black-ic-lethal": "Black IC Lethal",
+    "black-ic-non-lethal": "Black IC Non-Lethal",
+    "data-bomb": "Data Bomb",
+    "pavlov": "Pavlov",
+    "scout": "Scout",
+    "trace": "Trace",
+    "cerebropathic": "Cerebropathic",
+    "psychotropic": "Psychotropic",
+    "detection-factor": "DetectionFactor",
+    "computer-skill": "Computer Skill",
+    "utility-target-number-abbreviation": "Utility TN",
+    "oppose": "Oppose",
+    "mpcp": "MPCP",
+    "rapid-settings-system-rating": "Rapid Settings System Rating",
+    "apply": "Apply",
+    "vehicle-attributes": "Vehicle Attributes",
+    "vehicle-combat": "Vehicle Combat",
+    "vehicle-notes": "Vehicle Notes",
+    "ecm-flux": "ECM/FLUX",
+    "drone-attributes": "Drone Attributes",
+    "drone-combat": "Drone Combat",
+    "drone-notes": "Drone Notes",
+    "interface": "Interface",
+    "datajack": "Datajack",
+    "VCR": "VCR",
+    "autonav": "Autonav",
+    "speed": "Speed",
+    "current": "Current",
+    "maximum": "Maximum",
+    "maneuever": "Maneuever",
+    "generate": "Generate",
+    "compare": "Compare",
+    "off-road": "Off Road",
+    "open": "Open",
+    "urban-setting": "Urban Setting",
+    "weather": "Weather",
+    "bad": "Bad",
+    "terrible": "Terrible",
+    "fog": "Fog",
+    "smog": "Smog",
+    "rain": "Rain",
+    "snow": "Snow",
+    "thunderstorm": "ThunderStorm",
+    "windy": "Windy",
+    "heavy-wind": "Heavy Wind",
+    "sensor-los": "Sensor LOS",
+    "sensor-test": "Sensor Test",
+    "destroyed": "Destroyed",
+    "rc-signal": "RC Signal",
+    "full-strength": "Full Strength",
+    "light-degredation": "Light Degredation",
+    "moderate-degredation": "Moderate Degredation",
+    "serious-degredation": "Serious Degredation",
+    "disengaged": "Disengaged",
+    "command-channel": "Command Channel",
+    "simsense-channel": "Simsense Channel",
+    "system-channel": "System Channel",
+    "driver": "Driver",
+    "driving": "Driving",
+    "maimum-abbreviation": "Max",
+    "operative-mode": "Operative Mode",
+    "primary": "Primary",
+    "secondary": "Secondary",
+    "vehicle-configuration": "Vehicle Configuration",
+    "drone-configuration": "Drone Configuration",
+    "manual-control": "Manual Control",
+    "datajack-port": "Datajack Port",
+    "rigger-adaption": "Rigger Adaption",
+    "remote-control": "Remote Control",
+    "vehicle-type": "Vehicle Type ",
+    "vehicle-size": "Vehicle Size ",
+    "car-pickup-truck": "Car/Pickup Truck",
+    "fighter-jet": "Fighter Jet",
+    "heavy-truck": "Heavy Truck",
+    "large-airplane": "Large Airplane",
+    "limousine": "Limousine/Light Truck/Van",
+    "lighter-than-air": "LTA/Zeppelin",
+    "motorcycle": "Motorcyle",
+    "racing-boat": "Racing Boat",
+    "small-airplane": "Small Airplane",
+    "small-boat": "Small Motorboat",
+    "sports-car": "Sports Car",
+    "tracked-vehicle": "Tracked Vehicle",
+    "tractor-trailer": "Tractor Trailer",
+    "train": "Train/Monorail",
+    "ultralight": "Ultra-light Aircraft",
+    "large": "Large",
+    "extra-large": "Extra-Large",
+    "handling": "Handling",
+    "acceleration": "Acceleration",
+    "signature": "Signature",
+    "firmpoints": "Firmpoints",
+    "hardpoint": "Hardpoint",
+    "seating": "Seating",
+    "entry-points": "Entry Points",
+    "fuel": "Fuel",
+    "economy": "Economy",
+    "cargo": "Cargo",
+    "load": "Load",
+    "vehicle-skill": "Vehicle Skill",
+    "ivis-pool": "IVIS Pool;",
+    "stress": "Stress",
+    "setup-breakdown": "Setup/Breakdown",
+    "total-cost": "Total Cost",
+    "rapid-attributes-set": "Rapid Attribute Set",
+    "modification-notes": "Modification Notes",
+    "vehicle-electronics-and-ecm-eccm": "Vehicle Electornics and ECM/ECCM",
+    "drone-electronics-and-ecm-eccm": "Drone Electornics and ECM/ECCM",
+    "vehicle-flux-rating": "Vehicle Flux Rating",
+    "drone-flux-rating": "Drone Flux Rating",
+    "vehicle-flux-used": "Vehicle Flux Used",
+    "drone-flux-used": "Drone Flux Used",
+    "max-flux": "Max Flux",
+    "roll-test": "Roll Test",
+    "opposition-test": "Opposition Test",
+    "sonar": "Sonar",
+    "ECM": "ECM",
+    "ED": "ED",
+    "ECD": "ECD",
+    "handling-abbreviation": "Hand",
+    "accleration-abbreviation": "Accel",
+    "signature-abbreviation": "Sig",
+    "auto-pilot-rating-abbreviation": "Auto",
+    "vehicle-actions": "Vehicle Actions",
+    "drone-actions": "Drone Actions",
+    "accelerate": "Accelerate",
+    "brake": "Brake",
+    "ram": "Ram",
+    "relocate": "Relocate",
+    "crash": "Crash",
+    "sensor-mode": "Sensor Mode",
+    "manual-target-nubmber-abbreviation": "Manual TN",
+    "sensor-target-nubmber-abbreviation": "Sensor TN",
+    "about-equal": "About Equal",
+    "up-to-2x": "Up to 2X",
+    "up-to-3x": "Up to 3X",
+    "more-than-3x": "More than 3X",
+    "attacker-greater-by-10": "Attacker Greaty by 10",
+    "target-greater-by-10": "Target Greater by 10",
+    "full-dark ": "Full Dark",
+    "limo-light-truck": "Limo/Light Truck",
+    "commercial-airliner": "Commerical Airliner",
+    "vehicle-weapons": "Vehicle Weapons",
+    "mount": "Mount",
+    "firmpoint": "Firmpoint",
+    "turret": "Turret",
+    "cyberware-bioware-nanoware": "Cyberware, Bioware and Nanoware",
+    "bio-index": "Bio Index",
+    "lifestyle": "Lifestyle",
+    "contacts": "Contacts",
+    "contact-type": "Contact Type",
+    "contact": "Contact",
+    "buddy": "Buddy",
+    "friend-for-life": "Friend for Life",
+    "followers": "Followers",
+    "lifesytle-class-gear-at-home": "Lifestyle Class/Gear at Home",
+    "months-paid": "Months Paid",
+    "address": "Address",
+    "edges-flaws": "Edges/Flaws",
+    "weakness": "Weakness",
+    "json-import": "JSON Import",
+    "json-export": "JSON Export",
+    "rolling": "Rolling",
+    "control-pool-dice-used": "Control Pool Dice Used",
+    "score": "score",
+    "ecd-test": "ECD Test",
+    "all-pools-refreshed": "All Pools Refreshed",
+    "maneuever-score-difference": "Maneuever Score Difference",
+    "new-position-score": "New Posistion Score",
+    "attack-test": "Attack Test",
+    "control-pool-used": "Control Pool Used",
+    "weapon-damage": "Weapon Damage",
+    "move-penalty": "Move Penalty",
+    "aim-assist": "Aim Assist",
+    "rounds": "Rounds",
+    "action": "Action",
+    "multi-combat-phase-message": "has qualified for multiple combat phases!",
+    "result": "result",
+    "final-damage-staged-to": "Final Damage Staged To",
+    "attacks-msg": "Number of Success for Attacker",
+    "attack-power": "Attack Power",
+    "attack-type": "Attack Type",
+    "full-defense": "Full Defense",
+    "pool-used": "Pool Used",
+    "distance-from-explosive-in-meters": "Distance from Explosive in Meters",
+    "half": "Half",
+    "double": "Double",
+    "use-reach-modifier": "Use Reach Modifier",
+    "success-test": "Success Test",
+    "pool-dice": "Pool Dice",
+    "skill-test": "Skill Test",
+    "dice": "Dice",
+    "resist-test": "resist test",
+    "spellblocked-msg": "spell fully blocked, no resistance test needed",
+    "missed-msg": "attack missed, no resistance test needed",
+    "verification-system-rating": "Verification System Rating",
+    "system-operation-with": "System Operation With",
+    "operator": "Operator",
+    "icon": "Icon",
+    "update-gunnery-and-control-pool": "Update Gunnery and Control Pool",
+    "set-vehicle-operator": "Set Vehicle Operator",
+    "set-decker-for-security-tally": "Set Decker for Security Tally",
+    "spell-resistance-test": "Spell Resistance Test",
+    "damage-resistance-test": "Damage Resistance Test",
+    "sorcery-dice": "Sorcery Dice",
+    "sorcery-dice-for-drain": "Sorcery Dice for Drain",
+    "force-of-spell": "Force of Spell",
+    "ally": "ally",
+    "out-of-ammo": "Out of Ammo",
+    "simple": "simple",
+    "rounds-already-fired-in-combat-phase": "Rounds Already Fired in Combat Phase",
+    "complex": "complex",
+    "cover-modifiers": "Cover Modifiers",
+    "spirit-focus-dice": "Spirit Focus Dice",
+    "are-you-the-summoner": "Are You the Summoner",
+    "additional-modifiers": "Additional Modifers",
+    "successes-from-hiding-test": "Successes from Hiding Test",
+    "decker": "Decker",
+    "yes": "yes",
+    "no": "no",
+    "how-many-additional-enemy-vehicles": "How Many Additional Enemy Vehicles",
+    "short": "short",
+    "long": "long",
+    "extreme": "extreme",
+    "ic-rating": "IC Rating",
+    "drain-modifiers": "Drain Modifiers"
+}