Merge branch 'Roll20:master' into psi-run-migration

2021-08-16 12:26:57 -04:00
parent 0eb659a308 e862cbf34e
commit e81eeead84
592 changed files with 74635 additions and 34808 deletions
@@ -3,7 +3,7 @@
 	"Race": "Race",
 	"Class": "Class",
 	"Level": "Level",
-	"AbilityScores": "AbilityScores",
+	"AbilityScores": "Ability Scores",
 	"STR": "STR",
 	"Strength": "Strength",
 	"CON": "CON",
@@ -53,7 +53,7 @@
 	"Temp.": "Temp.",
 	"Initiative": "Initiative",
 	"One Unique Thing": "One Unique Thing",
-	"Describe your characters one unique thing ...": "Describe your characters one unique thing ...",
+	"Describe your characters one unique thing ...": "Describe your character's one unique thing ...",
 	"Class Features": "Class Features",
 	"Talents": "Talents",
 	"Powers & Spells": "Powers & Spells",
@@ -3,7 +3,7 @@
 	"Race": "Rasa ",
 	"Class": "Klasa",
 	"Level": "Poziom",
-	"AbilityScores": "AbilityScores",
+	"AbilityScores": "WartościCech",
 	"STR": "SIŁ",
 	"Strength": "Siła",
 	"CON": "BUD",
@@ -31,56 +31,56 @@
 	"Misc.": "Inne.",
 	"Weapon": "Broń",
 	"Item": "Przedmiot",
-	"On Miss": "On Miss",
+	"On Miss": "Przy nie trafieniu",
 	"AC": "KZ",
 	"PD": "PD",
 	"MD": "MD",
 	"Basic melee": "Basic melee",
 	"Basic ranged": "Basic ranged",
 	"Situational Attack Modifier": "Situational Attack Modifier",
-	"Damage on hit": "Damage on hit",
-	"Damage on miss": "Damage on miss",
+	"Damage on hit": "Obrażenia przy trafieniu",
+	"Damage on miss": "Obrażenia przy nie trafieniu",
 	"Escalation die value": "Escalation die value",
-	"Attack result": "Attack result",
-	"Hit Points": "Hit Points",
-	"HP": "HP",
+	"Attack result": "Wynik ataku",
+	"Hit Points": "Punkty Wytrzymałości",
+	"HP": "PW",
 	"Recoveries": "Recoveries",
 	"Recovery": "Recovery",
 	"Recovery Value": "Recovery Value",
 	"Current": "Current",
 	"Max.": "Max.",
 	"Rec. Die": "Rec. Die",
-	"Temp.": "Temp.",
-	"Initiative": "Initiative",
+	"Temp.": "Tymcz.",
+	"Initiative": "Inicjatywa",
 	"One Unique Thing": "One Unique Thing",
 	"Describe your characters one unique thing ...": "Describe your characters one unique thing ...",
-	"Class Features": "Class Features",
-	"Talents": "Talents",
+	"Class Features": "Zdolność klasowa",
+	"Talents": "Talenty",
 	"Powers & Spells": "Powers & Spells",
-	"Feats": "Feats",
+	"Feats": "Atuty",
 	"At-Will": "At-Will",
 	"Battle uses left": "Battle uses left",
-	"Daily uses left": "Daily uses left",
-	"Show Description": "Show Description",
-	"Show Macro": "Show Macro",
-	"Usage": "Usage",
+	"Daily uses left": "Pozostało użyć na dzień",
+	"Show Description": "Pokaż opis",
+	"Show Macro": "Pokaż makro",
+	"Usage": "Użycie",
 	"Type": "Typ",
-	"Points": "Points",
+	"Points": "Punkty",
 	"Icon Relationships": "Icon Relationships",
-	"Icon": "Icon",
-	"positive": "positive",
-	"conflicted": "conflicted",
-	"negative": "negative",
+	"Icon": "Ikona",
+	"positive": "dodatnie",
+	"conflicted": "skonfliktowany",
+	"negative": "ujemne",
 	"Background": "Tło",
-	"Backgrounds": "Backgrounds",
+	"Backgrounds": "Pochodzenie",
 	"Roll": "Rzuć",
-	"Attribute": "Attribute",
-	"Check": "Check",
-	"Description": "Description",
-	"Macro": "Macro",
-	"Magic Items": "Magic Items",
-	"Equipment": "Equipment",
-	"Coins": "Coins",
+	"Attribute": "Cechy",
+	"Check": "Test",
+	"Description": "Opis",
+	"Macro": "Makro",
+	"Magic Items": "Magiczne przedmioty",
+	"Equipment": "Ekwipunek",
+	"Coins": "Monety",
 	"Qty": "Qty",
 	"Incremental Advances": "Incremental Advances",
 	"4th / 7th / 10th Level": "4th / 7th / 10th Level <br>(+1 to 3 abilities)",
@@ -145,11 +145,11 @@
  "CHA": "Cha",
  "CHALLENGE": "Challenge",
  "CHARACTER": "Postać",
-  "CHARACTER_NAME": "Character name",
+  "CHARACTER_NAME": "Imię postaci",
  "CHARACTER_NAME_ON_ROLL_TEMPLATES": "Character Name on all roll templates",
-  "CHARISMA": "Charisma",
-  "CHARISMA_SAVING_THROW": "Charisma saving throw",
-  "CHARMED": "Charmed",
+  "CHARISMA": "Charyzma",
+  "CHARISMA_SAVING_THROW": "Rzut obronny na charyzmę",
+  "CHARMED": "Zauroczony",
  "CHARMED_1": "A charmed creature can’t attack the charmer or target the charmer with harmful abilities or magical effects.",
  "CHARMED_2": "The charmer has advantage on any ability check to interact socially with the creature.",
  "CHECK": "Check",
@@ -6,13 +6,21 @@
 <div aria-label="Announces changes to sheet">
    <input type="checkbox" class="sheet-show-announcement" value="1" title="Show Announcements" name="attr_announcement"/><span></span><b style="color:red;" title="Show Announcements">Announcements</b>
    <div class="sheet-announcement">
-        <h2 style="font-size:24px; line-height: 36px">Changes in <input type="text" name="attr_version" class="sheet-version-large"/></h2>
+        <h2 style="font-size:24px; line-height: 36px">Potential Changes coming! <input type="text" name="attr_version" class="sheet-version-large"/></h2>
        <br/>
        <div class="sheet-announce-items">
+            <p>In order to make room for new functionality on the Monster Sheet, the <b>Variants repeating section is scheduled for deletion</b>. The deletion will happen in 1 month, around the 1st of September.</p>
+            <p style="text-align: center;">
+                <img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/uDkBIZp.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
+                <img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/yILTmXJ.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
+            </p>
+            <p><b>If anyone uses this section, please let me know, so that I do not delete your work!</b></p>
+            <p>If the section gets removed the following features will be added afterwards to the Monster Sheet</p>
            <ul style="font-style:italic">
-                <li>Fixed a bug with setting the character_sheet version attribute on new games / new character sheets</li>
-                <li>Fixed a bug that made any API loaded with the sheet fail to load correctly</li>
+                <li>Repeating Weapons / attack table allowing for adding more attacks to a monster</li>
+                <li>Repeating spells, allowing monsters to use the full list of spells, currently available to players. This also include rolling spells secretly as the DM, so that players cannot see what spell you are using</li>
            </ul>
+            
            <hr>
            <p>
                To get notified on future updates, discuss changes, or contribute suggestions, please follow this topic on the forum:
@@ -30753,7 +30761,7 @@ gemSections.forEach(i => {
 // --- Version change start --- //

 const sheetName = 'AD&D 2E Revised';
-const sheetVersion = '4.1.2';
+const sheetVersion = '4.1.3';

 on('sheet:opened', function(){
    getAttrs(['character_sheet'],function(attrs){
@@ -781,7 +781,7 @@ button {

 .charsheet,
 .charsheet button:hover {
-    background-image: url("http://www.commentnation.com/backgrounds/images/parchment_paper_seamless_pattern.jpg");
+    background-image: url("https://www.commentnation.com/backgrounds/images/parchment_paper_seamless_pattern.jpg");
 }

 /*/ Styles for 2ESheet rolltemplates /*/
@@ -1439,4 +1439,13 @@ div.sheet-announcement {
    -ms-user-select: all;      /* IE 10+ */
    user-select: all;          /* Likely future */
 }
+
+img.expandable {
+    transition:transform 0.25s ease;
+}
+
+img.expandable:hover {
+    -webkit-transform:scale(3); /* or some other value */
+    transform:scale(3);
+}
 /* Announcement styling end */
@@ -6,13 +6,21 @@
 <div aria-label="Announces changes to sheet">
    <input type="checkbox" class="sheet-show-announcement" value="1" title="Show Announcements" name="attr_announcement"/><span></span><b style="color:red;" title="Show Announcements">Announcements</b>
    <div class="sheet-announcement">
-        <h2 style="font-size:24px; line-height: 36px">Changes in <input type="text" name="attr_version" class="sheet-version-large"/></h2>
+        <h2 style="font-size:24px; line-height: 36px">Potential Changes coming! <input type="text" name="attr_version" class="sheet-version-large"/></h2>
        <br/>
        <div class="sheet-announce-items">
+            <p>In order to make room for new functionality on the Monster Sheet, the <b>Variants repeating section is scheduled for deletion</b>. The deletion will happen in 1 month, around the 1st of September.</p>
+            <p style="text-align: center;">
+                <img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/uDkBIZp.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
+                <img src="https://imgsrv.roll20.net/?src=https://i.imgur.com/yILTmXJ.png" style="max-height: 230px;" class="expandable" alt="Section removal"/>
+            </p>
+            <p><b>If anyone uses this section, please let me know, so that I do not delete your work!</b></p>
+            <p>If the section gets removed the following features will be added afterwards to the Monster Sheet</p>
            <ul style="font-style:italic">
-                <li>Fixed a bug with setting the character_sheet version attribute on new games / new character sheets</li>
-                <li>Fixed a bug that made any API loaded with the sheet fail to load correctly</li>
+                <li>Repeating Weapons / attack table allowing for adding more attacks to a monster</li>
+                <li>Repeating spells, allowing monsters to use the full list of spells, currently available to players. This also include rolling spells secretly as the DM, so that players cannot see what spell you are using</li>
            </ul>
+            
            <hr>
            <p>
                To get notified on future updates, discuss changes, or contribute suggestions, please follow this topic on the forum:
@@ -1,7 +1,7 @@
 // --- Version change start --- //

 const sheetName = 'AD&D 2E Revised';
-const sheetVersion = '4.1.2';
+const sheetVersion = '4.1.3';

 on('sheet:opened', function(){
    getAttrs(['character_sheet'],function(attrs){
@@ -84,7 +84,7 @@
    "misses": "Misses",
    "move": "Move",
    "name": "Name",
-    "nolonger-vulnerable-hunger": "You can live on local human food and are no loger vulnerable to hunger.",
+    "nolonger-vulnerable-hunger": "You can live on local human food and are no longer vulnerable to hunger.",
    "nolonger-vulnerable-xharm": "You are no longer vulnerable to Ψ-harm.",
    "open-your-brain": "Open your brain",
    "operator": "Operator",
@@ -50,7 +50,7 @@
 	"gang": "Gang",
 	"gang-new-option": "choose a new option for your gang",
 	"gear-barter": "Gear &amp; Barter",
-	"get-2brainer-gear": "get 2 new or relacement brainer gear (you choose)",
+	"get-2brainer-gear": "get 2 new or replacement brainer gear (you choose)",
 	"get-ally": "get an ally (cf, detail with the MC)",
 	"get-establishment": "get an establishment (detail)",
 	"get-followers-fortune": "get followers (you detail) and Fortunes",
@@ -10,15 +10,15 @@
 	"fatale-desc": "You drip sensuality from your lips. Others watch your every move and crave for you to take control.",
 	"mother": "Mother",
 	"Mother": "Mother",
-	"mother-desc": "You walk with authority.\n                    Others ache for your approval,and long for you to soothe their wounds.\n                ",
+	"mother-desc": "You walk with authority.\n                    Others ache for your approval, and long for you to soothe their wounds.\n                ",
 	"virgin": "Virgin",
 	"Virgin": "Virgin",
 	"virgin-desc": "\n                    You see beauty where there is none.\n                    Others seek comfort in your warmth and delight in your obedience.\n                ",
 	"witch": "Witch",
 	"Witch": "Witch",
-	"witch-desc": "\n                    You braid magic from shadow and blood.\n                    Others desire a taste of your sing and pray for your undoing.\n                ",
+	"witch-desc": "\n                    You braid magic from shadow and blood.\n                    Others desire a taste of your sin and pray for your undoing.\n                ",
 	"shattered-desc": "\n                    When a sister misses her roll, the Groundskeeper may look to you\n                    to describe what happens to the Bride.<br>\n                    Use the following prompts to help describe what happens to the Bride:\n                ",
-	"shattered-options": "\n                    <li>Answer with what you find frightening.</li>\n                    <li>Illuminate the horror in beauty as well as gore.</li>\n                    <li>Decribe interesting details using all five senses.</li>\n                ",
+	"shattered-options": "\n                    <li>Answer with what you find frightening.</li>\n                    <li>Illuminate the horror in beauty as well as gore.</li>\n                    <li>Describe interesting details using all five senses.</li>\n                ",
 	"stats": "Stats",
 	"blood": "blood",
 	"carnality": "carnality",
@@ -30,7 +30,7 @@
 	"the-rooster-desc": "Mark one trauma to give a direct order to an NPC. They do it, but choose one: Your order…",
 	"the-rooster-options": "<li>is carried out to the letter and then some.</li>\n<li>is overwhelming and carried out sloppily.</li>\n<li>is not something they can do, and a third party steps in to carry it out.</li>",
 	"the-shield": "The Shield",
-	"the-shield-desc": "When one of your Sisters marks trauma, explain to her howthe trauma she is experiencing is her fault, then ask if she believes you. If she believes you, she marks one less trauma. If she rejects your explanation, mark one trauma as you experience the shame of your own impotence.",
+	"the-shield-desc": "When one of your Sisters marks trauma, explain to her how the trauma she is experiencing is her fault, then ask if she believes you. If she believes you, she marks one less trauma. If she rejects your explanation, mark one trauma as you experience the shame of your own impotence.",
 	"the-dancer": "The Dancer",
 	"the-dancer-desc": "Remove a piece of your clothing to <em>care for someone</em>.That item of clothing is lost to you forever, but it feeds the appetite of the horror or servant until the Bride speaks again.",
 	"the-mistress": "The Mistress",
@@ -119,7 +119,7 @@
 	"propose-a-truth-desc2": "\n                    If it is a <em>token of Faithfulness</em>, \n                    you are close to proving that your trust in your husband is well placed;\n                    heal one trauma.\n                ",
 	"propose-a-truth-desc3": "\n                    If it is a <em>token of Disloyalty</em>, you are closer to proving\n                    that your unkind suspicions about your husband are true;\n                    mark one trauma.\n                ",
 	"the-bride": "The Bride",
-	"the-bride-desc": "\n        Use this page to track the Bride's progress thru the mansion.\n        When the Bride aquires Tokens of <em>Faithfulness</em> and\n        <em>Disloyalty</em>, click the appropriate icon, and enter information\n        about the Token in the text boxes.\n    ",
+	"the-bride-desc": "\n        Use this page to track the Bride's progress through the mansion.\n        When the Bride acquires Tokens of <em>Faithfulness</em> and\n        <em>Disloyalty</em>, click the appropriate icon, and enter information\n        about the Token in the text boxes.\n    ",
 	"faithfulness": "faithfulness",
 	"disloyalty": "disloyalty",
 	"help": "Help",
@@ -16,7 +16,7 @@
 	"virgin-desc": "\nVous voyez la beauté là où il n'y en a pas.\n                    Les autres cherchent du confort dans votre chaleur et du bonheur dans vote obéissance.\n                ",
 	"witch": "Sorcière",
 	"Witch": "Sorcière",
-	"witch-desc": "\nVous tissez la magie avec l'ombre et le sang.\n                    Les autres désirent un avant-goût de vos chants et prient pour vos désensorcellement.                ",
+	"witch-desc": "\nVous tissez la magie avec l'ombre et le sang.\n                    Les autres désirent un avant-goût de vos péchés et prient pour votre ruine.                ",
 	"shattered-desc": "\n                    Quand une sœur rate son jet, le Jardinier peut prendre la main\n                    pour décrire ce qui arrive à la Mariée.<br>\n                    Utilisez les répliques suivantes pour vous aider à décrire ce qui arrive à la Mariée:                ",
 	"shattered-options": "\n                    <li>Répondez avec ce qui vous terrifie.</li>\n                    <li>Illustrez l'horreur dans la beauté comme dans le gore.</li>\n                    <li>Décrivez les détails importants à l'aides des 5 sens.</li>                ",
 	"stats": "Caractéristiques",
@@ -118,7 +118,7 @@
 				<span> </span>
 				<button type="roll" name="roll_night_move" value='&{template:com12} {{char=@{character_name}}} {{move=Night}} {{showroll=[[1]]}} {{check=[[?{Advantage or Disadvantage|None,2d6|Advantage,3d6k2|Disadvantage,3d6kl2}+?{Select Ability to Use|Vitality,@{vitality}|Composure,@{composure}|Reason,@{reason}|Presence,@{presence}|Sensitivity,@{sensitivity}}]]}} {{best=@{nightbest}}} {{success=@{nightsuccess}}} {{partial=@{nightpartial}}} {{miss=@{nightmiss}}}'  class="sheet-rollbutton" >The Night Move</button>
 				<span> </span>
-				<button type="roll" name="roll_meddling_move" value='&{template:com12} {{char=@{character_name}}} {{move=Meddling}} {{showroll=[[1]]}} {{check=[[?{Advantage or Disadvantage|None,2d6|Advantage,3d6k2|Disadvantage,3d6kl2}+?{Select Ability to Use|Vitality,@{vitality}|Composure,@{composure}|Reason,@{reason}|Presence,@{presence}|Sensitivity,@{sensitivity}}]]}} {{best=@{meddlingbest}}} {{success=@{meddlingsuccess}}} {{partial=@{daypartial}}} {{miss=@{meddlingmiss}}}'  class="sheet-rollbutton" >The Meddling Move</button>
+				<button type="roll" name="roll_meddling_move" value='&{template:com12} {{char=@{character_name}}} {{move=Meddling}} {{showroll=[[1]]}} {{check=[[?{Advantage or Disadvantage|None,2d6|Advantage,3d6k2|Disadvantage,3d6kl2}+?{Select Ability to Use|Vitality,@{vitality}|Composure,@{composure}|Reason,@{reason}|Presence,@{presence}|Sensitivity,@{sensitivity}}]]}} {{best=@{meddlingbest}}} {{success=@{meddlingsuccess}}} {{partial=@{meddlingpartial}}} {{miss=@{meddlingmiss}}}'  class="sheet-rollbutton" >The Meddling Move</button>
 				<span> </span>
 				<button type="roll" name="roll_occult_move" value='&{template:com} {{char=@{character_name}}} {{move=Occult}} {{showroll=[[1]]}} {{statused=Sensitivity}} {{check=[[?{Advantage or Disadvantage|None,2d6|Advantage,3d6k2|Disadvantage,3d6kl2} + @{sensitivity}]]}} {{success=@{occultsuccess}}} {{partial=@{occultpartial}}} {{miss=@{occultmiss}}}' class="sheet-rollbutton" >The Occult Move</button>
 				<span> </span>
@@ -237,7 +237,7 @@
 					</div>
 				</div>
 				
-				<!-- Cozy move possible outcomes -->
+				<!-- Gold Crown Mysteries move possible outcomes -->
 				<div class="hidden">
 					<div class="sheet-action">
 						<span class="sheet-action">Result: </span>
@@ -46,7 +46,7 @@
          <input type="number" id="attr_verteidigung" name="attr_verteidigung" class="number-20" readonly />
        </div>
        <div class="formular">
-          <button type="roll" class="small-button" name="roll_schicksalRoll" value="Die Gruppe hat jetzt noch [[@{schicksal} + ?{Modifier?|-1}]] Schicksalspunkte">Schicksal</button>
+          <button type="roll" class="small-button" name="roll_schicksalRoll" value="Die Gruppe hat jetzt noch [[@{schicksal}]] Schicksalspunkte">Schicksal</button>
          <input type="number" name="attr_schicksal" value="4" class="number-20" />
        </div>
      </div>
@@ -521,7 +521,7 @@
  <div class="break"></div>

  <div class="float full version">
-    v21.07
+    v21.08
  </div>
 </div>

@@ -1,24 +1,67 @@
@import url('https://fonts.googleapis.com/css?family=Passion+One:wght@300&display=swap');

-button[type=roll].sheet-stat-roll::before {
-    background-image: none;
-    font-family: dicefontd6;
-    content: "l";
-    color: #3f0f12;
-}
-
-.sheet-collateral-damage {
+.collateral-damage {
    font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
    font-size: 14px;
    font-weight: bold;
    min-width: 500px; /* TODO: Figure out if there is a better value for this */
 }

-.sheet-collateral-damage .sheet-row-padding {
+.collateral-damage button[type=roll].stat-roll::before {
+    background-image: none;
+    font-family: dicefontd6;
+    content: "F";
+}
+
+.collateral-damage button[type=roll] {
+    color: #3f0f12;
+}
+
+.collateral-damage button[type=roll]:hover {
+    color: #eeb8bb;
+}
+
+
+.collateral-damage a {
+    color: #eeb8bb;
+}
+
+.collateral-damage a:hover {
+    color: #3f0f12;
+}
+
+.collateral-damage .row-padding {
    padding-top:5px;
 }

-.sheet-collateral-damage .sheet-section-act-heading {
+.collateral-damage select {
+    width: 100%;
+    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
+    text-transform: uppercase;
+    margin-bottom: 0px;
+}
+
+.collateral-damage .section {
+    padding: 5px;
+}
+
+.collateral-damage .randomize-button {
+    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
+    font-size: 13px;
+    font-weight: normal;
+    line-height: 18px;
+    width: 50px;
+    height: 15px;
+    color: #3f0f12;
+    background-color: #eeb8bb;
+}
+
+.collateral-damage .randomize-button:hover {
+    color: #eeb8bb;
+    background-color: #3f0f12;
+}
+
+.collateral-damage .section-act-heading {
    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
    text-transform: uppercase;
    font-weight: 300;
@@ -30,18 +73,7 @@ button[type=roll].sheet-stat-roll::before {
    border-width: 2px;
 }

-.sheet-collateral-damage .sheet-stat-content {
-    display: inline-block;
-    vertical-align: middle;
-    text-align: center;
-    width: 45px;
-}
-
-.sheet-collateral-damage .sheet-section {
-    padding: 5px;
-}
-
-.sheet-collateral-damage .sheet-section-heading {
+.collateral-damage .section-heading {
    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
    text-transform: uppercase;
    font-weight: 300;
@@ -51,14 +83,21 @@ button[type=roll].sheet-stat-roll::before {
    background-color: #eeb8bb;
 }

-.sheet-collateral-damage .sheet-section-content {
+.collateral-damage .section-content {
    border-left: solid #3f0f12;
    border-top: solid #3f0f12;
    border-width: 2px;
    padding: 5px;
 }

-.sheet-collateral-damage .sheet-input-label-header {
+.collateral-damage .stat-content {
+    display: inline-block;
+    vertical-align: middle;
+    text-align: center;
+    width: 45px;
+}
+
+.collateral-damage .input-label-header {
    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
    text-transform: uppercase;
    font-weight: 300;
@@ -69,7 +108,7 @@ button[type=roll].sheet-stat-roll::before {
    text-align: left;
 }

-.sheet-collateral-damage .sheet-input-label {
+.collateral-damage .input-label {
    color: #3f0f12;
    border-top: solid #3f0f12;
    border-width: 1px;
@@ -77,19 +116,19 @@ button[type=roll].sheet-stat-roll::before {
    text-align: left;
 }

-.sheet-collateral-damage .sheet-center-text {
+.collateral-damage .center-text {
    text-align: center;
 }

 /* Customizes the inputs to use bold font */
-.sheet-collateral-damage input[type=text] {
+.collateral-damage input[type=text] {
    width: 100%;
    font-size: 14px;
    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
    text-transform: uppercase;
    font-weight: 300;
 }
-.sheet-collateral-damage textarea {
+.collateral-damage textarea {
    box-sizing: border-box;
    -moz-box-sizing: border-box;
    -webkit-box-sizing: border-box;
@@ -103,20 +142,27 @@ button[type=roll].sheet-stat-roll::before {
 }

 /* Used to build out + or - in stat table */
-.sheet-collateral-damage .sheet-stat-content label {
+.collateral-damage .stat-content label {
    text-align: center;
+    font-size: 25px;
 }
-.sheet-collateral-damage .sheet-stat-content label span:before {
+.collateral-damage .stat-content label span:before {
    content: "+";
+    font-size: 25px;
    cursor: pointer;
 }
-.sheet-collateral-damage .sheet-stat-content label input[type=checkbox]:checked + span:before {
+.collateral-damage .stat-content label input[type=checkbox]:checked + span:before {
    content: "-";
+    font-size: 25px;
    cursor: pointer;
 }

+.collateral-damage .stat-content label input[type=checkbox] + span:hover {
+    color: #eeb8bb
+}
+
 /* Used to build the stat dice table */
-.sheet-collateral-damage .sheet-stats-dice-header {
+.collateral-damage .stats-dice-header {
    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
    text-transform: uppercase;
    font-weight: 300;
@@ -125,35 +171,105 @@ button[type=roll].sheet-stat-roll::before {
    text-align: center;
    color: white;
 }
-.sheet-collateral-damage table {
+.collateral-damage table {
    width: 100%;
 }
-.sheet-collateral-damage td {
+.collateral-damage td {
    text-align: center;
    border: 1px solid #3f0f12;
 }

 /* Used to build out the wound heart toggles */
-.sheet-collateral-damage input[type=checkbox] {
+.collateral-damage input[type=checkbox] {
    display: none;
 }
-.sheet-collateral-damage label span:before {
-    content: url("https://raw.githubusercontent.com/patschroed/roll20-character-sheets/master/CDMG/heart.png");
+.collateral-damage label span:before {
+    content: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/CDMG/heart.png");
    cursor: pointer;
 }
-.sheet-collateral-damage label input[type=checkbox]:checked + span:before {
-    content: url("https://raw.githubusercontent.com/patschroed/roll20-character-sheets/master/CDMG/heart-slash.png");
+.collateral-damage label input[type=checkbox]:checked + span:before {
+    content: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/CDMG/heart-slash.png");
    cursor: pointer;
 }
-.sheet-collateral-damage ul {
+.collateral-damage ul {
    list-style-type: none;
    margin-bottom: 0px;
    margin-left: 13px;
 }
-.sheet-collateral-damage li {
+.collateral-damage li {
    display: inline-block;
 }
-.sheet-collateral-damage li label {
+.collateral-damage li label {
    padding: 0px;
    display: inline-block;
 }
+
+/* Used to dynamically switch between the different class selections */
+.fantasy-class-selector,
+.horror-class-selector,
+.western-class-selector,
+.superhero-class-selector,
+.scifi-class-selector {
+    display: none;
+}
+
+.class-toggle[value="fantasy"] ~ div.fantasy-class-selector,
+.class-toggle[value="horror"] ~ div.horror-class-selector,
+.class-toggle[value="western"] ~ div.western-class-selector,
+.class-toggle[value="superhero"] ~ div.superhero-class-selector,
+.class-toggle[value="scifi"] ~ div.scifi-class-selector {
+    display: block;
+}
+
+/* Popup content */
+.overlay {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: rgba(0, 0, 0, 0.7);
+    transition: opacity 500ms;
+    visibility: hidden;
+    opacity: 0;
+}
+.overlay:target {
+    visibility: visible;
+    opacity: 1;
+}
+
+.popup {
+    margin: 70px auto;
+    padding: 20px;
+    background: #fff;
+    border-radius: 5px;
+    width: 55%;
+    position: relative;
+    transition: all 5s ease-in-out;
+    font-family: 'Passion One', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
+    font-weight: 300;
+    font-size: 16px;
+}
+.popup h2 {
+    margin-top: 0;
+    color: rgb(0, 0, 0);
+}
+.popup .close {
+    position: absolute;
+    top: 20px;
+    right: 30px;
+    transition: all 200ms;
+    font-size: 30px;
+    font-weight: bold;
+    text-decoration: none;
+    color: rgb(0, 0, 0);
+}
+.popup .content {
+    max-height: 30%;
+}
+
+/* Using this to pre-load the heart-slash to avoid the flicker */
+.collateral-damage::after{
+    position:absolute; width:0; height:0; overflow:hidden; z-index:-1;
+    content:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/CDMG/heart-slash.png")
+}
@@ -1,10 +1,10 @@
 <div class="collateral-damage">
    <!--Logo / Player Name / Movie Title -->
-    <div class="2colrow">
-        <div class="col">
-            <img src="https://github.com/patschroed/roll20-character-sheets/blob/master/CDMG/cdmg-logo.png?raw=true" />
+    <div class="sheet-2colrow">
+        <div class="sheet-col">
+            <img src="https://github.com/Roll20/roll20-character-sheets/blob/master/CDMG/cdmg-logo.png?raw=true" />
        </div>
-        <div class="col">
+        <div class="sheet-col">
            <div>
                <input type="text" name="attr_name" />
                <div class="input-label-header">PLAYER NAME</div>
@@ -13,44 +13,193 @@
                <input type="text" name="attr_movie_title" />
                <div class="input-label-header">MOVIE TITLE</div>
            </div>
+            <div>
+                <select name="attr_setting">
+                    <option value="fantasy" selected>fantasy</option>
+                    <option value="horror">horror</option>
+                    <option value="western">western</option>
+                    <option value="superhero">superhero</option>
+                    <option value="scifi">sci-fi</option>
+                </select>
+                <div class="input-label-header">MOVIE SETTING</div>
+            </div>
        </div>
    </div>

    <!--Act summaries-->
-    <div class="3colrow row-padding">
-        <div class="col">
-            <div class="section-act-heading">Act 1 <br> Objectives</div>
+    <div class="sheet-3colrow row-padding">
+        <div class="sheet-col">
+            <div class="section-act-heading">
+                <div>Act 1 Objectives</div>
+                <button type="action" class="randomize-button" name="act-random-act1-objective">Randomize</button>
+            </div>
            <textarea name="attr_act_1_objective"></textarea>
        </div>
-        <div class="col">
-            <div class="section-act-heading">Act 2 <br> Objectives</div>
+        <div class="sheet-col">
+            <div class="section-act-heading">
+                <div>Act 2 Objectives</div>
+                <button type="action" class="randomize-button" name="act-random-act2-objective">Randomize</button>
+            </div>
            <textarea name="attr_act_2_objective"></textarea>
        </div>
-        <div class="col">
-            <div class="section-act-heading">Act 3 <br> Objectives</div>
+        <div class="sheet-col">
+            <div class="section-act-heading">
+                <div>Act 3 Objectives</div>
+                <button type="action" class="randomize-button" name="act-random-act3-objective">Randomize</button>
+            </div>
            <textarea name="attr_act_3_objective"></textarea>
        </div>
    </div>

    <!--Player Info / Stats / Wounds / Relationships -->
-    <div class="2colrow row-padding">
-        <div class="col">
+    <div class="sheet-2colrow row-padding">
+        <div class="sheet-col">
            <div class="section-heading">
                PLAYER INFO
+                <button type="action" class="randomize-button" name="act-randomize-player-info">Randomize</button>
            </div>
            <div class="section-content">
+                <!-- Character Name Selection -->
                <input type="text" name="attr_character_name" />
                <div class="input-label">CHARACTER NAME</div>
-                <input type="text" name="attr_class" />
-                <div class="input-label">CLASS</div>
-                <input type="text" name="attr_mentality" />
-                <div class="input-label">MENTALITY</div>
-                <input type="text" name="attr_flaw" />
-                <div class="input-label">FLAW</div>
+
+                <!-- Class Selection -->
+                <section>
+                    <input type="hidden" class="class-toggle" name="attr_setting" value="fantasy" />
+                    <div class="fantasy-class-selector">
+                        <select name="attr_class">
+                            <option value="shopkeep">Shop Keep</option>
+                            <option value="tavernworker">Tavern Worker</option>
+                            <option value="hireling">Hireling</option>
+                            <option value="streeturchin">Street Urchin</option>
+                            <option value="wizardapprentice">Wizard Apprentice</option>
+                            <option value="doomsayer">doomsayer</option>
+                            <option value="minion">Minion</option>
+                            <option value="monsterousbeast">Monsterous Beast</option>
+                            <option value="nobleperson">Noble Person</option>
+                        </select>
+                    </div>
+                    <div class="horror-class-selector">
+                        <select name="attr_class">
+                            <option value="gasattendant">Gas Attendant</option>
+                            <option value="gothkid">Goth Kid</option>
+                            <option value="localdeputy">Local Deputy</option>
+                            <option value="campcounselor">Camp Counselor</option>
+                            <option value="babysitter">Babysitter</option>
+                            <option value="localhistorian">Local Historian</option>
+                            <option value="firstvictimsparent">First Victim's Parent</option>
+                            <option value="paranormalfanatic">Paranormal Fanatic</option>
+                            <option value="firstvictimsbff">First Victim's BFF</option>
+                        </select>
+                    </div>
+                    <div class="western-class-selector">
+                        <select name="attr_class">
+                            <option value="bartender">Bartender</option>
+                            <option value="pianoplayer">Piano Player</option>
+                            <option value="paintedlady">Painted Lady</option>
+                            <option value="deputy">Deputy</option>
+                            <option value="farmer">Farmer</option>
+                            <option value="pastor">Pastor</option>
+                            <option value="bandit">Bandit</option>
+                            <option value="swindler">Swindler</option>
+                            <option value="townmayor">Town Mayor</option>
+                        </select>
+                    </div>
+                    <div class="superhero-class-selector">
+                        <select name="attr_class">
+                            <option value="newsreporter">News reporter</option>
+                            <option value="streetfoodvendor">Street Food Vender</option>
+                            <option value="beatcop">Beat Cop</option>
+                            <option value="bikemessenger">Bike Messenger</option>
+                            <option value="businessmastermind">Business Mastermind</option>
+                            <option value="henchman">Henchman</option>
+                            <option value="sidekick">Side Kick</option>
+                            <option value="robotminion">Robot Minion</option>
+                            <option value="antimutantactivist">Anti-Mutant Activist</option>
+                        </select>
+                    </div>
+                    <div class="scifi-class-selector">
+                        <select name="attr_class">
+                            <option value="attractivesmuggler">Attractive Smuggler</option>
+                            <option value="helperdroid">Helper Droid</option>
+                            <option value="firstofficer">First Officer</option>
+                            <option value="chiefengineer">Chief Engineer</option>
+                            <option value="redshirt">Red Shirt</option>
+                            <option value="alienriffraff">Alien Riff-Raff</option>
+                            <option value="shipspilot">Ship's Pilor</option>
+                            <option value="sentientplantlife">Sentient Plant Life</option>
+                            <option value="bountyhunter">Bounty Hunter</option>
+                        </select>
+                    </div>
+                    <div class="input-label">CLASS</div>
+                </section>
+                
+                <!-- Mentality -->
+                <section>
+                    <input type="text" name="attr_mentality" />
+                    <div class="input-label">MENTALITY <a href="#mentalityhelppopup">?</a></div>
+                    <div id="mentalityhelppopup" class="overlay">
+                        <div class="popup">
+                            <h2 class="center-text">CHARACTER MENTALITY CHART</h2>
+                            <a class="close" href="#">×</a>
+                            <div class="content">
+                                <table>
+                                    <tr>
+                                        <td>CHILDISH</td>
+                                        <td>Literally, you have the mind of a small child.</td>
+                                    </tr>
+                                    <tr>
+                                        <td>DELUSIONAL</td>
+                                        <td>You think you’re way cooler/better than you really are.</td>
+                                    </tr>
+                                    <tr>
+                                        <td>CHAOTIC</td>
+                                        <td>Chaos and destruction are always on your mind.</td>
+                                    </tr>
+                                    <tr>
+                                        <td>BIZARRE</td>
+                                        <td>Your unusual appearance and unexpected outbursts keep many around you on edge.</td>
+                                    </tr>
+                                    <tr>
+                                        <td>FLASHY / FLAMBOYANT</td>
+                                        <td>Your presence must always be known. You love attention!</td>
+                                    </tr>
+                                    <tr>
+                                        <td>GREEDY</td>
+                                        <td>You want everything for yourself. Sharing is not in your vocabulary.</td>
+                                    </tr>
+                                    <tr>
+                                        <td>ENVIOUS</td>
+                                        <td>You want everything everyone else has, and you believe you deserve it.</td>
+                                    </tr>
+                                    <tr>
+                                        <td>PETTY</td>
+                                        <td>Every little thing bothers you, and it’s everyone else’s fault!</td>
+                                    </tr>
+                                    <tr>
+                                        <td>AMBITIOUS</td>
+                                        <td>You are determined! You will be the best at any and everything you do.</td>
+                                    </tr>
+                                    <tr>
+                                        <td>STUBBORN</td>
+                                        <td>It’s your way or nothing.</td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <!-- Flaw -->
+                <section>
+                    <input type="text" name="attr_flaw" />
+                    <div class="input-label">FLAW</div>
+                </section>
            </div>

            <div class="section-heading">
                STATS
+                <button type="action" class="randomize-button" name="act-randomize-player-stats">Randomize</button>
            </div>
            <div class="section-content">
                <div>
@@ -71,10 +220,9 @@
                        <input class="center-text" type="text" name="attr_luck_bonus" />
                        <div class="input-label center-text">BONUS</div>
                    </div>
-                    <div class="stat-content"> = </div>
+                    <div class="stat-content"><label> = </label></div>
                    <div class="stat-content">
-                        <input type="hidden" name="attr_luck_total_hidden" />
-                        <input class="center-text" type="text" name="attr_luck_total" value="@{luck_total_hidden}" disabled/>
+                        <input class="center-text" type="text" name="attr_luck_total" />
                        <div class="input-label center-text">TOTAL</div>
                    </div>
                    <div class="stat-content">
@@ -105,10 +253,9 @@
                        <input class="center-text" type="text" name="attr_vul_bonus" />
                        <div class="input-label center-text">BONUS</div>
                    </div>
-                    <div class="stat-content"> = </div>
+                    <div class="stat-content"><label> = </label></div>
                    <div class="stat-content">
-                        <input type="hidden" name="attr_vul_total_hidden" />
-                        <input class="center-text" type="text" name="attr_vul_total" value="@{vul_total_hidden}" disabled/>
+                        <input class="center-text" type="text" name="attr_vul_total" />
                        <div class="input-label center-text">TOTAL</div>
                    </div>
                    <div class="stat-content">
@@ -130,7 +277,7 @@
                    </div>
                    <div class="stat-content">
                        <label>
-                            <input name="attr_res_modifier" type="checkbox" value="1"/>
+                            <input name="attr_res_modifier" type="checkbox" value="1" />
                            <span></span>
                        </label>
                    </div>
@@ -138,10 +285,9 @@
                        <input class="center-text" type="text" name="attr_res_bonus" />
                        <div class="input-label center-text">BONUS</div>
                    </div>
-                    <div class="stat-content"> = </div>
+                    <div class="stat-content"><label> = </label></div>
                    <div class="stat-content">
-                        <input type="hidden" name="attr_res_total_hidden" />
-                        <input class="center-text" type="text" name="attr_res_total" value="@{res_total_hidden}" disabled/>
+                        <input class="center-text" type="text" name="attr_res_total" />
                        <div class="input-label center-text">TOTAL</div>
                    </div>
                    <div class="stat-content">
@@ -174,7 +320,7 @@
                </table>
            </div>
        </div>
-        <div class="col">
+        <div class="sheet-col">
            <div class="section-heading">
                WOUNDS
            </div>
@@ -223,7 +369,7 @@
                            LEFT:
                        </div>
                        <div>
-                            <label>YOUR ROLL:</label>
+                            <label>YOUR ROLL: <button type="action" class="randomize-button" name="act-randomize-left-relationship">Randomize</button></label>
                            <textarea name="attr_left_your"></textarea>
                            <label>THEIR ROLL:</label>
                            <textarea name="attr_left_their"></textarea>
@@ -234,7 +380,7 @@
                            RIGHT:
                        </div>
                        <div>
-                            <label>YOUR ROLL:</label>
+                            <label>YOUR ROLL: <button type="action" class="randomize-button" name="act-randomize-right-relationship">Randomize</button></label>
                            <textarea name="attr_right_your"></textarea>
                            <label>THEIR ROLL:</label>
                            <textarea name="attr_right_their"></textarea>
@@ -248,30 +394,509 @@

 <!-- Sheetworker scripts -->
 <script type="text/worker">
-const stats = ["luck", "vul", "res"];
-stats.forEach(stat => {
-    on(`change:${stat}_base change:${stat}_modifier change:${stat}_bonus`, () => {
-        getAttrs([`${stat}_base`, `${stat}_modifier`, `${stat}_bonus`], values => {
-            const base = parseInt(values[`${stat}_base`]) || 0;
-            const mod = parseInt(values[`${stat}_modifier`]) || 0;
-            const bonus = parseInt(values[`${stat}_bonus`]) || 0;
-
-            //Calculate the total
-            let total;
-            if(mod) total = base - bonus;
-            else total = base + bonus;
-
-            //Calculate the dice bonus
-            let dice;
-            if(total < 5) dice = 1;
-            else if(total >= 5 && total < 9) dice = 2;
-            else dice = 3;
-
-            setAttrs({
-                [`${stat}_total_hidden`]: total,
-                [`${stat}_dice_hidden`]: dice
+    const SETTING_ATTR = 'setting';
+    const STATS = ["luck", "vul", "res"];
+    const PLAYER_INFO_STATS = {
+        fantasy: [{
+            class: 'shopkeep',
+            stats: {
+                luck: 2,
+                vul: -1,
+                res: 0,
+            }
+        }, {
+            class: 'tavernworker',
+            stats: {
+                luck: -2,
+                vul: 0,
+                res: 2,
+            }
+        }, {
+            class: 'hireling',
+            stats: {
+                luck: -2,
+                vul: 2,
+                res: 2,
+            }
+        }, {
+            class: 'streeturchin',
+            stats: {
+                luck: 0,
+                vul: 0,
+                res: 0,
+            }
+        }, {
+            class: 'wizardapprentice',
+            stats: {
+                luck: 0,
+                vul: 2,
+                res: 0,
+            }
+        }, {
+            class: 'doomsayer',
+            stats: {
+                luck: 1,
+                vul: -1,
+                res: -1,
+            }
+        }, {
+            class: 'minion',
+            stats: {
+                luck: -1,
+                vul: -1,
+                res: 1,
+            }
+        }, {
+            class: 'monsterousbeast',
+            stats: {
+                luck: 0,
+                vul: 3,
+                res: 0,
+            }
+        }, {
+            class: 'nobleperson',
+            stats: {
+                luck: 2,
+                vul: 2,
+                res: 0,
+            }
+        }],
+        horror: [{
+            class: 'gasattendant',
+            stats: {
+                luck: 0,
+                vul: 1,
+                res: -2,
+            }    
+        }, {
+            class: 'gothkid',
+            stats: {
+                luck: -1,
+                vul: -2,
+                res: 0,
+            }    
+        }, {
+            class: 'localdeputy',
+            stats: {
+                luck: -1,
+                vul: 2,
+                res: 2,
+            }    
+        }, {
+            class: 'campcounselor',
+            stats: {
+                luck: 0,
+                vul: 0,
+                res: 3,
+            }    
+        }, {
+            class: 'babysitter',
+            stats: {
+                luck: 0,
+                vul: 0,
+                res: 0,
+            }    
+        }, {
+            class: 'localhistorian',
+            stats: {
+                luck: 2,
+                vul: 0,
+                res: 2,
+            }    
+        }, {
+            class: 'firstvictimsparent',
+            stats: {
+                luck: 0,
+                vul: 2,
+                res: 0,
+            }    
+        }, {
+            class: 'paranormalfanatic',
+            stats: {
+                luck: -2,
+                vul: 2,
+                res: 0,
+            }    
+        }, {
+            class: 'firstvictimsbff',
+            stats: {
+                luck: -2,
+                vul: 2,
+                res: 0,
+            }    
+        }],
+        western: [{
+            class: 'bartender',
+            stats: {
+                luck: 2,
+                vul: -1,
+                res: 0,
+            }    
+        }, {
+            class: 'pianoplayer',
+            stats: {
+                luck: 2,
+                vul: 0,
+                res: 0,
+            }    
+        }, {
+            class: 'paintedlady',
+            stats: {
+                luck: 0,
+                vul: 1,
+                res: 2,
+            }    
+        }, {
+            class: 'deputy',
+            stats: {
+                luck: -2,
+                vul: 0,
+                res: 0,
+            }    
+        }, {
+            class: 'farmer',
+            stats: {
+                luck: 0,
+                vul: -1,
+                res: 1,
+            }    
+        }, {
+            class: 'pastor',
+            stats: {
+                luck: 1,
+                vul: -1,
+                res: 0,
+            }    
+        }, {
+            class: 'bandit',
+            stats: {
+                luck: -1,
+                vul: -1,
+                res: -1,
+            }    
+        }, {
+            class: 'swindler',
+            stats: {
+                luck: -2,
+                vul: 0,
+                res: 1,
+            }    
+        }, {
+            class: 'townmayor',
+            stats: {
+                luck: 2,
+                vul: 2,
+                res: 0,
+            }    
+        }],
+        superhero: [{
+            class: 'newsreporter',
+            stats: {
+                luck: -2,
+                vul: 2,
+                res: 0,
+            }    
+        }, {
+            class: 'streetfoodvendor',
+            stats: {
+                luck: 0,
+                vul: 2,
+                res: 0,
+            }    
+        }, {
+            class: 'beatcop',
+            stats: {
+                luck: -3,
+                vul: 1,
+                res: 1,
+            }    
+        }, {
+            class: 'bikemessenger',
+            stats: {
+                luck: -2,
+                vul: 0,
+                res: 1,
+            }    
+        }, {
+            class: 'businessmastermind',
+            stats: {
+                luck: -2,
+                vul: 0,
+                res: 0,
+            }    
+        }, {
+            class: 'henchman',
+            stats: {
+                luck: -2,
+                vul: 0,
+                res: 2,
+            }    
+        }, {
+            class: 'sidekick',
+            stats: {
+                luck: 0,
+                vul: 0,
+                res: 2,
+            }    
+        }, {
+            class: 'robotminion',
+            stats: {
+                luck: 0,
+                vul: 3,
+                res: 1,
+            }    
+        }, {
+            class: 'antimutantactivist',
+            stats: {
+                luck: 0,
+                vul: 1,
+                res: 1,
+            }    
+        }],
+        scifi: [{
+            class: 'attractivesmuggler',
+            stats: {
+                luck: 2,
+                vul: -1,
+                res: 0,
+            }    
+        }, {
+            class: 'helperdroid',
+            stats: {
+                luck: -2,
+                vul: 0,
+                res: 2,
+            }    
+        }, {
+            class: 'firstofficer',
+            stats: {
+                luck: -1,
+                vul: -2,
+                res: 0,
+            }    
+        }, {
+            class: 'chiefengineer',
+            stats: {
+                luck: 2,
+                vul: 0,
+                res: 0,
+            }    
+        }, {
+            class: 'redshirt',
+            stats: {
+                luck: -2,
+                vul: 2,
+                res: -2,
+            }    
+        }, {
+            class: 'alienriffraff',
+            stats: {
+                luck: 2,
+                vul: -2,
+                res: 0,
+            }    
+        }, {
+            class: 'shipspilot',
+            stats: {
+                luck: 0,
+                vul: 0,
+                res: 2,
+            }    
+        }, {
+            class: 'sentientplantlife',
+            stats: {
+                luck: 0,
+                vul: 2,
+                res: 2,
+            }    
+        }, {
+            class: 'bountyhunter',
+            stats: {
+                luck: 2,
+                vul: 0,
+                res: 2,
+            }    
+        }],
+    }
+    const MENTALITIES = [
+        'childish',
+        'delusional',
+        'chaotic',
+        'bizarre',
+        'flashy/flamboyant',
+        'greedy',
+        'petty',
+        'ambitious',
+        'stubborn',
+    ];
+    const ACT_OBJECTIVES = [
+        [
+            'Get outta there',
+            'Save another player',
+            'Don\'t be seen',
+            'Be on time',
+            'Put yourself in harm\'s way (without getting hurt)',
+            'Get to work',
+            'Don\'t forget to pick up dinner',
+            'Pick up the kids from school',
+            'Meet up with an old friend',
+            'Don\'t take any damage'
+        ],
+        [
+            'Disarm/Plant a trap',
+            'Escape',
+            'Ruin another player\'s chance of completing their Objective',
+            'Find the bright side of the situation',
+            'Protect a family/friend/person',
+            'Gain employment',
+            'Put yourself in harm\'s way (without getting hurt)',
+            'Aid the elderly',
+            'Gain any amount of income',
+            'Don\'t take more than one point of damage'
+        ],
+        [
+            'Ruin another player\'s change of completing their Objective',
+            'Save the day',
+            'Have a profitable/positive ending',
+            'Discover a deep dark secret',
+            'Put yourself and others in danger',
+            'Join a side',
+            'Save your business',
+            'Be Heroic',
+            'Sacrifice youself for someone else',
+            'Take two points of damage (with or without dying)'
+        ],
+    ]
+    const RELATIONSHIPS_RIGHT = [
+        'Your PC and this PC are members of a secret organization. Prompt: What is the name of this organization, and what is its purpose?',
+        'Your PC and this PC are related by blood. Prompt: How are you related?',
+        'Your PC and this PC used to work together. Prompt: What was the job?',
+        'Your PC lent something to this PC over a year ago and they have yet to return it. Prompt: What is the item? Why did you lend it to them? How much do you want it back?',
+        'This PC used to pick on you when you both were younger. Prompt: What did they do to you in school? How badly do you want revenge?',
+        'Your PC and this PC see each other almost every day, but have never spoken. Prompt: Where do you keep seeing each other, and why haven\'t you talked to each other yet?',
+        'This PC knows a dark secret about your PC. Prompt: What is the secret? Do you know that they know?',
+        'This player is your best friend. Prompt: How long have you known each other? Where did you meet?',
+        'Your PC and this PC were once in a very long and serious romantic relationship. Prompt: Why didn\'t it work out? Do you want them back?',
+        'Your PC and this PC once got drunk together and had a heart-to-heart. Prompt: What happened? How well do you remember it?'
+    ];
+    const RELATIONSHIPS_LEFT = [
+        'Your PC is in love with this PC but has never told them. Prompt: What is it about them that you love?',
+        'Your PC and this PC openly hate one another. Prompt: Where does your hatred come from?',
+        'This PC doesn’t know who your character is, but your character has a huge crush on them. Prompt: What is it about this character that has your PC so smitten?',
+        'Your PC and this PC are neighbors! Prompt: What was the feud that soured your neighborly good will toward each other?',
+        'This PC is clueless to the fact that your character longs for their demise. Prompt: Why do you want their PC to die?',
+        'When your PC and this PC talk, it’s like pulling teeth. You just have nothing in common. Prompt: Tell us about the most awkward interaction the two of you have had.',
+        'Your PC is incredibly envious of this PC, for one reason or another. Prompt: What makes you so jealous?',
+        'Your PC feels that this PC’s character flaw has deeply impacted their life. Prompt: How did they impact your life?',
+        'Your PC feels that this PC is incredibly annoying, yet you still hang out with them. Prompt: What is it about them that annoys you so much?',
+        'Your PC is angry with this PC about something. Prompt: Why are you mad? What would cause you to forgive them?'
+    ];
+    
+    const setRandomActObjective = (act) => {
+        setAttrs({
+           [`act_${act+1}_objective`]: ACT_OBJECTIVES[act][Math.floor(Math.random() * ACT_OBJECTIVES[act].length)]
+        });
+    };
+    
+    const rollD6 = () => {
+        return Math.floor(Math.random() * 6) + 1;
+    }
+    
+    STATS.forEach(stat => {
+        on(`change:${stat}_base change:${stat}_modifier change:${stat}_bonus`, () => {
+            getAttrs([`${stat}_base`, `${stat}_modifier`, `${stat}_bonus`], values => {
+                const base = parseInt(values[`${stat}_base`]) || 0;
+                const mod = parseInt(values[`${stat}_modifier`]) || 0;
+                const bonus = parseInt(values[`${stat}_bonus`]) || 0;
+    
+                //Calculate the total
+                let total;
+                if(mod) total = base - bonus;
+                else total = base + bonus;
+    
+                setAttrs({
+                    [`${stat}_total`]: total,
+                });
            });
        });
    });
-});
+    
+    STATS.forEach(stat => {
+        on(`change:${stat}_total`, () => {
+            getAttrs([`${stat}_total`], values => {
+                const total = parseInt(values[`${stat}_total`]) || 0;
+    
+                //Calculate the dice bonus
+                let dice;
+                if(total < 5) dice = 1;
+                else if(total >= 5 && total < 9) dice = 2;
+                else dice = 3;
+    
+                setAttrs({
+                    [`${stat}_dice_hidden`]: dice
+                });
+            });
+        });
+    });
+    
+    on(`change:class`, (event) => {
+        getAttrs([SETTING_ATTR], values => {
+            const setting = values[SETTING_ATTR];
+            const selectedClass = PLAYER_INFO_STATS[setting].find(settingClass => settingClass.class === event.newValue);
+            STATS.forEach(stat => {
+                const statValue = selectedClass.stats[stat]
+                const negative = statValue < 0;
+                const modifier = negative ? 1 : 0;
+                setAttrs({
+                    [`${stat}_bonus`]: negative ? statValue * -1 : statValue,
+                    [`${stat}_modifier`]: modifier,
+                });
+            });
+        });
+    });
+    
+    on("clicked:randomize-player-info", () => {
+        getAttrs([SETTING_ATTR], values => {
+            const setting = values[SETTING_ATTR];
+            const selectedClass = PLAYER_INFO_STATS[setting][Math.floor(Math.random() * PLAYER_INFO_STATS[setting].length)];
+            setAttrs({
+                ['class']: selectedClass.class,
+                ['mentality']: MENTALITIES[Math.floor(Math.random() * 9)],
+            });
+        });
+    });
+    
+    on("clicked:randomize-player-stats", () => {
+        STATS.forEach(stat => {
+            const value = rollD6();
+            setAttrs({
+                [`${stat}_base`]: value,
+            });
+        });
+    });
+    
+    on("clicked:random-act1-objective", () => {
+        setRandomActObjective(0)
+    });
+    
+    on("clicked:random-act2-objective", () => {
+        setRandomActObjective(1)
+    });
+    
+    on("clicked:random-act3-objective", () => {
+        setRandomActObjective(2)
+    });
+    
+    on("clicked:randomize-right-relationship", () => {
+        setAttrs({
+            ['right_your']: RELATIONSHIPS_RIGHT[Math.floor(Math.random() * RELATIONSHIPS_RIGHT.length)]
+        });
+    });
+    
+    on("clicked:randomize-left-relationship", () => {
+        setAttrs({
+            ['left_your']: RELATIONSHIPS_LEFT[Math.floor(Math.random() * RELATIONSHIPS_RIGHT.length)]
+        });
+    });
+    
 </script>
@@ -5,5 +5,6 @@
  "roll20userid": "1474331",
  "preview": "cdmg-preview.png",
  "instructions": "**Collateral Damage Character Sheet**\n\nUse this simple character sheet to track stats and player info for your Collateral Damage games",
-  "legacy": true
-}
+  "patreon": "https://www.patreon.com/collateraldamagerpg",
+  "legacy": false
+}
@@ -13,10 +13,10 @@
 	"maxtrait-u": "Макс. Черты",
 	"extrabruised-u": "Доп. Здоровье",
 	"movement-u": "Передвижение",
-	"dexspeed-u": "Dex Speed",
-	"dexboostspeed-u": "Dex Boost Speed",
-	"celerityspeed-u": "Celerity Speed",
-	"miscspeed-u": "Misc Speed",
+	"dexspeed-u": "Скорость (Ловкость)",
+	"dexboostspeed-u": "Скорость (бонус от Ловкости)",
+	"celerityspeed-u": "Скорость (Стремительность)",
+	"miscspeed-u": "Скорость (другое)",
 	"walkspeed-u": "Скорость шага",
 	"jogspeed-u": "Бег трусцой",
 	"runspeed-u": "Скорость бега",
@@ -91,3 +91,16 @@
    border-collapse: collapse;
    border-spacing: 0;
 }
+/*Configure the tab buttons*/
+.sheet-character,
+.sheet-monster,
+.sheet-journal {
+    display: none;
+}
+
+/* show the selected tab */
+.sheet-tabstoggle[value="character"] ~ div.sheet-character,
+.sheet-tabstoggle[value="monster"] ~ div.sheet-monster,
+.sheet-tabstoggle[value="journal"] ~ div.sheet-journal {
+    display: block;
+}
@@ -1,3 +1,36 @@
+<div>
+    <button type="action" name="act_character" checked="checked">Character</button>
+    <button type="action" name="act_journal" >Journal</button>
+    <button type="action" name="act_monster" >Monster</button>
+</div>
+<input type="hidden" class="sheet-tabstoggle" name="attr_sheetTab"  value="character"  />
+
+<div class="sheet-character">
+    <h2>Character</h2>
+</div>
+<div class="sheet-journal">
+    <h2>Journal/Notes</h2>
+    <span>Journal/Notes</span>
+	<textarea name="attr_my-text1"></textarea>
+	<textarea name="attr_my-text2"></textarea>
+	<textarea name="attr_my-text3"></textarea>
+</div>
+<div class="sheet-monster">
+    <h2>Monster</h2>
+    <span>Monster goes here</span> 
+</div>
+
+<script type="text/worker">
+    const buttonlist = ["character","journal","monster"];
+    buttonlist.forEach(button => {
+        on(`clicked:${button}`, function() {
+            setAttrs({
+                sheetTab: button
+            });
+        });
+    });
+</script>
+<div class="sheet-character">
 <div class="sheet-2colrow">
   <div class="sheet-col">
      <table>
@@ -37,10 +70,25 @@
                  <option value="Chaotic Evil">Chaotic Evil</option>
               </select>
            </td>
-            <td></td>
+			<td></td>
            <td class="boldme">Movement:</td>
            <td><input type="number" name="attr_Movement" class="short" value="30"/></td>
         </tr>
+	
+		 <tr>
+            <td class="boldme">Hair:</td>
+            <td><input type="text" name="attr_Hair" class="medium" value="0" /></td>
+            <td></td>
+            <td class="boldme">Height:</td>
+            <td><input type="text" name="attr_Height" class="short" value="0"/></td>
+         </tr>
+		<tr>
+            <td class="boldme">Eyes:</td>
+            <td><input type="text" name="attr_Eyes" class="medium" value="0" /></td>
+            <td></td>
+            <td class="boldme">Weight</td>
+            <td><input type="text" name="attr_Weight" class="short" value="0"/></td>
+         </tr>
         <tr>
            <td colspan="5" class="boldme">Languages</td>
         </tr>
@@ -59,121 +107,44 @@
            <td colspan="5" class="bluehilite botul">Turn Undead</td>
        </tr>
        <tr>
-            <td colspan="2" class="bluehilite">Turning Check</td>
-            <td class="bluehilite"></td>
-            <td colspan="2"  class="bluehilite"># Turned</td>
+            <td colspan="3" class="bluehilite">Turning Check</td>
+            <td colspan="1" class="bluehilite">Success Roll</td>
+            <td colspan="1" class="bluehilite"># Turned</td>
         </tr>
         <tr>
-            <td colspan="2" width="50%"><input type="text" name="attr_TurnUndeadCheck" class="undead" value="WIS (12 + Monster HD)" /></td>
-            <td>&nbsp;</td>
-            <td colspan="2" width="50%"><input  type="text" name="attr_TurnUndeadTurned" class="undead" value="d12 + 0" /></td>
+            <td colspan="2" width="30%"><input type="text" name="attr_TurnUndeadCheck" class="undead" value="WIS (12 + Monster HD)" disabled="true"/></td>
+			<td></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Turning Undead}} {{Result=[[1d20+@{Level}+@{WisdomMod}]]}}" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Common Undead}} {{Result=[[1d12+@{CharismaMod}]] common undead turned}}" /></td>
         </tr>
         <tr>
            <td colspan="5">&nbsp;</td>
         </tr>
+		 <tr>
+            <td class="boldme">Roll For Initiative</td>
+			<td class="attrchk alleft"><button type="roll" value="&{template:default} {{name=Initiative Roll}} {{Result=[[1d10 &{tracker}]]}}" /></td>
+		 </tr>
+        <tr>
+            <td colspan="2" class="bluehilite botul">Armor</td>
+			<td colspan="3" class="bluehilite botul">Hit Points</td>
+        </tr>
         <tr>
            <td class="boldme">Armor:</td>
-            <td colspan="4"><input type="text" name="attr_ArmorWorn" value="" /></td>
+            <td colspan="2"><input type="text" name="attr_ArmorWorn" value="" /></td>
+            <td colspan="3" class="alcenter"><input type="number" name="attr_HP" class="short" value="10"/>/<input type="number" name="attr_HPmax" class="short" value="10"/></td>
         </tr>
         <tr>
            <td class="boldme">Shield:</td>
            <td colspan="2"><input type="text" name="attr_ShieldWorn" value="" /></td>
-            <td colspan="2"class="boldme alcenter">Hit Points:</td>
+			<td colspan="3">&nbsp;</td>
         </tr>
         <tr>
            <td class="boldme">Helm:</td>
            <td colspan="2"><input type="text" name="attr_HelmWorn" value="" /></td>
-            <td colspan="2" class="alcenter"><input type="number" name="attr_HP" class="short" value="10"/>/<input type="number" name="attr_HPmax" class="short" value="10"/></td>
+			<td colspan="3">&nbsp;</td>
         </tr>
    </table>
-   </div>
-   <div class="sheet-col">
-      <table class="attrtab">
-        <tr>
-            <td colspan="6" class="alcenter"><img src="http://cf.geekdo-images.com/images/pic1807281_t.png"></img></td>
-        </tr>
-         <tr>
-            <td colspan="2" class="boldme">Attributes</td>
-            <td colspan="4">(Attribute check: d20 + lvl + mod)</td>
-         </tr>
-         <tr>
-            <td class="bluehilite alleft attrchk">Check</td>
-            <td class="bluehilite attrhdrtext">Pri Sec Ter</td>
-            <td class="bluehilite"></td>
-            <td class="bluehilite">Score</td>
-            <td class="bluehilite">Mod</td>
-         </tr>
-         <tr>
-            <td class="attrchk alcenter"><button type="roll" value="/roll d20+@{Level}+@{StrengthMod} (Strength Check)" /></td>
-            <td class="alcenter tiny" />
-				<input type="checkbox" title='Primary' name="attr_StrengthPri" class="supertiny" value="1" /> 
-				<input type="checkbox" title='Secondary' name="attr_StrengthSec" class="supertiny" value="1" />
-				<input type="checkbox" title='Ternary' name="attr_StrengthTer" class="supertiny" value="1" />
-			</td>
-            <td title='Paralysis &amp; Constriction' class="mnattr attrtext alcenter">Strength</td>
-            <td><input type="number" name="attr_Strength" class="attrtext" value="@{Strength}" /></td>
-            <td><input type="number" name="attr_StrengthMod" class="attrtext" value="0" /></td>
-         </tr>
-         <tr>
-            <td class="attrchk alcenter" ><button type="roll" value="/roll d20+@{Level}+@{DexterityMod} (Dexterity check)"/></td>
-            <td class="alcenter tiny" />
-                <input type="checkbox" title='Primary' name="attr_DexterityPri" class="supertiny" value="1" />
-			    <input type="checkbox" title='Secondary' name="attr_DexteritySec" class="supertiny" value="1" />
-			    <input type="checkbox" title='Ternary' name="attr_DexterityTer" class="supertiny" value="1" />
-			</td>
-            <td title='Breath weapon &amp; Traps' class="mnattr attrtext alcenter">Dexterity</td>
-            <td><input type="number" name="attr_Dexterity" class="short" value="@{Dexterity}" /></td>
-            <td><input type="number" name="attr_DexterityMod" class="short" value="0" /></td>
-         </tr>
-         <tr>
-            <td class="attrchk alcenter" ><button type="roll" value="/roll d20+@{Level}+@{ConstitutionMod} (Constitution check)" /></td>
-            <td class="alcenter tiny" />
-                <input type="checkbox" title='Primary' name="attr_ConstitutionPri" class="supertiny" value="1" />
-			    <input type="checkbox" title='Secondary' name="attr_ConstitutionSec" class="supertiny" value="1" />
-			    <input type="checkbox" title='Ternary' name="attr_ConstitutionTer" class="supertiny" value="1" />
-            </td>
-            <td title='Disease, Energy drain &amp; Poison' class="mnattr attrtext alcenter">Constitution</td>
-            <td><input type="number" name="attr_Constitution" class="short" value="@{Constitution}" /></td>
-            <td><input type="number" name="attr_ConstitutionMod" class="short" value="0" /></td>
-         </tr>
-         <tr>
-            <td class="attrchk alcenter"><button type="roll" value="/roll d20+@{Level}+@{IntelligenceMod} (Intelligence check)" /></td>
-            <td class="alcenter tiny" />
-                <input type="checkbox" title='Primary' name="attr_IntelligencePri" class="supertiny" value="1" />
-			    <input type="checkbox" title='Secondary' name="attr_IntelligenceSec" class="supertiny" value="1" />
-			    <input type="checkbox" title='Ternary' name="attr_IntelligenceTer" class="supertiny" value="1" />
-			</td>
-            <td title='Arcane magic &amp; Illusion' class="mnattr attrtext alcenter">Intelligence</td>
-            <td><input type="number" name="attr_Intelligence" class="short" value="@{Intelligence}" /></td>
-            <td><input type="number" name="attr_IntelligenceMod" class="short" value="0" /></td>
-         </tr>
-         <tr>
-            <td class="attrchk alcenter" ><button type="roll" value="/roll d20+@{Level}+@{WisdomMod} (Wisdom check)" /></td>
-            <td class="alcenter tiny" />
-                <input type="checkbox" title='Primary' name="attr_WisdomPri" class="supertiny" value="1" />
-			    <input type="checkbox" title='Secondary' name="attr_WisdomSec" class="supertiny" value="1" />
-			    <input type="checkbox" title='Ternary' name="attr_WisdomTer" class="supertiny" value="1" />
-			</td>
-            <td title='Confusion, Divine magic &amp; Gaze attack' class="mnattr attrtext alcenter">Wisdom</td>
-            <td><input type="number" name="attr_Wisdom" class="short" value="@{Wisdom}" /></td>
-            <td><input type="number" name="attr_WisdomMod" class="short" value="0" /></td>
-         </tr>
-         <tr>
-            <td class="attrchk alcenter"><button type="roll" value="/roll d20+@{Level}+@{CharismaMod} (Charisma check)" /></td>
-            <td class="alcenter tiny" />
-                <input type="checkbox" title='Primary' name="attr_CharismaPri" class="supertiny" value="1" />
-			    <input type="checkbox" title='Secondary' name="attr_CharismaSec" class="supertiny" value="1" />
-			    <input type="checkbox" title='Ternary' name="attr_CharismaTer" class="supertiny" value="1" />
-			</td>
-            <td title='Death attack, Charm &amp; Fear' class="mnattr attrtext alcenter">Charisma</td>
-            <td><input type="number" name="attr_Charisma" class="short" value="@{Charisma}" /></td>
-            <td><input type="number" name="attr_CharismaMod" class="short" value="0" /></td>
-         </tr>
-         <tr>
-            <td colspan="5"></td>
-         </tr>
-      </table>
-      <table>
+	<table>
         <tr>
            <td class="bluehilite alleft">AC</td>
            <td class="bluehilite alcenter">Armor</td>
@@ -192,7 +163,199 @@
         </tr>
         <tr>
            <td colspan="6"></td>
+		 </tr>
+	</table>
+
+   </div>
+   <div class="sheet-col">
+      <table class="attrtab">
+        <tr>
+            <td colspan="6" class="alcenter"><img src="https://i.imgur.com/ivQOW2B.png"></img></td>
+        </tr>
+         <tr>
+            <td colspan="2" class="boldme">Attributes</td>
+            <td colspan="4">(Attribute check: d20 + lvl + mod)</td>
         </tr>
+         <tr>
+            <td class="bluehilite alleft attrchk">Check</td>
+            <td class="bluehilite attrhdrtext">Pri Sec Ter</td>
+            <td class="bluehilite"></td>
+            <td class="bluehilite">Score</td>
+            <td class="bluehilite">Mod</td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Strength Check}} {{Result=[[1d20+@{Level}+@{StrengthMod}]]}} {{Strength Prime=@{StrengthPri}}}" /></td>
+            <td class="alcenter tiny" />
+				<input type="checkbox" title='Primary' name="attr_StrengthPri" class="supertiny" value="1" />
+				<input type="checkbox" title='Secondary' name="attr_StrengthSec" class="supertiny" value="0" />
+				<input type="checkbox" title='Ternary' name="attr_StrengthTer" class="supertiny" value="0" />
+			</td>
+            <td title='Paralysis &amp; Constriction' class="mnattr attrtext alcenter">Strength</td>
+            <td><input type="number" name="attr_Strength" class="attrtext" value="@{Strength}" /></td>
+            <td><input type="number" name="attr_StrengthMod" class="attrtext" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter" ><button type="roll" value="&{template:default} {{name=Dexterity Check}} {{Result=[[1d20+@{Level}+@{DexterityMod}]]}} {{Dexterity Prime=@{DexterityPri}}}"/></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_DexterityPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_DexteritySec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_DexterityTer" class="supertiny" value="0" />
+			</td>
+            <td title='Breath weapon &amp; Traps' class="mnattr attrtext alcenter">Dexterity</td>
+            <td><input type="number" name="attr_Dexterity" class="short" value="@{Dexterity}" /></td>
+            <td><input type="number" name="attr_DexterityMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter" ><button type="roll" value="&{template:default} {{name=Constitution Check}} {{Result=[[1d20+@{Level}+@{ConstitutionMod}]]}} {{Constitution Prime=@{ConstitutionPri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_ConstitutionPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_ConstitutionSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_ConstitutionTer" class="supertiny" value="0" />
+            </td>
+            <td title='Disease, Energy drain &amp; Poison' class="mnattr attrtext alcenter">Constitution</td>
+            <td><input type="number" name="attr_Constitution" class="short" value="@{Constitution}" /></td>
+            <td><input type="number" name="attr_ConstitutionMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Intelligence Check}} {{Result=[[1d20+@{Level}+@{IntelligenceMod}]]}} {{Intelligence Prime=@{IntelligencePri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_IntelligencePri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_IntelligenceSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_IntelligenceTer" class="supertiny" value="0" />
+			</td>
+            <td title='Arcane magic &amp; Illusion' class="mnattr attrtext alcenter">Intelligence</td>
+            <td><input type="number" name="attr_Intelligence" class="short" value="@{Intelligence}" /></td>
+            <td><input type="number" name="attr_IntelligenceMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter" ><button type="roll" value="&{template:default} {{name=Wisdom Check}} {{Result=[[1d20+@{Level}+@{WisdomMod}]]}} {{Wisdom Prime=@{WisdomPri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_WisdomPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_WisdomSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_WisdomTer" class="supertiny" value="0" />
+			</td>
+            <td title='Confusion, Divine magic &amp; Gaze attack' class="mnattr attrtext alcenter">Wisdom</td>
+            <td><input type="number" name="attr_Wisdom" class="short" value="@{Wisdom}" /></td>
+            <td><input type="number" name="attr_WisdomMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Charisma Check}} {{Result=[[1d20+@{Level}+@{CharismaMod}]]}} {{Charisma Prime=@{CharismaPri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_CharismaPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_CharismaSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_CharismaTer" class="supertiny" value="0" />
+			</td>
+            <td title='Death attack, Charm &amp; Fear' class="mnattr attrtext alcenter">Charisma</td>
+            <td><input type="number" name="attr_Charisma" class="short" value="@{Charisma}" /></td>
+            <td><input type="number" name="attr_CharismaMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td colspan="5"></td>
+         </tr>
+      </table>
+		<table class="attrtab">
+		 <tr>
+            <td colspan="2" class="boldme">Saving Throws</td>
+            <td colspan="4">(Attribute check: d20 + lvl + mod)</td>
+         </tr>
+         <tr>
+            <td class="bluehilite alleft attrchk">Check</td>
+            <td class="bluehilite">Save Type</td>
+            <td class="bluehilite alleft">Mod</td>
+            <td class="bluehilite alleft attrchk">Check</td>
+            <td class="bluehilite">Save Type</td>
+            <td class="bluehilite alleft">Mod</td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Paralysis}} {{Result=[[1d20+@{Level}+@{StrengthMod}+@{SaveParalysisSaveMod}]]}} {{Strength Prime=@{StrengthPri}}}" /></td>
+			</td>
+            <td title='Paralysis' class="attrhdrtext alcenter">Paralysis</td>
+            <td><input type="number" name="attr_SaveParalysisSaveMod" class="attrtext" value="0" /></td>
+			<td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Constriction}} {{Result=[[1d20+@{Level}+@{StrengthMod}+@{SaveConstrictionSaveMod}]]}} {{Strength Prime=@{StrengthPri}}}" /></td>
+			</td>
+			<td title='Constriction' class="attrhdrtext alcenter">Constriction</td>
+            <td><input type="number" name="attr_SaveConstrictionSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Breath Weapon}} {{Result=[[1d20+@{Level}+@{DexterityMod}+@{SaveBreathWeaponSaveMod}]]}} {{Dexterity Prime=@{DexterityPri}}}" /></td>
+			</td>
+            <td title='Breath Weapon' class="attrhdrtext alcenter">Breath Weapon</td>
+            <td><input type="number" name="attr_SaveBreathWeaponSaveMod" class="attrtext" value="0" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Traps}} {{Result=[[1d20+@{Level}+@{DexterityMod}+@{SaveTrapsSaveMod}]]}} {{Dexterity Prime=@{DexterityPri}}}" /></td>
+			</td>
+            <td title='Traps' class="attrhdrtext alcenter">Traps</td>
+            <td><input type="number" name="attr_SaveTrapsSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Disease}} {{Result=[[1d20+@{Level}+@{ConstitutionMod}+@{SaveDiseaseSaveMod}]]}} {{Constitution Prime=@{ConstitutionPri}}}" /></td>
+			</td>
+            <td title='Disease' class="attrhdrtext alcenter">Disease</td>
+            <td><input type="number" name="attr_SaveDiseaseSaveMod" class="attrtext" value="0" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Poison}} {{Result=[[1d20+@{Level}+@{ConstitutionMod}+@{SavePoisonSaveMod}]]}} {{Constitution Prime=@{ConstitutionPri}}}" /></td>
+			</td>
+            <td title='Poison' class="attrhdrtext alcenter">Poison</td>
+            <td><input type="number" name="attr_SavePoisonSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Arcane Magic}} {{Result=[[1d20+@{Level}+@{IntelligenceMod}+@{SaveArcaneMagicSaveMod}]]}} {{Intelligence Prime=@{IntelligencePri}}}" /></td>
+			</td>
+            <td title='Arcane Magic' class="attrhdrtext alcenter">Arcane Magic</td>
+            <td><input type="number" name="attr_SaveArcaneMagicSaveMod" class="attrtext" value="0" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Illusion}} {{Result=[[1d20+@{Level}+@{IntelligenceMod}+@{SaveIllusionSaveMod}]]}} {{Intelligence Prime=@{IntelligencePri}}}" /></td>
+			</td>
+            <td title='Illusion' class="attrhdrtext alcenter">Illusion</td>
+            <td><input type="number" name="attr_SaveIllusionSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Confusion}} {{Result=[[1d20+@{Level}+@{WisdomMod}+@{SaveConfusionSaveMod}]]}} {{Wisdom Prime=@{WisdomPri}}}" /></td>
+			</td>
+            <td title='Confusion' class="attrhdrtext alcenter">Confusion</td>
+            <td><input type="number" name="attr_SaveConfusionSaveMod" class="attrtext" value="0" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Divine Magic}} {{Result=[[1d20+@{Level}+@{WisdomMod}+@{SaveDivineMagicSaveMod}]]}} {{Wisdom Prime=@{WisdomPri}}}" /></td>
+			</td>
+            <td title='Divine Magic' class="attrhdrtext alcenter">Divine Magic</td>
+            <td><input type="number" name="attr_SaveDivineMagicSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Gaze Attack}} {{Result=[[1d20+@{Level}+@{WisdomMod}+@{SaveGazeAttackSaveMod}]]}} {{Wisdom Prime=@{WisdomPri}}}" /></td>
+			</td>
+            <td title='Gaze Attack' class="attrhdrtext alcenter">Gaze Attack</td>
+            <td><input type="number" name="attr_SaveGazeAttackSaveMod" class="attrtext" value="0" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Petrification}} {{Result=[[1d20+@{Level}+@{WisdomMod}+@{SavePetrificationSaveMod}]]}} {{Wisdom Prime=@{WisdomPri}}}" /></td>
+			</td>
+            <td title='Petrification' class="attrhdrtext alcenter">Petrification</td>
+            <td><input type="number" name="attr_SavePetrificationSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Death Attack}} {{Result=[[1d20+@{Level}+@{CharismaMod}+@{SaveDeathAttackSaveMod}]]}} {{Charisma Prime=@{CharismaPri}}}" /></td>
+			</td>
+            <td title='Death Attack' class="attrhdrtext alcenter">Death Attack</td>
+            <td><input type="number" name="attr_SaveDeathAttackSaveMod" class="attrtext" value="0" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Charm}} {{Result=[[1d20+@{Level}+@{CharismaMod}+@{SaveCharmSaveMod}]]}} {{Charisma Prime=@{CharismaPri}}}" /></td>
+			</td>
+            <td title='Charm' class="attrhdrtext alcenter">Charm</td>
+            <td><input type="number" name="attr_SaveCharmSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Fear}} {{Result=[[1d20+@{Level}+@{CharismaMod}+@{SaveFearSaveMod}]]}} {{Charisma Prime=@{CharismaPri}}}" /></td>
+			</td>
+            <td title='Fear' class="attrhdrtext alcenter">Fear</td>
+            <td><input type="number" name="attr_SaveFearSaveMod" class="attrtext" value="0" /></td>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Energy Drain}} {{Result=[[1d20+@{Level}+@{ConstitutionMod}+@{SaveEnergyDrainSaveMod}]]}} {{Constitution Prime=@{ConstitutionPri}}}" /></td>
+			</td>
+            <td title='Energy Drain' class="attrhdrtext alcenter">Energy Drain</td>
+            <td><input type="number" name="attr_SaveEnergyDrainSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+		 <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=Save Vs Polymorph}} {{Result=[[1d20+@{Level}+@{WisdomMod}+@{SavePolymorphSaveMod}]]}} {{Wisdom Prime=@{WisdomPri}}}" /></td>
+			</td>
+            <td title='Polymorph' class="attrhdrtext alcenter">Polymorph</td>
+            <td><input type="number" name="attr_SavePolymorphSaveMod" class="attrtext" value="0" /></td>
+         </tr>
+<!--		<tr>
+			<td class="attrchk alcenter"><button type="roll" value="/roll d20+@{Level}+@{StrengthMod} (Strength Check) (Prime = @{StrengthPri} )" /></td>
+			<td class="attrchk alcenter"><button type="roll" value="/roll d20+@{Level}+@{StrengthMod} (Strength Check)" /></td>
+       </tr>--> 
      </table>
   </div>
 </div>
@@ -218,8 +381,8 @@
        </tr>
        <tr>
            <td>
-               <button type="roll" value="/roll d20+@{WeaponHitTotal_1} Attack with @{WeaponName_1}" name="roll_WeaponHitOne" />
-               <button type="roll" value="/roll @{WeaponDmg_1}+@{WeaponDmgTotal_1}  @{WeaponName_1} damage" name="roll_WeaponDmgOne" />
+			   <button type="roll" value="&{template:default} {{name=Attack with @{WeaponName_1}}} {{Result=[[1d20++@{WeaponHitTotal_1}]]}}" name="roll_WeaponHitOne" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{WeaponName_1}}} {{Result=[[@{WeaponDmg_1}+@{WeaponDmgTotal_1}]]}}" name="roll_WeaponDmgOne" />
            </td>
            <td><input type="text" name="attr_WeaponName_1" class="medium" value="Empty" /></td>
            <td><input type="number" name="attr_WeaponBth_1" class="short" value="0" />+</td>
@@ -236,8 +399,8 @@
        </tr>
        <tr>
            <td>
-               <button type="roll" value="/roll d20+@{WeaponHitTotal_2} Attack with @{WeaponName_2}" name="roll_WeaponHitTwo" />
-               <button type="roll" value="/roll @{WeaponDmg_2}+@{WeaponDmgTotal_2} @{WeaponName_2} damage" name="roll_WeaponDmgTwo" />
+			   <button type="roll" value="&{template:default} {{name=Attack with @{WeaponName_2}}} {{Result=[[1d20++@{WeaponHitTotal_2}]]}}" name="roll_WeaponHitTwo" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{WeaponName_2}}} {{Result=[[@{WeaponDmg_2}+@{WeaponDmgTotal_2}]]}}" name="roll_WeaponDmgTwo" />
            </td>
            <td><input type="text" name="attr_WeaponName_2" class="medium" value="Empty" /></td>
            <td><input type="number" name="attr_WeaponBth_2" class="short" value="0" />+</td>
@@ -254,8 +417,8 @@
        </tr>
        <tr>
            <td>
-               <button type="roll" value="/roll d20+@{WeaponHitTotal_3} Attack with @{WeaponName_3}" name="roll_WeaponHitThree" />
-               <button type="roll" value="/roll @{WeaponDmg_3}+@{WeaponDmgTotal_3} @{WeaponName_3} damage" name="roll_WeaponDmgThree" />
+			   <button type="roll" value="&{template:default} {{name=Attack with @{WeaponName_3}}} {{Result=[[1d20++@{WeaponHitTotal_3}]]}}" name="roll_WeaponHitThree" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{WeaponName_3}}} {{Result=[[@{WeaponDmg_3}+@{WeaponDmgTotal_3}]]}}" name="roll_WeaponDmgThree" />
            </td>
            <td><input type="text" name="attr_WeaponName_3" class="medium" value="Empty" /></td>
            <td><input type="number" name="attr_WeaponBth_3" class="short" value="0" />+</td>
@@ -272,8 +435,8 @@
        </tr>
        <tr>
            <td>
-               <button type="roll" value="/roll d20+@{WeaponHitTotal_4} Attack with @{WeaponName_4}" name="roll_WeaponHitFour" />
-               <button type="roll" value="/roll @{WeaponDmg_4}+@{WeaponDmgTotal_4} @{WeaponName_4} damage" name="roll_WeaponDmgFour" />
+			   <button type="roll" value="&{template:default} {{name=Attack with @{WeaponName_4}}} {{Result=[[1d20++@{WeaponHitTotal_4}]]}}" name="roll_WeaponHitFour" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{WeaponName_4}}} {{Result=[[@{WeaponDmg_4}+@{WeaponDmgTotal_4}]]}}" name="roll_WeaponDmgFour" />
            </td>
            <td><input type="text" name="attr_WeaponName_4" class="medium" value="Empty" /></td>
            <td><input type="number" name="attr_WeaponBth_4" class="short" value="0" />+</td>
@@ -290,8 +453,8 @@
        </tr>
        <tr>
            <td>
-               <button type="roll" value="/roll d20+@{WeaponHitTotal_5} Attack with @{WeaponName_5}" name="roll_WeaponHitFive" />
-               <button type="roll" value="/roll @{WeaponDmg_5}+@{WeaponDmgTotal_5} @{WeaponName_5} damage" name="roll_WeaponDmgFive" />
+			   <button type="roll" value="&{template:default} {{name=Attack with @{WeaponName_5}}} {{Result=[[1d20++@{WeaponHitTotal_5}]]}}" name="roll_WeaponHitFive" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{WeaponName_5}}} {{Result=[[@{WeaponDmg_5}+@{WeaponDmgTotal_5}]]}}" name="roll_WeaponDmgFive" />
            </td>
            <td><input type="text" name="attr_WeaponName_5" class="medium" value="Empty" /></td>
            <td><input type="number" name="attr_WeaponBth_5" class="short" value="0" />+</td>
@@ -307,6 +470,181 @@
            <td><input type="number" name="attr_WeaponDmgTotal_5" class="short" value="@{WeaponDmgMod_5}+@{WeaponDmgMisc_5}+@{WeaponDmgMagic_5}" disabled="true" /></td>
        </tr>
    </table>
+	<table>
+        <tr>
+            <td colspan="13" class="ceme" class="boldme">Class and Race Skills</td>
+        </tr>
+        <tr>
+            <td class="bluehilite boldme">Roll</td>
+            <td class="bluehilite boldme alcenter">Name</td>
+			<td class="bluehilite boldme alcenter">Attr</td>
+            <td class="bluehilite boldme alcenter">AttrBonus</td>
+            <td class="bluehilite boldme alcenter">Misc</td>
+            <td class="bluehilite boldme alcenter">Magic</td>
+            <td class="bluehilite boldme alcenter">Total</td>
+
+        </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name1}}} {{Result=[[1d20+@{SkillCheckTotal_1}]]}}" name="roll_SkillCheckOne"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name1" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment1">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus1" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_1" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_1" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_1" class="short" value="@{level}+@{AttrBonus1}+@{SkillBonusMisc_1}+@{SkillBonusMagic_1}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name2}}} {{Result=[[1d20+@{SkillCheckTotal_2}]]}}" name="roll_SkillCheckTwo"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name2" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment2">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus2" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_2" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_2" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_2" class="short" value="@{level}+@{AttrBonus2}+@{SkillBonusMisc_2}+@{SkillBonusMagic_2}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name3}}} {{Result=[[1d20+@{SkillCheckTotal_3}]]}}" name="roll_SkillCheckThree"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name3" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment3">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus3" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_3" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_3" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_3" class="short" value="@{level}+@{AttrBonus3}+@{SkillBonusMisc_3}+@{SkillBonusMagic_3}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name4}}} {{Result=[[1d20+@{SkillCheckTotal_4}]]}}" name="roll_SkillCheckFour"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name4" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment4">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus4" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_4" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_4" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_4" class="short" value="@{level}+@{AttrBonus4}+@{SkillBonusMisc_4}+@{SkillBonusMagic_4}" disabled="true" /></td>
+         </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name5}}} {{Result=[[1d20+@{SkillCheckTotal_5}]]}}" name="roll_SkillCheckFive"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name5" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment5">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus5" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_5" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_5" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_5" class="short" value="@{level}+@{AttrBonus5}+@{SkillBonusMisc_5}+@{SkillBonusMagic_5}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name6}}} {{Result=[[1d20+@{SkillCheckTotal_6}]]}}" name="roll_SkillCheckSix"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name6" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment6">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus6" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_6" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_6" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_6" class="short" value="@{level}+@{AttrBonus6}+@{SkillBonusMisc_6}+@{SkillBonusMagic_6}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name7}}} {{Result=[[1d20+@{SkillCheckTotal_7}]]}}" name="roll_SkillCheckSeven"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name7" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment7">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus7" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_7" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_7" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_7" class="short" value="@{level}+@{AttrBonus7}+@{SkillBonusMisc_7}+@{SkillBonusMagic_7}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+				<button type="roll" value="&{template:default} {{name=Attempt with @{Skill_Name8}}} {{Result=[[1d20+@{SkillCheckTotal_8}]]}}" name="roll_SkillCheckEight"/>
+            </td>
+            <td><input type="text" name="attr_Skill_Name8" class="long" value="Empty" /></td>
+			<td>
+                <select name="attr_Alignment8">
+                  <option value="Strength">Strength</option>
+                  <option value="Dexterity">Dexterity</option>
+                  <option value="Constitution">Constitution</option>
+                  <option value="Intelligence">Intelligence</option>
+                  <option value="Wisdom">Wisdom</option>
+                  <option value="Charisma">Charisma</option>
+               </select>
+            </td>
+            <td><input type="number" name="attr_AttrBonus8" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMisc_8" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_SkillBonusMagic_8" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_SkillCheckTotal_8" class="short" value="@{level}+@{AttrBonus8}+@{SkillBonusMisc_8}+@{SkillBonusMagic_8}" disabled="true" /></td>
+        </tr>
+    </table>
 </div>
 <div class="sheet-3colrow">
   <div class="sheet-col">
@@ -337,7 +675,7 @@
      </table>
   </div>
   <div class="sheet-col">
-      <table width="100%">
+      <table width="80%">
      <tr>
            <td></td>
        </tr>
@@ -354,11 +692,15 @@
            <td></td>
         </tr>
         <tr>
-            <td class="boldme">Senses</td>
+            <td class="boldme">Spellbook</td>
         <tr>
-            <td>
-               <fieldset class="repeating_senses">
-                  <input type="text" name="attr_Senses" class="long" />
+            <td align="left" class="bluehilite">Spell / Level / Memorized</td>
+         </tr>
+            <td style="white-space:nowrap">
+               <fieldset class="repeating_Spells">
+                  <input type="text" name="attr_Spells" class="medium" />
+				  <input type="number" name="attr_spelllevel" class="short" value="0" />
+				  <input type="number" name="attr_numbermemorized" class="short" value="0" />
               </fieldset>
            </td>
         </tr>
@@ -441,3 +783,274 @@
      </table>
   </div>
 </div>
+</div>
+<div class="sheet-monster">
+<div class="sheet-2colrow">
+   <div class="sheet-col">
+      <table>
+         <tr>
+            <td class="boldme">Name:</td>
+            <td><input type="text" name="attr_MonsterName" value="Monster Name" /></td>
+            <td></td>
+            <td class="boldme">HitDice:</td>
+            <td><input type="number" name="attr_MonsterHD" class="short" value="1"/></td>
+         </tr>
+         <tr>
+            <td class="boldme">Int</td>
+            <td><input type="text" name="attr_MonsterInt" value="Average" /></td>
+            <td></td>
+            <td class="boldme">Saves</td>
+            <td><input type="text" name="attr_MonsterSave" class="short" value="P"/></td>
+         </tr>
+         <tr>
+            <td class="boldme">Type:</td>
+            <td><input type="text" name="attr_MonRace" value="Type" /></td>
+            <td></td>
+            <td class="boldme">ArmorClass</td>
+            <td><input type="number" name="attr_MonsterAC" value="10" /></td>
+         </tr>
+         <tr>
+            <td class="boldme">Alignment:</td>
+            <td>
+                <select name="attr_MonAlignment">
+                  <option value="Lawful Good">Lawful Good</option>
+                  <option value="Neutral Good">Neutral Good</option>
+                  <option value="Chaotic Good">Chaotic Good</option>
+                  <option value="Lawful Neutral">Lawful Neutral</option>
+                  <option value="Neutral" selected="selected">Neutral</option>
+                  <option value="Chaotic Neutral">Chaotic Neutral</option>
+                  <option value="Lawful Evil">Lawful Evil</option>
+                  <option value="Neutral Evil">Neutral Evil</option>
+                  <option value="Chaotic Evil">Chaotic Evil</option>
+               </select>
+            </td>
+			<td></td>
+            <td class="boldme">Movement:</td>
+            <td><input type="number" name="attr_MonsterMovement" class="short" value="30"/></td>
+         </tr>
+	
+		 <tr>
+            <td class="boldme">Size</td>
+            <td><input type="text" name="attr_MonsterSize" class="medium" value="M" /></td>
+            <td></td>
+            <td class="boldme">No. Encountered</td>
+            <td><input type="text" name="attr_MonsterEncountered" class="short" value="1"/></td>
+         </tr>
+            <td class="boldme">Roll For Initiative</td>
+			<td class="attrchk alleft"><button type="roll" value="&{template:default} {{name=Initiative Roll}} {{Result=[[1d10 &{tracker}]]}}" /></td>
+		 </tr>
+        <tr>
+            <td colspan="2" class="bluehilite botul">Special Attacks</td>
+			<td colspan="3" class="bluehilite botul">Hit Points</td>
+        </tr>
+         <tr>
+            <td>&nbsp;</td>
+            <td colspan="2">&nbsp;</td>
+            <td colspan="3" class="alcenter"><input type="number" name="attr_MonHP" class="short" value="10"/>/<input type="number" name="attr_MonHPmax" class="short" value="10"/></td>
+         </tr>
+         <tr>
+            <td class="boldme">Special Attacks:</td>
+            <td colspan="2"><input type="text" name="attr_MonsSpec1" value="" /></td>
+            <td colspan="3" class="alcenter"><input type="text" name="attr_MonSA1" class="short" value="1d6"/></td>
+			<td class="attrchk alleft"><button type="roll" value="&{template:default} {{name=@{MonsSpec1}}} {{Result=[[@{MonSA1}]]}}" /></td>
+         </tr>
+         <tr>
+            <td class="boldme">Special Attacks:</td>
+            <td colspan="2"><input type="text" name="attr_MonsSpec2" value="" /></td>
+            <td colspan="3" class="alcenter"><input type="text" name="attr_MonSA2" class="short" value="1d6"/></td>
+			<td class="attrchk alleft"><button type="roll" value="&{template:default} {{name=@{MonsSpec2}}} {{Result=[[@{MonSA2}]]}}" /></td>
+         </tr>
+         <tr>
+            <td class="boldme">Special Defenses:</td>
+            <td colspan="2"><input type="text" name="attr_MonSpec3" value="" /></td>
+			<td colspan="3">&nbsp;</td>
+         </tr>
+    </table>
+	</div>
+	  <div class="sheet-col">
+      <table class="attrtab">
+        <tr>
+            <td colspan="6" class="alcenter"><img src="https://i.imgur.com/ivQOW2B.png"></img></td>
+        </tr>
+         <tr>
+            <td colspan="2" class="boldme">Attributes</td>
+            <td colspan="4">(Attribute check: d20 + lvl + mod)</td>
+         </tr>
+         <tr>
+            <td class="bluehilite alleft attrchk">Check</td>
+            <td class="bluehilite attrhdrtext">Pri Sec Ter</td>
+            <td class="bluehilite"></td>
+            <td class="bluehilite">Score</td>
+            <td class="bluehilite">Mod</td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=MonStr Check}} {{Result=[[1d20+@{Level}+@{MonStrMod}]]}} {{MonStr Prime=@{MonStrPri}}}" /></td>
+            <td class="alcenter tiny" />
+				<input type="checkbox" title='Primary' name="attr_MonStrPri" class="supertiny" value="1" />
+				<input type="checkbox" title='Secondary' name="attr_MonStrSec" class="supertiny" value="0" />
+				<input type="checkbox" title='Ternary' name="attr_MonStrTer" class="supertiny" value="0" />
+			</td>
+            <td title='Paralysis &amp; Constriction' class="mnattr attrtext alcenter">Str</td>
+            <td><input type="number" name="attr_MonStr" class="attrtext" value="@{MonStr}" /></td>
+            <td><input type="number" name="attr_MonStrMod" class="attrtext" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter" ><button type="roll" value="&{template:default} {{name=MonDex Check}} {{Result=[[1d20+@{Level}+@{MonDexMod}]]}} {{MonDex Prime=@{MonDexPri}}}"/></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_MonDexPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_MonDexSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_MonDexTer" class="supertiny" value="0" />
+			</td>
+            <td title='Breath weapon &amp; Traps' class="mnattr attrtext alcenter">Dex</td>
+            <td><input type="number" name="attr_MonDex" class="short" value="@{MonDex}" /></td>
+            <td><input type="number" name="attr_MonDexMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter" ><button type="roll" value="&{template:default} {{name=MonCon Check}} {{Result=[[1d20+@{Level}+@{MonConMod}]]}} {{MonCon Prime=@{MonConPri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_MonConPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_MonConSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_MonConTer" class="supertiny" value="0" />
+            </td>
+            <td title='Disease, Energy drain &amp; Poison' class="mnattr attrtext alcenter">Con</td>
+            <td><input type="number" name="attr_MonCon" class="short" value="@{MonCon}" /></td>
+            <td><input type="number" name="attr_MonConMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=MonInt Check}} {{Result=[[1d20+@{Level}+@{MonIntMod}]]}} {{MonInt Prime=@{MonIntPri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_MonIntPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_MonIntSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_MonIntTer" class="supertiny" value="0" />
+			</td>
+            <td title='Arcane magic &amp; Illusion' class="mnattr attrtext alcenter">Int</td>
+            <td><input type="number" name="attr_MonInt" class="short" value="@{MonInt}" /></td>
+            <td><input type="number" name="attr_MonIntMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter" ><button type="roll" value="&{template:default} {{name=MonWis Check}} {{Result=[[1d20+@{Level}+@{MonWisMod}]]}} {{MonWis Prime=@{MonWisPri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_MonWisPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_MonWisSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_MonWisTer" class="supertiny" value="0" />
+			</td>
+            <td title='Confusion, Divine magic &amp; Gaze attack' class="mnattr attrtext alcenter">Wis</td>
+            <td><input type="number" name="attr_MonWis" class="short" value="@{MonWis}" /></td>
+            <td><input type="number" name="attr_MonWisMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td class="attrchk alcenter"><button type="roll" value="&{template:default} {{name=MonCha Check}} {{Result=[[1d20+@{Level}+@{MonChaMod}]]}} {{MonCha Prime=@{MonChaPri}}}" /></td>
+            <td class="alcenter tiny" />
+                <input type="checkbox" title='Primary' name="attr_MonChaPri" class="supertiny" value="1" />
+			    <input type="checkbox" title='Secondary' name="attr_MonChaSec" class="supertiny" value="0" />
+			    <input type="checkbox" title='Ternary' name="attr_MonChaTer" class="supertiny" value="0" />
+			</td>
+            <td title='Death attack, Charm &amp; Fear' class="mnattr attrtext alcenter">Cha</td>
+            <td><input type="number" name="attr_MonCha" class="short" value="@{MonCha}" /></td>
+            <td><input type="number" name="attr_MonChaMod" class="short" value="0" /></td>
+         </tr>
+         <tr>
+            <td colspan="5"></td>
+         </tr>
+      </table>
+</div>
+</div>
+    <table>
+        <tr>
+            <td colspan="13" class="ceme" class="boldme">Attacks</td>
+        </tr>
+        <tr>
+            <td class="bluehilite boldme">HitDmg</td>
+            <td class="bluehilite boldme alcenter">Name</td>
+            <td class="bluehilite boldme alcenter">BtH</td>
+            <td class="bluehilite boldme alcenter">Mod</td>
+            <td class="bluehilite boldme alcenter">Misc</td>
+            <td class="bluehilite boldme alcenter">Magic</td>
+            <td class="bluehilite boldme alcenter">Total</td>
+            <td class="bluehilite boldme alcenter">|</td>
+            <td class="bluehilite boldme alcenter">Dmg</td>
+            <td class="bluehilite boldme alcenter">Mod</td>
+            <td class="bluehilite boldme alcenter">Misc</td>
+            <td class="bluehilite boldme alcenter">Magic</td>
+            <td class="bluehilite boldme alcenter">Total</td>
+        </tr>
+        <tr>
+            <td>
+			   <button type="roll" value="&{template:default} {{name=Attack with @{MonWeaponName_1}}} {{Result=[[1d20++@{MonWeaponHitTotal_1}]]}}" name="roll_MonWeaponHitOne" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{MonWeaponName_1}}} {{Result=[[@{MonWeaponDmg_1}+@{MonWeaponDmgTotal_1}]]}}" name="roll_MonWeaponDmgOne" />
+            </td>
+            <td><input type="text" name="attr_MonWeaponName_1" class="medium" value="Empty" /></td>
+            <td><input type="number" name="attr_MonWeaponBth_1" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMod_1" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMisc_1" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMagic_1" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponHitTotal_1" class="short" value="@{MonWeaponBth_1}+@{MonWeaponHitMod_1}+@{MonWeaponHitMisc_1}+@{MonWeaponHitMagic_1}" disabled="true" /></td>
+            <td class="boldme">|</td>
+            <td><input type="text" name="attr_MonWeaponDmg_1" class="short" value="1d0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMod_1" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMisc_1" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMagic_1" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponDmgTotal_1" class="short" value="@{MonWeaponDmgMod_1}+@{MonWeaponDmgMisc_1}+@{MonWeaponDmgMagic_1}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+			   <button type="roll" value="&{template:default} {{name=Attack with @{MonWeaponName_2}}} {{Result=[[1d20++@{MonWeaponHitTotal_2}]]}}" name="roll_MonWeaponHitTwo" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{MonWeaponName_2}}} {{Result=[[@{MonWeaponDmg_2}+@{MonWeaponDmgTotal_2}]]}}" name="roll_MonWeaponDmgTwo" />
+            </td>
+            <td><input type="text" name="attr_MonWeaponName_2" class="medium" value="Empty" /></td>
+            <td><input type="number" name="attr_MonWeaponBth_2" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMod_2" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMisc_2" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMagic_2" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponHitTotal_2" class="short" value="@{MonWeaponBth_2}+@{MonWeaponHitMod_2}+@{MonWeaponHitMisc_2}+@{MonWeaponHitMagic_2}" disabled="true" /></td>
+            <td class="boldme">|</td>
+            <td><input type="text" name="attr_MonWeaponDmg_2" class="short" value="2d0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMod_2" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMisc_2" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMagic_2" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponDmgTotal_2" class="short" value="@{MonWeaponDmgMod_2}+@{MonWeaponDmgMisc_2}+@{MonWeaponDmgMagic_2}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+			   <button type="roll" value="&{template:default} {{name=Attack with @{MonWeaponName_3}}} {{Result=[[1d20++@{MonWeaponHitTotal_3}]]}}" name="roll_MonWeaponHitThree" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{MonWeaponName_3}}} {{Result=[[@{MonWeaponDmg_3}+@{MonWeaponDmgTotal_3}]]}}" name="roll_MonWeaponDmgThree" />
+            </td>
+            <td><input type="text" name="attr_MonWeaponName_3" class="medium" value="Empty" /></td>
+            <td><input type="number" name="attr_MonWeaponBth_3" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMod_3" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMisc_3" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMagic_3" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponHitTotal_3" class="short" value="@{MonWeaponBth_3}+@{MonWeaponHitMod_3}+@{MonWeaponHitMisc_3}+@{MonWeaponHitMagic_3}" disabled="true" /></td>
+            <td class="boldme">|</td>
+            <td><input type="text" name="attr_MonWeaponDmg_3" class="short" value="3d0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMod_3" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMisc_3" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMagic_3" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponDmgTotal_3" class="short" value="@{MonWeaponDmgMod_3}+@{MonWeaponDmgMisc_3}+@{MonWeaponDmgMagic_3}" disabled="true" /></td>
+        </tr>
+        <tr>
+            <td>
+			   <button type="roll" value="&{template:default} {{name=Attack with @{MonWeaponName_4}}} {{Result=[[1d20++@{MonWeaponHitTotal_4}]]}}" name="roll_MonWeaponHitFour" />
+			   <button type="roll" value="&{template:default} {{name=Damage with @{MonWeaponName_4}}} {{Result=[[@{MonWeaponDmg_4}+@{MonWeaponDmgTotal_4}]]}}" name="roll_MonWeaponDmgFour" />
+            </td>
+            <td><input type="text" name="attr_MonWeaponName_4" class="medium" value="Empty" /></td>
+            <td><input type="number" name="attr_MonWeaponBth_4" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMod_4" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMisc_4" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponHitMagic_4" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponHitTotal_4" class="short" value="@{MonWeaponBth_4}+@{MonWeaponHitMod_4}+@{MonWeaponHitMisc_4}+@{MonWeaponHitMagic_4}" disabled="true" /></td>
+            <td class="boldme">|</td>
+            <td><input type="text" name="attr_MonWeaponDmg_4" class="short" value="4d0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMod_4" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMisc_4" class="short" value="0" />+</td>
+            <td><input type="number" name="attr_MonWeaponDmgMagic_4" class="short" value="0" />=</td>
+            <td><input type="number" name="attr_MonWeaponDmgTotal_4" class="short" value="@{MonWeaponDmgMod_4}+@{MonWeaponDmgMisc_4}+@{MonWeaponDmgMagic_4}" disabled="true" /></td>
+        </tr>
+    </table>
+	<table>
+		<td colspan="1" class="bluehilite">Notes</td>
+	</table>
+		<textarea name="attr_Monmy-text"></textarea>
+
+	</div>
+</div>
@@ -37,7 +37,7 @@
 }

 .sheet-header.sheet-image {
-    background-image: url("https://github.com/NocFenix/roll20-character-sheets/blob/changed-stars/Changed%20Stars/Images/flower_trace.png?raw=true");
+    background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Changed%20Stars/Images/flower_trace.png?raw=true");
    background-size: contain;
    background-repeat: no-repeat;
    height: 75px;
@@ -1045,7 +1045,7 @@ button[type="action"].sheet-action-tab.sheet-weapons-header:hover {
 }

 .sheet-rolltemplate-changed-stars .sheet-template-background {
-    background: url("https://github.com/NocFenix/roll20-character-sheets/blob/changed-stars/Changed%20Stars/Images/trinity_symbol_gray.png?raw=true");
+    background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Changed%20Stars/Images/trinity_symbol_gray.png?raw=true");
    background-repeat: no-repeat;
    background-size: contain;
    background-position: center center;
@@ -1168,7 +1168,7 @@ button[type="action"].sheet-action-tab.sheet-weapons-header:hover {
 .sheet-rolltemplate-changed-stars .sheet-template-base-between {
    height: 35px;
    width: 35px;
-    background-image: url("https://github.com/NocFenix/roll20-character-sheets/blob/changed-stars/Changed%20Stars/Images/changed_stars_blank_die.png?raw=true");
+    background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Changed%20Stars/Images/changed_stars_blank_die.png?raw=true");
    background-size: 100% 100%;
    
 }
@@ -1176,28 +1176,28 @@ button[type="action"].sheet-action-tab.sheet-weapons-header:hover {
 .sheet-rolltemplate-changed-stars .sheet-template-base-success {
    height: 35px;
    width: 35px;
-    background-image: url("https://github.com/NocFenix/roll20-character-sheets/blob/changed-stars/Changed%20Stars/Images/changed_stars_success_die.png?raw=true");
+    background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Changed%20Stars/Images/changed_stars_success_die.png?raw=true");
    background-size: 100% 100%;
 }

 .sheet-rolltemplate-changed-stars .sheet-template-edge-fail {
    height: 35px;
    width: 35px;
-    background-image: url("https://github.com/NocFenix/roll20-character-sheets/blob/changed-stars/Changed%20Stars/Images/changed_stars_edge_die_shock.png?raw=true");
+    background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Changed%20Stars/Images/changed_stars_edge_die_shock.png?raw=true");
    background-size: 100% 100%;
 }

 .sheet-rolltemplate-changed-stars .sheet-template-edge-between {
    height: 35px;
    width: 35px;
-    background-image: url("https://github.com/NocFenix/roll20-character-sheets/blob/changed-stars/Changed%20Stars/Images/changed_stars_edge_die.png?raw=true");
+    background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Changed%20Stars/Images/changed_stars_edge_die.png?raw=true");
    background-size: 100% 100%;
 }

 .sheet-rolltemplate-changed-stars .sheet-template-edge-success {
    height: 35px;
    width: 35px;
-    background-image: url("https://github.com/NocFenix/roll20-character-sheets/blob/changed-stars/Changed%20Stars/Images/changed_stars_edge_die_success.png?raw=true");
+    background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Changed%20Stars/Images/changed_stars_edge_die_success.png?raw=true");
    background-size: 100% 100%;
 }

@@ -47,7 +47,7 @@
 	"disable-desc": "DESABILITAR DESCRIÇÕES -",
 	"divination": "Adivinhação",
 	"divinination": "Adivinhação",
-	"downtime-button": "Montagem (Downtime)",
+	"downtime-button": "Hora do Show (Intervalo)",
 	"downtime-button-desc": "<b>Quando quer que seu personagem tenha algum downtime</b>, escolha uma forma para usá-lo:<ul><li><b>Dê atenção</b> para um de seus temas Logos (ou extra). Diga a todos na mesa como você fez isso e marque Atenção nesse tema. </li><li><b>Trabalho no caso.</b> Diga a todos na mesa como você fez isso, ganhe 3 pistas com o método e a fonte baseada na sua descrição. </li><li><b>Explore seu Mythos.</b> Diga à todos na mesa qual Mistério você explora e como faz isso. Você ganha 1 Cola com o método e a fonte baseada em sua descrição. Marque Atenção no tema do Mistério. </li><li><b>Prepare-se para sua próxima atividade.</b> Diga à todos na mesa como você se preparou e escolha um: recupere todas as suas tags de poder queimadas OU ganhe 3 Juice com o método baseado em sua descrição. Você pode escolher um dos efeitos a seguir <b>Mude o Jogo.</b></li><li><b>Recupere de sua última atividade.</b> Para cada em andamento ainda afetando você, o MC vai te dizer se e como isto apode ser reduzido durante seu botão-downtime e por quantos ranques. Alternativamente, o MC pode permitir que você reduza uma ou mais de seus status por um ranque para cada tag relevante que você tenha. </li></ul><br> O MC pode ter uma deixa dentro de qualquer evento da montagem e continuar, então, as cenas.\"",
 	"downtime-desc": "<b>Quando quer que seu personagem tenha algum downtime</b>, escolha uma forma para usá-lo:<ul><li><b>Dê atenção</b> para um de seus temas Logos (ou extra). Diga a todos na mesa como você fez isso e marque Atenção nesse tema. </li><li><b>Trabalho no caso.</b> Diga a todos na mesa como você fez isso, ganhe 3 pistas com o método e a fonte baseada na sua descrição. </li><li><b>Explore seu Mythos.</b> Diga à todos na mesa qual Mistério você explora e como faz isso. Você ganha 1 Cola com o método e a fonte baseada em sua descrição. Marque Atenção no tema do Mistério. </li><li><b>Prepare-se para sua próxima atividade.</b> Diga à todos na mesa como você se preparou e escolha um: recupere todas as suas tags de poder queimadas OU ganhe 3 Juice com o método baseado em sua descrição. Você pode escolher um dos efeitos a seguir <b>Mude o Jogo.</b></li><li><b>Recupere de sua última atividade.</b> Para cada em andamento ainda afetando você, o MC vai te dizer se e como isto apode ser reduzido durante seu botão-downtime e por quantos tiers. Alternativamente, o MC pode permitir que você reduza uma ou mais de seus status por um tier para cada tag relevante que você tenha. </li></ul><br> O MC pode ter uma deixa dentro de qualquer evento da montagem e continuar, então, as cenas.",
 	"eliminate-nemeses": "Obtenha o encerramento de seu Nemeses",
@@ -126,7 +126,7 @@
 	"rolls-a": "rolou um",
 	"routine": "Rotina",
 	"see-through-mist": "Ver através da Névoa",
-	"sneak-around-button": "Esgueirar-se",
+	"sneak-around-button": "Agir na Encolha",
 	"sneak-around-dynamite": "Seu alvo está completamente enganado pelo seu subterfúgio que você pode continuar a se mover e / ou agir sem ser detectado por ele pelo resto da cena.",
 	"sneak-around-fail": "Você erra! O MC pode invocar um de seus movimentos de MC.",
 	"sneak-around-max-succ": "Todos que deveriam cair nessa, caem.",
@@ -148,12 +148,12 @@
 	"takes-spotlight": "assume os holofotes!",
 	"text": "texto...",
 	"theme-title": "TÍTULO TEMA",
-	"toe-to-toe-button": "Vai bater-de-frente",
+	"toe-to-toe-button": "Partir pro abraço",
 	"toe-to-toe-dynamite": "Você acerta todos os três <ul><li>Você acerta todos os três</li><li>Os acerta em cheio, infligindo status com <b>tier=Poder</b>.</li><li>Você bloqueia, se esquiva ou revida suas melhores tentativas</li></ul>",
 	"toe-to-toe-fail": "Você erra! O MC pode invocar um de seus movimentos de MC.",
 	"toe-to-toe-max-succ": "Escolha 2:<ul><li>Você consegue atingir seu objetivo, por exemplo, pegar algo que eles possuem</li><li>Você os acerta em cheio, infligindo status com <b>tier=Poder</b>.</li><li>Você bloqueia, se esquiva ou revida suas melhores tentativas</li></ul>",
 	"toe-to-toe-min-succ": "Escolha 1: <ul><li>Você consegue atingir seu objetivo, por exemplo, pegar algo que eles possuem</li><li>Você os acerta em cheio, infligindo status com <b>tier=Poder</b>.</li><li>Você bloqueia, se esquiva ou revida suas melhores tentativas</li></ul>",
-	"tracking-card": "CARTA DE RASTRO",
+	"tracking-card": "CARTA DE MEDIDOR",
 	"tracking-card-only-npc": "SOMENTE CARTÕES DE RASTRO (NPC)",
 	"training": "Treinando",
 	"transformation": "Passe por uma transformação",
@@ -1,9 +1,12 @@
 /* ----------------------- classes for area display toggles -----------------------*/
 .sheet-switch-pc-show:not(:checked)~.sheet-switch-pc {display:none;}
 .sheet-switch-npc-show:not(:checked)~.sheet-switch-npc {display:none;}
+.sheet-switch-baseModeSpellSection-show:not(:checked)~.sheet-switch-baseModeSpellSection {display:none;}
+.sheet-switch-fullModeSpellSection-show:not(:checked)~.sheet-switch-fullModeSpellSection {display:none;}

 .sheet-pc-spells-show:not(:checked)~.sheet-pc-spells {display:none;}
 .sheet-pc-charrpinfo-show:not(:checked)~.sheet-pc-charrpinfo {display:none;}
+.sheet-pc-charclasses-show:not(:checked)~.sheet-pc-charclasses {display:none;}
 .sheet-pc-combat-show:not(:checked)~.sheet-pc-combat {display:none;}
 .sheet-pc-charnotes-show:not(:checked)~.sheet-pc-charnotes {display:none;}
 .sheet-pc-saveblock-show:not(:checked)~.sheet-pc-saveblock {display:none;}
@@ -20,6 +23,7 @@
 .sheet-pc-otherequipment-show:not(:checked)~.sheet-pc-otherequipment {display:none;}
 .sheet-pc-encumbrance-show:not(:checked)~.sheet-pc-encumbrance {display:none;}
 .sheet-pc-weapons-show:not(:checked)~.sheet-pc-weapons {display:none;}
+.sheet-pc-turn-undead-show:not(:checked)~.sheet-pc-turn-undead {display:none;}
 .sheet-pc-skills-show:not(:checked)~.sheet-pc-skills {display:none;}
 .sheet-pc-pronouns-show:not(:checked)~.sheet-pc-pronouns {display:none;}
 .sheet-pc-summons-show:not(:checked)~.sheet-pc-summons {display:none;}
@@ -44,6 +48,65 @@
 .sheet-pc-weapon10-show:not(:checked)~.sheet-pc-weapon10 {display:none;}
 .sheet-pc-weapon11-show:not(:checked)~.sheet-pc-weapon11 {display:none;}

+.sheet-pc-divineSpells-show:not(:checked)~.sheet-pc-divineSpells {display:none;}
+.sheet-pc-divineSpells0-show:not(:checked)~.sheet-pc-divineSpells0 {display:none;}
+.sheet-pc-divineSpells1-show:not(:checked)~.sheet-pc-divineSpells1 {display:none;}
+.sheet-pc-divineSpells2-show:not(:checked)~.sheet-pc-divineSpells2 {display:none;}
+.sheet-pc-divineSpells3-show:not(:checked)~.sheet-pc-divineSpells3 {display:none;}
+.sheet-pc-divineSpells4-show:not(:checked)~.sheet-pc-divineSpells4 {display:none;}
+.sheet-pc-divineSpells5-show:not(:checked)~.sheet-pc-divineSpells5 {display:none;}
+.sheet-pc-divineSpells6-show:not(:checked)~.sheet-pc-divineSpells6 {display:none;}
+.sheet-pc-divineSpells7-show:not(:checked)~.sheet-pc-divineSpells7 {display:none;}
+.sheet-pc-divineSpells8-show:not(:checked)~.sheet-pc-divineSpells8 {display:none;}
+.sheet-pc-divineSpells9-show:not(:checked)~.sheet-pc-divineSpells9 {display:none;}
+.sheet-pc-divineSpells10-show:not(:checked)~.sheet-pc-divineSpells10 {display:none;}
+
+.sheet-pc-arcaneSpells-show:not(:checked)~.sheet-pc-arcaneSpells {display:none;}
+.sheet-pc-arcaneSpells0-show:not(:checked)~.sheet-pc-arcaneSpells0 {display:none;}
+.sheet-pc-arcaneSpells1-show:not(:checked)~.sheet-pc-arcaneSpells1 {display:none;}
+.sheet-pc-arcaneSpells2-show:not(:checked)~.sheet-pc-arcaneSpells2 {display:none;}
+.sheet-pc-arcaneSpells3-show:not(:checked)~.sheet-pc-arcaneSpells3 {display:none;}
+.sheet-pc-arcaneSpells4-show:not(:checked)~.sheet-pc-arcaneSpells4 {display:none;}
+.sheet-pc-arcaneSpells5-show:not(:checked)~.sheet-pc-arcaneSpells5 {display:none;}
+.sheet-pc-arcaneSpells6-show:not(:checked)~.sheet-pc-arcaneSpells6 {display:none;}
+.sheet-pc-arcaneSpells7-show:not(:checked)~.sheet-pc-arcaneSpells7 {display:none;}
+.sheet-pc-arcaneSpells8-show:not(:checked)~.sheet-pc-arcaneSpells8 {display:none;}
+.sheet-pc-arcaneSpells9-show:not(:checked)~.sheet-pc-arcaneSpells9 {display:none;}
+.sheet-pc-arcaneSpells10-show:not(:checked)~.sheet-pc-arcaneSpells10 {display:none;}
+
+.sheet-pc-psionicPowers-show:not(:checked)~.sheet-pc-psionicPowers {display:none;}
+.sheet-pc-psionicPowers1-show:not(:checked)~.sheet-pc-psionicPowers1 {display:none;}
+.sheet-pc-psionicPowers2-show:not(:checked)~.sheet-pc-psionicPowers2 {display:none;}
+.sheet-pc-psionicPowers3-show:not(:checked)~.sheet-pc-psionicPowers3 {display:none;}
+.sheet-pc-psionicPowers4-show:not(:checked)~.sheet-pc-psionicPowers4 {display:none;}
+.sheet-pc-psionicPowers5-show:not(:checked)~.sheet-pc-psionicPowers5 {display:none;}
+.sheet-pc-psionicPowers6-show:not(:checked)~.sheet-pc-psionicPowers6 {display:none;}
+.sheet-pc-psionicPowers7-show:not(:checked)~.sheet-pc-psionicPowers7 {display:none;}
+.sheet-pc-psionicPowers8-show:not(:checked)~.sheet-pc-psionicPowers8 {display:none;}
+.sheet-pc-psionicPowers9-show:not(:checked)~.sheet-pc-psionicPowers9 {display:none;}
+.sheet-pc-psionicPowers10-show:not(:checked)~.sheet-pc-psionicPowers10 {display:none;}
+
+.sheet-pc-invocations-show:not(:checked)~.sheet-pc-invocations {display:none;}
+.sheet-pc-invocations1-show:not(:checked)~.sheet-pc-invocations1 {display:none;}
+.sheet-pc-invocations2-show:not(:checked)~.sheet-pc-invocations2 {display:none;}
+.sheet-pc-invocations3-show:not(:checked)~.sheet-pc-invocations3 {display:none;}
+.sheet-pc-invocations4-show:not(:checked)~.sheet-pc-invocations4 {display:none;}
+
+.sheet-pc-maneuversStances-show:not(:checked)~.sheet-pc-maneuversStances {display:none;}
+.sheet-pc-maneuversStances1-show:not(:checked)~.sheet-pc-maneuversStances1 {display:none;}
+.sheet-pc-maneuversStances2-show:not(:checked)~.sheet-pc-maneuversStances2 {display:none;}
+.sheet-pc-maneuversStances3-show:not(:checked)~.sheet-pc-maneuversStances3 {display:none;}
+.sheet-pc-maneuversStances4-show:not(:checked)~.sheet-pc-maneuversStances4 {display:none;}
+.sheet-pc-maneuversStances5-show:not(:checked)~.sheet-pc-maneuversStances5 {display:none;}
+.sheet-pc-maneuversStances6-show:not(:checked)~.sheet-pc-maneuversStances6 {display:none;}
+.sheet-pc-maneuversStances7-show:not(:checked)~.sheet-pc-maneuversStances7 {display:none;}
+.sheet-pc-maneuversStances8-show:not(:checked)~.sheet-pc-maneuversStances8 {display:none;}
+.sheet-pc-maneuversStances9-show:not(:checked)~.sheet-pc-maneuversStances9 {display:none;}
+.sheet-pc-maneuversStances10-show:not(:checked)~.sheet-pc-maneuversStances10 {display:none;}
+
+.sheet-pc-spellLikeAbilites-show:not(:checked)~.sheet-pc-spellLikeAbilites {display:none;}
+.sheet-pc-spellLikeAbilites1-show:not(:checked)~.sheet-pc-spellLikeAbilites1 {display:none;}
+
 .sheet-pc-spells0-show:not(:checked)~.sheet-pc-spells0 {display:none;}
 .sheet-pc-spells1-show:not(:checked)~.sheet-pc-spells1 {display:none;}
 .sheet-pc-spells2-show:not(:checked)~.sheet-pc-spells2 {display:none;}
@@ -55,7 +118,6 @@
 .sheet-pc-spells8-show:not(:checked)~.sheet-pc-spells8 {display:none;}
 .sheet-pc-spells9-show:not(:checked)~.sheet-pc-spells9 {display:none;}
 .sheet-pc-spells10-show:not(:checked)~.sheet-pc-spells10 {display:none;}
-.sheet-pc-spells11-show:not(:checked)~.sheet-pc-spells11 {display:none;}

 .sheet-pc-other1-show:not(:checked)~.sheet-pc-other1 {display:none;}
 .sheet-pc-other2-show:not(:checked)~.sheet-pc-other2 {display:none;}
@@ -69,6 +131,50 @@

 .sheet-pc-rolltemplates-show:not(:checked)~.sheet-pc-rolltemplates {display:none;}

+.sheet-summons-attack1-show:not(:checked)~.sheet-summons-attack1 {display:none;}
+.sheet-summons-attack2-show:not(:checked)~.sheet-summons-attack2 {display:none;}
+.sheet-summons-attack3-show:not(:checked)~.sheet-summons-attack3 {display:none;}
+.sheet-summons-attack4-show:not(:checked)~.sheet-summons-attack4 {display:none;}
+.sheet-summons-attack5-show:not(:checked)~.sheet-summons-attack5 {display:none;}
+
+.sheet-summons-tab-content-show:not(:checked)~.sheet-summons-tab-content {display:none;}
+.sheet-summons-charclasses-show:not(:checked)~.sheet-summons-charclasses {display:none;}
+
+.sheet-npc-charrpinfo-show:not(:checked)~.sheet-npc-charrpinfo {display:none;}
+.sheet-npc-charclasses-show:not(:checked)~.sheet-npc-charclasses {display:none;}
+.sheet-npc-attack1-show:not(:checked)~.sheet-npc-attack1 {display:none;}
+.sheet-npc-attack2-show:not(:checked)~.sheet-npc-attack2 {display:none;}
+.sheet-npc-attack3-show:not(:checked)~.sheet-npc-attack3 {display:none;}
+.sheet-npc-attack11-show:not(:checked)~.sheet-npc-attack11 {display:none;}
+
+
+.tableNoCellSpacingNoCellPadding {
+	border-collapse: collapse; 
+	border-spacing: 0;
+}
+
+table.tableNoCellSpacingNoCellPadding th, table.tableNoCellSpacingNoCellPadding td{
+	padding: 0;
+}
+
+.tableNoCellSpacingCellPadding5 {
+	border-collapse: collapse; 
+	border-spacing: 0;
+}
+
+table.tableNoCellSpacingCellPadding5 th, table.tableNoCellSpacingCellPadding5 td{
+	padding: 5;
+}
+
+.tableNoCellSpacingCellPadding10 {
+	border-collapse: collapse; 
+	border-spacing: 0;
+}
+
+table.tableNoCellSpacingCellPadding10 th, table.tableNoCellSpacingCellPadding10 td{
+	padding: 10;
+}
+
 .charsheet label {
    display: inline-block;
    width: 75px;
@@ -184,6 +290,12 @@ select.sheet-dtype {
    vertical-align: bottom;
 }

+.sheet-table-header-spell {
+    text-align: center;
+    font-weight: bold;
+    vertical-align: bottom;
+}
+
 .sheet-table-header-left {
    display: table-cell;
    text-align: left;
@@ -293,6 +405,11 @@ select.sheet-dtype {
    width: 100%;
 }

+.sheet-table-row-spell {
+    vertical-align: top;
+    width: 100%;
+}
+
 .sheet-table-row-name {
    display: table-cell;
    text-align: center;
@@ -504,7 +621,8 @@ input.sheet-tab:not(:first-child)::before
    border-left: none;
 }

-div.sheet-tab-content
+
+div.sheet-tab-content, .sheet-npc-tab-content, .sheet-summons-tab-content
 {
    border: 1px solid #a8a8a8;
    border-top-color: #000;   	                  /* black */
@@ -5,5 +5,18 @@
  "preview": "charsheet_3-5.jpg",
  "roll20userid": "108188",
  "instructions": "Roll templates now implemented; see descriptions and other information in new Roll Template section at bottom of sheet.  Attack and full attack rolls modifiable in-sheet to allow inclusion of feat- or item-based additions to attacks.  Full attack gives 'undefined' error for attacks one does not have a BAB defined for (remove that part of the macro if BAB is not high enough for 2, 3, or 4 attacks/rnd)",
-  "legacy": true
+  "legacy": true,
+  "useroptions": [
+		{
+			"attribute": "spellmode",
+			"displayname": "Spell mode? ",
+			"type": "select",
+			"options": [
+				"Base mode|1",
+				"Full mode|2"
+			],
+			"default": "",
+			"description": "spell mode This option can be be later changed on individual sheets from the 'Settings-page.'"
+		}
+	]
 }
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PJ ",
 	"npc": "PNJ",
 	"header": "Capçalera",
@@ -22,8 +24,13 @@
 	"alignment": "Alineament",
 	"deity": "Deïtat",
 	"class": "Classe",
+	"classes": "Classes",
 	"level": "Nivell",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "DC",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Edat",
 	"height": "Alçada",
 	"weight": "Pes",
@@ -33,6 +40,7 @@
 	"weapons": "Armes",
 	"armor-class-i": "CA",
 	"equipment": "Equipament",
+	"turn-undead": "Turn Undead",
 	"skills": "Habilitats",
 	"spells": "Encanteris",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CAR",
 	"show-ability-macros": "Mostra Macros de Característiques",
 	"hit-points-i": "PC",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Punts de Cop",
 	"current-hit-points": "PC Actuals",
 	"max": "Màx",
 	"nonlethal-damage": "Dany No Letal",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INICIATIVA",
 	"dexterity-modifier": "Mod Des",
 	"miscellaneous-modifier-a": "Mod Varis",
@@ -126,10 +137,18 @@
 	"class-abilities": "Trets de Classe",
 	"feats": "Talents",
 	"other": "Altres",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Arma",
 	"weapon-enhancement-a": "Millora arma",
 	"weapon-focus-s": "Perícia<br>Arma",
 	"weapon-specialization-as": "Especialitz.<br>Arma",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Crític",
 	"range": "Abast",
 	"ammunition": "Munició",
@@ -138,8 +157,11 @@
 	"special-properties": "Propietats Especials",
 	"strength-a": "For",
 	"dexterity-a": "Des",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 For",
 	"strength-and-half-strength": "For+1/2For",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Càlcul Atac",
 	"macro": "Macro",
 	"full-attack-macro": "Macro Atac Complert",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Càlcul Crític",
 	"damage-macro": "Macro Dany",
 	"other-weapons": "Altres Armes",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilitzat",
 	"armor-check-penalty-a": "Penalitz. Armadura",
 	"armor": "Armadura",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuració",
@@ -324,10 +358,48 @@
 	"necromancy": "Nigromància",
 	"transmutation": "Transmutació",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Přesvědčení",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Úroveň",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Věk",
 	"height": "Výška",
 	"weight": "Váha",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "OČ",
 	"equipment": "Vybavení",
+	"turn-undead": "Turn Undead",
 	"skills": "Dovednosti",
 	"spells": "Kouzla",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Útok",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Dosah",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Síl",
 	"dexterity-a": "Obr",
+	"wisdom-a": "Mdr",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Zbroj",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Léčení",
-	"wisdom-a": "Mdr",
 	"hide": "Skrýt",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1.",
@@ -312,7 +341,12 @@
 	"eighth": "8.",
 	"ninth": "9.",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Vymítání",
@@ -324,10 +358,48 @@
 	"necromancy": "Nekromancie",
 	"transmutation": "Transmutace",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Útok",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Niveau",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NSC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Gesinnung",
 	"deity": "Deity",
 	"class": "Klasse",
+	"classes": "Classes",
 	"level": "Stufe",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Alter",
 	"height": "Höhe",
 	"weight": "Gewicht",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "RK",
 	"equipment": "Ausrüstung",
+	"turn-undead": "Turn Undead",
 	"skills": "Fertigkeiten",
 	"spells": "Zauber",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Andere",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Angriff",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Reichweite",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Ges",
+	"wisdom-a": "Wei",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Rüstung",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heilung",
-	"wisdom-a": "Wei",
 	"hide": "Verstecken",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1.",
@@ -312,7 +341,12 @@
 	"eighth": "8.",
 	"ninth": "9.",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Bannzauber",
@@ -324,10 +358,48 @@
 	"necromancy": "Nekromantie",
 	"transmutation": "Verwandlung",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Angriff",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Επίπεδο",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PJ ",
 	"npc": "PNJ",
 	"header": "Cabecera",
@@ -22,8 +24,13 @@
 	"alignment": "Alineamiento",
 	"deity": "Deidad",
 	"class": "Clase",
+	"classes": "Classes",
 	"level": "Nivel",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "DG",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Edad",
 	"height": "Altura",
 	"weight": "Peso",
@@ -33,6 +40,7 @@
 	"weapons": "Armas",
 	"armor-class-i": "CA",
 	"equipment": "Equipo",
+	"turn-undead": "Turn Undead",
 	"skills": "Habilidades",
 	"spells": "Hechizos",
 	"notes": "Notas",
@@ -54,10 +62,13 @@
 	"charisma-i": "CAR",
 	"show-ability-macros": "Mostrar Macros de Características",
 	"hit-points-i": "PG",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Puntos de Golpe",
 	"current-hit-points": "PG Actuales",
 	"max": "Max",
 	"nonlethal-damage": "Daño No Letal",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INICIATIVA",
 	"dexterity-modifier": "Mod Des",
 	"miscellaneous-modifier-a": "Mod Misc",
@@ -126,10 +137,18 @@
 	"class-abilities": "Rasgos de Clase",
 	"feats": "Dotes",
 	"other": "Otros",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Arma",
 	"weapon-enhancement-a": "Mejora Arma",
 	"weapon-focus-s": "Foco<br>Arma",
 	"weapon-specialization-as": "Especializ.<br>Arma",
+	"attack": "Ataque",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Crítico",
 	"range": "Alcance",
 	"ammunition": "Munición",
@@ -138,8 +157,11 @@
 	"special-properties": "Propiedades Especiales",
 	"strength-a": "Fue",
 	"dexterity-a": "Des",
+	"wisdom-a": "Sab",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Fue",
 	"strength-and-half-strength": "Fue+1/2Fue",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Calc Ataque",
 	"macro": "Macro",
 	"full-attack-macro": "Macro Ataque Comleto",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Calc Crítico",
 	"damage-macro": "Macro Daño",
 	"other-weapons": "Otras Armas",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Inmobilizado",
 	"armor-check-penalty-a": "Pen Prueba Armad.",
 	"armor": "Armadura",
@@ -247,8 +270,13 @@
 	"ranks": "Rangos",
 	"armor-penalty-s": "Penal.<br>Armad.",
 	"miscellaneous-modifier-as": "Mod<br>Misc",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Tasación",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Equilibrio",
 	"bluff": "Engañar",
@@ -265,7 +293,6 @@
 	"gather-information": "Reunir Información",
 	"handle-animal": "Trato con Animales",
 	"heal": "Sanar",
-	"wisdom-a": "Sab",
 	"hide": "Esconderse",
 	"intimidate": "Intimidar",
 	"jump": "Saltar",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Caract.",
 	"trained-only": "Solo entrenada",
 	"caster-level": "Nivel de Lanzador",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Conjuros/Día",
 	"zero": "0",
 	"first": "1er",
@@ -312,7 +341,12 @@
 	"eighth": "8o",
 	"ninth": "9o",
 	"casting-ability": "Caract. Lanzador",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "CD Conjuro",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Conj. Pen",
 	"spell-focus": "Espec. Conj.",
 	"abjuration": "Abjuración",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancia",
 	"transmutation": "Transmutación",
 	"power-points": "Puntos de Poder",
-	"spell-section": "Sección de Conjuros",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
+	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Usad./Prep.",
 	"spell-name": " Nombre Conj. ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Nivel",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Ext./macro",
 	"show?": "Mostrar?",
 	"date": "Fecha",
@@ -353,7 +425,6 @@
 	"touch": "Toque",
 	"touch-armor-class-i": "CA T",
 	"flat-footed-i": "Fl.",
-	"attack": "Ataque",
 	"attack-macro": "Macro de Ataque",
 	"full-attack": "Ataque Compl.",
 	"space": "Espacio",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PJ ",
 	"npc": "PNJ",
 	"header": "En-tête",
@@ -22,8 +24,13 @@
 	"alignment": "Alignement",
 	"deity": "Divinité",
 	"class": "Classe",
+	"classes": "Classes",
 	"level": "Niveau",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "DV",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Âge",
 	"height": "Taille",
 	"weight": "Poids",
@@ -33,6 +40,7 @@
 	"weapons": "Armes",
 	"armor-class-i": "CA",
 	"equipment": "Équipement",
+	"turn-undead": "Turn Undead",
 	"skills": "Compétences",
 	"spells": "Sorts",
 	"notes": "Notes ",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Afficher les macros de Caractéristiques",
 	"hit-points-i": "PV",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Points de vie",
 	"current-hit-points": "PV courants",
 	"max": "Max",
 	"nonlethal-damage": "Dégâts Non Létaux",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Mod de Dex",
 	"miscellaneous-modifier-a": "Mod divers",
@@ -126,10 +137,18 @@
 	"class-abilities": "Capacités de classe",
 	"feats": "Dons",
 	"other": "Autre",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Arme",
 	"weapon-enhancement-a": "Amélio. d'Arme",
 	"weapon-focus-s": "Arme de <br>prédilection",
 	"weapon-specialization-as": "Spécialisation<br>martiale",
+	"attack": "Attaque",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critique",
 	"range": "Distance",
 	"ammunition": "Munitions",
@@ -138,8 +157,11 @@
 	"special-properties": "Propriétés spéciales",
 	"strength-a": "For",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Sag",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 For",
 	"strength-and-half-strength": "For+1/2For",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Calc Attaque",
 	"macro": "Macro",
 	"full-attack-macro": "Macro complète d'Attaque",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Calc Crit",
 	"damage-macro": "Macro de Dégâts",
 	"other-weapons": "Autres armes",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilisé",
 	"armor-check-penalty-a": "Malus d'Armure aux compétences",
 	"armor": "Armure",
@@ -247,8 +270,13 @@
 	"ranks": "Rangs",
 	"armor-penalty-s": "Malus <br>d'Armure",
 	"miscellaneous-modifier-as": "Mod.<br> divers",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Estimation",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Équilibre",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Renseignement",
 	"handle-animal": "Dressage",
 	"heal": "Premiers Secours",
-	"wisdom-a": "Sag",
 	"hide": "Discrétion",
 	"intimidate": "Intimidation",
 	"jump": "Saut",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Caractéristique<br>Stat",
 	"trained-only": "Entraîné seulement",
 	"caster-level": "Niveau de Lanceur de Sorts",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Sorts/Jour",
 	"zero": "0",
 	"first": "1er",
@@ -312,7 +341,12 @@
 	"eighth": "8ème",
 	"ninth": "9ème",
 	"casting-ability": "Carac. de Sort",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "DD de sort",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Pén des sorts",
 	"spell-focus": "Focus de sort",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Nécromancie",
 	"transmutation": "Transmutation",
 	"power-points": "Points de Pouvoir",
-	"spell-section": "Section des sorts",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
+	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Utilisation/Prép",
 	"spell-name": " Nom du Sort ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Niv",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Afficher?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Contact",
 	"touch-armor-class-i": "C CA",
 	"flat-footed-i": "PaD",
-	"attack": "Attaque",
 	"attack-macro": "Macro Attaque",
 	"full-attack": "Attaque complète",
 	"space": "Espace",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PG ",
 	"npc": "PNG",
 	"header": "Intestazione",
@@ -22,8 +24,13 @@
 	"alignment": "Allineamento",
 	"deity": "Divinità",
 	"class": "Classe",
+	"classes": "Classi",
 	"level": "Livello",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "DV",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Età",
 	"height": "Altezza",
 	"weight": "Peso",
@@ -33,6 +40,7 @@
 	"weapons": "Armi",
 	"armor-class-i": "CA",
 	"equipment": "Equipaggiamento",
+	"turn-undead": "Turn Undead",
 	"skills": "Abilità",
 	"spells": "Incantesimi",
 	"notes": "Note",
@@ -54,10 +62,13 @@
 	"charisma-i": "CAR",
 	"show-ability-macros": "Mostra macro Caratteristiche",
 	"hit-points-i": "PF",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Punti Ferita",
 	"current-hit-points": "HP restanti",
 	"max": "Max",
 	"nonlethal-damage": "Ferite non letali",
+	"damage": "Danno",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INIZIATIVA",
 	"dexterity-modifier": "Des Mod",
 	"miscellaneous-modifier-a": "Mod. vari",
@@ -126,10 +137,18 @@
 	"class-abilities": "Caratteristiche di classe",
 	"feats": "Talenti",
 	"other": "Altro",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Arma",
 	"weapon-enhancement-a": "Potenziamento",
 	"weapon-focus-s": "Arma<br>Focalizzata",
 	"weapon-specialization-as": "Arma<br>Specializzata",
+	"attack": "Attacco",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critico",
 	"range": "Gittata",
 	"ammunition": "Munizioni",
@@ -138,8 +157,11 @@
 	"special-properties": "Proprietà Speciali",
 	"strength-a": "FOR",
 	"dexterity-a": "DES",
+	"wisdom-a": "Sag",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 ModFor",
 	"strength-and-half-strength": "ModFor+1/2ModFor",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Calcolo Attacco",
 	"macro": "Macro",
 	"full-attack-macro": "Macro Attacco Completo",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Calc. Crit",
 	"damage-macro": "Macro Danno",
 	"other-weapons": "Altre Armi",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilizzato",
 	"armor-check-penalty-a": "Penalità di armatura alla prova",
 	"armor": "Armatura",
@@ -247,8 +270,13 @@
 	"ranks": "Gradi",
 	"armor-penalty-s": "Penalità<br>Armatura",
 	"miscellaneous-modifier-as": "Mod<br>Vari.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Si",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Valutare",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Equilibrio",
 	"bluff": "Raggirare",
@@ -265,7 +293,6 @@
 	"gather-information": "Raccogliere informazioni",
 	"handle-animal": "Addestrare Animali",
 	"heal": "Guarire",
-	"wisdom-a": "Sag",
 	"hide": "Nascondersi",
 	"intimidate": "Intimidire",
 	"jump": "Saltare",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Valore<br>Caratteristica",
 	"trained-only": "Richiede Addestramento",
 	"caster-level": "Livello Incantatore",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Incantesimi/Giorno",
 	"zero": "0",
 	"first": "primo",
@@ -312,7 +341,12 @@
 	"eighth": "ottavo",
 	"ninth": "nono",
 	"casting-ability": "Caratteristica di lancio incantesimi",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "CD Incantesimi",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Penalità Incantesimi",
 	"spell-focus": "Incantesimi Focalizzati",
 	"abjuration": "Abiurazione",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromanzia",
 	"transmutation": "Transmutazione",
 	"power-points": "Punti Potere",
-	"spell-section": "Sezione Incantesimi",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Livello Incantesimo",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
+	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Incantesimi Arcani",
+	"psionic-powers": "Poteri Psionici",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Usati/Preparati",
 	"spell-name": " Nome Incantesimo ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Livello 1",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Mostra?",
 	"date": "Data",
@@ -353,7 +425,6 @@
 	"touch": "Contatto",
 	"touch-armor-class-i": "C AC",
 	"flat-footed-i": "S AC",
-	"attack": "Attacco",
 	"attack-macro": "Macro Attacco",
 	"full-attack": "Attacco Completo",
 	"space": "Spazio",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "属性",
 	"deity": "Deity",
 	"class": "クラス",
+	"classes": "Classes",
 	"level": "ユーザレベル",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "年齢",
 	"height": "身長",
 	"weight": "重量",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "装備",
+	"turn-undead": "Turn Undead",
 	"skills": "技能",
 	"spells": "呪文",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "最大",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "その他",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "攻撃",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "距離",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "筋力",
 	"dexterity-a": "敏捷力",
+	"wisdom-a": "判断力",
+	"intelligence-a": "知力",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "鎧",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "知力",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "回復",
-	"wisdom-a": "判断力",
 	"hide": "隠す",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "防御術",
@@ -324,10 +358,48 @@
 	"necromancy": "死霊術",
 	"transmutation": "変成術",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "攻撃",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "레벨",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "무기",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "체력",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "무기",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "숨기기",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "BN",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Klasa",
+	"classes": "Classes",
 	"level": "Poziom",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Wiek",
 	"height": "Wzrost",
 	"weight": "Waga",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "KP",
 	"equipment": "Ekwipunek",
+	"turn-undead": "Turn Undead",
 	"skills": "Umiejętności",
 	"spells": "Czary",
 	"notes": "Notatki",
@@ -54,10 +62,13 @@
 	"charisma-i": "Cha",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "PW",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Punkty Wytrzymałości",
 	"current-hit-points": "Current HP",
 	"max": "Maks.",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Atuty klasowe",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Ukryj",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PdJ ",
 	"npc": "PdM",
 	"header": "Cabeçalho",
@@ -22,8 +24,13 @@
 	"alignment": "Alinhamento",
 	"deity": "Divindade",
 	"class": "Classe",
+	"classes": "Classes",
 	"level": "Nível",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "DV",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Idade",
 	"height": "Altura",
 	"weight": "Peso",
@@ -33,6 +40,7 @@
 	"weapons": "Armas",
 	"armor-class-i": "CA",
 	"equipment": "Equipamento",
+	"turn-undead": "Turn Undead",
 	"skills": "Perícias",
 	"spells": "Magias",
 	"notes": "Notas",
@@ -54,10 +62,13 @@
 	"charisma-i": "CAR",
 	"show-ability-macros": "Mostrar Macros de Habilidade",
 	"hit-points-i": "PV",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Pontos de Vida",
 	"current-hit-points": "Ferimentos/PV's Atuais",
 	"max": "Max",
 	"nonlethal-damage": "Dano por Contusão",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INICIATIVA",
 	"dexterity-modifier": "Mod de Des",
 	"miscellaneous-modifier-a": "Outros",
@@ -126,10 +137,18 @@
 	"class-abilities": "Habilidades de Classe",
 	"feats": "Talentos",
 	"other": "Outros",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Arma",
 	"weapon-enhancement-a": "Aprimoramento",
 	"weapon-focus-s": "Foco em<br>Arma",
 	"weapon-specialization-as": "Especialização",
+	"attack": "Ataque",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Crítico",
 	"range": "Distância",
 	"ammunition": "Munição",
@@ -138,8 +157,11 @@
 	"special-properties": "Propriedades Especiais",
 	"strength-a": "Força",
 	"dexterity-a": "Destreza",
+	"wisdom-a": "Sab",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Força",
 	"strength-and-half-strength": "Força + 1/2 Força",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Macro Ataque Total",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Macro de Dano",
 	"other-weapons": "Outras Armas",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Imobilizado",
 	"armor-check-penalty-a": "Penalidade de Armadura",
 	"armor": "Armadura",
@@ -247,8 +270,13 @@
 	"ranks": "Graduação",
 	"armor-penalty-s": "Pen. de<br>Armadura",
 	"miscellaneous-modifier-as": "Outros",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Avaliação",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Equilíbrio",
 	"bluff": "Blefar",
@@ -265,7 +293,6 @@
 	"gather-information": "Obter Informação",
 	"handle-animal": "Adestrar Animais",
 	"heal": "Cura",
-	"wisdom-a": "Sab",
 	"hide": "Esconder",
 	"intimidate": "Intimidar",
 	"jump": "Saltar",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Hab. Chave",
 	"trained-only": "Apenas Treinado",
 	"caster-level": "Nível de Conjurador",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Magias/Dia",
 	"zero": "0",
 	"first": "1º",
@@ -312,7 +341,12 @@
 	"eighth": "8º",
 	"ninth": "9º",
 	"casting-ability": "Hab. de Conjuração",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "CD da Magia",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Foco em Magia",
 	"abjuration": "Abjuração",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancia",
 	"transmutation": "Transmutação",
 	"power-points": "Pontos de Poder",
-	"spell-section": "Seção de Magias ",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
+	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Usada/Prep",
 	"spell-name": " Nome da magia ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Nvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Mostrar?",
 	"date": "Data",
@@ -353,7 +425,6 @@
 	"touch": "Toque",
 	"touch-armor-class-i": "CA Toque",
 	"flat-footed-i": "Surpresa",
-	"attack": "Ataque",
 	"attack-macro": "Macro de Ataque",
 	"full-attack": "Ataque Total",
 	"space": "Área",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "НИП",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Мировоззрение",
 	"deity": "Deity",
 	"class": "Класс",
+	"classes": "Classes",
 	"level": "Уровень",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Возраст",
 	"height": "Рост",
 	"weight": "Масса",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "КД",
 	"equipment": "Экипировка",
+	"turn-undead": "Turn Undead",
 	"skills": "Скиллы",
 	"spells": "Закл.",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Макс",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Другое",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Атака",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Дистанция",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Сила",
 	"dexterity-a": "Лов",
+	"wisdom-a": "Муд",
+	"intelligence-a": "Инт",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Доспех",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Инт",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Лечение",
-	"wisdom-a": "Муд",
 	"hide": "Скрыть",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1ый",
@@ -312,7 +341,12 @@
 	"eighth": "8ой",
 	"ninth": "9ый",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Ограждение",
@@ -324,10 +358,48 @@
 	"necromancy": "Некромантия",
 	"transmutation": "Преобразование ",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Атака",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Nivå",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Höjd",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Dölj",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC ",
 	"npc": "NPC",
 	"header": "Header",
@@ -22,8 +24,13 @@
 	"alignment": "Alignment",
 	"deity": "Deity",
 	"class": "Class",
+	"classes": "Classes",
 	"level": "Level",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "HD",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "Age",
 	"height": "Height",
 	"weight": "Weight",
@@ -33,6 +40,7 @@
 	"weapons": "Weapons",
 	"armor-class-i": "AC",
 	"equipment": "Equipment",
+	"turn-undead": "Turn Undead",
 	"skills": "Skills",
 	"spells": "Spells",
 	"notes": "Notes",
@@ -54,10 +62,13 @@
 	"charisma-i": "CHA",
 	"show-ability-macros": "Show Ability Macros",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "Hit Points",
 	"current-hit-points": "Current HP",
 	"max": "Max",
 	"nonlethal-damage": "Nonlethal Damage",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "INITIATIVE",
 	"dexterity-modifier": "Dex Mod",
 	"miscellaneous-modifier-a": "Misc Mod",
@@ -126,10 +137,18 @@
 	"class-abilities": "Class Abilities",
 	"feats": "Feats",
 	"other": "Other",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "Weapon",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",
+	"attack": "Attack",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "Critical",
 	"range": "Range",
 	"ammunition": "Ammunition",
@@ -138,8 +157,11 @@
 	"special-properties": "Special Properties",
 	"strength-a": "Str",
 	"dexterity-a": "Dex",
+	"wisdom-a": "Wis",
+	"intelligence-a": "Int",
 	"half-strength": "1/2 Str",
 	"strength-and-half-strength": "Str+1/2Str",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "Attack Calc",
 	"macro": "Macro",
 	"full-attack-macro": "Full Attack Macro",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "Crit Calc",
 	"damage-macro": "Damage Macro",
 	"other-weapons": "Other Weapons",
+	"other-attacks": "Other Attacks",
 	"immobilized": "Immobilized",
 	"armor-check-penalty-a": "Armor Check Pen",
 	"armor": "Armor",
@@ -247,8 +270,13 @@
 	"ranks": "Ranks",
 	"armor-penalty-s": "Armor<br>Penalty",
 	"miscellaneous-modifier-as": "Misc<br>Mod.",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "Appraise",
-	"intelligence-a": "Int",
 	"not-applicable": "N/A",
 	"balance": "Balance",
 	"bluff": "Bluff",
@@ -265,7 +293,6 @@
 	"gather-information": "Gather Information",
 	"handle-animal": "Handle Animal",
 	"heal": "Heal",
-	"wisdom-a": "Wis",
 	"hide": "Hide",
 	"intimidate": "Intimidate",
 	"jump": "Jump",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "Ability<br>Stat",
 	"trained-only": "Trained Only",
 	"caster-level": "Caster Level",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "Spells/Day",
 	"zero": "0",
 	"first": "1st",
@@ -312,7 +341,12 @@
 	"eighth": "8th",
 	"ninth": "9th",
 	"casting-ability": "Casting Ability",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "Spell DC's",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "Spell Pen",
 	"spell-focus": "Spell Focus",
 	"abjuration": "Abjuration",
@@ -324,10 +358,48 @@
 	"necromancy": "Necromancy",
 	"transmutation": "Transmutation",
 	"power-points": "Power Points",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
 	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "Use/Prep",
 	"spell-name": " Spell name ",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "Lvl",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "Emote/macro",
 	"show?": "Show?",
 	"date": "Date",
@@ -353,7 +425,6 @@
 	"touch": "Touch",
 	"touch-armor-class-i": "T AC",
 	"flat-footed-i": "FF",
-	"attack": "Attack",
 	"attack-macro": "Attack Macro",
 	"full-attack": "Full Attack",
 	"space": "Space",
@@ -1,4 +1,6 @@
 {
+	"whisp-skill-rolls-gm": "Whisper Skill Rolls to GM",
+	"whisp-skill-rolls-gm-info": "All skill rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Skill Rolls will send all skill rolls only to yourself and the GM.",
 	"pc": "PC",
 	"npc": "NPC",
 	"header": "標題",
@@ -22,8 +24,13 @@
 	"alignment": "陣營",
 	"deity": "信仰",
 	"class": "職業",
+	"classes": "Classes",
 	"level": "等級",
+	"autoCalc": "Auto Calculate",
+	"ecl-i": "ECL",
 	"hit-dice-i": "生命骰",
+	"hit-dietype-i": "HD T.",
+	"hit-diceTotal-i": "HD Total",
 	"age": "年齡",
 	"height": "身高",
 	"weight": "體重",
@@ -33,6 +40,7 @@
 	"weapons": "武器",
 	"armor-class-i": "AC",
 	"equipment": "裝備",
+	"turn-undead": "Turn Undead",
 	"skills": "技能",
 	"spells": "法術",
 	"notes": "筆記",
@@ -54,10 +62,13 @@
 	"charisma-i": "魅力",
 	"show-ability-macros": "顯示屬性巨集",
 	"hit-points-i": "HP",
+	"hit-pointsTotal-i": "HP Total",
 	"hit-points": "生命值",
 	"current-hit-points": "目前生命值",
 	"max": "最大值",
 	"nonlethal-damage": "非致死傷害",
+	"damage": "Damage",
+	"var-damage": "Var. Damage",
 	"initiative-u": "先攻",
 	"dexterity-modifier": "敏捷調整值",
 	"miscellaneous-modifier-a": "其他調整值",
@@ -126,10 +137,18 @@
 	"class-abilities": "職業能力",
 	"feats": "專長",
 	"other": "其他",
+	"summons": "Summons",
+	"summoned": "Summoned",
+	"available": "Available",
+	"used": "Used",
 	"weapon": "武器",
 	"weapon-enhancement-a": "武器能力",
 	"weapon-focus-s": "專攻<br>武器",
 	"weapon-specialization-as": "武器<br>專精",
+	"attack": "攻擊",
+	"attack-enhancement-a": "Attack Enh",
+	"attack-focus-s": "Attack<br>Focus",
+	"attack-specialization-as": "Attack<br>Specialize",
 	"critical": "致命一擊",
 	"range": "距離",
 	"ammunition": "彈藥",
@@ -138,8 +157,11 @@
 	"special-properties": "特殊性質",
 	"strength-a": "力量",
 	"dexterity-a": "敏捷",
+	"wisdom-a": "睿智",
+	"intelligence-a": "智力",
 	"half-strength": "1/2力量",
 	"strength-and-half-strength": "力量+1/2力量",
+	"strength-and-intellicenge": "Str+Int",
 	"attack-calculation-a": "攻擊計算",
 	"macro": "巨集",
 	"full-attack-macro": "全力攻擊巨集",
@@ -147,6 +169,7 @@
 	"critical-calculation-a": "致命一擊計算",
 	"damage-macro": "傷害巨集",
 	"other-weapons": "其他武器",
+	"other-attacks": "Other Attacks",
 	"immobilized": "無法移動",
 	"armor-check-penalty-a": "盔甲檢定減值",
 	"armor": "盔甲",
@@ -247,8 +270,13 @@
 	"ranks": "級數",
 	"armor-penalty-s": "盔甲<br>減值",
 	"miscellaneous-modifier-as": "其他<br>調整值",
+	"damage-bonus-as": "Damage<br>Bonus",
+	"whisper-gm": "Whisper<br>GM",
+	"yes": "Yes",
+	"no": "No",
+	"turning-check": "Turning Check",
+	"turning-damage": "Turning Damage",
 	"appraise": "估價",
-	"intelligence-a": "智力",
 	"not-applicable": "不適用",
 	"balance": "平衡感",
 	"bluff": "唬弄",
@@ -265,7 +293,6 @@
 	"gather-information": "蒐集資訊",
 	"handle-animal": "馴養動物",
 	"heal": "醫療",
-	"wisdom-a": "睿智",
 	"hide": "躲藏",
 	"intimidate": "威嚇",
 	"jump": "跳躍",
@@ -300,6 +327,8 @@
 	"ability-stat-s": "能力<br>屬性",
 	"trained-only": "必須受訓",
 	"caster-level": "施法者等級",
+	"manifester-level": "Manifester Level",
+	"invocer-level": "Invocer Level",
 	"spells-per-day": "法術/每日",
 	"zero": "零級",
 	"first": "一級",
@@ -312,7 +341,12 @@
 	"eighth": "八級",
 	"ninth": "九級",
 	"casting-ability": "施法屬性",
+	"manifesting-ability": "Manifesting Ability",
+	"invocing-ability": "Invocing Ability",
 	"spell-difficulty-classes": "法術DC",
+	"power-difficulty-classes": "Power DC's",
+	"dc": "DC",
+	"invocation-difficulty-classes": "Invocation DC's",
 	"spell-penetration-a": "法術穿透",
 	"spell-focus": "專攻法術",
 	"abjuration": "防護系",
@@ -324,10 +358,48 @@
 	"necromancy": "死靈系",
 	"transmutation": "變化系",
 	"power-points": "靈能點",
-	"spell-section": "法術區塊",
+	"maneuvers-known": "Maneuvers Known",
+	"maneuvers-readied": "Maneuvers Readied",
+	"stances-known": "Stances Known",
+	"spell-level": "Spell Level",
+	"power-level": "Power Level",
+	"maneuver-level": "Maneuver Level",
+	"initiator-level": "Initiator Level",
+	"invocation-level": "Invocation Level",
+	"invocation-level-least": "Invocation Level Least",
+	"invocation-level-lesser": "Invocation Level Lesser",
+	"invocation-level-greater": "Invocation Level Greater",
+	"invocation-level-dark": "Invocation Level Dark",
+	"ability-level": "Ability Level",
+	"spell-section": "Spell Section",
+	"spellBaseMode": "Base Mode",
+	"spellFullMode": "Full Mode",
+	"divine-spells": "Divine Spells",
+	"arcane-spells": "Arcane Spells",
+	"psionic-powers": "Psionic Powers",
+	"maneuvers-stances": "Maneuvers & Stances",
+	"invocations": "Invocations",
+	"spell-like-abilites": "Spell Like Abilities",
 	"use-prep": "使用/已準備",
 	"spell-name": "法術名稱",
+	"power-name": " Power name ",
+	"invocation-name": " Invocation name ",
+	"ability-name": " Ability name ",
 	"level-a": "等級",
+	"school": "School (Subschool)",
+	"descriptor": "Descriptor",
+	"components": "Comp.",
+	"augment": "Aug.",
+	"display": "Display",
+	"casting-time": "Casting Time",
+	"target-effect-area": "Targ./Eff./Area",
+	"duration": "Duration",
+	"ready": "Ready",
+	"discipline": "Discipline",
+	"initiation-action": "Initiation Action",
+	"st": "ST",
+	"sr": "SR",
+	"pr": "PR",
 	"emote-macro": "表情/巨集",
 	"show?": "顯示？",
 	"date": "日期",
@@ -353,7 +425,6 @@
 	"touch": "觸碰",
 	"touch-armor-class-i": "觸碰AC",
 	"flat-footed-i": "遲滯",
-	"attack": "攻擊",
 	"attack-macro": "攻擊巨集",
 	"full-attack": "全力攻擊",
 	"space": "佔用空間",
@@ -58,7 +58,7 @@
 	"clear-additional-stress": "Clear Additional Stress",
 	"hunger": "Hunger",
 	"discipline": "Discipline",
-	"armor-etc": "Armor, Etc",
+	"armor-etc": "Armor, etc",
 	"consequences": "Consequences",
 	"type": "type",
 	"physical-mental-social": "P/M/S",
@@ -636,7 +636,7 @@
    </div>
  </fieldset>
  <div class="linha-de-divisao-2">
-    <h3>Magias Magias - Nível Avançado</h3>
+    <h3>Magias - Nível Avançado</h3>
  </div>
  <div class="magias">
    <input type="text" style= "width: 38%;" name="Fake" value="NOME DA MAGIA" class="linha-inicial-pericias"/>
@@ -705,7 +705,7 @@
    </div>
  </fieldset>
  <div class="linha-de-divisao-2">
-    <h3>Magias Magias - Nível Superior</h3>
+    <h3>Magias - Nível Superior</h3>
  </div>
  <div class="magias">
    <input type="text" style= "width: 38%;" name="Fake" value="NOME DA MAGIA" class="linha-inicial-pericias"/>
@@ -482,6 +482,11 @@ The solution: convert the <input>s to type="text" and make them look like normal
 	font-weight: 700;
 }

+/*----------------------------------------------Info--------------------------------------*/
+.charsheet .sheet-section-info > p {
+	font-family: serif;
+	font-size: 1em;
+}

 /*-------------------------------------------------Tabs--------------------------------------*/

@@ -643,7 +643,7 @@
                <th>GE: <input type="text" class="sheet-stat-immutable" name="attr_GE" readonly="readonly" value="0"></th>
                <th>KO: <input type="text" class="sheet-stat-immutable" name="attr_KO" readonly="readonly" value="0"></th>
                <th>KK: <input type="text" class="sheet-stat-immutable" name="attr_KK" readonly="readonly" value="0"></th>
-                <th>BE: <input type="text" class="sheet-stat-immutable" name="attr_BE_TaW" readonly="true" ></th>
+                <th>BE: <input type="text" class="sheet-stat-immutable" name="attr_BE" readonly="readonly" value="0"></th>
            </tr>
        </table>
        <br>
@@ -1051,7 +1051,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe" selected="selected">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Akrobatik" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Akrobatik}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_akrobatik}]]}} {{stat1=[[@{Eigenschaft1akrobatik}]]}} {{stat2=[[@{Eigenschaft2akrobatik}]]}} {{stat3=[[@{Eigenschaft3akrobatik}]]}} {{Talent=[[ { [[{0d1 + @{TaW_akrobatik} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik}, 0d1}kh1]] - @{Eigenschaft1akrobatik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik}, 0d1}kh1]] - @{Eigenschaft2akrobatik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik}, 0d1}kh1]] - @{Eigenschaft3akrobatik}, 0d1}kh1, 0d1 + @{TaW_akrobatik}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Akrobatik" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Akrobatik}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_akrobatik}]]}} {{stat1=[[@{Eigenschaft1akrobatik}]]}} {{stat2=[[@{Eigenschaft2akrobatik}]]}} {{stat3=[[@{Eigenschaft3akrobatik}]]}} {{Talent=[[ { [[{0d1 + @{TaW_akrobatik} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik}, 0d1}kh1]] - @{Eigenschaft1akrobatik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik}, 0d1}kh1]] - @{Eigenschaft2akrobatik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik}, 0d1}kh1]] - @{Eigenschaft3akrobatik}, 0d1}kh1, 0d1 + @{TaW_akrobatik}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_akrobatik">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_akrobatik" min="-4" value="0">
                    <button name="AkrobatikSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Akrobatik (@{spez_akrobatik})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_akrobatik} + 2]]}} {{stat1=[[@{Eigenschaft1akrobatik}]]}} {{stat2=[[@{Eigenschaft2akrobatik}]]}} {{stat3=[[@{Eigenschaft3akrobatik}]]}} {{Talent=[[ { [[{0d1 + @{TaW_akrobatik} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik} + 2, 0d1}kh1]] - @{Eigenschaft1akrobatik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik} + 2, 0d1}kh1]] - @{Eigenschaft2akrobatik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_akrobatik} + 2, 0d1}kh1]] - @{Eigenschaft3akrobatik}, 0d1}kh1, 0d1 + @{TaW_akrobatik} + 2}dh1]]}}">Spez</button>
@@ -1093,7 +1093,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe" selected="selected">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Athletik" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Athletik}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_athletik}]]}} {{stat1=[[@{Eigenschaft1athletik}]]}} {{stat2=[[@{Eigenschaft2athletik}]]}} {{stat3=[[@{Eigenschaft3athletik}]]}} {{Talent=[[ { [[{0d1 + @{TaW_athletik} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik}, 0d1}kh1]] - @{Eigenschaft1athletik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik}, 0d1}kh1]] - @{Eigenschaft2athletik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik}, 0d1}kh1]] - @{Eigenschaft3athletik}, 0d1}kh1, 0d1 + @{TaW_athletik}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Athletik" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Athletik}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_athletik}]]}} {{stat1=[[@{Eigenschaft1athletik}]]}} {{stat2=[[@{Eigenschaft2athletik}]]}} {{stat3=[[@{Eigenschaft3athletik}]]}} {{Talent=[[ { [[{0d1 + @{TaW_athletik} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik}, 0d1}kh1]] - @{Eigenschaft1athletik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik}, 0d1}kh1]] - @{Eigenschaft2athletik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik}, 0d1}kh1]] - @{Eigenschaft3athletik}, 0d1}kh1, 0d1 + @{TaW_athletik}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_athletik">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_athletik" min="-4" value="0">
                    <button name="AthletikSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Athletik (@{spez_athletik})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_athletik} + 2]]}} {{stat1=[[@{Eigenschaft1athletik}]]}} {{stat2=[[@{Eigenschaft2athletik}]]}} {{stat3=[[@{Eigenschaft3athletik}]]}} {{Talent=[[ { [[{0d1 + @{TaW_athletik} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik} + 2, 0d1}kh1]] - @{Eigenschaft1athletik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik} + 2, 0d1}kh1]] - @{Eigenschaft2athletik}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_athletik} + 2, 0d1}kh1]] - @{Eigenschaft3athletik}, 0d1}kh1, 0d1 + @{TaW_athletik} + 2}dh1]]}}">Spez</button>
@@ -1135,7 +1135,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Fliegen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Fliegen}} {{ebe=[[@{BE_TaW}]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW}]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_fliegen}]]}} {{stat1=[[@{Eigenschaft1fliegen}]]}} {{stat2=[[@{Eigenschaft2fliegen}]]}} {{stat3=[[@{Eigenschaft3fliegen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_fliegen} - [[@{BE_TaW}]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen}, 0d1}kh1]] - @{Eigenschaft1fliegen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen}, 0d1}kh1]] - @{Eigenschaft2fliegen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen}, 0d1}kh1]] - @{Eigenschaft3fliegen}, 0d1}kh1, 0d1 + @{TaW_fliegen}}dh1]]}}"> <span>BE</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Fliegen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Fliegen}} {{ebe=[[@{BE}]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE}]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_fliegen}]]}} {{stat1=[[@{Eigenschaft1fliegen}]]}} {{stat2=[[@{Eigenschaft2fliegen}]]}} {{stat3=[[@{Eigenschaft3fliegen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_fliegen} - [[@{BE}]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen}, 0d1}kh1]] - @{Eigenschaft1fliegen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen}, 0d1}kh1]] - @{Eigenschaft2fliegen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen}, 0d1}kh1]] - @{Eigenschaft3fliegen}, 0d1}kh1, 0d1 + @{TaW_fliegen}}dh1]]}}"> <span>BE</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_fliegen">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_fliegen" min="-4" value="0">
                    <button name="FliegenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Fliegen (@{spez_fliegen})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_fliegen} + 2]]}} {{stat1=[[@{Eigenschaft1fliegen}]]}} {{stat2=[[@{Eigenschaft2fliegen}]]}} {{stat3=[[@{Eigenschaft3fliegen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_fliegen} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen} + 2, 0d1}kh1]] - @{Eigenschaft1fliegen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen} + 2, 0d1}kh1]] - @{Eigenschaft2fliegen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_fliegen} + 2, 0d1}kh1]] - @{Eigenschaft3fliegen}, 0d1}kh1, 0d1 + @{TaW_fliegen} + 2}dh1]]}}">Spez</button>
@@ -1177,7 +1177,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Gaukeleien" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Gaukeleien}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_gaukeleien}]]}} {{stat1=[[@{Eigenschaft1gaukeleien}]]}} {{stat2=[[@{Eigenschaft2gaukeleien}]]}} {{stat3=[[@{Eigenschaft3gaukeleien}]]}} {{Talent=[[ { [[{0d1 + @{TaW_gaukeleien} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien}, 0d1}kh1]] - @{Eigenschaft1gaukeleien}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien}, 0d1}kh1]] - @{Eigenschaft2gaukeleien}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien}, 0d1}kh1]] - @{Eigenschaft3gaukeleien}, 0d1}kh1, 0d1 + @{TaW_gaukeleien}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Gaukeleien" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Gaukeleien}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_gaukeleien}]]}} {{stat1=[[@{Eigenschaft1gaukeleien}]]}} {{stat2=[[@{Eigenschaft2gaukeleien}]]}} {{stat3=[[@{Eigenschaft3gaukeleien}]]}} {{Talent=[[ { [[{0d1 + @{TaW_gaukeleien} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien}, 0d1}kh1]] - @{Eigenschaft1gaukeleien}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien}, 0d1}kh1]] - @{Eigenschaft2gaukeleien}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien}, 0d1}kh1]] - @{Eigenschaft3gaukeleien}, 0d1}kh1, 0d1 + @{TaW_gaukeleien}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_gaukeleien">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_gaukeleien" min="-4" value="0">
                    <button name="GaukeleienSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Gaukeleien (@{spez_gaukeleien})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_gaukeleien} + 2]]}} {{stat1=[[@{Eigenschaft1gaukeleien}]]}} {{stat2=[[@{Eigenschaft2gaukeleien}]]}} {{stat3=[[@{Eigenschaft3gaukeleien}]]}} {{Talent=[[ { [[{0d1 + @{TaW_gaukeleien} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien} + 2, 0d1}kh1]] - @{Eigenschaft1gaukeleien}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien} + 2, 0d1}kh1]] - @{Eigenschaft2gaukeleien}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_gaukeleien} + 2, 0d1}kh1]] - @{Eigenschaft3gaukeleien}, 0d1}kh1, 0d1 + @{TaW_gaukeleien} + 2}dh1]]}}">Spez</button>
@@ -1219,7 +1219,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe" selected="selected">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Klettern" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Klettern}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_klettern}]]}} {{stat1=[[@{Eigenschaft1klettern}]]}} {{stat2=[[@{Eigenschaft2klettern}]]}} {{stat3=[[@{Eigenschaft3klettern}]]}} {{Talent=[[ { [[{0d1 + @{TaW_klettern} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern}, 0d1}kh1]] - @{Eigenschaft1klettern}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern}, 0d1}kh1]] - @{Eigenschaft2klettern}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern}, 0d1}kh1]] - @{Eigenschaft3klettern}, 0d1}kh1, 0d1 + @{TaW_klettern}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Klettern" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Klettern}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_klettern}]]}} {{stat1=[[@{Eigenschaft1klettern}]]}} {{stat2=[[@{Eigenschaft2klettern}]]}} {{stat3=[[@{Eigenschaft3klettern}]]}} {{Talent=[[ { [[{0d1 + @{TaW_klettern} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern}, 0d1}kh1]] - @{Eigenschaft1klettern}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern}, 0d1}kh1]] - @{Eigenschaft2klettern}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern}, 0d1}kh1]] - @{Eigenschaft3klettern}, 0d1}kh1, 0d1 + @{TaW_klettern}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_klettern">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_klettern" min="-4" value="0">
                    <button name="KletternSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Klettern (@{spez_klettern})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_klettern} + 2]]}} {{stat1=[[@{Eigenschaft1klettern}]]}} {{stat2=[[@{Eigenschaft2klettern}]]}} {{stat3=[[@{Eigenschaft3klettern}]]}} {{Talent=[[ { [[{0d1 + @{TaW_klettern} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern} + 2, 0d1}kh1]] - @{Eigenschaft1klettern}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern} + 2, 0d1}kh1]] - @{Eigenschaft2klettern}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_klettern} + 2, 0d1}kh1]] - @{Eigenschaft3klettern}, 0d1}kh1, 0d1 + @{TaW_klettern} + 2}dh1]]}}">Spez</button>
@@ -1261,7 +1261,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Körperbeherrschung" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Körperbeherrschung}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_korperbeherrschung}]]}} {{stat1=[[@{Eigenschaft1korperbeherrschung}]]}} {{stat2=[[@{Eigenschaft2korperbeherrschung}]]}} {{stat3=[[@{Eigenschaft3korperbeherrschung}]]}} {{Talent=[[ { [[{0d1 + @{TaW_korperbeherrschung} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung}, 0d1}kh1]] - @{Eigenschaft1korperbeherrschung}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung}, 0d1}kh1]] - @{Eigenschaft2korperbeherrschung}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung}, 0d1}kh1]] - @{Eigenschaft3korperbeherrschung}, 0d1}kh1, 0d1 + @{TaW_korperbeherrschung}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Körperbeherrschung" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Körperbeherrschung}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_korperbeherrschung}]]}} {{stat1=[[@{Eigenschaft1korperbeherrschung}]]}} {{stat2=[[@{Eigenschaft2korperbeherrschung}]]}} {{stat3=[[@{Eigenschaft3korperbeherrschung}]]}} {{Talent=[[ { [[{0d1 + @{TaW_korperbeherrschung} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung}, 0d1}kh1]] - @{Eigenschaft1korperbeherrschung}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung}, 0d1}kh1]] - @{Eigenschaft2korperbeherrschung}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung}, 0d1}kh1]] - @{Eigenschaft3korperbeherrschung}, 0d1}kh1, 0d1 + @{TaW_korperbeherrschung}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_korperbeherrschung">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_korperbeherrschung" min="-4" value="0">
                    <button name="KörperbeherrschungSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Körperbeherrschung (@{spez_korperbeherrschung})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_korperbeherrschung} + 2]]}} {{stat1=[[@{Eigenschaft1korperbeherrschung}]]}} {{stat2=[[@{Eigenschaft2korperbeherrschung}]]}} {{stat3=[[@{Eigenschaft3korperbeherrschung}]]}} {{Talent=[[ { [[{0d1 + @{TaW_korperbeherrschung} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung} + 2, 0d1}kh1]] - @{Eigenschaft1korperbeherrschung}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung} + 2, 0d1}kh1]] - @{Eigenschaft2korperbeherrschung}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_korperbeherrschung} + 2, 0d1}kh1]] - @{Eigenschaft3korperbeherrschung}, 0d1}kh1, 0d1 + @{TaW_korperbeherrschung} + 2}dh1]]}}">Spez</button>
@@ -1303,7 +1303,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe" selected="selected">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Reiten" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Reiten}} {{ebe=[[{0d1 + @{BE_TaW} - 2, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_reiten}]]}} {{stat1=[[@{Eigenschaft1reiten}]]}} {{stat2=[[@{Eigenschaft2reiten}]]}} {{stat3=[[@{Eigenschaft3reiten}]]}} {{Talent=[[ { [[{0d1 + @{TaW_reiten} - [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten}, 0d1}kh1]] - @{Eigenschaft1reiten}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten}, 0d1}kh1]] - @{Eigenschaft2reiten}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten}, 0d1}kh1]] - @{Eigenschaft3reiten}, 0d1}kh1, 0d1 + @{TaW_reiten}}dh1]]}}"> <span>BE−2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Reiten" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Reiten}} {{ebe=[[{0d1 + @{BE} - 2, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE} - 2, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_reiten}]]}} {{stat1=[[@{Eigenschaft1reiten}]]}} {{stat2=[[@{Eigenschaft2reiten}]]}} {{stat3=[[@{Eigenschaft3reiten}]]}} {{Talent=[[ { [[{0d1 + @{TaW_reiten} - [[{0d1 + @{BE} - 2, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten}, 0d1}kh1]] - @{Eigenschaft1reiten}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten}, 0d1}kh1]] - @{Eigenschaft2reiten}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten}, 0d1}kh1]] - @{Eigenschaft3reiten}, 0d1}kh1, 0d1 + @{TaW_reiten}}dh1]]}}"> <span>BE−2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_reiten">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_reiten" min="-4" value="0">
                    <button name="ReitenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Reiten (@{spez_reiten})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_reiten} + 2]]}} {{stat1=[[@{Eigenschaft1reiten}]]}} {{stat2=[[@{Eigenschaft2reiten}]]}} {{stat3=[[@{Eigenschaft3reiten}]]}} {{Talent=[[ { [[{0d1 + @{TaW_reiten} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten} + 2, 0d1}kh1]] - @{Eigenschaft1reiten}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten} + 2, 0d1}kh1]] - @{Eigenschaft2reiten}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_reiten} + 2, 0d1}kh1]] - @{Eigenschaft3reiten}, 0d1}kh1, 0d1 + @{TaW_reiten} + 2}dh1]]}}">Spez</button>
@@ -1345,7 +1345,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Schleichen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Schleichen}} {{ebe=[[@{BE_TaW}]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW}]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_schleichen}]]}} {{stat1=[[@{Eigenschaft1schleichen}]]}} {{stat2=[[@{Eigenschaft2schleichen}]]}} {{stat3=[[@{Eigenschaft3schleichen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_schleichen} - [[@{BE_TaW}]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen}, 0d1}kh1]] - @{Eigenschaft1schleichen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen}, 0d1}kh1]] - @{Eigenschaft2schleichen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen}, 0d1}kh1]] - @{Eigenschaft3schleichen}, 0d1}kh1, 0d1 + @{TaW_schleichen}}dh1]]}}"> <span>BE</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Schleichen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Schleichen}} {{ebe=[[@{BE}]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE}]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_schleichen}]]}} {{stat1=[[@{Eigenschaft1schleichen}]]}} {{stat2=[[@{Eigenschaft2schleichen}]]}} {{stat3=[[@{Eigenschaft3schleichen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_schleichen} - [[@{BE}]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen}, 0d1}kh1]] - @{Eigenschaft1schleichen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen}, 0d1}kh1]] - @{Eigenschaft2schleichen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE}]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen}, 0d1}kh1]] - @{Eigenschaft3schleichen}, 0d1}kh1, 0d1 + @{TaW_schleichen}}dh1]]}}"> <span>BE</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_schleichen">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_schleichen" min="-4" value="0">
                    <button name="SchleichenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Schleichen (@{spez_schleichen})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_schleichen} + 2]]}} {{stat1=[[@{Eigenschaft1schleichen}]]}} {{stat2=[[@{Eigenschaft2schleichen}]]}} {{stat3=[[@{Eigenschaft3schleichen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_schleichen} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen} + 2, 0d1}kh1]] - @{Eigenschaft1schleichen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen} + 2, 0d1}kh1]] - @{Eigenschaft2schleichen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schleichen} + 2, 0d1}kh1]] - @{Eigenschaft3schleichen}, 0d1}kh1, 0d1 + @{TaW_schleichen} + 2}dh1]]}}">Spez</button>
@@ -1387,7 +1387,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe" selected="selected">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Schwimmen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Schwimmen}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_schwimmen}]]}} {{stat1=[[@{Eigenschaft1schwimmen}]]}} {{stat2=[[@{Eigenschaft2schwimmen}]]}} {{stat3=[[@{Eigenschaft3schwimmen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_schwimmen} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen}, 0d1}kh1]] - @{Eigenschaft1schwimmen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen}, 0d1}kh1]] - @{Eigenschaft2schwimmen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen}, 0d1}kh1]] - @{Eigenschaft3schwimmen}, 0d1}kh1, 0d1 + @{TaW_schwimmen}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Schwimmen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Schwimmen}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_schwimmen}]]}} {{stat1=[[@{Eigenschaft1schwimmen}]]}} {{stat2=[[@{Eigenschaft2schwimmen}]]}} {{stat3=[[@{Eigenschaft3schwimmen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_schwimmen} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen}, 0d1}kh1]] - @{Eigenschaft1schwimmen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen}, 0d1}kh1]] - @{Eigenschaft2schwimmen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen}, 0d1}kh1]] - @{Eigenschaft3schwimmen}, 0d1}kh1, 0d1 + @{TaW_schwimmen}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_schwimmen">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_schwimmen" min="-4" value="0">
                    <button name="SchwimmenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Schwimmen (@{spez_schwimmen})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_schwimmen} + 2]]}} {{stat1=[[@{Eigenschaft1schwimmen}]]}} {{stat2=[[@{Eigenschaft2schwimmen}]]}} {{stat3=[[@{Eigenschaft3schwimmen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_schwimmen} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen} + 2, 0d1}kh1]] - @{Eigenschaft1schwimmen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen} + 2, 0d1}kh1]] - @{Eigenschaft2schwimmen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_schwimmen} + 2, 0d1}kh1]] - @{Eigenschaft3schwimmen}, 0d1}kh1, 0d1 + @{TaW_schwimmen} + 2}dh1]]}}">Spez</button>
@@ -1471,7 +1471,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe" selected="selected">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="SichVerstecken" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Sich Verstecken}} {{ebe=[[{0d1 + @{BE_TaW} - 2, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_sichverstecken}]]}} {{stat1=[[@{Eigenschaft1sichverstecken}]]}} {{stat2=[[@{Eigenschaft2sichverstecken}]]}} {{stat3=[[@{Eigenschaft3sichverstecken}]]}} {{Talent=[[ { [[{0d1 + @{TaW_sichverstecken} - [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken}, 0d1}kh1]] - @{Eigenschaft1sichverstecken}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken}, 0d1}kh1]] - @{Eigenschaft2sichverstecken}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken}, 0d1}kh1]] - @{Eigenschaft3sichverstecken}, 0d1}kh1, 0d1 + @{TaW_sichverstecken}}dh1]]}}"> <span>BE−2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="SichVerstecken" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Sich Verstecken}} {{ebe=[[{0d1 + @{BE} - 2, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE} - 2, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_sichverstecken}]]}} {{stat1=[[@{Eigenschaft1sichverstecken}]]}} {{stat2=[[@{Eigenschaft2sichverstecken}]]}} {{stat3=[[@{Eigenschaft3sichverstecken}]]}} {{Talent=[[ { [[{0d1 + @{TaW_sichverstecken} - [[{0d1 + @{BE} - 2, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken}, 0d1}kh1]] - @{Eigenschaft1sichverstecken}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken}, 0d1}kh1]] - @{Eigenschaft2sichverstecken}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken}, 0d1}kh1]] - @{Eigenschaft3sichverstecken}, 0d1}kh1, 0d1 + @{TaW_sichverstecken}}dh1]]}}"> <span>BE−2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_sichverstecken">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_sichverstecken" min="-4" value="0">
                    <button name="SichVersteckenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Sich Verstecken (@{spez_sichverstecken})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_sichverstecken} + 2]]}} {{stat1=[[@{Eigenschaft1sichverstecken}]]}} {{stat2=[[@{Eigenschaft2sichverstecken}]]}} {{stat3=[[@{Eigenschaft3sichverstecken}]]}} {{Talent=[[ { [[{0d1 + @{TaW_sichverstecken} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken} + 2, 0d1}kh1]] - @{Eigenschaft1sichverstecken}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken} + 2, 0d1}kh1]] - @{Eigenschaft2sichverstecken}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_sichverstecken} + 2, 0d1}kh1]] - @{Eigenschaft3sichverstecken}, 0d1}kh1, 0d1 + @{TaW_sichverstecken} + 2}dh1]]}}">Spez</button>
@@ -1513,7 +1513,7 @@
                        <option value="@{KO}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe bei besonders lautem Singen oder Koloraturen">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Singen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Singen}} {{ebe=[[{0d1 + @{BE_TaW} - 3, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE_TaW} - 3, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_singen}]]}} {{stat1=[[@{Eigenschaft1singen}]]}} {{stat2=[[@{Eigenschaft2singen}]]}} {{stat3=[[@{Eigenschaft3singen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_singen} - [[{0d1 + @{BE_TaW} - 3, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 3, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen}, 0d1}kh1]] - @{Eigenschaft1singen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 3, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen}, 0d1}kh1]] - @{Eigenschaft2singen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 3, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen}, 0d1}kh1]] - @{Eigenschaft3singen}, 0d1}kh1, 0d1 + @{TaW_singen}}dh1]]}}"> <span>BE−3</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Singen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Singen}} {{ebe=[[{0d1 + @{BE} - 3, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE} - 3, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_singen}]]}} {{stat1=[[@{Eigenschaft1singen}]]}} {{stat2=[[@{Eigenschaft2singen}]]}} {{stat3=[[@{Eigenschaft3singen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_singen} - [[{0d1 + @{BE} - 3, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 3, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen}, 0d1}kh1]] - @{Eigenschaft1singen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 3, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen}, 0d1}kh1]] - @{Eigenschaft2singen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 3, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen}, 0d1}kh1]] - @{Eigenschaft3singen}, 0d1}kh1, 0d1 + @{TaW_singen}}dh1]]}}"> <span>BE−3</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_singen">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_singen" min="-4" value="0">
                    <button name="SingenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Singen (@{spez_singen})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_singen} + 2]]}} {{stat1=[[@{Eigenschaft1singen}]]}} {{stat2=[[@{Eigenschaft2singen}]]}} {{stat3=[[@{Eigenschaft3singen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_singen} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen} + 2, 0d1}kh1]] - @{Eigenschaft1singen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen} + 2, 0d1}kh1]] - @{Eigenschaft2singen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_singen} + 2, 0d1}kh1]] - @{Eigenschaft3singen}, 0d1}kh1, 0d1 + @{TaW_singen} + 2}dh1]]}}">Spez</button>
@@ -1597,7 +1597,7 @@
                        <option value="@{KO}" class="sheet-talent-default-eigenschaft" title="Standardeigenschaft für diese Teilprobe" selected="selected">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="SkiFahren" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Skifahren}} {{ebe=[[{0d1 + @{BE_TaW} - 2, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_skifahren}]]}} {{stat1=[[@{Eigenschaft1skifahren}]]}} {{stat2=[[@{Eigenschaft2skifahren}]]}} {{stat3=[[@{Eigenschaft3skifahren}]]}} {{Talent=[[ { [[{0d1 + @{TaW_skifahren} - [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren}, 0d1}kh1]] - @{Eigenschaft1skifahren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren}, 0d1}kh1]] - @{Eigenschaft2skifahren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren}, 0d1}kh1]] - @{Eigenschaft3skifahren}, 0d1}kh1, 0d1 + @{TaW_skifahren}}dh1]]}}"> <span>BE−2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="SkiFahren" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Skifahren}} {{ebe=[[{0d1 + @{BE} - 2, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE} - 2, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_skifahren}]]}} {{stat1=[[@{Eigenschaft1skifahren}]]}} {{stat2=[[@{Eigenschaft2skifahren}]]}} {{stat3=[[@{Eigenschaft3skifahren}]]}} {{Talent=[[ { [[{0d1 + @{TaW_skifahren} - [[{0d1 + @{BE} - 2, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren}, 0d1}kh1]] - @{Eigenschaft1skifahren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren}, 0d1}kh1]] - @{Eigenschaft2skifahren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 2, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren}, 0d1}kh1]] - @{Eigenschaft3skifahren}, 0d1}kh1, 0d1 + @{TaW_skifahren}}dh1]]}}"> <span>BE−2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_skifahren">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_skifahren" min="-4" value="0">
                    <button name="SkiFahrenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Skifahren (@{spez_skifahren})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_skifahren} + 2]]}} {{stat1=[[@{Eigenschaft1skifahren}]]}} {{stat2=[[@{Eigenschaft2skifahren}]]}} {{stat3=[[@{Eigenschaft3skifahren}]]}} {{Talent=[[ { [[{0d1 + @{TaW_skifahren} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren} + 2, 0d1}kh1]] - @{Eigenschaft1skifahren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren} + 2, 0d1}kh1]] - @{Eigenschaft2skifahren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_skifahren} + 2, 0d1}kh1]] - @{Eigenschaft3skifahren}, 0d1}kh1, 0d1 + @{TaW_skifahren} + 2}dh1]]}}">Spez</button>
@@ -1639,7 +1639,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="StimmenImmitieren" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Stimmen Immitieren}} {{ebe=[[{0d1 + @{BE_TaW} - 4, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE_TaW} - 4, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_stimmenimmitieren}]]}} {{stat1=[[@{Eigenschaft1stimmenimmitieren}]]}} {{stat2=[[@{Eigenschaft2stimmenimmitieren}]]}} {{stat3=[[@{Eigenschaft3stimmenimmitieren}]]}} {{Talent=[[ { [[{0d1 + @{TaW_stimmenimmitieren} - [[{0d1 + @{BE_TaW} - 4, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 4, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren}, 0d1}kh1]] - @{Eigenschaft1stimmenimmitieren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 4, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren}, 0d1}kh1]] - @{Eigenschaft2stimmenimmitieren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE_TaW} - 4, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren}, 0d1}kh1]] - @{Eigenschaft3stimmenimmitieren}, 0d1}kh1, 0d1 + @{TaW_stimmenimmitieren}}dh1]]}}"> <span>BE−4</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="StimmenImmitieren" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Stimmen Immitieren}} {{ebe=[[{0d1 + @{BE} - 4, 0d1}kh1]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[{0d1 + @{BE} - 4, 0d1}kh1]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_stimmenimmitieren}]]}} {{stat1=[[@{Eigenschaft1stimmenimmitieren}]]}} {{stat2=[[@{Eigenschaft2stimmenimmitieren}]]}} {{stat3=[[@{Eigenschaft3stimmenimmitieren}]]}} {{Talent=[[ { [[{0d1 + @{TaW_stimmenimmitieren} - [[{0d1 + @{BE} - 4, 0d1}kh1]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 4, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren}, 0d1}kh1]] - @{Eigenschaft1stimmenimmitieren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 4, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren}, 0d1}kh1]] - @{Eigenschaft2stimmenimmitieren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[{0d1 + @{BE} - 4, 0d1}kh1]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren}, 0d1}kh1]] - @{Eigenschaft3stimmenimmitieren}, 0d1}kh1, 0d1 + @{TaW_stimmenimmitieren}}dh1]]}}"> <span>BE−4</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_stimmenimmitieren">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_stimmenimmitieren" min="-4" value="0">
                    <button name="StimmenImmitierenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Stimmen Immitieren (@{spez_stimmenimmitieren})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_stimmenimmitieren} + 2]]}} {{stat1=[[@{Eigenschaft1stimmenimmitieren}]]}} {{stat2=[[@{Eigenschaft2stimmenimmitieren}]]}} {{stat3=[[@{Eigenschaft3stimmenimmitieren}]]}} {{Talent=[[ { [[{0d1 + @{TaW_stimmenimmitieren} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren} + 2, 0d1}kh1]] - @{Eigenschaft1stimmenimmitieren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren} + 2, 0d1}kh1]] - @{Eigenschaft2stimmenimmitieren}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_stimmenimmitieren} + 2, 0d1}kh1]] - @{Eigenschaft3stimmenimmitieren}, 0d1}kh1, 0d1 + @{TaW_stimmenimmitieren} + 2}dh1]]}}">Spez</button>
@@ -1681,7 +1681,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Tanzen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Tanzen}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_tanzen}]]}} {{stat1=[[@{Eigenschaft1tanzen}]]}} {{stat2=[[@{Eigenschaft2tanzen}]]}} {{stat3=[[@{Eigenschaft3tanzen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_tanzen} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen}, 0d1}kh1]] - @{Eigenschaft1tanzen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen}, 0d1}kh1]] - @{Eigenschaft2tanzen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen}, 0d1}kh1]] - @{Eigenschaft3tanzen}, 0d1}kh1, 0d1 + @{TaW_tanzen}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Tanzen" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Tanzen}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_tanzen}]]}} {{stat1=[[@{Eigenschaft1tanzen}]]}} {{stat2=[[@{Eigenschaft2tanzen}]]}} {{stat3=[[@{Eigenschaft3tanzen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_tanzen} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen}, 0d1}kh1]] - @{Eigenschaft1tanzen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen}, 0d1}kh1]] - @{Eigenschaft2tanzen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen}, 0d1}kh1]] - @{Eigenschaft3tanzen}, 0d1}kh1, 0d1 + @{TaW_tanzen}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_tanzen">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_tanzen" min="-4" value="0">
                    <button name="TanzenSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Tanzen (@{spez_tanzen})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_tanzen} + 2]]}} {{stat1=[[@{Eigenschaft1tanzen}]]}} {{stat2=[[@{Eigenschaft2tanzen}]]}} {{stat3=[[@{Eigenschaft3tanzen}]]}} {{Talent=[[ { [[{0d1 + @{TaW_tanzen} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen} + 2, 0d1}kh1]] - @{Eigenschaft1tanzen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen} + 2, 0d1}kh1]] - @{Eigenschaft2tanzen}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_tanzen} + 2, 0d1}kh1]] - @{Eigenschaft3tanzen}, 0d1}kh1, 0d1 + @{TaW_tanzen} + 2}dh1]]}}">Spez</button>
@@ -1723,7 +1723,7 @@
                        <option value="@{KO}">KO</option>
                        <option value="@{KK}">KK</option>
                    </select>
-                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Taschendiebstahl" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Taschendiebstahl}} {{ebe=[[@{BE_TaW} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE_TaW} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_taschendiebstahl}]]}} {{stat1=[[@{Eigenschaft1taschendiebstahl}]]}} {{stat2=[[@{Eigenschaft2taschendiebstahl}]]}} {{stat3=[[@{Eigenschaft3taschendiebstahl}]]}} {{Talent=[[ { [[{0d1 + @{TaW_taschendiebstahl} - [[@{BE_TaW} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl}, 0d1}kh1]] - @{Eigenschaft1taschendiebstahl}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl}, 0d1}kh1]] - @{Eigenschaft2taschendiebstahl}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE_TaW} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl}, 0d1}kh1]] - @{Eigenschaft3taschendiebstahl}, 0d1}kh1, 0d1 + @{TaW_taschendiebstahl}}dh1]]}}"> <span>BEx2</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-ebe"><button name="Taschendiebstahl" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente-eBE} {{name=Taschendiebstahl}} {{ebe=[[@{BE} * 2]]}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modebe=[[[[@{BE} * 2]] + [[?{Erleichterung (−) oder Erschwernis (+)|0}]]]]}} {{taw=[[@{TaW_taschendiebstahl}]]}} {{stat1=[[@{Eigenschaft1taschendiebstahl}]]}} {{stat2=[[@{Eigenschaft2taschendiebstahl}]]}} {{stat3=[[@{Eigenschaft3taschendiebstahl}]]}} {{Talent=[[ { [[{0d1 + @{TaW_taschendiebstahl} - [[@{BE} * 2]] - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl}, 0d1}kh1]] - @{Eigenschaft1taschendiebstahl}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl}, 0d1}kh1]] - @{Eigenschaft2taschendiebstahl}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + [[@{BE} * 2]] + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl}, 0d1}kh1]] - @{Eigenschaft3taschendiebstahl}, 0d1}kh1, 0d1 + @{TaW_taschendiebstahl}}dh1]]}}"> <span>BEx2</span></button></div>
                    <input type="text" class="sheet-talent-spez" name="attr_Spez_taschendiebstahl">
                    <input type="number" class="sheet-talent-taw" name="attr_TaW_taschendiebstahl" min="-4" value="0">
                    <button name="TaschendiebstahlSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Talente} {{name=Taschendiebstahl (@{spez_taschendiebstahl})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{TaW_taschendiebstahl} + 2]]}} {{stat1=[[@{Eigenschaft1taschendiebstahl}]]}} {{stat2=[[@{Eigenschaft2taschendiebstahl}]]}} {{stat3=[[@{Eigenschaft3taschendiebstahl}]]}} {{Talent=[[ { [[{0d1 + @{TaW_taschendiebstahl} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl} + 2, 0d1}kh1]] - @{Eigenschaft1taschendiebstahl}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl} + 2, 0d1}kh1]] - @{Eigenschaft2taschendiebstahl}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{TaW_taschendiebstahl} + 2, 0d1}kh1]] - @{Eigenschaft3taschendiebstahl}, 0d1}kh1, 0d1 + @{TaW_taschendiebstahl} + 2}dh1]]}}">Spez</button>
@@ -6359,7 +6359,7 @@
                <th>GE: <input type="text" class="sheet-stat-immutable" name="attr_GE" readonly="readonly" value="0"></th>
                <th>KO: <input type="text" class="sheet-stat-immutable" name="attr_KO" readonly="readonly" value="0"></th>
                <th>KK: <input type="text" class="sheet-stat-immutable" name="attr_KK" readonly="readonly" value="0"></th>
-                <th>BE: <input type="text" class="sheet-stat-immutable" name="attr_BE_TaW" readonly="true"></th>
+                <th>BE: <input type="text" class="sheet-stat-immutable" name="attr_BE" readonly="readonly" value="0"></th>
            </tr>
        </table>
        <br>
@@ -11181,7 +11181,7 @@
                            <input type="number" disabled="disabled" name="attr_Ges_RS_RB" value="@{RSAktiv1} * @{RS_RB1} + @{RSAktiv2} * @{RS_RB2} + @{RSAktiv3} * @{RS_RB3} + @{RSAktiv4} * @{RS_RB4}">
                        </td>
                        <td>
-                            <input type="number" readonly="true" name="attr_Ges_BE">
+                            <input type="number" readonly="true" name="attr_BE_RG">
                        </td>
                        <td>
                            <input type="number" disabled="disabled" name="attr_Ges_Gewicht" value="@{RSAktiv1} * @{RSGew1} + @{RSAktiv2} * @{RSGew2} + @{RSAktiv3} * @{RSGew3} + @{RSAktiv4} * @{RSGew4}">
@@ -11208,9 +11208,9 @@
                    <th>IB
                        <input class="sheet-stat-immutable" readonly="readonly" type="text" name="attr_INIBasis2" style="width: 3em" value="0">
                    </th>
-                    <th>BE <input class="sheet-stat-immutable" disabled="disabled" type="text" name="attr_Ges_BE_Anzeige" value="@{BE_TaW}" style="width: 2em">
+                    <th>BE <input class="sheet-stat-immutable" readonly="readonly" type="text" name="attr_BE" value="0" style="width: 2em">
                    </th>
-                    <th><button name="Initiative" type="roll" value="@{gm_roll_opt} &{template:DSA-Initiative} {{char=@{Name}}} {{mod=[[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]]}} {{dice=[[@{INI_dice_count}]]}} {{IB=[[@{INIBasis2}]]}} {{be=[[@{BE_TaW}]]}} {{ini=[[(@{INI_dice_count}d6 + @{INIBasis2} - @{BE_TaW} + ([[@{INI_mod_hauptwaffe}]]) + ([[@{ShieldParryINI}]]) + [[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]])&{tracker}]]}}"> <span>Initiative</span></button> mit <select type="number" name="attr_INI_dice_count" style="width: 4em">
+                    <th><button name="Initiative" type="roll" value="@{gm_roll_opt} &{template:DSA-Initiative} {{char=@{Name}}} {{mod=[[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]]}} {{dice=[[@{INI_dice_count}]]}} {{IB=[[@{INIBasis2}]]}} {{BE=[[(@{BE_Last}) + (@{BE_RG_INI})]]}} {{BE_Last=[[@{BE_Last}]]}} {{BE_RG_INI=[[@{BE_RG_INI}]]}} {{rg3=[[@{sf_rustungsgewohnungIII}]]}} {{ini=[[(@{INI_dice_count}d6 + @{INIBasis2} - (@{BE_Last}) - (@{BE_RG_INI}) + ([[@{INI_mod_hauptwaffe}]]) + ([[@{ShieldParryINI}]]) + [[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]])&{tracker}]]}}"> <span>Initiative</span></button> mit <select type="number" name="attr_INI_dice_count" style="width: 4em">
                <option value="1" selected="selected">1</option>
                <option value="2">2</option>
            </select><span class="sheet-abbr" title="sechsseitiger Würfel" style="margin-right: 1em;">W6</span>
@@ -11356,8 +11356,8 @@
                    <button class="sheet-grid-melee-actions-button-mod" name="AT+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Nahkampfangriff}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{ansage=[[-1]]}} {{wert=[[@{AT_Aktiv}]]}} {{eff_wert=[[[[@{AT_Aktiv}]] - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
                    <button class="sheet-grid-melee-actions-button" name="Passierschlag" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Passierschlag}} {{mod=[[4]]}} {{ansage=[[-1]]}} {{wert=[[@{AT_Aktiv}]]}} {{eff_wert=[[[[@{AT_Aktiv}]] - 4]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Passierschlag</span></button>
                    <button class="sheet-grid-melee-actions-button-mod" name="Passierschlag+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Passierschlag}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|4}]]}} {{ansage=[[-1]]}} {{wert=[[@{AT_Aktiv}]]}} {{eff_wert=[[[[@{AT_Aktiv}]] - (?{Erleichterung (−) oder Erschwernis (+)|4})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
-                    <button class="sheet-grid-melee-actions-button" name="TP" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{TP_W_Aktiv})]]d6 + @{TP_Bonus_Aktiv}]]}}"> <span>Trefferpunkte</span></button>
-                    <button class="sheet-grid-melee-actions-button-mod" name="TP+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{TP_W_Aktiv})]]d6 + @{TP_Bonus_Aktiv} + ?{TP-Bonus (+) oder TP-Malus (−) angeben|0}]]}}"> <span>+/−</span></button>
+                    <button class="sheet-grid-melee-actions-button" name="TP" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{TP_W_Aktiv})]]d6 + (@{TP_Bonus_Aktiv})]]}}"> <span>Trefferpunkte</span></button>
+                    <button class="sheet-grid-melee-actions-button-mod" name="TP+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{TP_W_Aktiv})]]d6 + (@{TP_Bonus_Aktiv}) + (?{TP-Bonus (+) oder TP-Malus (−) angeben|0})]]}}"> <span>+/−</span></button>
                    <button class="sheet-grid-melee-actions-button-single" name="AT-Patzer" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-Patzer} {{name=Nahkampfangriffspatzer}} {{wurf=[[2d6cs1cf6]]}}"> <span>Patzer</span></button>
                    <div class="sheet-grid-melee-actions-label"><span>Manöver</span></div>
                    <button class="sheet-grid-melee-actions-button sheet-hideable-man-finte-o-sf sheet-abbr" name="Finte-o-SF" title="Finte (ohne Sonderfertigkeit)" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Finte o. SF}} {{mod=[[0]]}} {{ansage=[[?{Ansage für Finte (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32}]]}} {{modansage=[[(?{Ansage für Finte (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32})]]}} {{wert=[[@{AT_Aktiv}]]}} {{eff_wert=[[[[@{AT_Aktiv}]] - (?{Ansage für Finte (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Finte o. SF</span></button>
@@ -11409,10 +11409,10 @@
                    <button class="sheet-grid-melee-actions-button-mod" name="PA+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-PA} {{name=Nahkampfparade}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modansage=[[-1]]}} {{ansage=[[-1]]}} {{wert=[[@{PA_Aktiv}]]}} {{eff_wert=[[[[@{PA_Aktiv}]] - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
                    <button class="sheet-grid-melee-actions-button sheet-hideable-man-pwparade" name="Parierwaffen-PA" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-PA} {{name=Parierwaffenparade}} {{mod=[[0]]}} {{ansage=[[-1]]}} {{modansage=[[-1]]}} {{wert=[[@{parryweapon_pa}]]}} {{eff_wert=[[@{parryweapon_pa}]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Parierwaffen-Parade</span></button>
                    <button class="sheet-grid-melee-actions-button-mod sheet-hideable-man-pwparade" name="Parierwaffen-PA+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-PA} {{name=Parierwaffenparade}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{modansage=[[-1]]}} {{ansage=[[-1]]}} {{wert=[[@{parryweapon_pa}]]}} {{eff_wert=[[[[@{parryweapon_pa}]] - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
-                    <button class="sheet-grid-melee-actions-button" name="Ausweichen" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[0]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + (@{BE_TaW})]]}} {{ansage=[[-1]]}} {{modansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE_TaW}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE_TaW})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Ausweichen</span></button>
-                    <button class="sheet-grid-melee-actions-button-mod" name="Ausweichen+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + ?{Erleichterung (−) oder Erschwernis (+)|0} + (@{BE_TaW})]]}} {{ansage=[[-1]]}} {{modansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE_TaW}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE_TaW}) - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
-                    <button class="sheet-grid-melee-actions-button sheet-hideable-man-gezieltes-ausweichen" name="Gezieltes_Ausweichen" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Gezieltes Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[0]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + (@{BE_TaW})]]}} {{ansage=[[-1]]}} {{modansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE_TaW}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE_TaW})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Gezieltes Ausweichen</span></button>
-                    <button class="sheet-grid-melee-actions-button-mod sheet-hideable-man-gezieltes-ausweichen" name="Gezieltes_Ausweichen+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Gezieltes Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + ?{Erleichterung (−) oder Erschwernis (+)|0} + (@{BE_TaW})]]}} {{modansage=[[-1]]}} {{ansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE_TaW}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE_TaW}) - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
+                    <button class="sheet-grid-melee-actions-button" name="Ausweichen" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[0]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + (@{BE})]]}} {{ansage=[[-1]]}} {{modansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Ausweichen</span></button>
+                    <button class="sheet-grid-melee-actions-button-mod" name="Ausweichen+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + ?{Erleichterung (−) oder Erschwernis (+)|0} + (@{BE})]]}} {{ansage=[[-1]]}} {{modansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE}) - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
+                    <button class="sheet-grid-melee-actions-button sheet-hideable-man-gezieltes-ausweichen" name="Gezieltes_Ausweichen" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Gezieltes Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[0]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + (@{BE})]]}} {{ansage=[[-1]]}} {{modansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Gezieltes Ausweichen</span></button>
+                    <button class="sheet-grid-melee-actions-button-mod sheet-hideable-man-gezieltes-ausweichen" name="Gezieltes_Ausweichen+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Ausweichen} {{name=Gezieltes Ausweichen}} {{ausweichenmod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}))]]}} {{probenmod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{mod=[[(-1)*((@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII})) + ?{Erleichterung (−) oder Erschwernis (+)|0} + (@{BE})]]}} {{modansage=[[-1]]}} {{ansage=[[-1]]}} {{pa=[[@{PABasis}]]}} {{be=[[@{BE}]]}} {{wert=[[@{PABasis}]]}} {{eff_wert=[[@{PABasis} + (@{sf_ausweichenI}) + (@{sf_ausweichenII}) + (@{sf_ausweichenIII}) - (@{BE}) - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
                    <div class="sheet-grid-melee-actions-label"><span>Parade-Manöver</span></div>
                    <button class="sheet-grid-melee-actions-button sheet-hideable-man-binden" name="Binden" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-PA} {{name=Binden}} {{mod=[[0]]}} {{ansage=[[4]]}} {{modansage=[[4]]}} {{wert=[[@{PA_Aktiv}]]}} {{eff_wert=[[[[@{PA_Aktiv}]] - 4]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Binden</span></button>
                    <button class="sheet-grid-melee-actions-button-mod sheet-hideable-man-binden" name="Binden+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-PA} {{name=Binden}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{ansage=[[4]]}} {{modansage=[[?{Erleichterung (−) oder Erschwernis (+)|0} + 4]]}} {{wert=[[@{PA_Aktiv}]]}} {{eff_wert=[[[[@{PA_Aktiv}]] - 4 - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
@@ -11437,8 +11437,8 @@
                    <!-- Schildattacke -->
                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button" name="Schildattacke" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Raufen (Schildattacke)}} {{mod=[[@{shield_at_mod}]]}} {{ansage=[[-1]]}} {{wert=[[@{AT_Raufen}]]}} {{eff_wert=[[@{AT_Raufen} - (@{shield_at_mod})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Schildattacke</span></button>
                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button-mod" name="Schildattacke+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Schildattacke}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}]]}} {{ansage=[[-1]]}} {{wert=[[@{AT_Raufen}]]}} {{eff_wert=[[ @{AT_Raufen} - (@{shield_at_mod}) - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
-                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button" name="TP-Schild" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[1]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{shield_TP_roll})]] + @{shield_TPKK}]]}}"> <span>Trefferpunkte</span></button>
-                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button-mod" name="TP-Schild+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[1]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{shield_TP_roll})]] + @{shield_TPKK} + ?{TP-Bonus (+) oder TP-Malus (−) angeben|0}]]}}"> <span>+/−</span></button>
+                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button" name="TP-Schild" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[1]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{shield_TP_roll})]] + (@{shield_TPKK})]]}}"> <span>Trefferpunkte</span></button>
+                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button-mod" name="TP-Schild+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Kampf-Treffer} {{name=Nahkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[1]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{shield_TP_roll})]] + (@{shield_TPKK}) + (?{TP-Bonus (+) oder TP-Malus (−) angeben|0})]]}}"> <span>+/−</span></button>
                    <!-- Schildattacke mit Manövern -->
                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button sheet-hideable-man-wuchtschlag-o-sf sheet-abbr" name="Wuchtschlag-Schild-o-SF" title="Wuchtschlag (ohne Sonderfertigkeit)" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Wuchtschlag (Schild) o. SF}} {{mod=[[(@{shield_at_mod})]]}} {{ansage=[[?{Ansage für Wuchtschlag (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32}]]}} {{modansage=[[(@{shield_at_mod}) + (?{Ansage für Wuchtschlag (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32})]]}} {{wert=[[@{AT_Raufen}]]}} {{eff_wert=[[[[@{AT_Raufen}]] - (@{shield_at_mod}) - (?{Ansage für Wuchtschlag (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>Wuchtschlag o. SF</span></button>
                    <button class="sheet-hideable-man-schildattacke sheet-grid-melee-actions-button-mod sheet-hideable-man-wuchtschlag-o-sf" name="Wuchtschlag-Schild-o-SF+-" type="roll" value="@{gm_roll_opt} &{template:DSA-Nahkampf-AT} {{name=Wuchtschlag (Schild) o. SF}} {{mod=[[(@{shield_at_mod}) + (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{ansage=[[?{Ansage für Wuchtschlag (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32}]]}} {{modansage=[[(@{shield_at_mod}) + (?{Erleichterung (−) oder Erschwernis (+)|0}) + (?{Ansage für Wuchtschlag (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32})]]}} {{wert=[[@{AT_Raufen}]]}} {{eff_wert=[[[[@{AT_Raufen}]] - (@{shield_at_mod}) - (?{Ansage für Wuchtschlag (ohne Sonderfertigkeit)|2,2|4,4|6,6|8,8|10,10|12,12|14,14|16,16|18,18|20,20|22,22|24,24|26,26|28,28|30,30|32,32}) - (?{Erleichterung (−) oder Erschwernis (+)|0})]]}} {{wurf=[[1d20cs1cf20]]}} {{pruefwurf=[[1d20cs1cf20]]}}"> <span>+/−</span></button>
@@ -11540,9 +11540,9 @@
                    <th>IB
                        <input class="sheet-stat-immutable" readonly="readonly" type="text" name="attr_INIBasis2" style="width: 3em" value="0">
                    </th>
-                    <th>BE <input class="sheet-stat-immutable" readonly="true" type="text" name="attr_BE_TaW" style="width: 2em">
+                    <th>BE <input class="sheet-stat-immutable" readonly="readonly" type="text" name="attr_BE" value="0" style="width: 2em">
                    </th>
-                    <th><button name="Initiative" type="roll" value="&{template:DSA-Initiative} {{char=@{Name}}} {{mod=[[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]]}} {{dice=[[@{INI_dice_count}]]}} {{IB=[[@{INIBasis2}]]}} {{be=[[@{BE_TaW}]]}} {{ini=[[(@{INI_dice_count}d6 + @{INIBasis2} - @{BE_TaW} + [[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]])&{tracker}]]}}"> <span>Initiative</span></button> mit <select type="number" name="attr_INI_dice_count" style="width: 4em">
+                    <th><button name="Initiative" type="roll" value="@{gm_roll_opt} &{template:DSA-Initiative} {{char=@{Name}}} {{mod=[[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]]}} {{dice=[[@{INI_dice_count}]]}} {{IB=[[@{INIBasis2}]]}} {{BE=[[(@{BE_Last}) + (@{BE_RG_INI})]]}} {{BE_Last=[[@{BE_Last}]]}} {{BE_RG_INI=[[@{BE_RG_INI}]]}} {{rg3=[[@{sf_rustungsgewohnungIII}]]}} {{ini=[[(@{INI_dice_count}d6 + @{INIBasis2} - (@{BE_Last}) - (@{BE_RG_INI}) + ([[@{INI_mod_hauptwaffe}]]) + ([[@{ShieldParryINI}]]) + [[?{Bonus (+) oder Malus (−)|0}d1cs0cf2]])&{tracker}]]}}"> <span>Initiative</span></button> mit <select type="number" name="attr_INI_dice_count" style="width: 4em">
                <option value="1" selected="selected">1</option>
                <option value="2">2</option>
            </select><span class="sheet-abbr" title="sechsseitiger Würfel" style="margin-right: 1em;">W6</span>
@@ -11925,6 +11925,67 @@
                    <td class="sheet-table-armour-zones-right-cell">Bein (rechts)</td>
                </tr>
            </table>
+
+			<!-- I know that direct styling is evil, but this has to stay until I get around revamping this tab completely -->
+			<div class="sheet-combat-box sheet-flex-container" style="clear: both">
+				<span class="sheet-grid-label">Wunden</span>
+				<div class="sheet-flex-container-wound-zone">
+					<span>Kopf</span>
+					<span>
+						<input type="checkbox" name="attr_wound_Kopf1" value="1">
+						<input type="checkbox" name="attr_wound_Kopf2" value="1">
+						<input type="checkbox" name="attr_wound_Kopf3" value="1">
+					</span>
+				</div>
+				<div class="sheet-flex-container-wound-zone">
+					<span>Brust/Rücken</span>
+					<span>
+						<input type="checkbox" name="attr_wound_Brust1" value="1">
+						<input type="checkbox" name="attr_wound_Brust2" value="1">
+						<input type="checkbox" name="attr_wound_Brust3" value="1">
+					</span>
+				</div>
+				<div class="sheet-flex-container-wound-zone">
+					<span>Bauch</span>
+					<span>
+						<input type="checkbox" name="attr_wound_Bauch1" value="1">
+						<input type="checkbox" name="attr_wound_Bauch2" value="1">
+						<input type="checkbox" name="attr_wound_Bauch3" value="1">
+					</span>
+				</div>
+				<div class="sheet-flex-container-wound-zone">
+					<span>Arm (l.)</span>
+					<span>
+						<input type="checkbox" name="attr_wound_LA1" value="1">
+						<input type="checkbox" name="attr_wound_LA2" value="1">
+						<input type="checkbox" name="attr_wound_LA3" value="1">
+					</span>
+				</div>
+				<div class="sheet-flex-container-wound-zone">
+					<span>Arm (r.)</span>
+					<span>
+						<input type="checkbox" name="attr_wound_RA1" value="1">
+						<input type="checkbox" name="attr_wound_RA2" value="1">
+						<input type="checkbox" name="attr_wound_RA3" value="1">
+					</span>
+				</div>
+				<div class="sheet-flex-container-wound-zone">
+					<span>Bein (l.)</span>
+					<span>
+						<input type="checkbox" name="attr_wound_LB1" value="1">
+						<input type="checkbox" name="attr_wound_LB2" value="1">
+						<input type="checkbox" name="attr_wound_LB3" value="1">
+					</span>
+				</div>
+				<div class="sheet-flex-container-wound-zone">
+					<span>Bein (r.)</span>
+					<span>
+						<input type="checkbox" name="attr_wound_RB1" value="1">
+						<input type="checkbox" name="attr_wound_RB2" value="1">
+						<input type="checkbox" name="attr_wound_RB3" value="1">
+					</span>
+				</div>
+			</div>
        </div>

        <div class="sheet-section sheet-section-Kampfwerte5">
@@ -12637,15 +12698,15 @@
 			<!-- <input type="number" name="attr_AT_Aktiv" disabled="disabled" value="((@{AT_NKW1}) * @{NKW_Aktiv1}) + ((@{AT_NKW2}) * @{NKW_Aktiv2}) + ((@{AT_NKW3}) * @{NKW_Aktiv3}) + ((@{AT_NKW4}) * @{NKW_Aktiv4})"> -->

 			Anzahl an W6 aus aktiver Waffe (bei Wahl mehrerer aktiver Waffen wird addiert!)
-			<input type="number" name="attr_TP_W_Aktiv" disabled="disabled" value="@{NKW_Aktiv1} * @{NKWschaden1_1} + @{NKW_Aktiv2} * @{NKWschaden2_1} + @{NKW_Aktiv3} * @{NKWschaden3_1} + @{NKW_Aktiv4} * @{NKWschaden4_1}">
+			<input type="number" name="attr_TP_W_Aktiv" disabled="disabled" value="@{NKW_Aktiv1} * (@{NKWschaden1_1}) + @{NKW_Aktiv2} * (@{NKWschaden2_1}) + @{NKW_Aktiv3} * (@{NKWschaden3_1}) + @{NKW_Aktiv4} * (@{NKWschaden4_1})">

 			Schadensbonus aus aktiver Waffe inkl. TP/KK (bei Wahl mehrerer aktiver Waffen wird addiert!)
-			<input type="number" name="attr_TP_Bonus_Aktiv" disabled="disabled" value="@{NKW_Aktiv1} * (@{NKWschaden1_2} + @{NKW1_SB}) + @{NKW_Aktiv2} * (@{NKWschaden2_2} + @{NKW2_SB}) + @{NKW_Aktiv3} * (@{NKWschaden3_2} + @{NKW3_SB}) + @{NKW_Aktiv4} * (@{NKWschaden4_2} + @{NKW4_SB})">
+			<input type="number" name="attr_TP_Bonus_Aktiv" disabled="disabled" value="@{NKW_Aktiv1} * ((@{NKWschaden1_2}) + (@{NKW1_SB})) + @{NKW_Aktiv2} * ((@{NKWschaden2_2}) + (@{NKW2_SB})) + @{NKW_Aktiv3} * ((@{NKWschaden3_2}) + (@{NKW3_SB})) + @{NKW_Aktiv4} * ((@{NKWschaden4_2}) + (@{NKW4_SB}))">

 			<!-- Wird jetzt mittels Sheet Worker berechnet <input type="number" name="attr_PA_Aktiv" disabled="disabled" value="((@{PA_NKW1}) * @{NKW_Aktiv1}) + ((@{PA_NKW2}) * @{NKW_Aktiv2}) + ((@{PA_NKW3}) * @{NKW_Aktiv3}) + ((@{PA_NKW4}) * @{NKW_Aktiv4})">-->

 			Ausweichen-Wert für den Kampf (quasi deaktiviert im Zuge der Umstellung auf das WdS-System zum Ausweichen)
-			<input type="number" name="attr_Ausweichen_Kampf" disabled="disabled" value="@{PABasis} - @{BE_TaW}">
+			<input type="number" name="attr_Ausweichen_Kampf" disabled="disabled" value="@{PABasis} - @{BE}">
 		</div>
    </div>
    
@@ -12657,10 +12718,32 @@
        </p>
        <h3>Infos zum Charakterbogen</h3>
        <p>Dieser Charakterbogen wird weiterentwickelt. Dabei bleibt es nicht aus, dass alte Daten nicht mehr ohne Weiteres in den veränderten Bogen passen. Wenn es nötig wird, werden die alten Daten automatisch im Hintergrund umgewandelt. Da es aber immer zu Fehlern kommen kann, stehen für jeden Versionssprung hier weiterhin die alten Daten (inklusive ihrer Funktionalität) zur Verfügung. So wird sichergestellt, dass keine Daten verlorengehen und das Spiel weitergehen kann.</p>
-        <p>Videos zu einzelnen Updates, nicht immer pünktlich zum Release einer neuen Charakterbogenversion: <br />
-            <input type="text" class="sheet-selectable-text" style="width: 45em" value="https://www.youtube.com/watch?v=l2SCwz51T9g&list=PLGBXxa8pcNCqzNe4CrKvy-_QgjfgLDOZ-" />
+        <p>Zu besonderen Updates&nbsp;&ndash;&nbsp;sprich: alles, was über einfache Fehlerbehebungen und eher kleine kosmetische Veränderungen hinausgeht&nbsp;&ndash;&nbsp;gibt es in der Regel, wenn auch nicht immer pünktlich zum Release einer neuen Charakterbogenversion, Videos mit vielen Details: <br />
+            <input type="text" class="sheet-selectable-text" style="width: 52em" value="https://www.youtube.com/watch?v=l2SCwz51T9g&list=PLGBXxa8pcNCqzNe4CrKvy-_QgjfgLDOZ-" />
        </p>

+		<h4>Update auf Version 20210718</h4>
+		<p>Fehlerbehebungen:
+			<ul>
+				<li>Schadenswürfe berücksichtigen jetzt &bdquo;+&ldquo; vor der Zahl korrekt anstatt als Ergebnis 0 zu liefern.</li>
+				<li>TP/KK-Werte für Schilde/Parierwaffen werden jetzt sorgfältiger geprüft und im Fehlerfall auf den Standardwert zurückgesetzt anstatt in Folge fehlender Werte für TP/KK die Schildparade nicht aktiv zu schalten.</li>
+				<li>Rüstungsgewöhnung III wird nun bei der Initiativeberechnung korrekt berücksichtigt (INI-Abzug aus BE aus Rüstung halbiert).</li>
+			</ul>
+		</p>
+		<p>Design:
+			<ul>
+				<li>Das Fernkampftab verfügt jetzt auch über Häkchen für Wunden.</li>
+			</ul>
+		</p>
+		<p>Unter der Haube:
+			<ul>
+				<li>Erweiterung der Prüffunktion um die BE.</li>
+				<li>Umbenennung von BE-relevanten Attributen und Schaffung eines einheitlicheren Schemas. Umzug auf neue Werte sollte problemlos vonstattengehen.</li>
+				<li>Attributnamen in Event-Listenern kleingeschrieben.</li>
+			</ul>
+		</p>
+		<p>Zu dieser Version wird es voraussichtlich kein Video geben.</p>
+
        <h4>Update auf Version 20210425</h4>
        <p>Es wurden mehrere kleine Fehler behoben, die insbesondere bei neuen Charakteren zu allerlei obskuren Problemen führen konnten. Der Code ist jetzt wieder ein Stückchen robuster und ein Fehler, der dafür gesorgt hat, dass der Paradewert der aktiven Nahkampfwaffe 0 war, solange noch nie eine Wunde aktiviert war, wurde behoben. Danke an alle, die weiterhin fleißig Fehler melden! Ihr helft dabei mit, dass dieser Charakterbogen besser wird.</p>
        <p>Zu dieser Version wird es voraussichtlich kein Video geben.</p>
@@ -12780,7 +12863,7 @@
    </div>


-    <b>&bdquo;Das Schwarze Auge&ldquo;-Heldenbogen für Roll20.net, Version <input type="text" class="sheet-stat-immutable sheet-stat-immutable-version" disabled="disabled" name="attr_character_sheet_version" value="20210425"><input type="hidden" class="sheet-stat-immutable sheet-stat-immutable-version" readonly="readonly" name="attr_data_version" value=""></b>
+    <b>&bdquo;Das Schwarze Auge&ldquo;-Heldenbogen für Roll20.net, Version <input type="text" class="sheet-stat-immutable sheet-stat-immutable-version" disabled="disabled" name="attr_character_sheet_version" value="20210718"><input type="hidden" class="sheet-stat-immutable sheet-stat-immutable-version" readonly="readonly" name="attr_data_version" value=""></b>
    </table>
 </div>

@@ -12995,24 +13078,34 @@
 </rolltemplate>

 <rolltemplate class="sheet-rolltemplate-DSA-Initiative">
-    <table>
-        <tr>
-            <th colspan="4">Initiative für {{char}}: {{ini}}</th>
-        </tr>
-        <tr>
-            <td><span class="sheet abbr" title="Anzahl an sechsseitigen Würfeln">#W6</span>: 
-                {{#rollTotal() dice 1}}
-                    <span class="sheet-abbr" title="Standardwert">1</span>
-                {{/rollTotal() dice 1}}
-                {{#rollTotal() dice 2}}
-                    <span class="sheet-abbr" title="Sonderfertigkeit &bdquo;Klingentänzer&ldquo; notwendig.">2</span>
-                {{/rollTotal() dice 2}}
-            </td>
-            <td><span class="sheet-abbr" title="Initiativebasis">IB</span>: {{IB}}</td>
-            <td><span class="sheet-abbr" title="Behinderung">BE</span>: {{be}}</td>
-            <td><span class="sheet-abbr" title="Modifikator">Mod.</span>: {{mod}}</td>
-        </tr>
-    </table>
+	<table>
+		<tr>
+			<th colspan="4">Initiative für {{char}}: {{ini}}</th>
+		</tr>
+		<tr>
+			<td><span class="sheet abbr" title="Anzahl an sechsseitigen Würfeln">#W6</span>:
+				{{#rollTotal() dice 1}}
+					<span class="sheet-abbr" title="Standardwert">1</span>
+				{{/rollTotal() dice 1}}
+				{{#rollTotal() dice 2}}
+					<span class="sheet-abbr" title="Sonderfertigkeit &bdquo;Klingentänzer&ldquo; notwendig.">2</span>
+				{{/rollTotal() dice 2}}
+			</td>
+			<td><span class="sheet-abbr" title="Initiativebasis">IB</span>: {{IB}}</td>
+			<td><span class="sheet-abbr" title="Behinderung">BE</span>: {{BE}}</td>
+			<td><span class="sheet-abbr" title="Modifikator">Mod.</span>: {{mod}}</td>
+		</tr>
+		{{#rollTotal() rg3 1}}
+			<tr>
+				<td colspan="4" class="sheet-templates-warning">Behinderung aus Rüstung für Initiativewurf aufgrund von Rüstungsgewöhnung III halbiert. Behinderung zusammengesetzt aus Last ({{BE_Last}}) und Behinderung aus Rüstung ({{BE_RG_INI}}).</td>
+			</tr>
+		{{/rollTotal() rg3 1}}
+		{{#rollTotal() rg3 0}}
+			<tr>
+				<td colspan="4" class="sheet-templates-warning">NULL.</td>
+			</tr>
+		{{/rollTotal() rg3 0}}
+	</table>
 </rolltemplate>

 <rolltemplate class="sheet-rolltemplate-DSA-Nahkampf-AT">
@@ -14418,7 +14511,7 @@ function deactivateRCC() {
 		fkr_erschwernis_ansage_gesamt: "?{Ansage für Fernkampfangriff|0,0|1,1|2,2|3,3|4,4|5,5|6,6|7,7|8,8|9,9|10,10|11,11|12,12|13,13|14,14|15,15|16,16|17,17|18,18|19,19|20,20|21,21|22,22|23,23|24,24|25,25|26,26|27,27|28,28|29,29|30,30|31,31|32,32}",
 		fkr_erschwernis_ohne_kampfgetuemmel: 0,
 		fkr_kampfgetuemmel_ziele: 0,
-		fk_tp_roll: "&{template:DSA-Kampf-Treffer} {{name=Fernkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[?{Anzahl W6 für Schadenswurf|1,1|2,2|3,3|4,4|5,5}d6 + ?{Bonus (+)/Malus (−) der Trefferpunkte|0}]]}}"
+		fk_tp_roll: "&{template:DSA-Kampf-Treffer} {{name=Fernkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[?{Anzahl W6 für Schadenswurf|1,1|2,2|3,3|4,4|5,5}d6 + (?{Bonus (+)/Malus (−) der Trefferpunkte|0})]]}}"
 	});
 }

@@ -15509,14 +15602,14 @@ on("change:safe-sheet-open change:fkw_aktiv1 change:fkw_aktiv2 change:fkw_aktiv3
 					{
 						ergebnis.tp.roll = "&{template:DSA-Kampf-Treffer-gezielt} {{name=Fernkampf}} {{target="
 							 + getTargetZoneName(FKR.schuss.gezielt2bzone)
-							 + "}} {{damage=[[[[(@{FTP_W_Aktiv})]]d6 + @{FTP_Bonus_Aktiv}]]}}";
+							 + "}} {{damage=[[[[(@{FTP_W_Aktiv})]]d6 + (@{FTP_Bonus_Aktiv})]]}}";
 					} else if (GUIgezielt4b == "off") {
 						ergebnis.tp.roll = "&{template:DSA-Kampf-Treffer-gezielt} {{name=Fernkampf}} {{target="
 							 + getTargetZoneName(FKR.schuss.gezielt4bzone)
-							 + "}} {{damage=[[[[(@{FTP_W_Aktiv})]]d6 + @{FTP_Bonus_Aktiv}]]}}";
+							 + "}} {{damage=[[[[(@{FTP_W_Aktiv})]]d6 + (@{FTP_Bonus_Aktiv})]]}}";
 					} else {
 						// Zufällige Trefferzone
-						ergebnis.tp.roll = "&{template:DSA-Kampf-Treffer} {{name=Fernkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{FTP_W_Aktiv})]]d6 + @{FTP_Bonus_Aktiv}]]}}";
+						ergebnis.tp.roll = "&{template:DSA-Kampf-Treffer} {{name=Fernkampf}} {{target=[[?{Tabelle für zufällige Trefferzone auswählen|Zweibeiner gegen unbeschwänzten Zweibeiner,0|Zweibeiner gegen beschwänzten Zweibeiner,1|Zweibeiner gegen Vierbeiner,3|Zweibeiner gegen Reiter,4|Reiter gegen Zweibeiner,2}]]}} {{TPArt=[[0]]}} {{zone=[[1d20]]}} {{damage=[[[[(@{FTP_W_Aktiv})]]d6 + (@{FTP_Bonus_Aktiv})]]}}";
 					}

 					console.log("ergebnis.mod: ", ergebnis.mod,
@@ -15555,22 +15648,22 @@ on("change:safe-sheet-open change:fkw_aktiv1 change:fkw_aktiv2 change:fkw_aktiv3

 on(
 	"change:safe-sheet-open " +
-	"change:mu_basis change:mu_mod change:MU_mod_wounds " +
-	"change:in_basis change:in_mod change:IN_mod_wounds " +
-	"change:kl_basis change:kl_mod change:KL_mod_wounds " +
+	"change:mu_basis change:mu_mod change:mu_mod_wounds " +
+	"change:in_basis change:in_mod change:in_mod_wounds " +
+	"change:kl_basis change:kl_mod change:kl_mod_wounds " +
 	"change:ch_basis change:ch_mod " +
-	"change:ff_basis change:ff_mod change:FF_mod_wounds " +
-	"change:ge_basis change:ge_mod change:GE_mod_wounds " +
-	"change:ko_basis change:ko_mod change:KO_mod_wounds " +
-	"change:kk_basis change:kk_mod change:KK_mod_wounds " +
-	"change:gs_basis change:gs_mod change:GS_mod_wounds " +
+	"change:ff_basis change:ff_mod change:ff_mod_wounds " +
+	"change:ge_basis change:ge_mod change:ge_mod_wounds " +
+	"change:ko_basis change:ko_mod change:ko_mod_wounds " +
+	"change:kk_basis change:kk_mod change:kk_mod_wounds " +
+	"change:gs_basis change:gs_mod change:gs_mod_wounds " +
 	"change:lezugek change:auszugek change:aspzugek " +
 	"change:mrzugek change:inizugek change:erschoepfung_mod " +
 	"change:eisern " +
 	"change:sf_gefaess_der_sterne " +
 	"change:sf_kampfgespur change:sf_kampfreflexe change:sf_klingentanzer " +
-	"change:BE_TaW " +
-	"change:IB_mod_wounds ",
+	"change:be " +
+	"change:ib_mod_wounds ",
 	function(eventInfo) {
 	getAttrs(["mu_basis", "mu_mod", "MU_mod_wounds",
 		"in_basis", "in_mod", "IN_mod_wounds",
@@ -15586,7 +15679,7 @@ on(
 		"eisern",
 		"sf_gefaess_der_sterne",
 		"sf_kampfgespur", "sf_kampfreflexe", "sf_klingentanzer",
-		"BE_TaW",
+		"BE",
 		"IB_mod_wounds"], function(v) {
        let update = {
            'MU': Math.max(0, +v.mu_basis + +v.mu_mod + (v.MU_mod_wounds || 0)),
@@ -15631,11 +15724,11 @@ on(
 		// Kampfreflexe is a prerequisite for the others, so stop if not active
 		var IBbonus = 0;
 		var INIdicecount = "1";
-		if (v.sf_kampfreflexe !== "0" && v.BE_TaW <= 4) {
+		if (v.sf_kampfreflexe !== "0" && v.BE <= 4) {
 			IBbonus += 4;
-			if (v.sf_kampfgespur !== "0" && v.BE_TaW <= 4) {
+			if (v.sf_kampfgespur !== "0" && v.BE <= 4) {
 				IBbonus += 2;
-				if (v.sf_klingentanzer !== "0" && v.BE_TaW <= 2) {
+				if (v.sf_klingentanzer !== "0" && v.BE <= 2) {
 					INIdicecount = "2";
 				} else {
 					INIdicecount = "1";
@@ -15835,6 +15928,7 @@ Relevant character sheet versions
 * 20210413: shield attack
 *           INI mod from main weapon
 *           wound mods
+* 20210718: Reorganisation of encumbrance
 */
 function migrationCheck() {
    getAttrs(["character_sheet_version", "data_version"], function(v) {
@@ -15906,7 +16000,8 @@ function callNextMigration(migrationChain) {
 var versionsWithMigrations = [
    20190427,
    20200809,
-    20210413
+    20210413,
+    20210718
 ]

 /*
@@ -16129,7 +16224,7 @@ function migrateTo20200809(migrationChain) {
    getAttrs([
            "NKW_Aktiv1", "NKW_Aktiv2", "NKW_Aktiv3", "NKW_Aktiv4", "TaW_peitsche", "ATbasis", 
            "RS_gBE1", "rs1_rg1", "RS_gBE2", "rs2_rg1", "RS_gBE3", "rs3_rg1", "RS_gBE4", "rs4_rg1", 
-            "RS_Aktiv1", "RS_Aktiv2", "RS_Aktiv3", "RS_Aktiv4", "Ges_BE", "BE_Last", "sf_rustungsgewohnungI", "sf_rustungsgewonungII", "sf_rustungsgewohnungIII",
+            "RS_Aktiv1", "RS_Aktiv2", "RS_Aktiv3", "RS_Aktiv4", "BE_RG", "BE_Last", "sf_rustungsgewohnungI", "sf_rustungsgewonungII", "sf_rustungsgewohnungIII",
            "BE_TaW", "NKW_AT_typ1", "NKW_PA_typ1", "NKW_AT_typ2", "NKW_PA_typ2",  
            "NKW_AT_typ3", "NKW_PA_typ3", "NKW_AT_typ4", "NKW_PA_typ4"], function(v) {
        
@@ -16165,9 +16260,9 @@ function migrateTo20200809(migrationChain) {
        Object.assign(attrsToChange, calculatedRuestungBE);

        var beTaw = 0;
-        // take Ges_BE from calculated values
-        if (calculatedRuestungBE["Ges_BE"]) {
-            beTaw += parseInt(calculatedRuestungBE["Ges_BE"]);
+        // take BE_RG from calculated values
+        if (calculatedRuestungBE["BE_RG"]) {
+            beTaw += parseInt(calculatedRuestungBE["BE_RG"]);
        }
        if (v["BE_Last"]) {
            beTaw += parseInt(v["BE_Last"]);
@@ -16308,6 +16403,82 @@ function migrateTo20210413(migrationChain) {
    });
 }

+/*
+## From version 20210413 to 20210718
+* Reorganisation of encumbrance
+
+Old:
+Encumbrance from armour
+	Ges_BE
+Encumbrance from equipment weight
+	BE_Last
+Sum of encumbrance from armor and encumbrance from equipment weight
+	BE_TaW
+Encumbrance for initiative calculation
+	not existing
+
+New:
+Encumbrance from armour
+	BE_RG
+Encumbrance from equipment weight
+	BE_Last
+Sum of encumbrance from armor and encumbrance from equipment weight
+	BE
+Encumbrance from armour for initiative calculation
+	BE_RG_INI
+
+Dummy attribute for display of value is not used anymore, BE used instead
+*/
+function migrateTo20210718 (migrationChain) {
+	console.log("migrateTo20210718 invoked");
+	var func = "migrateTo20210718";
+
+	var requirements = [
+		"Ges_BE",
+		"BE_Last",
+		"BE_TaW",
+		"RSName1", "RS_gBE1", "RSAktiv1",
+		"RSName2", "RS_gBE2", "RSAktiv2",
+		"RSName3", "RS_gBE3", "RSAktiv3",
+		"RSName4", "RS_gBE4", "RSAktiv4",
+		"sf_rustungsgewohnungI", "rustungsgewohnungI_rustungen",
+		"sf_rustungsgewohnungII",
+		"sf_rustungsgewohnungIII"
+	];
+
+	var defaultValue = 0;
+
+	getAttrs(requirements, function(values) {
+		results = checkRequiredProperties(requirements, values);
+		if (results["errors"] >= 1) {
+			console.log(func + ": Missing properties: '" + results["missing"] + "'. Using default values. 0 for 'Ges_BE', 'BE_Last', 'BE_TaW' and 'sf_rustungsgewohnungIII'.");
+			for (req of requirements) {
+				if (!values.hasOwnProperty(req)) {
+					values[req] = defaultValue;
+				}
+			}
+		}
+		// Check sanity
+		var reqsToCheck = requirements.slice(0,3);
+		for (req of reqsToCheck) {
+			if (!DSAsane(values[req], "encumbrance")) {
+				console.log(func + ": '" + req + "' not sane, set to default value (" + defaultValue + ").");
+				values[req] = defaultValue;
+			}
+		}
+		update = {};
+		update["BE_RG"] = parseInt(values["Ges_BE"]);
+		update["BE_Last"] = parseInt(values["BE_Last"]);
+		update["BE"] = parseInt(values["Ges_BE"]) + parseInt(values["BE_Last"]);
+		update["BE_RG_INI"] = calculateRuestungBE(values, {"sourceType": "migration"})["BE_RG_INI"];
+		console.log(func + ": Gathering new values complete:", update);
+		setAttrs(update, {}, function() {
+			callNextMigration(migrationChain);
+		});
+	});
+}
+
+
 on("sheet:opened", function() {
    migrationCheck();
    setAttrs({ "safe-sheet-open": Date.now() });
@@ -16624,26 +16795,40 @@ function calculateCombatValues() {
            attrsToChange["shield_bf"] = shieldparrybf;

            // Set shield parry weapon TP/KK (damage modifier based on low/high strength)
-            // For now no calculations, just showing text
-            var shieldparrytpkk = "";
+            var shieldparrytpkkdefault = "13/3";
+            var shieldparrytpkk = shieldparrytpkkdefault;
            if (activeShieldRowId) {
                shieldparrytpkk = values["repeating_shields_" + activeShieldRowId + "_shield_tpkk"];
-                if (shieldparrytpkk === undefined || shieldparrytpkk === "") {
-                    shieldparrytpkk = " ";
-                } else {
-                    // We are misusing the TP/KK function a bit ...
-                    var TPKK = new Object();
-                    TPKK["Schwellenwert"] = parseInt(shieldparrytpkk.match(/([^/]+)\/([^/]+)/)[1]);
-                    TPKK["Schritt"] = parseInt(shieldparrytpkk.match(/([^/]+)\/([^/]+)/)[2]);
-                    shieldparrytpkk = calculateTpKKMod(
-                        {
-                            "KK": values["KK"],
-                            "NKW-schild_SchwellenwertKK": TPKK["Schwellenwert"],
-                            "NKW-schild_Schwellenwert": TPKK["Schritt"]
-                        },
-                        "-schild"
-                    );
-                }
+
+				// Check for correct TP/KK
+				{
+					var setdefault = 1;
+					if (shieldparrytpkk === undefined) {
+						console.log('Error: TP/KK for shield parry is undefined. Set to default value ("' + shieldparrytpkkdefault + '").');
+					} else if (shieldparrytpkk === "") {
+						console.log('Error: TP/KK for shield parry is empty. Set to default value ("' + shieldparrytpkkdefault + '").');
+					} else if (shieldparrytpkk.match(/([^/]+)\/([^/]+)/) == null) {
+						console.log('Error: Invalid TP/KK \'' + shieldparrytpkk + '\'. Set to default value ("' + shieldparrytpkkdefault + '").');
+					} else {
+						setdefault = 0;
+					}
+					if ( setdefault === 1 ) {
+						attrsToChange["repeating_shields_" + activeShieldRowId + "_shield_tpkk"] = shieldparrytpkkdefault;
+						shieldparrytpkk = shieldparrytpkkdefault;
+					}
+				}
+                // We are misusing the TP/KK function a bit ...
+                var TPKK = new Object();
+                TPKK["Schwellenwert"] = parseInt(shieldparrytpkk.match(/([^/]+)\/([^/]+)/)[1]);
+                TPKK["Schritt"] = parseInt(shieldparrytpkk.match(/([^/]+)\/([^/]+)/)[2]);
+                shieldparrytpkk = calculateTpKKMod(
+                    {
+                        "KK": values["KK"],
+                        "NKW-schild_SchwellenwertKK": TPKK["Schwellenwert"],
+                        "NKW-schild_Schwellenwert": TPKK["Schritt"]
+                    },
+                    "-schild"
+                );
            }
            attrsToChange["shield_tpkk"] = shieldparrytpkk;

@@ -16712,7 +16897,7 @@ on("change:ATbasis change:TaW_peitsche change:AT_peitsche", function(eventInfo)
 });

 on("change:RSName1 change:RS_gBE1 change:RSAktiv1 change:RSName2 change:RS_gBE2 change:RSAktiv2 change:RSName3 change:RS_gBE3 change:RSAktiv3 change:RSName4 change:RS_gBE4 change:RSAktiv4 change:sf_rustungsgewohnungI change:rustungsgewohnungI_rustungen change:sf_rustungsgewohnungII change:sf_rustungsgewohnungIII", function(eventInfo) {
-    getAttrs([ "RSName1", "RS_gBE1", "RSAktiv1", "RSName2", "RS_gBE2", "RSAktiv2", "RSName2", "RS_gBE3", "RSAktiv3", "RSName3", "RS_gBE4", "RSAktiv4", "RSName4", "sf_rustungsgewohnungI", "rustungsgewohnungI_rustungen", "sf_rustungsgewohnungII", "sf_rustungsgewohnungIII"], function(values) {
+    getAttrs([ "RSName1", "RS_gBE1", "RSAktiv1", "RSName2", "RS_gBE2", "RSAktiv2", "RS_gBE3", "RSAktiv3", "RSName3", "RS_gBE4", "RSAktiv4", "RSName4", "sf_rustungsgewohnungI", "rustungsgewohnungI_rustungen", "sf_rustungsgewohnungII", "sf_rustungsgewohnungIII"], function(values) {
        var attrsToChange = calculateRuestungBE(values, eventInfo);
        setAttrs(attrsToChange);
    });
@@ -16721,6 +16906,7 @@ on("change:RSName1 change:RS_gBE1 change:RSAktiv1 change:RSName2 change:RS_gBE2
 // Berechnet die BE der aktiven Rüstungsteile
 // benötigt "RS_gBE1", "RSAktiv1", "RS_gBE2", "RSAktiv2", "RS_gBE3", "RSAktiv3", "RS_gBE4", "RSAktiv4", "sf_rustungsgewohnungI", "rustungsgewohnungI_rustungen", "sf_rustungsgewohnungII", "sf_rustungsgewohnungIII"
 // wenn bei dem übergebenen Event die aktive Rüstungsgewöhnung 1 geändert wurde, wird auch das übergeben
+// Enthält auch die Berechnung der auf die Initiative wirksamen BE aus Rüstung (BE_RG_INI)
 function calculateRuestungBE(values, eventInfo) {
    var attrsToChange = {};

@@ -16856,7 +17042,18 @@ function calculateRuestungBE(values, eventInfo) {

    totalBe = DSAround(roundDecimals(totalBe, 1));

-    attrsToChange["Ges_BE"] = totalBe;
+    attrsToChange["BE_RG"] = totalBe;
+
+	// Initiative reduction due to armour
+	var BEINI = 0;
+
+	BEINI = totalBe;
+
+	if (RG === 3) {
+		BEINI = DSAround(BEINI / 2);
+	}
+	attrsToChange["BE_RG_INI"] = BEINI;
+
    return attrsToChange;
 }
 /*
@@ -16900,7 +17097,6 @@ function roundDecimals (num, digits) {

 /*
 	General Sanity Check Function
-	Currently only checks sanity of stats.
 */
 function DSAsane (value, type) {
 	var func = "DSAsane";
@@ -16945,6 +17141,15 @@ function DSAsane (value, type) {
 				errors = true;
 			}
 			break;
+		case "encumbrance":
+			// Encumbrance from excessive equipment weight or armour
+			// Must be number or parseInt()-able number
+			// Must be integer in range [0, 99]
+			if (!limitedIntValid(value, 0, 99)) {
+				console.log(func + ": Value '" + value + "' check against type '" + type + "' failed.");
+				errors = true;
+			}
+			break;
 		default:
 			console.log(func + ": type '", type, "' not understood.");
 	}
@@ -17018,10 +17223,10 @@ function calculateAEBase(values) {
 }

 // Berechne BE-Basis aus dem gesamten Rüstungs BE und der BE durch Last
-on("change:Ges_BE change:BE_Last", function(eventInfo) {
-    getAttrs(["Ges_BE", "BE_Last"], function(values) {
+on("change:BE_RG change:BE_Last", function(eventInfo) {
+    getAttrs(["BE_RG", "BE_Last"], function(values) {
        var beTaw = calculateBEBasis(values);
-        setAttrs({ "BE_TaW": beTaw });
+        setAttrs({ "BE": beTaw });
    });
 });

@@ -17029,8 +17234,8 @@ on("change:Ges_BE change:BE_Last", function(eventInfo) {
 // Benötigt GesBE und BE_Last
 function calculateBEBasis(values) {
    var beTaw = 0;
-    if (values["Ges_BE"]) {
-        beTaw += parseInt(values["Ges_BE"]);
+    if (values["BE_RG"]) {
+        beTaw += parseInt(values["BE_RG"]);
    }
    if (values["BE_Last"]) {
        beTaw += parseInt(values["BE_Last"]);
@@ -17039,8 +17244,8 @@ function calculateBEBasis(values) {
 }

 // Berechne Waffenspezifische BE
-on("change:BE_TaW change:NKW_Aktiv1 change:NKW_AT_typ1 change:NKW_PA_typ1 change:NKW_Aktiv2 change:NKW_AT_typ2 change:NKW_PA_typ2 change:NKW_Aktiv3 change:NKW_AT_typ3 change:NKW_PA_typ3 change:NKW_Aktiv4 change:NKW_AT_typ4 change:NKW_PA_typ4", function(eventInfo) {
-    getAttrs([ "BE_TaW", "NKW_Aktiv1", "NKW_AT_typ1", "NKW_PA_typ1", "NKW_Aktiv2", "NKW_AT_typ2", "NKW_PA_typ2", "NKW_Aktiv3", "NKW_AT_typ3", "NKW_PA_typ3", "NKW_Aktiv4", "NKW_AT_typ4", "NKW_PA_typ4" ], function(values) {
+on("change:be change:nkw_aktiv1 change:nkw_at_typ1 change:nkw_pa_typ1 change:nkw_aktiv2 change:nkw_at_typ2 change:nkw_pa_typ2 change:nkw_aktiv3 change:nkw_at_typ3 change:nkw_pa_typ3 change:nkw_aktiv4 change:nkw_at_typ4 change:nkw_pa_typ4", function(eventInfo) {
+    getAttrs([ "BE", "NKW_Aktiv1", "NKW_AT_typ1", "NKW_PA_typ1", "NKW_Aktiv2", "NKW_AT_typ2", "NKW_PA_typ2", "NKW_Aktiv3", "NKW_AT_typ3", "NKW_PA_typ3", "NKW_Aktiv4", "NKW_AT_typ4", "NKW_PA_typ4" ], function(values) {
        var weaponBE = calculateWeaponBE(values);

        setAttrs({ be_at_mod: weaponBE.be_at, be_pa_mod: weaponBE.be_pa });
@@ -17122,7 +17327,7 @@ function calculateWeaponBEModifiers(combatTechnique, BE) {
    NKW_Aktiv 1-4
    NKW_AT_typ 1-4
    NKW_PA_typ 1-4
-    BE_TaW
+    BE
 */
 function calculateWeaponBE(values) {
    var weapon = 0;
@@ -17139,7 +17344,7 @@ function calculateWeaponBE(values) {
    } else {
        return BEModifiers;
    }
-    var baseBE = values["BE_TaW"];
+    var baseBE = values["BE"];
    var atTyp = values["NKW_AT_typ" + weapon];
    var paTyp = values["NKW_PA_typ" + weapon];
    var combatTechnique = {};
@@ -1,15 +1,11 @@
 # Das Schwarze Auge 4.1 Character Sheet
 Character sheet for the German system "Das Schwarze Auge" (The Dark Eye) version 4.1. If you are new to the system, you might prefer the most recent version 5.

-## Known Issues
-* Internal names for the "Paralysis" spell and the "Kartographie" and "Stimmenimitieren" skills are "paralys" and "karthographie" and "stimmenimmitieren" (unchanged for the sake of compatibility)
-* Skill checks do not take double 1 (automatic success with max. result), double 20 (automatic failure) and triple 20 (disastrous failure) into account
-* The whole combat system is a mess and should be used with great care only; some highlighted points:
-  * "Ansage" may be higher than the corresponding skill value (TaW)
-  * Target is not considered (distances class, special skills such as "Aufmerksamkeit")
-  * Target hit zone cannot be selected
-* 1d20 checks (such as attack) always roll 2d20 for technical reasons (one real roll and the confirmation roll in case of 1/20), therefore 3D dice are less useful.
-* Spells are not associated with a representation
-* Rituals are basically unimplemented
-* Miracles work rudimentally only and are lacking the comfort from talents and spells for activation
+## Known/Open Issues
+For a quite up-to-date list of known issues (and for posting issues), please take a look at the fork of GitHub user "kreuvf":
+https://github.com/kreuvf/roll20-character-sheets/issues
+
+## Known Limitations
+### Skill Checks: Double/Triple 1 or 20
+Skill checks do not take double 1 (automatic success with max. result), double 20 (automatic failure) and triple 20 (disastrous failure) into account. This could either be implemented via API scripts (= available to paying accounts only) or via Custom Roll Parsing (new as of 2021-07-13, available to everyone).

@@ -187,11 +187,11 @@
   "Geweihter": "Blessed",
   "Giftresistenz-Regel-Pub": "\n\t\t\t\t\t\t<b>Rules:</b> Resistant to Poison raises your Toughness and Spirit by 1 per level when resisting poison.<br>\n\t\t\t\t\t\t<b>Publication:</b> VR01 - Core Rules p. 169",
   "Giftresistenz": "Resistant to Poison",
-   "Glück-Regel-Pub": "\n\t\t\t\t\t\t<b>Regel:</b> Das für den Helden erreichbare Maximum an Schicksalspunkten steigt hierdurch um 1 je Stufe und der Held er erhält diesen Schip gleich zu Spielbeginn zu seinem Vorrat.<br>\n\t\t\t\t\t\t<b>Publikation:</b> VR01 - Regelwerk S. 165",
+   "Glück-Regel-Pub": "\n\t\t\t\t\t\t<b>Rule:</b> The maximum achievable fate points for the hero increases by 1 per level and the hero receives this point in their supply immediately.<br>\n\t\t\t\t\t\t<b>Source:</b> VR01 - Regelwerk p. 165",
   "Glück": "Luck",
   "Gutaussehend-Regel-Pub": "\n\t\t\t\t\t\t<b>Rule:</b> The hero receives a bonus of 1 per level of this advantage for checks using <i>Commerce (Haggling)</i>, <i>Fast-Talk (Hard Sell, Manipulate, Subterfuge, Sweet-Talk)</i>, and <i>Seduction (Flirting, Romantic Arts)</i>.<br>\n\t\t\t\t\t\t<b>Publikation:</b> VR01 - Regelwerk S. 165",
   "Gutaussehend": "Good Looks",
-   "Hart-im-Nehmen-Regel-Pub": "\n\t\t\t\t\t\t<b>Regel:</b> Muss eine Probe auf <i>Selbstbeherrschung (Handlungsfähigkeit bewahren oder Störungen ignorieren)</i> bei Wundeffekten abgelegt werden, bekommt die Spielerin eine Erleichterung von 1.<br>\n\t\t\t\t\t\t<b>Publikation:</b> VR02 - Aventurisches Kompendium S. 132",
+   "Hart-im-Nehmen-Regel-Pub": "\n\t\t\t\t\t\t<b>Rule:</b> If wound effects require a test for <i>Self-Control (maintaining the ability to act or ignoring interference)</i>, the player receives a bonus of 1.<br>\n\t\t\t\t\t\t<b>Source:</b> VR02 - Aventurisches Kompendium p. 132",
   "Hart-im-Nehmen": "Resilient",
   "Hass-auf-Regel-Pub": "\n\t\t\t\t\t\t<b>Regel:</b> Der Held richtet gegen eine Art von Wesen, das beim Erwerb dieses Vorteils festgelegt werden muss, +1 TP im Nahkampf an. Der Typus des Wesens muss dabei näher spezifiziert werden. Je häufiger der Typus des Wesens in Aventurien vorkommt, desto teurer der AP-Wert für diesen Vorteil. <br> \n\t\t\t\t\t\tAusgeschlossen als wählbare Typen sind die Oberkategorien Lebewesen und Nicht Lebende. Neben dem im Regelwerk aufgeführten Typen und Unterkategorien kann man auch Spezies und Kulturen wählen. Die eigene Spezies/Kultur ist prinzipiell wählbar, jedoch sind Helden mit Hass auf die eigene Spezies/Kultur oft nur schwer spielbar. Der Meister hat das letzte Wort bezüglich der Wählbarkeit eines Hassobjektes. Je kleinteiliger ein Typus gewählt wird und je seltener eine potenzielle Begegnung mit ihm ist, desto niedriger die AP-Kosten für den Vorteil. Mehr zu den Typen und ihren Unterkategorien siehe Regelwerk Seite 355.<br>\n\t\t\t\t\t\t<b>Publikation:</b> VS01 - Aventurisches Bestiarium I S. 122",
   "Hass-auf": "Hatred for ...",
@@ -399,7 +399,7 @@
   "Verstümmelt-Einhändig": "Maimed: one-handed",
   "Verstümmelt-Einohrig-Regel-Pub": "\n\t\t\t\t\t\t<b>Regel:</b> Viele Fertigkeitsproben können durch die Verstümmelung erschwert oder unmöglich sein. Die Entscheidung hierüber obliegt dem Meister je nach Situation.<br>\n\t\t\t\t\t\tEines der Ohren ist abgeschnitten oder verkrüppelt. Proben auf <i>Sinnesschärfe</i> auf Hören sind für den Helden grundsätzlich um 1 erschwert.<br>\n\t\t\t\t\t\t<b>Publikation:</b> VR01 - Regelwerk S. 179",
   "Verstümmelt-Einohrig": "Maimed: one-eared",
-   "Verweichlicht-Regel-Pub": "\n\t\t\t\t\t\t<b>Regel:</b> Bei der Probe auf Selbstbeherrschung (Handlungsfähigkeit bewahren oder Störungen ignorieren) bei Wundeffekten bekommt die Heldin eine Erschwernis von 2.<br>\n\t\t\t\t\t\t<b>Publikation:</b> VR02 - Aventurisches Kompendium S. 133",
+   "Verweichlicht-Regel-Pub": "\n\t\t\t\t\t\t<b>Rule:</b> If wound effects require a test for <i>Self-Control (maintaining the ability to act or ignoring interference)</i>, the player receives a penalty of 2.<br>\n\t\t\t\t\t\t<b>Source:</b> VR02 - Aventurisches Kompendium p. 133",
   "Verweichlicht": "Brittle Bones",
   "Wahrer-Name-Regel-Pub": "\n\t\t\t\t\t\t<b>Regel:</b> Wenn ein Zauberer einen Zauberspruch gegen ein Ziel einsetzt, dessen Wahren Namen er kennt (und der über diesen Nachteil verfügt), verschlechtert sich die Seelenkraft und die Zähigkeit des Ziels um 4, womit es leichter zu verzaubern ist.<br>\n\t\t\t\t\t\t<b>Publikation:</b> VR01 - Regelwerk S. 179",
   "Wahrer-Name": "True Name",
@@ -71,8 +71,8 @@
                <div class="sheet-row">
                    <div class="sheet-item" style="width:15%"><label data-i18n="Rank">Rank</label></div>
                    <div class="sheet-item" style="width:33%"><input name="attr_Rank" type="text" /></div>
-                    <div class="sheet-item" style="width:15%"><label data-i18n="Fame">Fame</label></div>
-                    <div class="sheet-item" style="width:32%"><input name="attr_Fame" type="text" /></div>
+                    <div class="sheet-item" style="width:15%"><label data-i18n="Renown">Renown</label></div>
+                    <div class="sheet-item" style="width:30%;margin-left: 5px;"><input name="Renown" type="text" /></div>
                </div>
                <div class="sheet-row">
                    <div class="sheet-item" style="width:45%"><label data-i18n="PowerArmourHistory">Power Armour History</label></div>
@@ -4532,4 +4532,4 @@
        {{/allprops() title subtitle desc color}}
    </div>
  </div>
-</rolltemplate>
+</rolltemplate>
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -197,4 +197,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Actitud del Capítulo",
  "Speciality": "Especialidad",
  "Rank": "Rango",
-  "Fame": "Fama",
+  "Renown": "Renown",
  "PowerArmourHistory": "Servoarmadura",
  "PlayerName": "Jugador",
  "Gender": "Género",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ataque a Distancia",
  "Penetration": "Penetración",
  "HideLogMessage": "Pulsa aquí para esconder este mensaje"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "C. Conduite (chapitre)",
  "Speciality": "Specialité",
  "Rank": "Rang",
-  "Fame": "Renom",
+  "Renown": "Renown",
  "PowerArmourHistory": "Historique d'armure",
  "PlayerName": "Nom joueur",
  "Gender": "Genre",
@@ -196,4 +196,4 @@
  "RangedAttack": "Attaque à distance",
  "Penetration": "Pénétration",
  "HideLogMessage": "\"Cochez cette case pour masquer l'annonce >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Chapter&nbsp;Demeanour",
  "Speciality": "Speciality",
  "Rank": "Rank",
-  "Fame": "Fame",
+  "Renown": "Renown",
  "PowerArmourHistory": "Power&nbsp;Armour&nbsp;History",
  "PlayerName": "Player Name",
  "Gender": "Gender",
@@ -196,4 +196,4 @@
  "RangedAttack": "Ranged Attack",
  "Penetration": "Penetration",
  "HideLogMessage": "Tick me to hide this message >>"
-}
+}
@@ -4,7 +4,7 @@
  "ChapterDemeanour": "Характер&nbsp;Ордена",
  "Speciality": "Специализация",
  "Rank": "Ранг",
-  "Fame": "Слава",
+  "Renown": "Renown",
  "PowerArmourHistory": "История&nbsp;Силовой&nbsp;брони",
  "PlayerName": "Имя игрока",
  "Gender": "Пол",
@@ -196,4 +196,4 @@
  "RangedAttack": "Дальнобойная атака",
  "Penetration": "Пробивание",
  "HideLogMessage": "Нажмите здесь, чтобы спрятать сообщение >>"
-}
+}
--- a/Show More
+++ b/Show More