Merge branch 'master' into ShadowrunSixthWorld-v.45

2026-08-30 03:40:32 +00:00 · 2021-11-04 11:51:55 -04:00
parent 93a6f6e4ec cf5599386a
commit 917241e51f
224 changed files with 95444 additions and 80170 deletions
@@ -1,41 +1,41 @@
-& 'D:\git\roll20-character-sheets\AD&D 2E Revised\build\sanitizeFiles.ps1'
-
-"---- Combining files ----"
-$inputFile = 'D:\git\roll20-character-sheets\AD&D 2E Revised\html\2ESheet-base.html'
-$sourceFolder = 'D:\git\roll20-character-sheets\AD&D 2E Revised'
-$outputFile = 'D:\git\roll20-character-sheets\AD&D 2E Revised\2ESheet.html'
-
-$replaceConstant = '#REPLACE{0}#'
-
-$content = Get-Content -Path $inputFile
-
-$inserts = ($content | Select-String -Pattern 'insert_')
-
-$inserts | ForEach-Object {
-   $_.Line.Trim()
-   $split = $_.Line.Split('_')
-   $whiteSpace = $split[0].Replace('insert', '')
-   $fileName = $split[1]
-   $file = Get-ChildItem -Path $sourceFolder -Filter $fileName -Recurse
-   $fileContent = Get-Content -Path $file.FullName
-   if ($whiteSpace.Length -gt 0) {
-      for ($i = 0; $i -lt $fileContent.Length; $i++)
-      {
-         $fileContent[$i] = $whiteSpace + $fileContent[$i]
-      }
-   }
-   $rawContent = $fileContent -join "`n"
-   $replaces = $split[2..100];
-   for ($i=0; $i -lt $replaces.Length; $i++) {
-      $replace = $replaceConstant -f $i;
-      $rawContent = $rawContent.Replace($replace, $replaces[$i])
-   }
-   $rawContent = $rawContent -replace "\#REPLACE\d+\#", ""
-   
-   $regex = "^" + [Regex]::Escape($_.Line) + "$"
-   $content = $content -replace $regex, $rawContent
-}
-
-$content | Set-Content -Path $outputFile
-$time = Get-Date -Format "HH:mm:ss";
+& 'D:\git\roll20-character-sheets\AD&D 2E Revised\build\sanitizeFiles.ps1'
+
+"---- Combining files ----"
+$inputFile = 'D:\git\roll20-character-sheets\AD&D 2E Revised\html\2ESheet-base.html'
+$sourceFolder = 'D:\git\roll20-character-sheets\AD&D 2E Revised'
+$outputFile = 'D:\git\roll20-character-sheets\AD&D 2E Revised\2ESheet.html'
+
+$replaceConstant = '#REPLACE{0}#'
+
+$content = Get-Content -Path $inputFile
+
+$inserts = ($content | Select-String -Pattern 'insert_')
+
+$inserts | ForEach-Object {
+   $_.Line.Trim()
+   $split = $_.Line.Split('_')
+   $whiteSpace = $split[0].Replace('insert', '')
+   $fileName = $split[1]
+   $file = Get-ChildItem -Path $sourceFolder -Filter $fileName -Recurse
+   $fileContent = Get-Content -Path $file.FullName
+   if ($whiteSpace.Length -gt 0) {
+      for ($i = 0; $i -lt $fileContent.Length; $i++)
+      {
+         $fileContent[$i] = $whiteSpace + $fileContent[$i]
+      }
+   }
+   $rawContent = $fileContent -join "`n"
+   $replaces = $split[2..100];
+   for ($i=0; $i -lt $replaces.Length; $i++) {
+      $replace = $replaceConstant -f $i;
+      $rawContent = $rawContent.Replace($replace, $replaces[$i])
+   }
+   $rawContent = $rawContent -replace "\#REPLACE\d+\#", ""
+   
+   $regex = "^" + [Regex]::Escape($_.Line) + "$"
+   $content = $content -replace $regex, $rawContent
+}
+
+$content | Set-Content -Path $outputFile
+$time = Get-Date -Format "HH:mm:ss";
 Write-Host "Combine complete $time" 
@@ -3,7 +3,7 @@
  <ul>
    <li data-i18n="written-by-brian-tyrrell">Written by Brian Tyrrell</li>
    <li data-i18n="edited-by-vi-huntsman">Edited by Vi Huntsman</li>
-    <li data-i18n="roll20-by-wes-baker">Roll20 by Wes Baker</li>
+    <li data-i18n="roll20-by-wes-baker-and-jess-peck">Roll20 by Wes Baker</li>
    <li data-i18n="copyright-dungeons-on-a-dime">Copyright © Dungeons on a Dime 2020</li>
  </ul>
  <img src="https://i.ibb.co/LzTzrJj/AOAD-150-DPI.png" />
@@ -1,9 +1,9 @@
 {
-    "html": "barbaric.html",
-    "css": "barbaric.css",
-    "authors": "Andreas J.",
-    "roll20userid": "1223200",
-    "preview": "preview.png",
-    "instructions": "This is the Official character sheet for **Barbaric!** by [Stellagama Publishing](https://www.drivethrurpg.com/browse/pub/9571/Stellagama-Publishing).\nHoja de personaje **¡Bárbaro!**\n* [Readme.md](https://github.com/Roll20/roll20-character-sheets/blob/master/Barbaric/) - sheet instructions\n* [Barbaric!](https://www.drivethrurpg.com/product/348272/Barbaric) - rules\n* [¡Bárbaro!](https://www.drivethrurpg.com/product/357031/Barbaro) - libro",
-    "legacy": false
-}
+	"html": "barbaric.html",
+	"css": "barbaric.css",
+	"authors": "Andreas J.",
+	"roll20userid": "1223200",
+	"preview": "preview.png",
+	"instructions": "This is the Official character sheet for **Barbaric!** by [Stellagama Publishing](https://www.drivethrurpg.com/browse/pub/9571/Stellagama-Publishing).\nHoja de personaje **&iexcl;B&aacute;rbaro!**\n\n* [Readme.md](https://github.com/Roll20/roll20-character-sheets/blob/master/Barbaric/) - sheet instructions\n* [Barbaric!](https://www.drivethrurpg.com/product/348272/Barbaric) - rules\n* [&iexcl;B&aacute;rbaro!](https://www.drivethrurpg.com/product/357031/Barbaro) - libro",
+	"legacy": false
+}
@@ -1627,10 +1627,9 @@
 		<fieldset class="repeating_ armors">
 			<table>
 				<tr>
-				<td><input style="width:125px" type="text" name="attr_armor_name1" /></td>
+				<td><input style="width:175px" type="text" name="attr_armor_name1" /></td>
 				<td ><input style="width:60px" type="text" name="attr_armor_value1" /></td>
 				<td><input type="number" name="attr_armor_skill_penalty1" /></td>
-				<td><input type="number" name="attr_armor_energy_points1" /></td>
 				<td style="text-align:center"><button type="roll" value="Armor deflects [[@{armor_value1}]] pts" /></td>
 				</tr>
 			</table>
@@ -10,7 +10,7 @@
    --color-mage:       #0000FF;
    --color-promethean: #660099;
    --color-changeling: #006600;
-    --color-geist:      #005394;
+    --color-geist:      #316195;
    --color-mummy:      #996600;
    --color-demon:      #2A2D80;
    --color-beast:      #2A2D80;
@@ -173,10 +173,9 @@ input.sheet-game-line[value="changeling"] ~ .sheet-background-image::after {
 }

 input.sheet-game-line[value="geist"] ~ .sheet-background-image::after {
-    background: url('https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/deemlbag.png');
+    background: url('https://raw.githubusercontent.com/AdolfoDomingues/roll20-character-sheets/adf6900d6b57636eb5273d731ccd6a22adb57a1d/Chronicles%20of%20Darkness/images/Geist2eBG.jpg');
    background-size: 100% 100%;
 }
-
 input.sheet-game-line[value="mummy"] ~ .sheet-background-image::after {
    background: url('https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/mummy-bg.jpg');
    background-size: 100% 100%;
@@ -198,12 +197,12 @@ input.sheet-game-line[value="hunter"] ~ .sheet-background-image::after {
 }

 input.sheet-game-line[value="wod-demon"] ~ .sheet-background-image::after {
-    background: url('https://raw.githubusercontent.com/AdolfoDomingues/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/demon-fallen-bg.png');
+    background: url('https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/demon-fallen-bg.png');
    background-size: 100% 100%;
 }

 input.sheet-game-line[value="deviant-the-renegades"] ~ .sheet-background-image::after {
-    background: url('https://raw.githubusercontent.com/AdolfoDomingues/roll20-character-sheets/e4e0a8597e968bf40dbe9d84ec203b248f55d4c1/Chronicles%20of%20Darkness/images/Deviant-bg.jpg');
+    background: url('https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/Deviant-bg.jpg');
    background-size: 100% 100%;
 }

@@ -257,8 +257,8 @@
        <img class="game-line geist" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/geist20200815.png">
        <img class="game-line hunter" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/hunter.png">
        <img class="game-line demon" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/DtD_logo.png">
-        <img class="game-line wod-demon" src="https://raw.githubusercontent.com/AdolfoDomingues/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/DtF_logo.png">
-        <img class="game-line deviant-the-renegades" src="https://raw.githubusercontent.com/AdolfoDomingues/roll20-character-sheets/e4e0a8597e968bf40dbe9d84ec203b248f55d4c1/Chronicles%20of%20Darkness/images/Deviant.png">
+        <img class="game-line wod-demon" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/DtF_logo.png">
+        <img class="game-line deviant-the-renegades" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Chronicles%20of%20Darkness/images/Deviant.png">
    </div>

    <!-- PAGE 1 -->
@@ -4,7 +4,7 @@
  "authors": "StéphaneD",
  "roll20userid": "84776",
  "preview": "coc_v2.png",
-  "instructions": "Feuille de Personnage pour [Chroniques Oubliées Contemporain](http://www.black-book-editions.fr/produit.php?id=4349). Chroniques Oubliées Contemporain est le dérivé de Chroniques Oubliées Fantasy adapté pour jouer dans la période 1900-2100. Il permet de jouer des aventures du genre espionnage, commando militaire, enquêtes policières occultes, vampires contre garous, mutants, super-héros, épouvante, pulp, apocalypse zombie, cyberpunk, et plus. Version 3.9.2 (27/04/2021). [Lisez-moi](https://github.com/Roll20/roll20-character-sheets/blob/master/ChroniquesOublieesContemporain/README.md).",
+  "instructions": "Feuille de Personnage pour [Chroniques Oubli&eacute;es Contemporain](http://www.black-book-editions.fr/produit.php?id=4349). Chroniques Oubli&eacute;es Contemporain est le d&eacute;riv&eacute; de Chroniques Oubli&eacute;es Fantasy adapt&eacute; pour jouer dans la p&eacute;riode 1900-2100. Il permet de jouer des aventures du genre espionnage, commando militaire, enqu&ecirc;tes polici&egrave;res occultes, vampires contre garous, mutants, super-h&eacute;ros, &eacute;pouvante, pulp, apocalypse zombie, cyberpunk, et plus.\n\n* Version 3.9.2 (27/04/2021)\n* [Lisez-moi](https://github.com/Roll20/roll20-character-sheets/blob/master/ChroniquesOublieesContemporain/README.md).",
  "useroptions": [
    {
      "attribute": "coc_setting",
@@ -3,7 +3,7 @@
    "tab-spaceship": "Spaceship sheet",
    "tab-utility": "Utility",
    "Attributes": "Attributs",
-    "attribute-strength": "Force",
+    "attribute-strength": "Vigueur",
    "attribute-agility": "Agilité",
    "attribute-wits": "Astuce",
    "attribute-empathy": "Empathie",
@@ -11,16 +11,16 @@
    "skill-melee-combat": "Combat de mêlée",
    "skill-dexterity": "Dextérité",
    "skill-infiltration": "Infiltration",
-    "skill-ranged-combat": "Ranged Combat",
+    "skill-ranged-combat": "Combat à distance",
    "skill-ranged-combat-short": "À distance",
    "skill-pilot": "Piloter",
    "skill-observation": "Observation",
    "skill-survival": "Survie",
    "skill-data-djinn": "Data Djinn",
    "skill-data-djinn-short": "Djinn",
-    "skill-medicurgy": "Medicurgy",
+    "skill-medicurgy": "Médirurgie",
    "skill-science": "Science",
-    "skill-technology": "Technology",
+    "skill-technology": "Technologie",
    "skill-manipulation": "Manipulation",
    "skill-command": "Command",
    "skill-culture": "Culture",
@@ -33,7 +33,7 @@
    "button-roll-radiation": "Radiation",
    "button-roll-primary-weapon": "Primary Weapon Attack",
    "button-roll-secondary-weapon": "Secondary Weapon Attack",
-    "char-experience": "Experience",
+    "char-experience": "Expérience",
    "char-name": "Nom",
    "char-background": "Fond",
    "char-concept": "Concept",
@@ -132,7 +132,7 @@
    "ship-action-sensors-meme-attack-description": "If successful: disable a module on the target ship.",
    "ship-action-sensors-disappear-label": "Disappear",
    "ship-action-sensors-disappear-description": "If successful: end combat.",
-    "ship-action-sensors-detect": "Sensors",
+    "ship-action-sensors-detect": "Senseurs",
    "ship-action-sensors-detect-description": "<strong>1-2 Successes</strong><br/>Distance, course<br/><strong>3 Successes</strong><br/>Distance, class, course, weapons.",
    "label-talents": "Talents",
    "label-critical-injuries": "&emsp;Blessures Critique&emsp;",
@@ -142,10 +142,10 @@
    "label-armor": "Armure",
    "label-features": "Capacités spéciales",
    "label-ship-weapons": "Ship Weapons",
-    "label-ship-crew-captain": "Captain",
+    "label-ship-crew-captain": "Capitaine",
    "label-ship-crew-engineer": "Ingénieur",
    "label-ship-crew-pilot": "Piloter",
-    "label-ship-crew-sensors": "Sensors",
+    "label-ship-crew-sensors": "Senseurs",
    "label-ship-crew-gunner": "Artilleur",
    "label-ship-modules": "Modules de",
    "label-ship-cargo": "Cargo",
@@ -156,7 +156,7 @@
    "label-info": "Info",
    "placeholder-weapon": "Weapon Name",
    "placeholder-gear": "Gear",
-    "placeholder-critical-injury": "Critical Injury",
+    "placeholder-critical-injury": "Blessure Critique",
    "placeholder-armor": "Armure",
    "placeholder-comment": "Spécial",
    "placeholder-talent": "Talent",
@@ -11,33 +11,72 @@

 //Rolls a d100 and calculates the success or fail results to the chat window.
 var Roll40k = Roll40k || (function(){
-
-    var rollResultForRoll40k = function (token, attribute, modifier) {
-        var roll = randomInteger(100);
-        var modTarget = parseInt(attribute) + parseInt(modifier);
-        var output1 = token + ' has a modified target of <B>' + modTarget + '</B> and rolled a <B>' + roll + '</B>. ';
-        var output2, degOfSuc;
-        //Form output message based on result
-        if (roll === 1) {
-            output2 = '<span style="color:green">' + token + ' rolled a 1 and automatically succeeds by <B>1 degree</B>.</span>';
-        }
-        else if (roll === 100) {
-            output2 = '<span style="color:red">' + token + ' rolled a 100 and automatically fails by <B>1 degree</B>.</span>';
-        }
-        else if (roll <= modTarget) {
-            degOfSuc = Math.floor((modTarget - roll) / 10) + 1;
-            output2 = '<span style="color:green">' + token + ' succeeds by <B>' + degOfSuc + ' degree(s)</B>.</span>';
-        }
-        else {
-            degOfSuc = Math.floor((roll - modTarget) / 10) + 1;
-            output2 = '<span style="color:red">' + token + ' fails by <B>' + degOfSuc + ' degree(s)</B></span>.';
-        }
-        //Return output
-        return output1 + '<br><br>' + output2;
-    },
-    processInlinerolls = function(msg) {
-        if (_.has(msg, 'inlinerolls')) {
-            return _.chain(msg.inlinerolls)
+    
+    //Addition of tracking for used Psy Rating to use in flavor text and for Psy Damage roll if needed.  Created by Oosh.
+	on('ready', () => {
+        const rxRoll = /^!roll40k\s/i;
+        const rxLabel = /(\d+)\[mymod\]/i;
+        
+		on('chat:message', (msg) => {
+            if (rxRoll.test(msg.content) && msg.inlinerolls) {
+                let sender = msg.who.replace(/\(gm\)/i, '');
+                
+				// Grab and verify data proceeding [mymod] is added.
+				reqRoll = msg.inlinerolls.find(r => rxLabel.test(r.expression));
+                if (!reqRoll) return /*sendChat('modifierBot', `/w "${sender}" Something went horribly wrong in reqRoll. Please reinstall universe.`)*/;
+                
+				// Grab the query value and set to a variable.
+				psyU = reqRoll.expression.match(rxLabel)[1];
+				if (!psyU) return /*sendChat('modifierBot', `/w "${sender}" Something went horribly wrong in psyU. Please reinstall universe.`)*/;
+                
+				// Grab the @{character_name} reference from the roll expression
+                let charName = msg.content.match(/^!roll40k\s+([^,]+)/i)[1];
+                let char = (findObjs({type: 'character', name: charName})||[])[0]
+                if (!char) return sendChat('modifierBot', `/w "${sender}" Something went horribly wrong. Please reinstall universe.`);
+                let charId = char.id;
+                
+				// Update the attribute if it exists, or create it if it doesn't
+                let attr = (findObjs({type: 'attribute', characterid: charId, name: 'psyuse'})||[])[0];
+                if (!attr) createObj('attribute', {characterid: charId, name:'psyuse', current: psyU});
+                else attr.set({current: psyU});
+            }
+        });
+		
+        var rollResultForRoll40k = function (token, attribute, modifier) {
+            var roll = randomInteger(100);
+            var modTarget = parseInt(attribute) + parseInt(modifier);
+            var output2 = token + ' has a modified target of <B>' + modTarget + '</B> and rolled a <B>' + roll + '</B>. ';
+            var output3, degOfSuc;
+            //Form output message based on result
+            if (roll === 1) {
+                degOfSuc = Math.floor((modTarget - roll) / 10) + 1;
+                output3 = '<span style="color:green">' + token + ' rolled a 1 and critically succeeds with <B>' + degOfSuc + ' degree(s)</B>!</span>';
+            }
+            else if (roll === 100) {
+                degOfSuc = Math.floor((roll - modTarget) / 10) + 1;
+                output3 = '<span style="color:red">' + token + ' rolled a 100 and critically fails with <B>' + degOfSuc + ' degree(s)</B>!</span>';
+            }
+            else if (roll <= modTarget) {
+                degOfSuc = Math.floor((modTarget - roll) / 10) + 1;
+                output3 = '<span style="color:#002e00">' + token + ' succeeds by <B>' + degOfSuc + ' degree(s)</B>.</span>';
+            }
+            else {
+                degOfSuc = Math.floor((roll - modTarget) / 10) + 1;
+                output3 = '<span style="color:#570000">' + token + ' fails by <B>' + degOfSuc + ' degree(s)</B></span>.';
+            }
+            //Return output: modified to have psy and non-psy output.
+            if (!reqRoll) {
+                log("weapon output");
+                return output2 + '<br><br>' + output3;
+            }else {
+                log("psy output");
+                var output1 = '<span style="color:#ad00ad">Psy Rating: ' + psyU + '</span>';
+                return output1 + '<br><br>' + output2 + '<br><br>' + output3;
+            }
+        }, 
+        processInlinerolls = function(msg) {
+            if (_.has(msg, 'inlinerolls')) {
+                return _.chain(msg.inlinerolls)
                    .reduce(function(previous, current, index) {
                        previous['$[[' + index + ']]'] = current.results.total || 0;
                        return previous;
@@ -46,27 +85,29 @@ var Roll40k = Roll40k || (function(){
                        return previous.replace(index, current);
                    }, msg.content)
                    .value();
-        } else {
-            return msg.content;
-        }
-    };
+            } else {
+                return msg.content;
+            }
+        };  

-    /** Interpret the chat commands. **/
-    on('chat:message', function (msg) {
-        'use strict';
-        var cmdName = '!roll40k ';
-        if (msg.type === 'api' && msg.content.indexOf(cmdName) !== -1) {
-            let content = processInlinerolls(msg);
-            var paramArray = content.slice(cmdName.length).split(',');
-            if (paramArray.length !== 3) {
-                sendChat(msg.who, '/w ' + msg.who + ' You must specify three comma-separated ' +
-                'parameters for the !roll40k command.');
+        /** Interpret the chat commands. **/
+        on('chat:message', function (msg) {
+            'use strict';
+            var cmdName = '!roll40k ';
+            if (msg.type === 'api' && msg.content.indexOf(cmdName) !== -1) {
+                let content = processInlinerolls(msg);
+                var paramArray = content.slice(cmdName.length).split(',');
+                if (paramArray.length !== 3) {
+                    sendChat(msg.who, '/w ' + msg.who + ' You must specify three comma-separated ' +
+                    'parameters for the !roll40k command.');
+                }
+                else {
+                    log("Success!");
+                    var result = rollResultForRoll40k(paramArray[0].trim(),
+                    paramArray[1].trim(), paramArray[2].trim());
+                    sendChat(msg.who, result);
+                }
            }
-            else {
-                var result = rollResultForRoll40k(paramArray[0].trim(),
-                paramArray[1].trim(), paramArray[2].trim());
-                sendChat(msg.who, result);
-            }
-        }
+        });
    });
 }())
@@ -13,7 +13,8 @@
 .charsheet input.sheet-tab5:checked ~ div.sheet-section-journal,
 .charsheet input.sheet-tab6:checked ~ div.sheet-section-vehicles,
 .charsheet input.sheet-tab7:checked ~ div.sheet-section-psykana,
-.charsheet input.sheet-tab8:checked ~ div.sheet-section-social {
+.charsheet input.sheet-tab8:checked ~ div.sheet-section-social,
+.charsheet input.sheet-tab9:checked ~ div.sheet-section-ship {
 	display: block;
 }

@@ -63,6 +64,7 @@
 .charsheet input.sheet-tab6:checked + span.sheet-tab6,
 .charsheet input.sheet-tab7:checked + span.sheet-tab7,
 .charsheet input.sheet-tab8:checked + span.sheet-tab8,
+.charsheet input.sheet-tab9:checked + span.sheet-tab9,
 .charsheet input.sheet-tab99:checked + span.sheet-tab99 {
    background: #6d131b;
    color: #eaeaea;
@@ -22,6 +22,9 @@

 <input type="radio" class="sheet-tab sheet-tab8" name="attr_core-tab" value="8" title="Social" /> 
 <span data-i18n="social-u" class="sheet-tab sheet-tab8" style="line-height: 40px;">Social</span>
+
+<input type="radio" class="sheet-tab sheet-tab9" name="attr_core-tab" value="9" title="Ship" />
+<span data-i18n="ship-u" class="sheet-tab sheet-tab9" style="line-height: 40px;">Ship</span>
 <br><br>
 <!-- End Main Tab setup -->

@@ -739,7 +742,7 @@
                            <!-- Strength (S) -->
                            <div class="sheet-2colrow">
                                <div class="sheet-col">
-                                    <button name="roll_S" type="roll" value="/em rolls strength: [[1d100]] Target: [[@{strength}+ ?{Modifier|0}]]."><span data-i18n="strength-(s)-u">Strength (S)</span></button>
+                                    <button name="roll_S" type="roll" value="/em rolls Strength: [[1d100]] Target: [[@{strength}+ ?{Modifier|0}]]."><span data-i18n="strength-(s)-u">Strength (S)</span></button>
                                </div>
                                <div class="sheet-col">
                                    <div class="sheet-unnatural_box">
@@ -2721,7 +2724,7 @@
 			
 		</div>
 		<br>
-		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Section separator"><!-- Divider -->
+		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Divider"><!-- Divider -->
 		<div class="sheet-2colrow">
 			<div class="sheet-fate"> 	<!-- Experience Totals -->
 				<br>
@@ -2782,7 +2785,7 @@
 			</div>
 		</fieldset>
 		<br>
-		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Section separator"><!-- Divider -->
+		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Divider"><!-- Divider -->

 		<div class="sheet-2colrow">
 		<!-- Left Column (Insanity and Corruption) -->
@@ -2899,7 +2902,7 @@
 					<div class="sheet-item" style="width:10%"><span data-i18n="personality-u">Personality:</span></div>
 					<div class="sheet-item" style="width:50%"><input name="attr_NPCPersonality" type="text"></div>
 				        </div>  
-					<img src="http://i.imgur.com/TKfHnQ9.png" alt="Section separator"><!-- Divider -->
+					<img src="http://i.imgur.com/TKfHnQ9.png" alt="Divider"><!-- Divider -->
 				<div class="sheet-2colrow">
 					<div class="sheet-col"><!--Left Column for individual NPC Profile-->
 						<br>
@@ -3423,7 +3426,7 @@
 			</div>
 		</div>
 		<!--Player entry for basic notes and journal keeping-->    
-			<img src="http://i.imgur.com/TKfHnQ9.png" alt="Section separator"> <!-- Divider -->
+			<img src="http://i.imgur.com/TKfHnQ9.png" alt="Divider"> <!-- Divider -->
 			<h3 data-i18n="journal-entry-u">Journal Entry</h3>
 		<div>
 		    <input style="font-size: 18pt; height: 35px;" align="middle" name="attr_JournalTitle" type="text">
@@ -3493,7 +3496,7 @@
 				<div class="sheet-item sheet-DHBtn" style="width: 33%; text-align: center;"><button name="roll_PsyniscienceCharacteristic" type="roll" value="!roll40k @{character_name}'s channelled Perception, @{PsyniscienceCharacteristic},[[(@{PsyRating} - ?{Psy Use?|1}) *10 + ?{Modifier|0}]]"> <span data-i18n="psyniscience-u">Psyniscience</span> </button></div>
 			</div>
 		<br>
-		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Section separator"><!-- Divider  -->
+		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Divider"><!-- Divider  -->
 		<h3 data-i18n="psychic-powers-u">Psychic Powers</h3>
 		<div class="sheet-2colrow">
 		<!-- Psychic Powers Left Column -->
@@ -3546,8 +3549,11 @@
 						<div class="sheet-item" style="width: 23%;"><input name="attr_PsyDamage" type="text" /></div>
 						<div class="sheet-item" style="width: 7%;"><span data-i18n="penetration-u">Pen:</span></div>
 						<div class="sheet-item" style="width: 23%;"><input name="attr_PsyPen" type="text" /></div>
-						<div class="sheet-item sheet-redbgns" style="width: 17%;"><button name="roll_PsyDamage" type="roll" value="/me does [[@{PsyDamage}]] damage! (Pen: @{PsyPen})"> <span data-i18n="damage-u">Damage</span> </button></div>
-						<div class="sheet-item sheet-redbgns" style="width: 15%;"><button name="roll_PsyHit" type="roll" value="!roll40k @{character_name}, ?{Focus Power Characteristic | Willpower,@{Willpower} | Perception,@{Perception} | Psyniscience,@{PsyniscienceCharacteristic}},  [[(@{PsyRating} - ?{Psy Use?|1}) *10 + ?{Modifier|0}]]"> <span data-i18n="hit-u">Hit</span> </button></div>
+						<div class="sheet-item sheet-redbgns" style="width: 17%;"><button name="roll_PsyDamage" type="roll" value="/me does [[@{PsyDamage} + ?{Use Rating? | Yes,@{psyuse} | No,0}]] damage! (Pen: @{PsyPen})"> <span data-i18n="damage-u">Damage</span> </button></div>
+						<div class="sheet-item sheet-redbgns" style="width: 15%;">
+							<button name="roll_PsyHit" type="roll" value="***@{character_name} attempts to Focus @{PsyName}!***
+!roll40k @{character_name}, ?{Focus Power Characteristic | Willpower,@{Willpower} | Perception,@{Perception} | Psyniscience,@{PsyniscienceCharacteristic}},  [[(@{PsyRating} - ?{Psy Use?|1}[myMod]) *10 + ?{Modifier|0}]]"> <span data-i18n="hit-u">Hit</span> </button>
+						</div>
 					</div>
 					<div><textarea name="attr_PsyPowersEffectRe"></textarea></div>
 				</div>
@@ -3598,8 +3604,11 @@
 						<div class="sheet-item" style="width: 23%;"><input name="attr_PsyPowerDamageRi" type="text" /></div>
 						<div class="sheet-item" style="width: 7%;"><span data-i18n="penetration-u">Pen:</span></div>
 						<div class="sheet-item" style="width: 23%;"><input name="attr_PsyPenRi" type="text" /></div>
-						<div class="sheet-item sheet-redbgns" style="width: 17%;"><button name="roll_PsyDamageRi" type="roll" value="/me does [[@{PsyPowerDamageRi}]] damage! (Pen: @{PsyPenRi})"> <span data-i18n="damage-u">Damage</span> </button></div>
-						<div class="sheet-item sheet-redbgns" style="width: 15%;"><button name="roll_PsyHitRi" type="roll" value="!roll40k @{character_name}, ?{Focus Power Characteristic | Willpower,@{Willpower} | Perception,@{Perception} | Psyniscience,@{PsyniscienceCharacteristic}},  [[(@{PsyRating} - ?{Psy Use?|1}) *10 + ?{Modifier|0}]]"> <span data-i18n="hit-u">Hit</span> </button></div>
+						<div class="sheet-item sheet-redbgns" style="width: 17%;"><button name="roll_PsyDamageRi" type="roll" value="/me does [[@{PsyPowerDamageRi} + ?{Use Rating? | Yes,@{psyuse} | No,0}]] damage! (Pen: @{PsyPenRi})"> <span data-i18n="damage-u">Damage</span> </button></div>
+						<div class="sheet-item sheet-redbgns" style="width: 15%;">
+							<button name="roll_PsyHitRi" type="roll" value="***@{character_name} attempts to Focus @{PsyNameRi}!***
+!roll40k @{character_name}, ?{Focus Power Characteristic | Willpower,@{Willpower} | Perception,@{Perception} | Psyniscience,@{PsyniscienceCharacteristic}},  [[(@{PsyRating} - ?{Psy Use?|1}[myMod]) *10 + ?{Modifier|0}]]"> <span data-i18n="hit-u">Hit</span> </button>
+						</div>
 					</div>
 					<div>
 					<textarea name="attr_PsyPowersEffectRI"></textarea>
@@ -3672,9 +3681,11 @@
 						<div class="sheet-row">
 							<div class="sheet-item" style="width: 15%;"><span data-i18n="special-u">Special:</span></div>
 							<div class="sheet-item" style="width: 76%;"><input name="attr_Rangedweaponspecial" type="text" /></div>
-							<div class="sheet-item sheet-redbgns" style="width: 9%;"><button name="roll_Rangedhit" type="roll" value="***@{character_name} fires @{rangedweaponname}!***
+							<div class="sheet-item sheet-redbgns" style="width: 9%;">
+								<button name="roll_Rangedhit" type="roll" value="***@{character_name} fires @{rangedweaponname}!***
 !roll40k @{character_name}, @{BallisticSkill}, [[(?{Aim | Half aim (+10),+10| No aim (+0),+0 | Full aim (+20),+20} + ?{Range | Point Blank (+30),+30 | Short Range (+10),+10 | Standard range (+0),+0 | Long Range (-10),-10 | Extreme Range (-30),-30} + ?{Rate of Fire/Attack Type|Standard (+10),+10 | Semi auto (+0),+0 | Full Auto (-10),-10 | Called Shot (-20),-20 | Suppressing Fire (-20),-20} + ?{Modifier|0})]]
-!ammo @{character_id} repeating_Rangedweapons_@{my_hidden_row_id}_Rangedweaponclip [[?{Ammo?|Single,-1|Semi-Auto,-@{Rangedweaponsemi}|Full Auto,-@{Rangedweaponfull}}*?{Firing Mode?|Normal,1|Overcharge,2|Maximal,3|Overload,4}]]"> <span data-i18n="hit-u">Hit</span> </button></div>
+!ammo @{character_id} repeating_Rangedweapons_@{my_hidden_row_id}_Rangedweaponclip [[?{Ammo?|Single,-1|Semi-Auto,-@{Rangedweaponsemi}|Full Auto,-@{Rangedweaponfull}}*?{Firing Mode?|Normal,1|Overcharge,2|Maximal,3|Overload,4}]]"> <span data-i18n="hit-u">Hit</span> </button>
+							</div>
 						</div>
 					</div>
 				</fieldset>
@@ -3712,7 +3723,10 @@
 							<div class="sheet-row">
 							<div class="sheet-item" style="width: 15%;"><span data-i18n="special-u">Special:</span></div>
 							<div class="sheet-item" style="width: 76%;"><input name="attr_meleeweaponspecial" type="text" /> </div>
-							<div class="sheet-item sheet-redbgns" style="width: 9%;"><button name="roll_meleehit" type="roll" value="!roll40k @{character_name}, @{WeaponSkill}, [[(?{Aim | Half aim (+10),+10| No aim (+0),+0| Full aim (+20),+20} + ?{Attack Type | All out (+30),+30| Charge (+20),+20| Standard (+10),+10| Swift Attack (+0),+0| Lighting (-10),-10} + ?{Modifier|0})]]"> <span data-i18n="hit-u">Hit</span> </button></div>
+							<div class="sheet-item sheet-redbgns" style="width: 9%;">
+								<button name="roll_meleehit" type="roll" value="***@{character_name} attacks with @{meleeweaponname}!***
+!roll40k @{character_name}, @{WeaponSkill}, [[(?{Aim | Half aim (+10),+10| No aim (+0),+0| Full aim (+20),+20} + ?{Attack Type | All out (+30),+30| Charge (+20),+20| Standard (+10),+10| Swift Attack (+0),+0| Lighting (-10),-10} + ?{Modifier|0})]]"> <span data-i18n="hit-u">Hit</span> </button>
+							</div>
 						</div>
 					</div>
 				</fieldset>
@@ -3877,7 +3891,7 @@
 				</div>
 			</div>
 		</div>
-		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Section separator">
+		<img src="http://i.imgur.com/TKfHnQ9.png" alt="Divider">
 		<div class="sheet-2colrow">
 			<!--Left Column: Backpack Items-->
 			<div class="sheet-col">
@@ -3952,6 +3966,331 @@
 	</div>
 </div>

+<!-- Shipsheet begin -->
+<div class="sheet-section-ship">
+	<div class="sheet-wrapper">
+		<div style="width:100%;text-align:center">
+			<div class="sheet-col" style="width:100%">
+					<input name="attr_ShipName" type="text" style="height:50px;font-size:30px; font-weight:bold; text-align:center;width:100%" placeholder="Ship Name" />
+			</div>
+		</div>
+		<br>
+		<div class="sheet-2colrow">
+			<div class="sheet-col sheet-col2" style="width:100%">
+				<div class="sheet-row">
+					<div class="sheet-item" style="width: 12%;"><label>Hull:</label></div>
+					<div class="sheet-item" style="width: 88%;"><input name="attr_ShipHull" type="text" /></div>
+				</div>
+				<div class="sheet-2colrow">
+					<div class="sheet-col sheet-col2" style="width:100%">
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 22%;"><label>Speed:</label></div>
+							<div class="sheet-item" style="width: 78%;"><input name="attr_ShipSpeed" type="text" /></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 54%;"><label>Manoeuvrability:</label></div>
+							<div class="sheet-item" style="width: 46%;"><input name="attr_ShipManoeuvrability" type="text" /></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 38%;"><label>Detection:</label></div>
+							<div class="sheet-item" style="width: 62%;"><input name="attr_ShipDetection" type="text" /></div>
+						</div>
+					</div>
+					<div class="sheet-col sheet-col2" style="width:100%">
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 28%;"><label>Shields:</label></div>
+							<div class="sheet-item" style="width: 34%;"><input name="attr_ShipShields1" type="text" /></div>
+							<div class="sheet-item" style="width: 4%;"><label>/</label></div>
+							<div class="sheet-item" style="width: 34%;"><input name="attr_ShipShields2" type="text" /></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 28%;"><label>Armour:</label></div>
+							<div class="sheet-item" style="width: 72%;"><input name="attr_ShipArmour" type="text" /></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 50%;"><label>Hull Integrity:</label></div>
+							<div class="sheet-item" style="width: 23%;"><input name="attr_ShipIntegrity1" type="text" /></div>
+							<div class="sheet-item" style="width: 4%;"><label>/</label></div>
+							<div class="sheet-item" style="width: 23%;"><input name="attr_ShipIntegrity2" type="text" /></div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="sheet-col sheet-col2" style="width:100%">
+				<div class="sheet-row">
+					<div class="sheet-item" style="width: 12%;"><label>Class:</label></div>
+					<div class="sheet-item" style="width: 58%;"><input name="attr_ShipClass" type="text" /></div>
+					<div class="sheet-item" style="width: 22%;"><label>Turn Rating:</label></div>
+					<div class="sheet-item" style="width: 8%;"><input name="attr_ShipTurnRating" type="text" /></div>
+				</div>
+				<div class="sheet-2colrow">
+					<div class="sheet-col sheet-col2" style="width:100%">
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 80%;"><button name="roll_CR" type="roll" value="/em rolls Crew Rating: [[1d100]] Target: [[@{ShipCrewRating} + [[?{Modifier|0}]]]]."><label>Crew Rating</label></button></div>
+							<div class="sheet-item" style="width: 20%;"><input name="attr_ShipCrewRating" type="number" value="0"></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 80%;"><label>Unnatural Crew Rating:</label></div>
+							<div class="sheet-item" style="width: 20%;"><input name="attr_ShipUnCrewRating" type="number" value="0"></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 50%;"><label>Turret Rating:</label></div>
+							<div class="sheet-item" style="width: 50%;"><input name="attr_ShipTurretRating" type="text" /></div>
+						</div>
+					</div>
+					<div class="sheet-col sheet-col2" style="width:100%">
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 34%;"></div>
+							<div class="sheet-item" style="width: 33%;"><label>Current:</label></div>
+							<div class="sheet-item" style="width: 33%;"><label>Max:</label></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 28%;"><label>Crew:</label></div>
+							<div class="sheet-item" style="width: 34%;"><input name="attr_ShipCrew1" type="text" /></div>
+							<div class="sheet-item" style="width: 4%;"><label>/</label></div>
+							<div class="sheet-item" style="width: 34%;"><input name="attr_ShipCrew2" type="text" /></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 28%;"><label>Morale:</label></div>
+							<div class="sheet-item" style="width: 34%;"><input name="attr_ShipMoral1" type="text" /></div>
+							<div class="sheet-item" style="width: 4%;"><label>/</label></div>
+							<div class="sheet-item" style="width: 34%;"><input name="attr_ShipMoral2" type="text" /></div>
+						</div>
+
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="sheet-2colrow">
+			<div class="sheet-col sheet-col2" style="width:100%">
+				<div class="sheet-2colrow">
+					<div class="sheet-col sheet-col2" style="width:100%">
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 60%;"><label>Power Max:</label></div>
+							<div class="sheet-item" style="width: 40%;"><input name="attr_ShipPowerMax" type="text" /></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 60%;"><label>Power Used:</label></div>
+							<div class="sheet-item" style="width: 40%;"><input disabled="true"  name="attr_ShipPowerUsed" type="text" value="@{ShipSupplementalComponentsPowerTotal} + @{ShipEssentialComponentsPowerTotal}"/></div>
+						</div>
+					</div>
+					<div class="sheet-col sheet-col2" style="width:100%">
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 60%;"><label>Space Max:</label></div>
+							<div class="sheet-item" style="width: 40%;"><input name="attr_ShipSpaceMax" type="text" /></div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-item" style="width: 60%;"><label>Space Used:</label></div>
+							<div class="sheet-item" style="width: 40%;" ><input disabled="true"  name="attr_ShipSpaceUsed" type="text" value="@{ShipSupplementalComponentsSpaceTotal} + @{ShipEssentialComponentsSpaceTotal}"/></div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="sheet-col sheet-col2" style="width:100%">
+				<div class="sheet-row">
+					<div class="sheet-item" style="width: 34%;"><label>Weapon Capacity:</label></div>
+					<div class="sheet-item" style="width: 12%;"><label>Dorsal:</label></div>
+					<div class="sheet-item" style="width: 10%;"><input name="attr_ShipWeaponDorsal" type="text" /></div>
+					<div class="sheet-item" style="width: 12%;"><label>Prow:</label></div>
+					<div class="sheet-item" style="width: 10%;"><input name="attr_ShipWeaponProw" type="text" /></div>
+					<div class="sheet-item" style="width: 12%;"><label>Keel:</label></div>
+					<div class="sheet-item" style="width: 10%;"><input name="attr_ShipWeaponKeel" type="text" /></div>
+
+				</div>
+				<div class="sheet-row">
+					<div class="sheet-item" style="width: 34%;"><label></label></div>
+					<div class="sheet-item" style="width: 12%;"><label>Port:</label></div>
+					<div class="sheet-item" style="width: 10%;"><input name="attr_ShipWeaponPort" type="text" /></div>
+					<div class="sheet-item" style="width: 18%;"><label>Starboard:</label></div>
+					<div class="sheet-item" style="width: 10%;"><input name="attr_ShipWeaponStarboard" type="text" /></div>
+				</div>
+			</div>
+		</div>
+		<br>
+		<div style="width:100%">
+			<h3>Weapons Components</h3>
+			<fieldset class="repeating_ShipWeapons" name="attr_repeating_ShipWeapons">
+				<table style="width:100%">
+					<tr>
+						<td style="width:30%">
+							<h2 style="width:100%;text-align:center">Name</h2>
+						</td>
+						<td style="width:11%">
+							<h2 style="width:100%;text-align:center">Type</h2>
+						</td>
+						<td style="width:8%">
+							<h2 style="width:100%;text-align:center">Strength</h2>
+						</td>
+						<td style="width:7%">
+							<h2 style="width:100%;text-align:center">Crit</h2>
+						</td>
+						<td style="width:10%">
+							<h2 style="width:100%;text-align:center">Damage</h2>
+						</td>
+						<td style="width:7%">
+							<h2 style="width:100%;text-align:center">Range</h2>
+						</td>
+						<td style="width:15%">
+							<h2 style="width:100%;text-align:center">Location</h2>
+						</td>
+							<td style="width:5%">
+						</td>
+					</tr>
+				</table>
+				<div style="width:100%">
+					<div class="sheet-item" style="width:30%; text-align:center">
+						<input type="text" name="attr_ShipWeaponsName" style="width:100%;text-align:center" />
+					</div>
+					<div class="sheet-item" style="width:15%; text-align:center">
+						<select name="attr_ShipWeaponsType" style="height:25px; width:100%" class="sheet-input-selectbox">
+							<option value="0" >Unknown</option>
+							<option value="1" selected>Macro Battery</option>
+							<option value="2">Lance</option>
+							<option value="3">Bay</option>
+							<option value="4">Torpedoes</option>
+						</select>
+					</div>
+					<div class="sheet-item" style="width:8%; text-align:center">
+						<input type="text" name="attr_ShipWeaponsStrength" />
+					</div>
+					<div class="sheet-item" style="width:7%; text-align:center">
+						<input type="text" name="attr_ShipWeaponsCrit" />
+					</div>
+					<div class="sheet-item" style="width:10%; text-align:center">
+						<input type="text" name="attr_ShipWeaponsDamage" />
+					</div>
+					<div class="sheet-item" style="width:15px;">
+						<button type="roll" name="roll_shipDamage" value="/me attacks with @{ShipName}'s weapon @{ShipWeaponsName}! Damage: [[ @{ShipWeaponsDamage} + [[?{Modifier|0}]] ]].">
+							<label>R</label>
+						</button>
+					</div>
+					<div class="sheet-item" style="width:15%; text-align:center">
+						<input type="text" name="attr_ShipWeaponsRange" />
+					</div>
+					<div class="sheet-item" style="width:10%; text-align:center">
+						<select name="attr_ShipWeaponsLocation" style="height:25px; width:100%" class="sheet-input-selectbox">
+							<option value="0">Unknown</option>
+							<option value="1" selected>Dorsal</option>
+							<option value="2">Prow</option>
+							<option value="3">Keel</option>
+							<option value="4">Port</option>
+							<option value="5">Starboard</option>
+						</select>
+					</div>
+					<div class="sheet-body">
+						<textarea name="attr_ShipWeaponsdesc" ></textarea>
+					</div>
+				</div>
+			</fieldset>
+		</div>
+
+
+		<div class="sheet-2colrow">
+			<!-- left col -->
+			<div class="sheet-col sheet-col2" style="width:100%">
+			<input type="hidden" name="attr_ShipEssentialComponentsPowerTotal" value="0">
+			<input type="hidden" name="attr_ShipEssentialComponentsSpaceTotal" value="0">
+				<h3>Essential Components</h3>
+				<fieldset class="repeating_ShipEssentialComponents" name="attr_repeating_ShipEssentialComponents">
+					<table style="width:100%">
+						<tr>
+							<td style="width:60%">
+								<h2  style="width:100%;text-align:center">Name</h2>
+							</td>
+							<td style="width:10%">
+								<h2 style="width:100%;text-align:center">Power</h2>
+							</td>
+							<td style="width:10%">
+								<h2  style="width:100%;text-align:center">Space</h2>
+							</td>
+							<td style="width:10%">
+								<h2  style="width:100%;text-align:center">SP</h2>
+							</td>
+								<td style="width:10%">
+							</td>
+						</tr>
+					</table>
+					<div style="width:100%">
+						<div class="sheet-item" style="width:60%"><input type="text" name="attr_ShipEssentialComponentName" style="width:100%;text-align:left" />
+						</div>
+						<div class="sheet-item" style="width:10%; text-align:center">
+							<input type="number" name="attr_ShipEssentialComponentPower" value="0"/>
+						</div>
+						<div class="sheet-item" style="width:10%; text-align:center">
+							<input type="number" name="attr_ShipEssentialComponentSpace" value="0" />
+						</div>
+						<div class="sheet-item" style="width:10%; text-align:center">
+							<input type="text" name="attr_ShipEssentialComponentSP" />
+						</div>
+						<div class="sheet-body">
+							<textarea name="attr_ShipEssentialComponentsdesc" ></textarea>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+			<!-- right col -->
+
+			<div class="sheet-col sheet-col2">
+				<h3>Supplemental Components</h3>
+				<input type="hidden" name="attr_ShipSupplementalComponentsPowerTotal" value="0">
+				<input type="hidden" name="attr_ShipSupplementalComponentsSpaceTotal" value="0">
+				<fieldset class="repeating_ShipSupplementalComponents" name="attr_repeating_ShipSupplementalComponents">
+					<table style="width:100%">
+						<tr>
+							<td style="width:60%"><h2  style="width:100%;text-align:center">Name</h2>
+							</td>
+								<td style="width:10%"><h2 style="width:100%;text-align:center">Power</h2>
+							</td>
+								<td style="width:10%"><h2  style="width:100%;text-align:center">Space</h2>
+							</td>
+								<td style="width:10%"><h2  style="width:100%;text-align:center">SP</h2>
+							</td>
+							<td style="width:10%"></td>
+						</tr>
+					</table>
+					<div style="width:100%">
+						<div class="sheet-item" style="width:60%">
+							<input type="text" name="attr_ShipSupplementalComponentName"/>
+						</div>
+						<div class="sheet-item" style="width:10%; text-align:center">
+							<input type="number" name="attr_ShipSupplementalComponentPower" value="0" />
+						</div>
+						<div class="sheet-item" style="width:10%; text-align:center">
+							<input type="number" name="attr_ShipSupplementalComponentSpace" value="0" />
+						</div>
+						<div class="sheet-item" style="width:10%; text-align:center">
+							<input type="text" name="attr_ShipSupplementalComponentSP" />
+						</div>
+						<div class="sheet-body">
+								<textarea name="attr_ShipSupplementalComponentsdesc"></textarea>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+		</div>
+		<br>
+		<div>
+			<h3>Complications/Past History</h3>
+			<textarea name="attr_ShipComplications" style="width:95%"></textarea>
+		</div>
+		<br>
+		<div>
+			<h3>Skill Modifiers</h3>
+			<textarea name="attr_ShipSkillModifiers" style="width:95%"></textarea>
+		</div>
+		<br>
+		<div>
+			<h3>Special Actions</h3>
+			<textarea name="attr_ShipSpecialActions" style="width:95%"></textarea>
+		</div>
+		<div>
+			<h3>Notes</h3>
+			<textarea name="attr_ShipNotes" style="width:95%"></textarea>
+		</div>
+	</div>
+</div>
+
 <!-- Social Tab -->
 <div class="sheet-section-social sheet-watermark">
 	<!-- This section contains Social and Influence Related entries  -->
@@ -4029,7 +4368,7 @@
       </div> 
   </div>
       
-	<img src="http://i.imgur.com/TKfHnQ9.png" alt="Section separator"><!-- Divider, seperates tabs from permenant space-->
+	<img src="http://i.imgur.com/TKfHnQ9.png" alt="Divider"><!-- Divider, seperates tabs from permenant space-->
 	   
 </div>

@@ -4038,14 +4377,14 @@
 		<rolltemplate class="sheet-rolltemplate-darkheresy2">
    <table >
        <tr><th>{{name}}</th></tr>
-        <td><img src="http://i.imgur.com/g1SVcwZ.png" alt="Section separator" height="100%" width="auto" max-width="100px"></td>
+        <td><img src="http://i.imgur.com/g1SVcwZ.png" alt="Divider" height="100%" width="auto" max-width="100px"></td>
        <tr><td><span class="tcat">{{dhdescription}} </span> </td></tr>
    </table>
 </rolltemplate>
 		<rolltemplate class="sheet-rolltemplate-scattergram">
    <table >
        <tr><th data-i18n="scatter-diagram-u">Scatter Diagram</th></tr>
-        <td><img src="http://i.imgur.com/g1SVcwZ.png" alt="Section separator" height="100%" width="auto" max-width="100px"></td>
+        <td><img src="http://i.imgur.com/g1SVcwZ.png" alt="Divider" height="100%" width="auto" max-width="100px"></td>
        <tr><td><span class="tcat"><img src="http://i.imgur.com/3Tvp7Ay.png" alt="Scatter Diagram"></span> </td></tr>
    </table>
 </rolltemplate>
@@ -4151,17 +4490,15 @@ on('change:strength change:toughness sheet:opened',function()
    });
 });

-/*on('change:repeating_ShipEssentialComponents',function(){
-    TAS.repeatingSimpleSum('ShipEssentialComponents','ShipEssentialComponentPower','ShipEssentialComponentsPowerTotal');
+on('change:repeating_ShipEssentialComponents change:repeating_ShipSupplementalComponents sheet:opened', function()
+{
+    /* Finds total power for ship based off usage from Essential and Supplemental Components */
+	repeatingSum('ShipEssentialComponentsPowerTotal','ShipEssentialComponents','ShipEssentialComponentPower');
+	repeatingSum('ShipSupplementalComponentsPowerTotal','ShipSupplementalComponents','ShipSupplementalComponentPower');
+	
+	/* Finds total space for ship based off usage from Eseential and Supplemental Components */
+	repeatingSum('ShipEssentialComponentsSpaceTotal','ShipEssentialComponents','ShipEssentialComponentSpace');
+	repeatingSum('ShipSupplementalComponentsSpaceTotal','ShipSupplementalComponents','ShipSupplementalComponentSpace');
 });
-on('change:repeating_ShipSupplementalComponents',function(){
-    TAS.repeatingSimpleSum('ShipSupplementalComponents','ShipSupplementalComponentPower','ShipSupplementalComponentsPowerTotal');
-});
-on('change:repeating_ShipEssentialComponents',function(){
-    TAS.repeatingSimpleSum('ShipEssentialComponents','ShipEssentialComponentSpace','ShipEssentialComponentsSpaceTotal');
-});
-on('change:repeating_ShipSupplementalComponents',function(){
-    TAS.repeatingSimpleSum('ShipSupplementalComponents','ShipSupplementalComponentSpace','ShipSupplementalComponentsSpaceTotal');
-});
-*/
+
 </script>
@@ -17,12 +17,12 @@ o Gear
 o Backpack/Vest
 o Stored Gear
 > Gear Calculations: All calculations are done for you regarding Gear now.  The information is also displayed so that you can verify that it is working correctly, these calculations include:
-o Finding Strength and Toughness Bonus and adding them together ( SB+TB: )
-o Using the SB+TB modifier to give your character’s starting weight ( Base: )
-o Location to insert Backpack/Vest weight bonuses ( Pack Bonus: | Vest Bonus: )
-o Adding up the different sections’ total weight ( Pack Weight: | Total Stored Weight: | Total Weight: )
-o Character’s maximum carry weight ( Max: )
-o Remaining weight before being encumbered ( Available: )
+o Finding Strength and Toughness Bonus and adding them together (SB+TB:)
+o Using the SB+TB modifier to give your character’s starting weight (Base:)
+o Location to insert Backpack/Vest weight bonuses (Pack Bonus: | Vest Bonus:)
+o Adding up the different sections’ total weight (Pack Weight: | Total Stored Weight: | Total Weight:)
+o Character’s maximum carry weight (Max:)
+o Remaining weight before being encumbered (Available:)

-If you have ides for changes or need something fixed in the DH2E Advanced Character Sheet you are welcome to DM Dustin S on Roll20
+If you have ideas for changes or need something fixed in the DH2E Advanced Character Sheet you are welcome to DM Dustin S on Roll20
 > Dustin S. | Roll20: Online virtual tabletop
@@ -7,6 +7,7 @@
   "vehicles-u":"Vehicles",
   "psykana-u":"Psykana",
   "social-u":"Social",
+   "ship-u":"Ship",
   "character-name-u":"Character Name:",
   "home-world-u":"Home World:",
   "homeworlds-u":"Homeworlds",
@@ -437,10 +438,10 @@
   "lost-foot-u":"Lost Foot",
   "lost-leg-u":"Lost Leg",
   "cybernetic-modifiers-u":"Cybernetics Modifiers",
-   "bionic-left-arm-u":"Bionic Arm (left): ",
+   "bionic-left-arm-u":"Bionic Arm (Left): ",
   "bionic-right-arm-u":"Bionic Arm (Right): ",
   "machine-trait-u":"Machine  Trait: ",
-   "left-leg-bionic-u":"Bionic Leg Toughness Bonus(left): ",
+   "left-leg-bionic-u":"Bionic Leg (Left): ",
   "right-leg-bionic-u":"Bionic Leg (Right): ",
   "special-abilities-u":"Special Abilities",
   "skills-u":"Skills",
@@ -1,8 +0,0 @@
-This is an Advanced character sheet for the Dark Heresy 2nd Edition role-playing game. It differs greatly from the standard character sheet available and utilizes API scripts to accurately (and correctly) provide dice rolls measuring Degrees of Success and Degrees of Failure. It has been redesigned to include a multitude of differing features and organizations. 
-
-The changes include tabbed divisions for organization, repeatable fields added to gear items, cybernetics, psychic powers, skills and talents, provided an 'Other skill' field for overflow of Trade/Lore/Specializations of Operate, and built-in macros for variable initiative rolls. 
-
-Note: The following API Scripts must be utilized in your API console for this sheet to work properly;
-	- DH Degrees of Success for Skill by Jack D: https://github.com/Roll20/roll20-character-sheets/blob/master/Dark%20Heresy%20Advanced%202nd%20Edition/API%20Scripts/DH_Degrees_Skills.js
-	- DH Degrees of Success for Weapons by Jack D: https://github.com/Roll20/roll20-character-sheets/blob/master/Dark%20Heresy%20Advanced%202nd%20Edition/API%20Scripts/DH_Degrees_Weapons.js
-	- Ammo Count by Aaron C. Meadow: https://github.com/shdwjk/Roll20API/blob/master/Ammo/Ammo.js
@@ -1,37 +1,37 @@
 {
    "---": "---",
    "1/2": "1/2",
-    "1-kategorie": "1 Kat.",
-    "2-kategorie": "2 Kat.",
-    "2-attacke": "2. Attacke",
-    "CH": "CH",
-    "FF": "FF",
-    "GE": "GE",
-    "IN": "IN",
-    "KK": "KK",
-    "KL": "KL",
-    "KO": "KO",
-    "MU": "MU",
+    "1-kategorie": "1 category",
+    "2-kategorie": "2 categories",
+    "2-attacke": "2nd attack",
+    "CH": "CHA",
+    "FF": "DEX",
+    "GE": "AGI",
+    "IN": "INT",
+    "KK": "STR",
+    "KL": "SAG",
+    "KO": "CON",
+    "MU": "COU",
    "ae": "AE",
-    "GEKK": "GE/KK",
+    "GEKK": "AGI/STR",
    "aktiv": "Aktiv",
-    "aktstatus": "akt. Status",
-    "aktuell": "Aktuell",
-    "alter": "Alter",
-    "anmerkung": "Anmerkung",
-    "anmerkungen": "Anmerkungen",
-    "ap-ausgegeben": "AP ausgegeben",
-    "ap-gesamt": "AP gesamt",
-    "ap-verfuegbar": "AP verfügbar",
-    "armbrueste": "Armbrüste",
-    "armbrust": "Armbrust",
-    "astralenergie": "Astralenergie",
-    "at-fk": "AT/FK",
+    "aktstatus": "current Condition",
+    "aktuell": "Current",
+    "alter": "Age",
+    "anmerkung": "Note",
+    "anmerkungen": "Notes",
+    "ap-ausgegeben": "AP spent",
+    "ap-gesamt": "AP total",
+    "ap-verfuegbar": "AP available",
+    "armbrueste": "Crossbows",
+    "armbrust": "Crossbow",
+    "astralenergie": "Arcane Energy",
+    "at-fk": "AT/RC",
    "at-mod": "AT-Mod",
    "at-pa": "AT-/PA-Mod.",
-    "attacke": "Attacke",
-    "augenfarbe": "Augenfarbe",
-    "ausruestung": "Ausrüstung",
+    "attacke": "Attack",
+    "augenfarbe": "Eye Color",
+    "ausruestung": "Equipment",
    "ausweichen": "Ausweichen",
    "auswirkung": "Auswirkung:",
    "basis": "Basis",
@@ -4,15 +4,15 @@
    "1-kategorie": "1 Kat.",
    "2-kategorie": "2 Kat.",
    "2-attacke": "2. Attacke",
-    "CH": "CH",
-    "FF": "FF",
-    "GE": "GE",
-    "IN": "IN",
-    "KK": "KK",
-    "KL": "KL",
-    "KO": "KO",
-    "MU": "MU",
-    "ae": "AE",
+    "CH": "CAR",
+    "FF": "DES",
+    "GE": "AGI",
+    "IN": "INT",
+    "KK": "FUE",
+    "KL": "SGC",
+    "KO": "CON",
+    "MU": "COR",
+    "ae": "EA",
    "GEKK": "GE/KK",
    "aktiv": "Aktiv",
    "aktstatus": "akt. Status",
@@ -35,7 +35,7 @@
    "ausweichen": "Esquive",
    "auswirkung": "Effet :",
    "basis": "Base",
-    "baseValues": "valeur de base",
+    "baseValues": "Valeurs de base",
    "be": "ENC",
    "be-aktiviert": "ENC activé",
    "be-gesamt": "ENC total",
@@ -56,7 +56,7 @@
    "brillant": "Brillant (1700 PAV)",
    "charakteristika": "Caractéristiques",
    "calcSchmerz": "Calcul de la douleur",
-    "calcTraglast": "Belastung durch Gepäck",
+    "calcTraglast": "Encombrement de l'équipement",
    "charisma": "Charisme",
    "compendiumDrop": "prise en charge du Compendium Drop",
    "dauer": "Durée",
@@ -579,7 +579,7 @@
    "paralyse-aktivieren": "Malus de Paralysie activé",
    "schmerz-aktivieren": "Malus de Douleur activé",
    "trance-aktivieren": "Malus de Trance activé",
-    "tragekraft": "Tragekraft",
+    "tragekraft": "Poids transportable",
    "verwirrung-aktivieren": "Malus de Confusion activé",
    "entrueckung-aktivieren": "Bonus/Malus d'Extase activé",
    "atpa-patzer": "AT/PRD-Maladresse",
@@ -602,7 +602,7 @@
    "Regen-AE": "Régénération d'Énergie Astrale",
    "Regen-KE": "Régénération d'Énergie Karmique",
    "keine": "aucun",
-    "status-liste": "blind,eingeengt,liegend,bewegungsunfaehig,pechmagnet,vergiftet,brennend,raserei,fixiert,handlungsunfaehig,bewusstlos,unsichtbar,krank,stumm,uebler-geruch,versteinert,blutrausch,taub,ueberrascht",
+    "status-liste": "blind,eingeengt,liegend,fixiert,pechmagnet,vergiftet,brennend,raserei,bewegungsunfaehig,handlungsunfaehig,bewusstlos,unsichtbar,krank,stumm,uebler-geruch,versteinert,blutrausch,taub,ueberrascht",
    "zustaende-liste": "verwirrung,schmerz,belastung,betaeubung,erregung,entrueckung,paralyse,furcht,trance",
    "koerpertalente-liste": "sinnesschaerfe,zechen,gaukeleien,singen,tanzen,reiten,klettern,verbergen,koerperbeherrschung,selbstbeherrschung,schwimmen,kraftakt,fliegen,taschendiebstahl",
    "gesellschaftstalente-liste": "gassenwissen,bekehren,verkleiden,etikette,einschuechtern,menschenkenntnis,ueberreden,betoeren,willenskraft",
@@ -1,54 +1,54 @@
 {
    "---": "---",
    "1/2": "1/2",
-    "1-kategorie": "1 Kat.",
-    "2-kategorie": "2 Kat.",
-    "2-attacke": "2. Attacke",
-    "CH": "CH",
-    "FF": "FF",
-    "GE": "GE",
-    "IN": "IN",
-    "KK": "KK",
-    "KL": "KL",
-    "KO": "KO",
-    "MU": "MU",
-    "ae": "AE",
-    "GEKK": "GE/KK",
-    "aktiv": "Aktiv",
-    "aktstatus": "akt. Status",
-    "aktuell": "Aktuell",
-    "alter": "Alter",
-    "anmerkung": "Anmerkung",
-    "anmerkungen": "Anmerkungen",
-    "ap-ausgegeben": "AP ausgegeben",
-    "ap-gesamt": "AP gesamt",
-    "ap-verfuegbar": "AP verfügbar",
-    "armbrueste": "Armbrüste",
-    "armbrust": "Armbrust",
-    "astralenergie": "Astralenergie",
-    "at-fk": "AT/FK",
-    "at-mod": "AT-Mod",
-    "at-pa": "AT-/PA-Mod.",
-    "attacke": "Attacke",
-    "augenfarbe": "Augenfarbe",
-    "ausruestung": "Ausrüstung",
-    "ausweichen": "Ausweichen",
-    "auswirkung": "Auswirkung:",
-    "basis": "Basis",
+    "1-kategorie": "1 categoria",
+    "2-kategorie": "2 categorie",
+    "2-attacke": "2° attacco",
+    "CH": "CAR",
+    "FF": "DES",
+    "GE": "AGI",
+    "IN": "INT",
+    "KK": "FOR",
+    "KL": "ACU",
+    "KO": "COS",
+    "MU": "COR",
+    "ae": "EA",
+    "GEKK": "AGI/FOR",
+    "aktiv": "attivo",
+    "aktstatus": "Stato attuale",
+    "aktuell": "Attuale",
+    "alter": "Età",
+    "anmerkung": "Note",
+    "anmerkungen": "Note",
+    "ap-ausgegeben": "PAvv spesi",
+    "ap-gesamt": "PAvv totali",
+    "ap-verfuegbar": "PAvv disponibili",
+    "armbrueste": "Balestre",
+    "armbrust": "Balestra",
+    "astralenergie": "Energia Astrale",
+    "at-fk": "Att/CD",
+    "at-mod": "Mod. Att",
+    "at-pa": "Mod. Att/Par",
+    "attacke": "Attacco",
+    "augenfarbe": "Colore degli occhi",
+    "ausruestung": "Equipaggiamento",
+    "ausweichen": "Schivata",
+    "auswirkung": "Effetto:",
+    "basis": "Base",
    "baseValues": "Basiswerte",
-    "be": "BE",
-    "be-aktiviert": "BE aktiviert",
-    "be-gesamt": "BE gesamt",
-    "beidhaendigerkampf": "Beidhändig",
-    "belastung": "Belastung",
-    "beschreibung": "Beschreibung",
-    "betaeubung": "Betäubung",
-    "bewegungsunfaehig": "Bewegungsunfähig",
-    "bewusstlos": "Bewusstlos",
-    "blasrohre": "Blasrohre",
-    "blind": "Blind",
-    "blutrausch": "Blutrausch",
-    "bogen": "Bogen",
+    "be": "Imp",
+    "be-aktiviert": "Imp attivato",
+    "be-gesamt": "Imp totale",
+    "beidhaendigerkampf": "Ambidestrismo",
+    "belastung": "Impiccio",
+    "beschreibung": "Descrizione",
+    "betaeubung": "Stordimento",
+    "bewegungsunfaehig": "Immobilizzato",
+    "bewusstlos": "Incosciente",
+    "blasrohre": "Cerbottane",
+    "blind": "Cecità",
+    "blutrausch": "Furibondo",
+    "bogen": "Arco",
    "boegen": "Bögen",
    "bonus": "Bonus",
    "bonus-malus": "Bonus/Malus",
@@ -96,54 +96,54 @@
    "fw": "FW",
    "fk-mod": "FK-Mod",
    "geburtsort": "Geburtsort",
-    "geburtstag": "Tsatag",
-    "gegner-von-hinten": "Gegner von Hinten",
-    "gegnerische-kt": "Gegnerische KT",
-    "gehend": "gehend",
-    "gesamt": "Gesamt",
-    "gesamtmodifikator": "Summe",
-    "gesamtstatus-ab": "Gesamt: ab -8 handlungsunfähig",
-    "gesamtwert": "Gesamtwert",
-    "geschlecht": "Geschlecht",
-    "geschwindigkeit": "Geschwindigkeit",
-    "gesellschaftstalente": "Gesellschaftstalente",
-    "gewandheit": "Gewandheit",
-    "gewicht": "Gewicht",
-    "glaube": "Glaube",
-    "gm": "GM ",
-    "gross": "groß",
-    "groesse": "Größe",
-    "grundwert": "Grundwert",
-    "grundwerte": "Grundwerte",
-    "gs": "GS",
-    "haarfarbe": "Haarfarbe",
-    "hakenschlagend": "hakenschlagend",
-    "handlungsunfaehig": "Handlungsunfähig",
-    "handwerkstalente": "Handwerkstalente",
-    "hiebwaffen": "Hiebwaffen",
+    "geburtstag": "Giorno di Tsa",
+    "gegner-von-hinten": "Attacco alle spalle",
+    "gegnerische-kt": "Tecnica avversario",
+    "gehend": "in movimento",
+    "gesamt": "Totale",
+    "gesamtmodifikator": "Somma",
+    "gesamtstatus-ab": "Totale: da -8 Incapacitato",
+    "gesamtwert": "Valore totale",
+    "geschlecht": "Sesso",
+    "geschwindigkeit": "Movimento (Mov)",
+    "gesellschaftstalente": "Competenze sociali",
+    "gewandheit": "Agilità",
+    "gewicht": "Peso",
+    "glaube": "Fede",
+    "gm": "DM ",
+    "gross": "grande",
+    "groesse": "Altezza",
+    "grundwert": "Base",
+    "grundwerte": "Valori di base",
+    "gs": "Mov",
+    "haarfarbe": "Colore dei capelli",
+    "hakenschlagend": "zigzagante",
+    "handlungsunfaehig": "Incapacitato",
+    "handwerkstalente": "Competenze artigianali",
+    "hiebwaffen": "Armi d’impatto",
    "info": "Info",
-    "initiative": "Initiative",
-    "intuition": "Intuition",
-    "inventar": "Inventar",
-    "ja": "ja",
-    "kampf": "Kampf",
-    "kampf-im-wasser": "Kampf im Wasser",
-    "kampf-unter-wasser": "Kampf unter Wasser",
-    "kampfsituationen-status": "Kampfsituationen / Status",
-    "kampftechniken": "Kampftechniken",
-    "kampftechnikwert": "Kampftechnikwert",
-    "karmaenergie": "Karmaenergie",
-    "ke": "KE",
-    "kettenwaffen": "Kettenwaffen",
-    "klein": "klein",
-    "klugheit": "Klugheit",
-    "koerperkraft": "Körperkraft",
-    "koerpertalente": "Körpertalente",
-    "kompetent": "Kompetent (1200 AP)",
-    "konstitution": "Konstitution",
-    "kosten": "Kosten",
-    "krank": "Krank",
-    "kultur": "Kultur",
+    "initiative": "Iniziativa (Ini)",
+    "intuition": "Intuito",
+    "inventar": "Inventario",
+    "ja": "sì",
+    "kampf": "Combattimento",
+    "kampf-im-wasser": "Combattimento in acqua",
+    "kampf-unter-wasser": "Combattimento sott’acqua",
+    "kampfsituationen-status": "Situazione / Stato",
+    "kampftechniken": "Tecniche",
+    "kampftechnikwert": "Livello Tecnica di Combattimento",
+    "karmaenergie": "Energia Karmica",
+    "ke": "EK",
+    "kettenwaffen": "Armi a catena",
+    "klein": "piccolo",
+    "klugheit": "Acume",
+    "koerperkraft": "Forza",
+    "koerpertalente": "Competenze fisiche",
+    "kompetent": "Competente (1200 PAvv)",
+    "konstitution": "Costituzione",
+    "kosten": "Costo",
+    "krank": "Malato",
+    "kultur": "Cultura",
    "kritisch": "Kritischer",
    "kulturpaket": "Kulturpaket hinzufügen?",
    "professionspaket": "Professionspaket hinzufügen?",
@@ -194,56 +194,56 @@
    "pa": "PA",
    "pa-mod": "PA-Mod",
    "passierschlag": "Passierschlag",
-    "parade": "Parade",
-    "paralyse": "Paralyse",
-    "patzer": "Patzer",
-    "pechmagnet": "Pechmagnet",
-    "perm-verlust": "Perm. Verlust",
-    "probe": "Probe",
-    "profession": "Profession",
+    "parade": "Parata",
+    "paralyse": "Paralisi",
+    "patzer": "Fallimento critico",
+    "pechmagnet": "Scalogna",
+    "perm-verlust": "Perdita permanente",
+    "probe": "Prova",
+    "profession": "Professione",
    "personalInformation": "Persönliche Daten",
-    "raserei": "Raserei",
-    "raufen": "Raufen",
-    "regeneration": "Regeneration",
-    "reichweite": "Reichweite",
-    "rennend": "rennend",
-    "riesig": "riesig",
-    "rituale": "Rituale",
-    "routineprobe": "Routineprobe",
-    "rs-mod": "RS-Mod.",
-    "rueckkauf": "Rückkauf",
-    "ruestungen": "Rüstungen",
-    "ruestungstyp": "Rüstungstyp",
-    "rs": "RS",
-    "schaden": "Schaden",
-    "schelmenstreiche": "Schelmenstreiche",
-    "schicksalspunkte": "Schicksalspunkte",
-    "schilde": "Schilde",
-    "schilde-waffen": "Schild und Nebenhandwaffen",
-    "schildparade-parierwaffe": "Schildparade",
-    "schips": "SchiPs",
-    "schleudern": "Schleudern",
-    "schmerz": "Schmerz",
-    "schmerzstufen-1-2-3-4": "Schmerzstufen",
-    "schnell": "schnell",
-    "schriften": "Schriften",
-    "schuetzenbewegung": "Schützenbewegung",
-    "schuss-ins-kampfgetuemmel": "Schuss ins Kampfgetümmel",
-    "schwerter": "Schwerter",
-    "seelenkraft": "Seelenkraft",
-    "selbst": "Selbst ",
-    "sf-modat": "SF-Mod. AT",
-    "sf-modaw": "SF-Mod. AW",
-    "sf-modpa": "SF-Mod. PA",
-    "sf-modtp": "SF-Mod. TP",
-    "sf-modifikatoren": "SF-Modifikatoren",
-    "sichtmodifikator": "Sichtmodifikator",
-    "sicht-iv": "IV - Treffer auf 1",
-    "sk": "SK",
-    "sonderfertigkeiten": "Sonderfertigkeiten",
-    "sonstiges": "Sonstiges",
-    "sozialstatus": "Sozialstatus",
-    "spezies": "Spezies",
+    "raserei": "Furente",
+    "raufen": "Mani nude",
+    "regeneration": "Rigenerazione",
+    "reichweite": "Raggio",
+    "rennend": "in corsa",
+    "riesig": "enorme",
+    "rituale": "Rituali",
+    "routineprobe": "Prova di routine",
+    "rs-mod": "Mod. Pro",
+    "rueckkauf": "Riacquisto",
+    "ruestungen": "Armature",
+    "ruestungstyp": "Tipo di armatura",
+    "rs": "Pro",
+    "schaden": "Ferite",
+    "schelmenstreiche": "Scherzi da discolo",
+    "schicksalspunkte": "Punti Fato (PFato)",
+    "schilde": "Scudi",
+    "schilde-waffen": "Scudi e armi secondarie",
+    "schildparade-parierwaffe": "Parata con scudo",
+    "schips": "PFato",
+    "schleudern": "Fionde",
+    "schmerz": "Dolore",
+    "schmerzstufen-1-2-3-4": "Livelli di Dolore",
+    "schnell": "veloce",
+    "schriften": "Scritture",
+    "schuetzenbewegung": "Movimento del tiratore",
+    "schuss-ins-kampfgetuemmel": "Tiro nella mischia",
+    "schwerter": "Spade",
+    "seelenkraft": "Animo (Anm)",
+    "selbst": "Sé stesso",
+    "sf-modat": "Mod. AS Att",
+    "sf-modaw": "Mod. AS Scv",
+    "sf-modpa": "Mod. AS Par",
+    "sf-modtp": "Mod. AS PImp",
+    "sf-modifikatoren": "Modificatori AS",
+    "sichtmodifikator": "Modificatore di visibilità",
+    "sicht-iv": "IV - Colpisce con 1",
+    "sk": "Anm",
+    "sonderfertigkeiten": "Abilità speciali",
+    "sonstiges": "Altro",
+    "sozialstatus": "Rango sociale",
+    "spezies": "Specie",
    "sprachen": "Sprachen",
    "stangenwaffen": "Stangenwaffen",
    "status": "Status",
@@ -293,10 +293,10 @@
    "wirkung": "Wirkung",
    "wirkungsdauer": "Wirkungsdauer",
    "wissenstalente": "Wissenstalente",
-    "wundschwelle": "Wundschwelle",
-    "wurfwaffen": "Wurfwaffen",
-    "x2": "x2",
-    "zaehigkeit": "Zähigkeit",
+    "wundschwelle": "Soglia ferite",
+    "wurfwaffen": "Armi da lancio",
+    "x2": "×2",
+    "zaehigkeit": "Tenacità (Tnc)",
    "zauber": "Zauber",
    "zaubermelodien": "Zaubermelodien",
    "zaubertaenze": "Zaubertänze",
@@ -1,99 +1,99 @@
 {
    "---": "---",
    "1/2": "1/2",
-    "1-kategorie": "1 Kat.",
-    "2-kategorie": "2 Kat.",
-    "2-attacke": "2. Attacke",
+    "1-kategorie": "1 Cat.",
+    "2-kategorie": "2 Cat.",
+    "2-attacke": "2e Aanval",
    "CH": "CH",
-    "FF": "FF",
-    "GE": "GE",
+    "FF": "VV",
+    "GE": "BE",
    "IN": "IN",
-    "KK": "KK",
-    "KL": "KL",
-    "KO": "KO",
-    "MU": "MU",
+    "KK": "LK",
+    "KL": "SL",
+    "KO": "CO",
+    "MU": "MO",
    "ae": "AE",
-    "GEKK": "GE/KK",
-    "aktiv": "Aktiv",
-    "aktstatus": "akt. Status",
-    "aktuell": "Aktuell",
-    "alter": "Alter",
-    "anmerkung": "Anmerkung",
-    "anmerkungen": "Anmerkungen",
-    "ap-ausgegeben": "AP ausgegeben",
-    "ap-gesamt": "AP gesamt",
-    "ap-verfuegbar": "AP verfügbar",
-    "armbrueste": "Armbrüste",
-    "armbrust": "Armbrust",
-    "astralenergie": "Astralenergie",
-    "at-fk": "AT/FK",
-    "at-mod": "AT-Mod",
+    "GEKK": "BE/LK",
+    "aktiv": "Actief",
+    "aktstatus": "Act. status",
+    "aktuell": "Actueel",
+    "alter": "Leeftijd",
+    "anmerkung": "Opmerking",
+    "anmerkungen": "Opmerkingen",
+    "ap-ausgegeben": "AP uitgegeven",
+    "ap-gesamt": "AP totaal",
+    "ap-verfuegbar": "AP beschikbaar",
+    "armbrueste": "Kruisbogen",
+    "armbrust": "Kruisboog",
+    "astralenergie": "Astraalenergie",
+    "at-fk": "AV/AG",
+    "at-mod": "AV-Mod",
    "at-pa": "AT-/PA-Mod.",
-    "attacke": "Attacke",
-    "augenfarbe": "Augenfarbe",
-    "ausruestung": "Ausrüstung",
-    "ausweichen": "Ausweichen",
-    "auswirkung": "Auswirkung:",
+    "attacke": "Aanval",
+    "augenfarbe": "Kleur ogen",
+    "ausruestung": "Uitrusting",
+    "ausweichen": "Uitwijken",
+    "auswirkung": "Uitwerkung:",
    "basis": "Basis",
    "baseValues": "Basiswerte",
-    "be": "BE",
-    "be-aktiviert": "BE aktiviert",
-    "be-gesamt": "BE gesamt",
-    "beidhaendigerkampf": "Beidhändig",
-    "belastung": "Belastung",
-    "beschreibung": "Beschreibung",
-    "betaeubung": "Betäubung",
-    "bewegungsunfaehig": "Bewegungsunfähig",
-    "bewusstlos": "Bewusstlos",
-    "blasrohre": "Blasrohre",
+    "be": "BA",
+    "be-aktiviert": "BA geactiveerd",
+    "be-gesamt": "BA totaal",
+    "beidhaendigerkampf": "Tweehandig",
+    "belastung": "Ballast",
+    "beschreibung": "Beschrijving",
+    "betaeubung": "Verdoving",
+    "bewegungsunfaehig": "Bewegingsonbekwaam",
+    "bewusstlos": "Bewusteloos",
+    "blasrohre": "Blaasroeren",
    "blind": "Blind",
-    "blutrausch": "Blutrausch",
-    "bogen": "Bogen",
-    "boegen": "Bögen",
+    "blutrausch": "Bloedroes",
+    "bogen": "Boog",
+    "boegen": "Bogen",
    "bonus": "Bonus",
    "bonus-malus": "Bonus/Malus",
-    "brennend": "Brennend",
-    "brillant": "Brillant (1700 AP)",
+    "brennend": "Brandend",
+    "brillant": "Briljant (1700 AP)",
    "charakteristika": "Charakteristika",
    "calcSchmerz": "Schmerz berechnen",
    "calcTraglast": "Belastung durch Gepäck",
    "charisma": "Charisma",
    "compendiumDrop": "Kompendium Drop übernehmen",
-    "dauer": "Dauer",
-    "diskus": "Diskus",
-    "diskusse": "Diskusse",
+    "dauer": "Duur",
+    "diskus": "Discus",
+    "diskusse": "Discussen",
    "distanz": "Distanz",
-    "dolche": "Dolche",
+    "dolche": "Dolken",
    "details": "Details",
-    "durchschnittlich": "Durchschnittlich (1000 AP)",
+    "durchschnittlich": "Gemiddeld (1000 AP)",
    "effekt-modat": "Effekt-Mod. AT",
    "effekt-modaw": "Effekt-Mod. AW",
    "effekt-modpa": "Effekt-Mod. PA",
    "effekt-modtp": "Effekt-Mod. TP",
-    "elfenlieder": "Elfenlieder",
-    "eigenschaften": "Eigenschaften",
-    "eigenschaft": "Eigenschaft",
-    "eingeengt": "Eingeengt",
-    "entrueckung": "Entrückung",
+    "elfenlieder": "Elfenliederen",
+    "eigenschaften": "Eigenschappen",
+    "eigenschaft": "Eigenschap",
+    "eingeengt": "Ingesloten",
+    "entrueckung": "Vervoering",
    "erfahren": "Erfahren (1100 AP)",
-    "erfahrungsgrad": "Erfahrungsgrad",
-    "erregung": "Erregung",
+    "erfahrungsgrad": "Ervaringsgraad",
+    "erregung": "Opwinding",
    "erweiterung1": "1. Erweiterung",
    "erweiterung2": "2. Erweiterung",
    "erweiterung3": "3. Erweiterung",
    "erweiterung4": "4. Erweiterung",
    "erweiterung5": "5. Erweiterung",
    "familie": "Familie",
-    "fechtwaffen": "Fechtwaffen",
-    "fernkampf": "Fernkampf",
-    "fernkampfwaffe": "Fernkampfwaffe",
-    "fernkampfwaffen": "Fernkampfwaffen",
-    "feuerspeien": "Feuerspeien",
-    "fingerfertigkeit": "Fingerfertigkeit",
-    "fixiert": "Fixiert",
-    "flueche": "Flüche",
-    "furcht": "Furcht",
-    "fw": "FW",
+    "fechtwaffen": "Schermwapens",
+    "fernkampf": "Afstandsgevecht",
+    "fernkampfwaffe": "Afstandswapen",
+    "fernkampfwaffen": "Afstandswapens",
+    "feuerspeien": "Vuurspuwen",
+    "fingerfertigkeit": "Vingervaardigheid",
+    "fixiert": "Gefixeerd",
+    "flueche": "Vloeken",
+    "furcht": "Angst",
+    "fw": "VaW",
    "fk-mod": "FK-Mod",
    "geburtsort": "Geburtsort",
    "geburtstag": "Tsatag",
@@ -123,55 +123,55 @@
    "hiebwaffen": "Hiebwaffen",
    "info": "Info",
    "initiative": "Initiative",
-    "intuition": "Intuition",
-    "inventar": "Inventar",
+    "intuition": "Intuïtie",
+    "inventar": "Inventaris",
    "ja": "ja",
-    "kampf": "Kampf",
-    "kampf-im-wasser": "Kampf im Wasser",
-    "kampf-unter-wasser": "Kampf unter Wasser",
-    "kampfsituationen-status": "Kampfsituationen / Status",
-    "kampftechniken": "Kampftechniken",
-    "kampftechnikwert": "Kampftechnikwert",
-    "karmaenergie": "Karmaenergie",
+    "kampf": "Gevecht",
+    "kampf-im-wasser": "Watergevecht",
+    "kampf-unter-wasser": "Onderwatergevecht",
+    "kampfsituationen-status": "Gevechtssituaties / Status",
+    "kampftechniken": "Gevechtstechnieken",
+    "kampftechnikwert": "Gevechtstechniekwaarde",
+    "karmaenergie": "Karmale energie",
    "ke": "KE",
-    "kettenwaffen": "Kettenwaffen",
+    "kettenwaffen": "Kettingwapens",
    "klein": "klein",
-    "klugheit": "Klugheit",
-    "koerperkraft": "Körperkraft",
-    "koerpertalente": "Körpertalente",
-    "kompetent": "Kompetent (1200 AP)",
-    "konstitution": "Konstitution",
+    "klugheit": "Slimheid",
+    "koerperkraft": "Lichaamskracht",
+    "koerpertalente": "Lichamelijke Talenten",
+    "kompetent": "Competent (1200 AP)",
+    "konstitution": "Constitutie",
    "kosten": "Kosten",
-    "krank": "Krank",
-    "kultur": "Kultur",
+    "krank": "Ziek",
+    "kultur": "Cultuur",
    "kritisch": "Kritischer",
    "kulturpaket": "Kulturpaket hinzufügen?",
    "professionspaket": "Professionspaket hinzufügen?",
-    "kurz": "kurz",
+    "kurz": "kort",
    "lz": "LZ",
-    "ladezeit": "Ladezeit in KR",
+    "ladezeit": "Laadtijd in GvR",
    "lang": "lang",
-    "lanzen": "Lanzen",
+    "lanzen": "Lansen",
    "le": "LE",
-    "lebensenergie": "Lebensenergie",
+    "lebensenergie": "Levensenergie",
    "linkToken": "Ressourcen mit Token verlinken",
-    "leicht": "leicht",
-    "legendaer": "Legendär (2100 AP)",
-    "leiteigenschaft": "Leiteigenschaft",
-    "leiteigschadensb": "TP-Bonus",
-    "liegend": "Liegend",
+    "leicht": "licht",
+    "legendaer": "Legendarisch (2100 AP)",
+    "leiteigenschaft": "Hoofdeigenschap",
+    "leiteigschadensb": "Leiteig. + Schadensb.",
+    "liegend": "Liggend",
    "magie": "Magie",
    "malus": "Malus",
    "max-5": "(max. -5)  ",
-    "maximal": "Maximum",
-    "meisterlich": "Meisterlich (1400 AP)",
-    "merkmal": "Merkmal",
-    "mittel": "mittel",
-    "modfikator-hinzuf": "Modfikator hinzufügen",
-    "modifikator": "Modifikator",
+    "maximal": "Maximaal",
+    "meisterlich": "Meesterlijk (1400 AP)",
+    "merkmal": "Kenmerk",
+    "mittel": "middel",
+    "modfikator-hinzuf": "Modificatie toevoegen",
+    "modifikator": "Modificatie",
    "modkurz": "Mod.",
-    "modifikatoren": "Modifikatoren",
-    "modifikatorplus": "Modifikator(+/-)",
+    "modifikatoren": "Modificaties",
+    "modifikatorplus": "Modificatie(+/-)",
    "modeffekt": "EF-Mod",
    "modsf": "SF-Mod",
    "mut": "Mut",
@@ -218,56 +218,56 @@
    "schaden": "Schaden",
    "schelmenstreiche": "Schelmenstreiche",
    "schicksalspunkte": "Schicksalspunkte",
-    "schilde": "Schilde",
-    "schilde-waffen": "Schild und Nebenhandwaffen",
-    "schildparade-parierwaffe": "Schildparade",
-    "schips": "SchiPs",
-    "schleudern": "Schleudern",
-    "schmerz": "Schmerz",
-    "schmerzstufen-1-2-3-4": "Schmerzstufen",
-    "schnell": "schnell",
+    "schilde": "Schilden",
+    "schilde-waffen": "Schilden und <i>Anderhandswapens</i>",
+    "schildparade-parierwaffe": "Schildafweer",
+    "schips": "Schips",
+    "schleudern": "Slingers",
+    "schmerz": "Pijn",
+    "schmerzstufen-1-2-3-4": "Graden pijn",
+    "schnell": "snel",
    "schriften": "Schriften",
-    "schuetzenbewegung": "Schützenbewegung",
-    "schuss-ins-kampfgetuemmel": "Schuss ins Kampfgetümmel",
-    "schwerter": "Schwerter",
-    "seelenkraft": "Seelenkraft",
-    "selbst": "Selbst ",
-    "sf-modat": "SF-Mod. AT",
-    "sf-modaw": "SF-Mod. AW",
-    "sf-modpa": "SF-Mod. PA",
-    "sf-modtp": "SF-Mod. TP",
-    "sf-modifikatoren": "SF-Modifikatoren",
-    "sichtmodifikator": "Sichtmodifikator",
-    "sicht-iv": "IV - Treffer auf 1",
-    "sk": "SK",
-    "sonderfertigkeiten": "Sonderfertigkeiten",
-    "sonstiges": "Sonstiges",
-    "sozialstatus": "Sozialstatus",
-    "spezies": "Spezies",
-    "sprachen": "Sprachen",
-    "stangenwaffen": "Stangenwaffen",
+    "schuetzenbewegung": "<i>Bewegende schutter</i>",
+    "schuss-ins-kampfgetuemmel": "<i>Schot naar strijdgewoel</i>",
+    "schwerter": "Zwaarden",
+    "seelenkraft": "Zielskracht",
+    "selbst": "Zelf ",
+    "sf-modat": "VF-Mod. AV",
+    "sf-modaw": "VF-Mod. OW",
+    "sf-modpa": "VF-Mod. AW",
+    "sf-modtp": "VF-Mod. TP",
+    "sf-modifikatoren": "SV-Modificaties",
+    "sichtmodifikator": "Zichtmodificatie",
+    "sicht-iv": "IV - Treffer op 1",
+    "sk": "ZK",
+    "sonderfertigkeiten": "Competenties",
+    "sonstiges": "Andere",
+    "sozialstatus": "Sociale status",
+    "spezies": "Ras",
+    "sprachen": "Talen",
+    "stangenwaffen": "Stangwapens",
    "status": "Status",
    "status-aktiviert": "Status-Mod",
-    "steigerung": "Steigerung",
-    "steigerungsfaktor": "Steigerungsfaktor",
-    "stehend": "stehend",
-    "still": "still",
-    "stg": "Stg.",
-    "stufe": "Stufe",
-    "stufe-i": "Stufe I",
-    "stufe-ii": "Stufe II",
-    "stufe-iii": "Stufe III",
-    "stufe-iv": "Stufe IV",
-    "stufe-iv-nk": "IV - halbe AT, PA auf 1",
-    "stumm": "Stumm",
-    "summe": "Summe",
-    "summe-der-statusmodifikatoren": "Summe der Statusmodifikatoren",
-    "talente": "Talente",
+    "steigerung": "Verhoging",
+    "steigerungsfaktor": "Verhogingsfactor",
+    "stehend": "staand",
+    "still": "stil",
+    "stg": "Vhg.",
+    "stufe": "Graad",
+    "stufe-i": "Graad I",
+    "stufe-ii": "Graad II",
+    "stufe-iii": "Graad III",
+    "stufe-iv": "Graad IV",
+    "stufe-iv-nk": "IV - halve AV, AW op 1",
+    "stumm": "Stom",
+    "summe": "Som",
+    "summe-der-statusmodifikatoren": "Som van de Statusmodificaties",
+    "talente": "Talenten",
    "talent": "Talent",
-    "taub": "Taub",
+    "taub": "Doof",
    "titel": "Titel",
-    "tp-at-pa-mod-": "TP/AT/PA-Mod.",
-    "tp-fk-mod-": "TP/FK-Mod.",
+    "tp-at-pa-mod-": "TP/AV/AW-Mod.",
+    "tp-fk-mod-": "TP/AG-Mod.",
    "tp-mod": "TP-Mod",
    "tradition": "Tradition",
    "traditionseigenschaft": "Traditionseigenschaft",
@@ -318,22 +318,22 @@
    "max-modifikator-roll": "Max. Modifikator:",
    "probe-roll": "Probe:",
    "initiative-roll": "´s Initiative",
-    "wert-roll": "Wert:",
-    "attackewurf": "Attackewurf:",
-    "verteidigungswurf": "Verteidigungswurf:",
-    "trefferpunkte-roll": "Trefferpunkte:",
-    "fliegen": "Fliegen",
-    "gaukeleien": "Gaukeleien",
-    "klettern": "Klettern",
-    "koerperbeherrschung": "Körperbeherrschung",
-    "kraftakt": "Kraftakt",
-    "reiten": "Reiten",
-    "schwimmen": "Schwimmen",
-    "selbstbeherrschung": "Selbstbeherrschung",
-    "singen": "Singen",
-    "sinnesschaerfe": "Sinnesschärfe",
-    "tanzen": "Tanzen",
-    "taschendiebstahl": "Taschendiebstahl",
+    "wert-roll": "Waarde: ",
+    "attackewurf": "Aanvalsworp: ",
+    "verteidigungswurf": "Verdedingsworp: ",
+    "trefferpunkte-roll": "Trefpunten:",
+    "fliegen": "Vliegen",
+    "gaukeleien": "Kunstenmakerij",
+    "klettern": "Klimmen",
+    "koerperbeherrschung": "Lichaamsbeheersing",
+    "kraftakt": "Krachttoer",
+    "reiten": "Rijden",
+    "schwimmen": "Zwemmen",
+    "selbstbeherrschung": "Zelfbeheersing",
+    "singen": "Zingen",
+    "sinnesschaerfe": "Zintuigen",
+    "tanzen": "Dansen",
+    "taschendiebstahl": "Zakkenrollen",
    "verbergen": "Verbergen",
    "zechen": "Zechen",
    "bekehren": "Bekehren & Überzeugen",
@@ -1177,6 +1177,7 @@ p + p {
 .charsheet .sheet-talent-zauber-memorans:checked + div.sheet-zauber,
 .charsheet .sheet-talent-zauber-menetekel:checked + div.sheet-zauber,
 .charsheet .sheet-talent-zauber-metamagie:checked + div.sheet-zauber,
+.charsheet .sheet-talent-zauber-metamorpho-felsenform:checked + div.sheet-zauber,
 .charsheet .sheet-talent-zauber-metamorpho:checked + div.sheet-zauber,
 .charsheet .sheet-talent-zauber-motoricus:checked + div.sheet-zauber,
 .charsheet .sheet-talent-zauber-movimento:checked + div.sheet-zauber,
@@ -8312,6 +8312,16 @@
                    <button name="metamagieSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Zauber} {{name=Metamagie neutralisieren (@{spez_metamagie})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{ZfW_metamagie} + 2]]}} {{stat1=[[@{KL}]]}} {{stat2=[[@{KL}]]}} {{stat3=[[@{KO}]]}} {{Talent=[[ { [[{0d1 + @{ZfW_metamagie} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamagie} + 2, 0d1}kh1]] - @{KL}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamagie} + 2, 0d1}kh1]] - @{KL}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamagie} + 2, 0d1}kh1]] - @{KO}, 0d1}kh1, 0d1 + @{ZfW_metamagie} + 2}dh1]]}}">Spez</button>
                    <br>
                </div>
+                <input class="sheet-talent-zauber-metamorpho-felsenform sheet-default-hide" type="checkbox" name="attr_zauber_metamorpho_felsenform" value="1">
+                <div class="sheet-zauber">
+                    <div class="sheet-talent-cell sheet-talent-name"><button name="metamorpho_felsenform" type="roll" value="@{gm_roll_opt} &{template:DSA-Zauber} {{name=Metamorpho Felsenform}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{ZfW_metamorpho_felsenform}]]}} {{stat1=[[@{KL}]]}} {{stat2=[[@{FF}]]}} {{stat3=[[@{KK}]]}} {{Talent=[[ { [[{0d1 + @{ZfW_metamorpho_felsenform} - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho_felsenform}, 0d1}kh1]] - @{KL}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho_felsenform}, 0d1}kh1]] - @{FF}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho_felsenform}, 0d1}kh1]] - @{KK}, 0d1}kh1, 0d1 + @{ZfW_metamorpho_felsenform}}dh1]]}}"> <span>Metamorpho Felsenform</span></button></div>
+                    <div class="sheet-talent-cell sheet-talent-eigenschaften">KL/FF/KK</div>
+                    <input type="text" class="sheet-talent-spez" name="attr_Spez_metamorpho_felsenform">
+                    <input type="number" class="sheet-talent-taw" name="attr_ZfW_metamorpho_felsenform" min="0" value="0">
+                    <div class="sheet-talent-cell sheet-talent-taw">180</div>
+                    <button name="metamorpho_felsenformSpez" type="roll" value="@{gm_roll_opt} &{template:DSA-Zauber} {{name=Metamorpho Felsenform (@{spez_metamorpho_felsenform})}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{ZfW_metamorpho_felsenform} + 2]]}} {{stat1=[[@{KL}]]}} {{stat2=[[@{FF}]]}} {{stat3=[[@{KK}]]}} {{Talent=[[ { [[{0d1 + @{ZfW_metamorpho_felsenform} + 2 - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho_felsenform} + 2, 0d1}kh1]] - @{KL}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho_felsenform} + 2, 0d1}kh1]] - @{FF}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho_felsenform} + 2, 0d1}kh1]] - @{KK}, 0d1}kh1, 0d1 + @{ZfW_metamorpho_felsenform} + 2}dh1]]}}">Spez</button>
+                    <br>
+                </div>
                <input class="sheet-talent-zauber-metamorpho sheet-default-hide" type="checkbox" name="attr_zauber_metamorpho" value="1">
                <div class="sheet-zauber">
                    <div class="sheet-talent-cell sheet-talent-name"><button name="metamorpho" type="roll" value="@{gm_roll_opt} &{template:DSA-Zauber} {{name=Metamorpho Gletscherform}} {{mod=[[?{Erleichterung (−) oder Erschwernis (+)|0}d1cs0cf2]]}} {{taw=[[@{ZfW_metamorpho}]]}} {{stat1=[[@{KL}]]}} {{stat2=[[@{FF}]]}} {{stat3=[[@{KK}]]}} {{Talent=[[ { [[{0d1 + @{ZfW_metamorpho} - (?{Erleichterung (−) oder Erschwernis (+)|0}), 0d1}kh1]] - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho}, 0d1}kh1]] - @{KL}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho}, 0d1}kh1]] - @{FF}, 0d1}kh1 - {1d20cs1cf20 + [[{0d1 + (?{Erleichterung (−) oder Erschwernis (+)|0}) - @{ZfW_metamorpho}, 0d1}kh1]] - @{KK}, 0d1}kh1, 0d1 + @{ZfW_metamorpho}}dh1]]}}"> <span>Metamorpho Gletscherform</span></button></div>
@@ -9892,6 +9902,7 @@
                                        <label><input type="checkbox" name="attr_zauber_memorans" value="1">Memorans Gedächtniskraft</label>
                                        <label><input type="checkbox" name="attr_zauber_menetekel" value="1">Menetekel Flammenschrift</label>
                                        <label><input type="checkbox" name="attr_zauber_metamagie" value="1">Metamagie neutralisieren</label>
+                                        <label><input type="checkbox" name="attr_zauber_metamorpho_felsenform" value="1">Metamorpho Felsenform</label>
                                        <label><input type="checkbox" name="attr_zauber_metamorpho" value="1">Metamorpho Gletscherform</label>
                                        <label><input type="checkbox" name="attr_zauber_motoricus" value="1">Motoricus Geisterhand</label>
                                        <label><input type="checkbox" name="attr_zauber_movimento" value="1">Movimento Dauerlauf</label>
@@ -9918,9 +9929,9 @@
                                        <label><input type="checkbox" name="attr_zauber_penetrizzel" value="1">Penetrizzel Tiefenblick</label>
                                        <label><input type="checkbox" name="attr_zauber_pentagramma" value="1">Pentagramma Sphärenbann</label>
                                        <label><input type="checkbox" name="attr_zauber_pestilenz" value="1">Pestilenz erspüren</label>
-                                        <label><input type="checkbox" name="attr_zauber_pfeilderluft" value="1">Pfeil der Luft</label>
                                    </td>
                                    <td valign="top">
+                                        <label><input type="checkbox" name="attr_zauber_pfeilderluft" value="1">Pfeil der Luft</label>
                                        <label><input type="checkbox" name="attr_zauber_pfeildeseises" value="1">Pfeil des Eises</label>
                                        <label><input type="checkbox" name="attr_zauber_pfeildeserzes" value="1">Pfeil des Erzes</label>
                                        <label><input type="checkbox" name="attr_zauber_pfeildesfeuers" value="1">Pfeil des Feuers</label>
@@ -12727,6 +12738,16 @@
            <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 20211101</h4>
+		<div>
+			<p>Neue Features
+				<ul>
+					<li>Zauber &bdquo;Metamorpho Felsenform&ldquo; hinzugefügt</li>
+				</ul>
+			</p>
+			<p>Diese Version wurde in einem Livestream erstellt, der Streammitschnitt ist verfügbar.</p>
+		</div>
+
 		<h4>Update auf Version 20211021</h4>
 		<div>
 			<p>Fehlerbehebungen:
@@ -12970,7 +12991,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="20211021"><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="20211101"><input type="hidden" class="sheet-stat-immutable sheet-stat-immutable-version" readonly="readonly" name="attr_data_version" value=""></b>
    </table>
 </div>

@@ -70,13 +70,13 @@
 "entrueckung": "Estraniamento",
 "erfahren": "Esperto (1100 PAvv)",
 "erfahrungsgrad": "Livello di Esperienza",
- "erregung": "Erregung",
- "erweiterungen": "Erweiterungen",
- "erweiterung1": "1. Erweiterung",
- "erweiterung2": "2. Erweiterung",
- "erweiterung3": "3. Erweiterung",
- "erweiterung4": "4. Erweiterung",
- "erweiterung5": "5. Erweiterung",
+ "erregung": "Eccitazione",
+ "erweiterungen": "Espansioni",
+ "erweiterung1": "1a espansione",
+ "erweiterung2": "2a espansione",
+ "erweiterung3": "3a espansione",
+ "erweiterung4": "4a espansione",
+ "erweiterung5": "5a espansione",
 "familie": "Famiglia",
 "fechtwaffen": "Armi da scherma",
 "fernkampf": "Distanza",
@@ -151,7 +151,7 @@
 "leiteigschadensb": "Bonus Impatto",
 "liegend": "Atterrato",
 "magie": "Magia",
- "malus": "Malus",
+ "malus": "Penalità",
 "max-5": "(max. -5)",
 "maximal": "Massimo",
 "meisterlich": "Magistrale (1400 PAvv)",
@@ -266,12 +266,12 @@
 "trance": "Trance",
 "trefferpunkte": "Punti Impatto",
 "ueberrascht": "Sorpreso",
- "uebler-geruch": "Übler Geruch",
+ "uebler-geruch": "Cattivo odore",
 "unerfahren": "Inesperto (900 PAvv)",
 "unsichtbar": "Invisibile",
 "vergiftet": "Avvelenato",
 "verschleiss": "Verschleiß",
- "versteinert": "Versteinert",
+ "versteinert": "Pietrificato",
 "verwirrung": "Confusione",
 "vornachteile": "Vantaggi/Svantaggi",
 "vorteile": "Vantaggi",
@@ -292,8 +292,8 @@
 "x2": "×2",
 "zaehigkeit": "Tenacità (Tnc)",
 "zauber": "Magia",
- "zaubermelodien": "Zaubermelodien",
- "zaubertaenze": "Zaubertänze",
+ "zaubermelodien": "Canti magici",
+ "zaubertaenze": "Balli magici",
 "zaubertricks": "Trucchi di magia",
 "zielbewegung": "Movimento bersaglio",
 "zielkategorie": "Categoria bersaglio",
@@ -465,10 +465,10 @@
 "heiligtum-magischer-ort": "+1 | Luogo sacro/magico",
 "falscher-ritualplatz": "-3 | Luogo inappropriato",
 "fluch": "Maledizione",
- "streich": "Streich",
+ "streich": "Scherzo",
 "animistenkraft": "Animistenkraft",
 "zaubermelodie": "Canto magico",
- "zaubertanz": "Zaubertanz",
+ "zaubertanz": "Ballo magico",
 "verbreitung": "Diffusione",
 "zielmodifikator": "Modificatore di obiettivo",
 "bitte-auswaehlen": "Seleziona",
@@ -557,11 +557,11 @@
 "handwerk": "Artigianali",
 "gesellschaft": "Sociali",
 "wissen": "Conoscitive",
- "1-parade": "1° Parata",
- "2-parade": "2° Parata",
- "3-parade": "3° Parata",
- "4-parade": "4° Parata",
- "5-parade": "5° Parata",
+ "1-parade": "1a parata",
+ "2-parade": "2a parata",
+ "3-parade": "3a parata",
+ "4-parade": "4a parata",
+ "5-parade": "5a parata",
 "nahkampf_doppelt": "Nahkampf, verdoppelt",
 "fernkampf_doppelt": "Fernkampf, verdoppelt",
 "query_trans": "Bonus (+) / Penalità (-), nel caso di bonus indicare senza ‘-’",
@@ -592,11 +592,11 @@
 "Regen-AE": "Rigenerazione energia astrale",
 "Regen-KE": "Rigenerazione energia karmica",
 "keine": "nessuna",
- "status-liste": "bewegungsunfaehig,bewusstlos,blind,blutrausch,brennend,eingeengt,fixiert,handlungsunfaehig,krank,liegend,pechmagnet,raserei,stumm,taub,ueberrascht,uebler-geruch,unsichtbar,vergiftet,versteinert",
- "zustaende-liste": "belastung,betaeubung,entrueckung,furcht,paralyse,schmerz,trance,verwirrung",
+ "status-liste": "immobilizzato,incosciente,cieco,furibondo,in fiamme,costretto,legato,incapacitato,malato,atterrato,scalogna,furente,muto,sordo,sorpreso,cattivo odore,invisibile,avvelenato,pietrificato",
+ "zustaende-liste": "impiccio,stordimento,estraniamento,paura,paralisi,dolore,trance,confusione",
 "koerpertalente-liste": "fliegen,gaukeleien,klettern,koerperbeherrschung,kraftakt,reiten,schwimmen,selbstbeherrschung,singen,sinnesschaerfe,tanzen,taschendiebstahl,verbergen,zechen",
 "gesellschaftstalente-liste": "bekehren,betoeren,einschuechtern,etikette,gassenwissen,menschenkenntnis,ueberreden,verkleiden,willenskraft",
- "naturtalente-liste": "faehrtensuchen,fesseln,fischen,orientierung,pflanzenkunde,tierkunde,wildnisleben",
+ "naturtalente-liste": "tracce,corde,pescare,orientamento,flora,fauna,sopravvivenza",
 "wissenstalente-liste": "glueckspiel,geographie,geschichtswissen,goetterkulte,kriegskunst,magiekunde,mechanik,rechnen,rechtskunde,sagenlegenden,sphaerenkunde,sternkunde",
 "handwerkstalente-liste": "alchemie,boote,fahrzeuge,handel,hkgift,hkkrankheiten,hkseele,hkwunden,holzbearbeitung,lebensmittelbearbeitung,lederbearbeitung,malenzeichnen,metallbearbeitung,musizieren,schloesserknacken,steinbearbeitung,stoffbearbeitung",
 "farbschema": "Farbschema",
@@ -703,15 +703,15 @@
 "ruestung_mod": "Modificatori aggiuntivi:",
 "npc-import": "NPC-Stats-Block importieren: (Achtung: Beta-Status!)",
 "import": "Starte Import",
- "lep": "LeP",
- "asp": "AsP",
- "kap": "KaP",
- "INI": "INI",
+ "lep": "PV",
+ "asp": "PA",
+ "kap": "PK",
+ "INI": "Ini",
 "VW": "VW",
- "RS/BE": "RS/BE",
- "aktionen": "Aktionen",
+ "RS/BE": "Pro/Imp",
+ "aktionen": "Azioni",
 "anrufungsschwierigkeit": "Anrufungsschwierigkeit",
- "schmerzplus1": "Schmerz +1 bei",
+ "schmerzplus1": "Dolore +1 con",
 "ENDTOKEN": "ENDTOKEN",
 "magie_und_glaube": "Magie und Glaube",
 "talente_fw_mod": "Talente FW-Modifikator"
@@ -1,40 +1,40 @@
-![Dračí Hlídka.png][logo]
-
-[logo]: ./assets/logo.png "Dračí Hlídka"
-
-# Dračí Hlídka Character Sheet
-
-* The character sheet is only a blank document, incorporating basic game rolls. It's up to you how you use it.
-* There are no data for abilities (schopnosti), items (inventář), monsters (bestiář) or any game rules.
-* Also there is no functionality for initial rolling of the character, neither for new level transition.
-* We are working on all these functions for charactermancer and compendium.
-* Also a monster character sheet will be delivered shortly.
-
-## Changelog
-
-Changes are listed [here](CHANGELOG.md)
-
-## Special thanks
-Thanks to all the hard workers. Jste nejlepší!
-Whether you were coding, processing rulebooks data, preparing wireframes or simply testing, you all made this possible!
-Daaron
-Ferryman
-MachalXVIII
-Perthorn
-Vaša
-Ranyar
-Kasai-Taliesin
-Korvoran
-Barbog
-Wertka
-Nenasyta
-Kokocudači
-Percy
-Abendaveer
-
-## Follow us
-You can follow us on our website: https://www.dracihlidka.cz/
-On our Facebook page: https://www.facebook.com/dracihlidka
-Our Youtube channel: https://www.youtube.com/c/Dra%C4%8D%C3%ADHl%C3%ADdka/
-Our Instagram: https://www.instagram.com/dracihlidka/
+![Dračí Hlídka.png][logo]
+
+[logo]: ./assets/logo.png "Dračí Hlídka"
+
+# Dračí Hlídka Character Sheet
+
+* The character sheet is only a blank document, incorporating basic game rolls. It's up to you how you use it.
+* There are no data for abilities (schopnosti), items (inventář), monsters (bestiář) or any game rules.
+* Also there is no functionality for initial rolling of the character, neither for new level transition.
+* We are working on all these functions for charactermancer and compendium.
+* Also a monster character sheet will be delivered shortly.
+
+## Changelog
+
+Changes are listed [here](CHANGELOG.md)
+
+## Special thanks
+Thanks to all the hard workers. Jste nejlepší!
+Whether you were coding, processing rulebooks data, preparing wireframes or simply testing, you all made this possible!
+Daaron
+Ferryman
+MachalXVIII
+Perthorn
+Vaša
+Ranyar
+Kasai-Taliesin
+Korvoran
+Barbog
+Wertka
+Nenasyta
+Kokocudači
+Percy
+Abendaveer
+
+## Follow us
+You can follow us on our website: https://www.dracihlidka.cz/
+On our Facebook page: https://www.facebook.com/dracihlidka
+Our Youtube channel: https://www.youtube.com/c/Dra%C4%8D%C3%ADHl%C3%ADdka/
+Our Instagram: https://www.instagram.com/dracihlidka/
 Or our Discord server: https://discord.com/invite/KTmXRvM
@@ -38,7 +38,7 @@
        	<div class="char2" >Reflexes</div><div class="charscore2" ><input class="fourshorttextinput" type="text" name="attr_finalreflexes" value="0" readonly/></div><button class="button2 d20" type="roll" value="&{template:default} {{name=@{character_name} makes a Reflexes test}} {{Reflexes Roll= [[d20cs1cf20]]}} {{VS Target Number= [[@{finalreflexes}+?{Modifier?|0}]] }}" name="roll_reflexescheck"></button>
        	<div class="char3" >Intelligence </div> <div class="charscore3" > <input class="fourshorttextinput" type="text" name="attr_finalintelligence" value="0" readonly/> </div><button class="button3 d20" type="roll" value="&{template:default} {{name=@{character_name} makes a Intelligence test}} {{Intelligence Roll= [[d20cs1cf20]]}} {{VS Target Number= [[@{finalintelligence}+?{Modifier?|0}]] }}" name="intelligencecheck"></button>
        	<div class="char4" >Psychic Talent</div><div class="charscore4" > <input class="fourshorttextinput" type="text" name="attr_finalpsychictalent" value="0" readonly/></div><button class="button4 d20" type="roll" value="&{template:default} {{name=@{character_name} makes a Psychic Talent test}} {{Psychic Talent Roll= [[d20cs1cf20]]}} {{VS Target Number= [[@{finalpsychictalent}+?{Modifier?|0}]] }}" name="roll_psychictalentcheck"></button>
-        	<div class="char5" >Looks</div><div class="charscore5" ><input class="fourshorttextinput" type="text" name="attr_finallooks" value="0" readonly/></div><button class="button5 d20" type="roll" value="&{template:default} {{name=@{character_name} makes a Looks test}} {{Looks Roll= [[d20cs1cf20]]}} {{VS Target Number= [[@{lfinalooks}+?{Modifier?|0}]] }}" name="roll_lookscheck"></button>
+        	<div class="char5" >Looks</div><div class="charscore5" ><input class="fourshorttextinput" type="text" name="attr_finallooks" value="0" readonly/></div><button class="button5 d20" type="roll" value="&{template:default} {{name=@{character_name} makes a Looks test}} {{Looks Roll= [[d20cs1cf20]]}} {{VS Target Number= [[@{finallooks}+?{Modifier?|0}]] }}" name="roll_lookscheck"></button>
 		</div>
 		<div class="atkdefattributes">
 			<label class="boxheading cfheading">Combat Factors</label>
@@ -1,5 +1,5 @@
-/*   Earthdawn.css  211023*/
-/********************************************** css Reset ***************************************************************************/
+/*   Earthdawn.css  211026*/
+/* ############################################ css Reset ######################################################################### */

 /* @import url('https://fonts.googleapis.com/css2?family=IM+Fell+English+SC&display=swap'); */
@import url('https://fonts.googleapis.com/css2?family=Aladin&display=swap');
@@ -43,7 +43,7 @@ textarea,



-/********iconselect****/
+/* ##### iconselect #### */

 .sheet-testRepEditMode:not(:checked)~.repcontainer .sheet-iconselect-select,
 .sheet-iconselect-span:not(:hover)>.sheet-iconselect-select-noedit,
@@ -72,14 +72,14 @@ textarea,
 /* In order to have a correct initialization, it is absolutely necessary to have the iconselect-icon before the iconselect-select, and have the default value marked as checked/selected*/


-/********************************************** Main section ***************************************************************************/
+/* ############################################ Main section ####################################################################### */
 /* Colors:    code        description       What used for.      */
 .sheet-user-root {
  --bg-color:         rgb(255,242,201,0.15);/*rgb(240,235,220,0.1);  /* Main background color ;*/
  --outline-color:    #071840;        /* Proposal JB2 #13294B; /*Proposal CD :#004A82;   /* JB Version :black    Main border */
  --font-color:    #071840;        /* Color of fonts on the normal background */
  --header-font-color:    white;        /* Color of fonts on the header background */
-  --highlight-font-color:  #1473B4;/*#5a189a; /*#B6244F; /* #c94a01;        /* #5a189a Color of fonts on the icon background */
+  --highlight-font-color:  #071840; /*#1473B4;/*#5a189a; /*#B6244F; /* #c94a01;        /* #5a189a Color of fonts on the icon background */
  --input-color:      rgba(0, 0, 10, 0.1); /* Proposal CD with transparency  rgba(177, 233, 255, 0.3); /*# Proposal CD :B1E9FF;/* JB Version : Grey rgba(0, 0, 10, 0.08);  /* Light gray     Main section Input fields that are not disabled. */
  --hover-color:      red; /*  Color of active fields when hovered. */
  --hover-color-bg:      rgba(255, 0, 0, 0.5); /* Color of active fields when hovered. */
@@ -231,7 +231,7 @@ input[type="number"]:disabled.sheet-hidden,     /* Need this bit of extra specif



-/****************** JBF 210104 Global formatting (inputs, select ...)***************/
+/* ################ JBF 210104 Global formatting (inputs, select ...) ############ */


 input[type="text"],
@@ -288,7 +288,7 @@ input.sheet-buttonlabel {
  padding:      0;
  margin:       0;
  /* font-family:  Papyrus, fantasy; */
-  font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+  font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
  font-weight:  normal;
  color:        var( --font-color );

@@ -342,7 +342,7 @@ input[type="text"].sheet-Locked,
  /* font-style : italic; */
  -moz-appearance:  textfield;
  /* font-family:      Papyrus, fantasy; */
-  font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+  font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
  font-weight:  normal;
 }

@@ -385,7 +385,7 @@ input[type="text"].sheet-Locked,
  font-weight:      Bold;
 }

-/****JBF@CD 210106 : What's the intention of having a different style for readonly and Locked****/
+/*   JBF@CD 210106 : What's the intention of having a different style for readonly and Locked   */

 input:disabled,
 input:disabled::-webkit-inner-spin-button,
@@ -425,10 +425,10 @@ input.sheet-nospinner::-webkit-outer-spin-button {
 }


-/****************JBF 210104 : fancy font to be more ED-esque *****/
+/* ############# JBF 210104 : fancy font to be more ED-esque ### */
 .sheet-fancyfont {
  /* font-family:  Papyrus, fantasy; */
-  font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+  font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
  font-weight:  normal;
 }

@@ -524,7 +524,7 @@ select {
 }


-/****JBF@JBF 210106 trials for transparent button***/
+/*   JBF@JBF 210106 trials for transparent button  */

 .charsheet button[type="roll"],
 .charsheet button[type="action"] {
@@ -625,7 +625,7 @@ input[type="number"].sheet-attrCostsGreen {
 }


-/***********Steps and StepSpan*********/
+/* ######## Steps and StepSpan ###### */

 .charsheet input[type="number"].sheet-StepBig,
 .sheet-StepBig {
@@ -784,7 +784,7 @@ span:hover .sheet-buffRight{



-/*********************************************** JBF Header Flex Containers ***********************************************************/
+/* ############################################# JBF Header Flex Containers ######################################################### */

 .sheet-header-flex-container {
  display:          flex;
@@ -904,10 +904,10 @@ span:hover .sheet-buffRight{
 }


-/********************************************** Colors and Margins ***************************************************************************/
+/* ############################################ Colors and Margins ###################################################### */


-/* JBF 210103 To be identified ****/
+/* JBF 210103 To be identified    */
 .ui-widget-content,
 .charsheet {
  position: absolute;
@@ -915,7 +915,7 @@ span:hover .sheet-buffRight{
  left:     0;
  top:      46px;
 }
-/* JBF 210103 To be identified ****/
+/* JBF 210103 To be identified    */


 .sheet-user-root {
@@ -1011,7 +1011,7 @@ background-size : 250px 1372px, 250px 1372px,250px 1372px, 250px 1372px, 340px 2
  left:       0px;
  height:    50px;
  width:     50px;
-  opacity:    0.4;
+  opacity:    0.2;
  z-index:      1;
 }

@@ -1074,13 +1074,13 @@ background-size : 250px 1372px, 250px 1372px,250px 1372px, 250px 1372px, 340px 2
 .sheet-heading {
  background-color: var( --control-secondary );
  color:            var( --header-font-color );
-  font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+  font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
  font-weight:  normal;
  margin:           1px;
 }


-/********************************************** Tables and cells ************************************************************/
+/* ############################################ Tables and cells #################################################### */

 .sheet-table {
  display:    table;
@@ -1118,7 +1118,7 @@ background-size : 250px 1372px, 250px 1372px,250px 1372px, 250px 1372px, 340px 2
  background-color: var(--outline-color);
  font-size:        14px;
  /* font-family:      Papyrus, fantasy; */
-  font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+  font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
  font-weight:  normal;
  width:            100%;
  /*  margin: auto; *//* JBF@JBF 210105*/
@@ -1245,7 +1245,7 @@ margin:    1%;
  align-items:      center;
 }

-/********************************************** Attribute Boxes ************************************************************/
+/ ############################################# Attribute Boxes ########################################################## */

 .sheet-Attrib-container {
  padding:      5px;
@@ -1320,7 +1320,8 @@ margin:    1%;
 .sheet-AttribStep
 {
  color: var( --highlight-font-color );
-  text-shadow:   2px 2px white;
+  text-shadow:   2px 2px var( --bg-color );
+  font-weight:bold;
  font-size:   250%;    /* JBF was important */
  padding:        0;    /* JBF was important */
  margin-top:     0;    /* JBF was important */
@@ -1340,7 +1341,7 @@ margin:    1%;

 }

-/********************************************** Formating and Length ************************************************************/
+/* ############################################ Formating and Length ###################################################### */

 .sheet-fixed-width {
  white-space:  nowrap;
@@ -1433,7 +1434,7 @@ margin:    1%;
 .charsheet input[type="number"].sheet-numHighlight,
 .sheet-numHighlight {
  color:       var( --highlight-font-color );
-  text-shadow: 2px 2px white;
+  text-shadow: 2px 2px var( --bg-color );
  font-weight: bold;
 }

@@ -1454,7 +1455,7 @@ margin:    1%;



-/********************************************** Variable length text boxes ************************************************************/
+/* ############################################ Variable length text boxes ########################################################## */
 /*  The next few blocks are for variable length text boxes that expand as needed.   sheet-label-under2 is a tall box and has labels under the text input.
 The form of the html is a label or span wrapper, an input box, an span that has the invisible auto-expanding field, and an optional span that has the label.
 <label class="sheet-label-under2 sheet-autoexpand-wrap" title="@{height}">
@@ -1557,9 +1558,9 @@ To have a label in front of the expanding field, use something like this.



-/********************************************** Filterboxes ************************************************************
-* Filterboxes are basically repitems. Except that Filterboxes have been formated to allow certain items to be hidden
-* if they don't match the requirements to be displayed.
+/* ########################################### Filterboxes #######################################################
+# Filterboxes are basically repitems. Except that Filterboxes have been formated to allow certain items to be hidden
+# if they don't match the requirements to be displayed.
 */

 .charsheet .repcontainer .repitem,          /* A filterbox should look exactly like a repitem.  */
@@ -1641,7 +1642,7 @@ input.sheet-tabMain[value="2"]~div .sheet-section-combat~div fieldset+.repcontai
 }


-  /********************************************** Tabs ***************************************************************************/
+  /* ############################################ Tabs ################################################################### */

  div[class^="sheet-section"] {           /* Every class that starts with "sheet-section" starts out hidden */
  visibility: hidden;
@@ -1826,7 +1827,7 @@ input.sheet-tabMain:checked + .sheet-testCloseChecked + .sheet-HideIfCloseChecke
  border:           1px solid black;
 }

-/********************************************** JBF Icons and images ******************************************************************************/
+/* ############################################ JBF Icons and images ################################################### */

 .sheet-icon-damage-background::before       { background-image: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Damage-background.png);} /*License Information*/
 .sheet-icon-devotion-background::before     { background-image: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Devotion.png); }         /*Creative Commons :https://game-icons.net/1x1/lorc/angel-outfit.html#download*/
@@ -1885,15 +1886,15 @@ input.sheet-tabMain:checked + .sheet-testCloseChecked + .sheet-HideIfCloseChecke
 .sheet-icon-effect-white       { content: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Effect-white.png); }     /*Creative Commons: https://game-icons.net/1x1/lorc/star-swirl.html#download*/
 .sheet-icon-entangled          { content: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Entangled.png); }        /*Creative Commons: https://game-icons.net/1x1/lorc/fishing-net.html*/
 .sheet-icon-flying             { content: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Flying.png); }           /*Creative Commons: https://game-icons.net/1x1/lorc/fishing-net.html*/
-.sheet-background-frame1 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame1.jpg); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame2 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame2.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame3 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame3.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame4 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame4.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame5 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame5.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame6 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame6.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame7 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame7.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame8 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame8.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
-.sheet-background-frame9 { background-image: url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame9.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame1 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame1.jpg); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame2 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame2.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame3 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame3.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame4 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame4.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame5 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame5.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame6 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame6.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame7 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame7.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame8 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame8.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
+.sheet-background-frame9 { background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame9.png); }        /*Creative Commons: https://game-icons.net/1x1/delapouite/knocked-out-stars.html#download*/
 .sheet-icon-grimoire           { content: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Grimoire.png); }         /*Creative Commons: https://game-icons.net/1x1/lorc/fishing-net.html*/
 .sheet-icon-harried            { content: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Harried.png); }          /*Creative Commons: https://game-icons.net/1x1/lorc/screaming.html#download*/
 .sheet-icon-harried3           { content: url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Harried3.png); }         /*Creative Commons: https://game-icons.net/1x1/lorc/screaming.html#download*/
@@ -2019,7 +2020,7 @@ input.sheet-tabMain:checked + .sheet-testCloseChecked + .sheet-HideIfCloseChecke

 .sheet-undernumber {
  padding-top:    0px;
-  margin-top:    -2px;
+  margin-top:    -4px;
 }


@@ -2033,7 +2034,7 @@ input.sheet-tabMain:checked + .sheet-testCloseChecked + .sheet-HideIfCloseChecke
  margin:         1px;
 }

-/********************************************** JBF : Icon checkboxes Management***************************************/
+/* ############################################ JBF : Icon checkboxes Management #################################### */
 .charsheet input.sheet-iconcheckbox {
  display:none;
 }
@@ -2194,8 +2195,8 @@ input[type="radio"].sheet-iconcheckbox:not(:checked) + .sheet-iconlabel-white:ho
 }


-/******************************************JBF : Strain icon******/
-/**** JBF version with the drop of blood****/
+/* ####################################### JBF : Strain icon */
+/*    JBF version with the drop of blood   */
 input[type="text"].sheet-strainicon {
  background:           var(--locked-color);
  background-image:     url(https://raw.githubusercontent.com/roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Strain.png);
@@ -2218,8 +2219,8 @@ input[type="text"].sheet-strainicon {
 }


-/********************************************** Roll Templates & colors ***************************************************************************/
-/***For some weird Reason, the Print format must be in between the roll templates and the API buttons. DO NOT MOVE***/
+/* ############################################ Roll Templates & colors ###################################################### */
+/*  For some weird Reason, the Print format must be in between the roll templates and the API buttons. DO NOT MOVE  */

 .sheet-rolltemplate-chatrecord {
 /* background-color:  LightBlue; */
@@ -2242,7 +2243,7 @@ input[type="text"].sheet-strainicon {
  line-height:    1.6em;
  font-size:      1.2em;
  /* font-family:    Papyrus, fantasy; */
-  font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+  font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
  font-weight:  normal;
 }

@@ -2294,7 +2295,7 @@ input[type="text"].sheet-strainicon {
 /* These are all tries for formatting the API roll templates*/
 .sheet-rolltemplate-sect{
  background-color:     white;
-  background-image:     url(https://raw.githubusercontent.com/ChrisDDickey/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame20.png);
+  background-image:     url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Earthdawn%20%28FASA%20Official%29/Images/Frame20.png);
  background-size :     103% 103%;
  background-position:  55% 53%;
  border:               solid 2px black;
@@ -2329,7 +2330,7 @@ margin-bottom:    0.2em;
  color:          black;
   background:    white;
  /* font-family:    Papyrus, fantasy; */
-  font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+  font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
  font-weight:  normal;
  vertical-align: middle;
  line-height:    1.2em;
@@ -2407,9 +2408,9 @@ margin-bottom:    0.2em;



-/**************************Print Format********************/
+/* ####################### Print Format ################# */

-/***For some weird Reason, the Print format must be in between the roll templates and the API buttons. DO NOT MOVE***/
+/*  For some weird Reason, the Print format must be in between the roll templates and the API buttons. DO NOT MOVE  */

@media print {
  /* All your print styles go here */
@@ -2520,7 +2521,7 @@ margin-bottom:    0.2em;
    color : white !important;
    background-color : var(--outline-color) !important;
    /* font-family: Papyrus, fantasy; */
-    font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+    font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
    font-weight:  normal;
  }

@@ -2528,7 +2529,7 @@ margin-bottom:    0.2em;
    color : var(--input-color) !important;
    background-color : var(--outline-color) !important;
    /* font-family: Papyrus, fantasy; */
-    font-family: Papyrus,'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
+    font-family: 'Aladin',  "Helvetica Neue", Helvetica, sans-serif;
    font-weight:  normal;
  }

@@ -2546,8 +2547,8 @@ margin-bottom:    0.2em;

 } /* end media print */

-/**************************API Format********************/
-/***For some weird Reason, the Print format must be in between the roll templates and the API buttons. DO NOT MOVE***/
+/* ####################### API Format ################# */
+/*  For some weird Reason, the Print format must be in between the roll templates and the API buttons. DO NOT MOVE  */
 a.sheet-chatbutton,
 .textchatcontainer a[href^="!"].sheet-chatbutton,
 a.textchatcontainer a.sheet-chatbutton {
@@ -2561,4 +2562,4 @@ a.textchatcontainer a.sheet-chatbutton {
  color:            white;
 }

-  /********************************************** End ***************************************************************************/
+/* ########################### End ############################### */
@@ -3,7 +3,7 @@
 <meta charset="UTF-8">

 <!--
-v20211023
+v20211026

 Character Sheet For Earthdawn Developped by JBF (Discord/Facebook Jiboux Faure) v2.
 Largerly using material from the work on the Official FASA version of Chris Dickey
@@ -2672,7 +2672,7 @@ Comments JBF@CD are action/reminders to Chris
                    <input name="attr_Adjust-Defenses-Auto" type="number" readonly class="sheet-buffLeft">
                  </span>
                  <span class="sheet-icon-defenses sheet-iconstaticBig" title="@{Adjust-Defenses-Auto} and @{Adjust-Defenses-Misc}   This is the total adjustment to Physical and Mystic Defenses from Conditions, Combat Options and Misc Adjustments."></span>
-                  <span title="@{Adjust-Defenses-Misc}:   Enter any Misc Adjustments to Effect Tests here.">
+                  <span title="@{Adjust-Defenses-Misc}:   Enter any Misc Adjustments to Defenses here.">
                    <input name="attr_Adjust-Defenses-Misc" type="hidden" class="sheet-redGreen" value="0">
                    <b class="sheet-buffSignRight">+</b>
                    <input name="attr_Adjust-Defenses-Misc" type="number" class="sheet-buffRight">
@@ -2732,7 +2732,7 @@ Comments JBF@CD are action/reminders to Chris

            <input type="checkbox" name="attr_modifiers_parameters" hidden value="1" class="sheet-testCloseChecked">
            <div class="sheet-HideIfNotCloseChecked sheet-content">
-              Bonus die:
+              Atk Bonus die:
              <input name="attr_Adjust-Attacks-Bonus"
              value="0"
              min="0"
@@ -2788,9 +2788,9 @@ Comments JBF@CD are action/reminders to Chris
                </span>
              </div>
            </div>
-              <input type="checkbox" name="attr_show-modifiers-parameters" hidden value="1" class="sheet-testCloseChecked">
+              <input type="checkbox" name="attr_modifiers_parameters" hidden value="1" class="sheet-testCloseChecked">
              <div class="sheet-HideIfNotCloseChecked">
-                Bonus die:
+                Dmg Bonus die:
                <input name="attr_Adjust-Damage-Bonus"
                value="0"
                min="0"
@@ -3450,8 +3450,7 @@ Comments JBF@CD are action/reminders to Chris
              <div class="sheet-Defense-box sheet-background-frame3 sheet-frame sheet-HideIfCloseChecked">
                <div class="sheet-headerbar" >Flying Alt.      </div>
                <div>
-                  <input name="attr_condition-Flying" type="number" value="0" min="-1" max="9" class="sheet-Big sheet-HideSpinners sheet-bordered-bottom" 
-                          title="@{condition-Flying}:   Altitude at which the character is flying (as displayed in Token). This is between 0 and 9 because it is what the Token Marker can show. Set to -1 to turn icon off. Discuss units with your GM." >
+                  <input name="attr_condition-Flying" type="number" value="0" min="0" max="9" class="sheet-Big sheet-HideSpinners sheet-bordered-bottom" title="@{condition-Flying}:   Altitude at which the character is flying (as displayed in Token). This is between 0 and 9 because it is what the Token Marker can show. Discuss units with your GM." >
                </div>
                <div style="padding-bottom:6px">
                  &nbsp;
@@ -3843,10 +3842,10 @@ Comments JBF@CD are action/reminders to Chris
            </div>
          </div>
          <div class="sheet-Creation sheet-headerbar"> <b class="sheet-creation-order">5-</b> Assign Skill Ranks</div>
-          <input class="sheet-testAttrCosts" name="attr_Skills-Costs" value="13" type="hidden">
+          <input class="sheet-testAttrCosts" name="attr_Skills-Costs" value="14" type="hidden">
          <div class="sheet-Creation"> 2 Rks Knowledge, 1 Rk Artisan, 2 Rks Speak Language, 1Rk R/W Language, 8 Rks Others . Remaining :
            <input name="attr_Skills-Costs" class="sheet-numShort sheet-attrCostsRed"
-            readonly="readonly" value="13"
+            readonly="readonly" value="14"
            title="@{Skills-Costs}   Number of Skill points remaining from the starting 13."
            type="number">
          </div>
@@ -8626,8 +8625,7 @@ Comments JBF@CD are action/reminders to Chris
            <div class="sheet-Defense-box sheet-background-frame3 sheet-frame sheet-HideIfCloseChecked">
              <div class="sheet-headerbar" >Flying Alt.      </div>
              <div>
-                <input name="attr_condition-Flying" type="number" value="0" min="-1" max="9" class="sheet-Big sheet-HideSpinners sheet-bordered-bottom" 
-                      title="@{condition-Flying}:   Altitude at which the character is flying (as displayed in Token). This is between 0 and 9 because it is what the Token Marker can show. Set to -1 to turn icon off. Discuss units with your GM." >
+                <input name="attr_condition-Flying" type="number" value="0" min="0" max="9" class="sheet-Big sheet-HideSpinners sheet-bordered-bottom" title="@{condition-Flying}:   Altitude at which the character is flying (as displayed in Token). This is between 0 and 9 because it is what the Token Marker can show. Discuss units with your GM." >
              </div>
              <div style="padding-bottom:6px">
                &nbsp;
@@ -9101,8 +9099,8 @@ Comments JBF@CD are action/reminders to Chris
              <input type="checkbox" name="attr_T_LP_ShowNotes" value="1" class="sheet-hidden sheet-testCloseChecked">
              <div class="sheet-HideIfNotCloseChecked">
              <input name="attr_Hide-Spells-Tab" type="checkbox" value="1" checked class="sheet-hidden sheet-testCloseChecked">
-              <div class="sheet-nowrap1 sheet-HideIfCloseChecked" title="@{LP-SpellsOption}:  Optional Rule - Do spell cost LP.">
-                <b class="sheet-label">Option - Spells Cost LP :</b>
+              <div class="sheet-nowrap1 sheet-HideIfCloseChecked" title="@{LP-SpellsOption}:  Uncheck this value if as a House Rule - Spells do not cost LP.">
+                <b class="sheet-label">Standard Rules - Spells Cost LP :</b>
                <input name="attr_LP-SpellsOption" type="checkbox" value="1" checked>
              </div>
              <div class="sheet-small">
@@ -9216,7 +9214,7 @@ Comments JBF@CD are action/reminders to Chris
            <div class="sheet-headerbar">Character Adjustments</div>
            <span class="sheet-info" title="Everything here is calculated or entered on other tabs. This is a place where more or less permanent adjustments can be made. For example: If you tie a thread to an item that gives you a +2 to Physical Defense, you should add the +2 on this tab.  Buffs and other temporary modifications to Defenses and Armor should be made on the Combat Tab. It is a very good idea to use the notes field at the bottom to document the reason for each adjustment.">i</span>
            <div class="sheet-content">
-              <span class="sheet-nowrap3 sheet-label" title="@{NPC}   Is this character a PC, NPC, Mook, or Object?   (Mook means more than one token shares one character sheet) (Object means it is not really a character at all)">PC?
+              <span class="sheet-nowrap3 sheet-label" title="@{NPC}   Is this character a PC, NPC, Mook, or Object?   (Mook means more than one token shares one character sheet) (Object means it is not really a character at all)">PC / NPC?
                <select name="attr_NPC" class="sheet-selShort">
                  <option value="0" 	title="PC"  > PC</option>
                  <option value="1"		selected	title="NPC" > NPC</option>
@@ -12554,7 +12552,7 @@ on("change:repeating_talents:t_target change:repeating_knacks:nac_target change:
 // Given an attribute name and value, look at the value and see if it is problematic (has double brackets, quotes, etc) and if so remove the problematic characters.
 var sanitize = function fnsanitize( name, value) {
  'use strict';
-  let newVal = value.replace( /[\'|\"|\,|\;|\:\~]/gi, "") // Remove all single and double quotes, commas, colons, semicolons or tildas.
+  let newVal = value.replace( /[\'|\"|\,|\;|\:\~\À]/gi, "") // Remove all single and double quotes, commas, colons, semicolons or tildas and charcter #192 which we use as a flag to trigger this routine.
  .replace( /\@\{/gi, "{")				// and all @ signs followed by {
    .replace( /\[+/gi, "[" ).replace( /\]+/gi, "]" ).replace( /\{+/gi, "{" ).replace( /\}+/gi, "}" ).replace( /\(+/gi, "(" ).replace( /\)+/gi, ")" );		// All sequances of more than one [] {} () get replaced by a single one.
    if ( value !== newVal ) {
@@ -13029,7 +13027,7 @@ var sanitize = function fnsanitize( name, value) {
    let newflags=flags;
    let toSheetVersion;

-    if( isNaN( fromSheetVersion) || fromSheetVersion ===0 ) { // v0 This is a blank new sheet. We want to initialize a certain number of stuff
+    if( isNaN( fromSheetVersion) || fromSheetVersion === 0 ) {  // v0 This is a blank new sheet. We want to initialize a certain number of stuff
      function generateRowIdNoUnderscore() {
        return generateRowID().replace(/_/g, "-")
      }
@@ -13197,7 +13195,7 @@ var sanitize = function fnsanitize( name, value) {
                            function updateRow( code, rid, flags)  {
                              pre = buildPre( code, rid);
                              rowflags=flags;
-                              vals[pre + "Name"]= values[pre + "Name"]+","; //Name is overwritten to trigger Autofill. Adding a "," will trigger a change, and the sanitize should do the rest
+                              vals[pre + "Name"]= values[pre + "Name"]+"À";     //Name is overwritten to trigger Autofill. Adding a charcter 192 will trigger a change, and the sanitize should do the rest
                              vals[pre + "MoveBased"]= 1-getInt(values, pre + "NotMoveBased");
                              rowflags=addAPIflag( rowflags, "RemoveAttr", pre+"NotMoveBased" );
                              vals[pre + "VisionBased"]= 1-getInt(values, pre + "NotVisionBased");
@@ -13918,7 +13916,7 @@ var updateLPSummary = function fnupdateLPSummary() {
                };
                let fibocost= [0,100,200,300,500,800,1300,2100,3400,5500,8900,14400,23300,37700,61000,98700,159700,258400,418100];
                let rnk=0,off=0,orig=0,inc=0,st=0;
-                let trnk=8, skrnk=13;
+                let trnk=8, skrnk=14;
                let sprnk=getInt(values,"Per-Step")
                let s="";
                let val=0;
@@ -14089,7 +14087,7 @@ var updateLPSummary = function fnupdateLPSummary() {
  });
 }; // End updateLPSummary()
 on("change:repeating_skills:sk_rank change:repeating_skills:sk_type change:repeating_threads:ti_rank change:repeating_threads:ti_type change:repeating_matrix:spm_rank change:repeating_matrix:spm_origin change:repeating_talents:t_rank change:repeating_talents:t_type change:repeating_knacks:nac_requirements change:repeating_knacks:nac_type change:repeating_spell remove:repeating_talents remove:repeating_matrix remove:repeating_spell remove:repeating_knacks remove:repeating_threads remove:repeating_skills", fn(updateLPSummary) );
-on("change:attrib-dex-increases change:attrib-str-increases change:attrib-tou-increases change:attrib-per-increases change:attrib-wil-increases change:attrib-cha-increases change:lp-creationoffset change:lp-creationoffset-spells change:lp-current change:lp-total change:lp-spellsoption change:per-step change:ls-speak-rank ls-readwrite-rank", fn(updateLPSummary) );
+on("change:attrib-dex-increases change:attrib-str-increases change:attrib-tou-increases change:attrib-per-increases change:attrib-wil-increases change:attrib-cha-increases change:lp-creationoffset change:lp-creationoffset-spells change:lp-current change:lp-total change:lp-spellsoption change:per-step change:ls-speak-rank change:ls-readwrite-rank", fn(updateLPSummary) );



@@ -14237,8 +14235,8 @@ var AutoFill = function fnAutoFill(eventInfo) {
      {names :"Battle Shout,Distract,Fearsome Charge,Steely Stare,Stopping Aim,Taunt,Champion Challenge,Confront Horror,Cutting Words,Undermine", modtype:"Action", target:"SD1: @{target|Target|token_id}", defensive:"0", resistance:"0", movebased:"0", visionbased:"0"},
      {names :"Blade Juggle", modtype:"Action", target:"Ask: ?{Target Number|0}", defensive:"1", resistance:"0", movebased:"0", visionbased:"1"},
      {names :"Call Missile,Conceal Object", modtype:"Effect", armortype:"N/A", defensive:"0", resistance:"0", movebased:"0", visionbased:"0"},
-      {names :"Charge,Claw Shape,Crushing Blow,Down Strike,Surprise Strike,Poison,Goring Attack,Venom,Vital Strike,Weapon Breaker,Bite,Claws", modtype:"Damage CC", armortype:"PA", defensive:"0", resistance:"0", movebased:"0", visionbased:"0"},
-      {names :"Claw Frenzy,Melee Weapon,Disarm,Double Charge,Momentum Attack,Mount Attack,Second Attack,Shield Bash,Swift Kick,Unarmed Combat,Wheeling Attack,Storm Shield,Atk,Attack ", modtype:"Attack CC", target:"PD1: @{target|Target|token_id}",defensive:"0", resistance:"0", movebased:"1", visionbased:"1"},
+      {names :"Charge,Claw Shape,Crushing Blow,Down Strike,Shield Bash,Surprise Strike,Poison,Goring Attack,Venom,Vital Strike,Weapon Breaker,Bite,Claws", modtype:"Damage CC", armortype:"PA", defensive:"0", resistance:"0", movebased:"0", visionbased:"0"},
+      {names :"Claw Frenzy,Melee Weapon,Disarm,Double Charge,Momentum Attack,Mount Attack,Second Attack,Swift Kick,Unarmed Combat,Wheeling Attack,Storm Shield,Atk,Attack ", modtype:"Attack CC", target:"PD1: @{target|Target|token_id}",defensive:"0", resistance:"0", movebased:"1", visionbased:"1"},
      {names :"Danger Sense,Dispel Magic,Fire Heal", modtype:"Action", target:"Ask: ?{Target Number|0}", defensive:"0", resistance:"0", movebased:"0", visionbased:"0"},
      {names :"Dominate Beast,Frighten,Blind Fire,Dream Thief", modtype:"Action", target:"MD1: @{target|Target|token_id}", defensive:"0", resistance:"0", movebased:"0", visionbased:"0"},
      {names :"Fireblood,Wood Skin,Relentless Recovery,Stone Skin,Vine Armor", modtype:"Effect", armortype:"N/A",special:"Recovery", defensive:"0", resistance:"1", movebased:"0", visionbased:"0"},
@@ -1,40 +1,46 @@
@import url('https://fonts.googleapis.com/css2?family=Mate+SC&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Rubik&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Alegreya+SC:wght@400;500;700;800&display=swap');


 .charsheet span {
-	font-family: Mate SC;
-	font-weight: bold;
+	font-family: Alegreya SC, Arial;
+	font-weight: 500;
 }

 .charsheet textarea {
-	font-family: Mate SC;
-	font-weight: bold;
+	font-family: Alegreya SC, Arial;
 	font-size: 14px;
+	font-weight: 700;
 }
 .charsheet input[type=text] {
-	font-family: Mate SC;
-	font-weight: bold;
+	font-family: Alegreya SC, Arial;
 }

 input[type=number]::-webkit-inner-spin-button, 
 input[type=number]::-webkit-outer-spin-button { 
  -webkit-appearance: none; 
-  margin: 0; 
+  margin: 0;
+}
+
+input[type=number] {
+	-moz-appearance: textfield;
 }

 .charsheet input[type=number] {
-	font-family: Mate SC;
-	font-weight: bold;
+	font-family: Mate SC, Arial;
 	font-size: 14px;
 	max-width: 35px;
+	font-weight: bold;
 }

 .charsheet select {
-	font-family: Mate SC;
-	font-weight: bold;
+	font-family: Alegreya SC, Arial;
+	font-weight: 700;
 }

+
+
 .sheet-character,
 .sheet-charms,
 .sheet-combat,
@@ -95,6 +101,8 @@ input[type=number]::-webkit-outer-spin-button {
 }

 input[type=text] {
+  font-weight: bold;
+  font-family: Alegreya SC;
  background: none;
  border: none;
  border-bottom: 2px solid black;
@@ -116,7 +124,7 @@ input.big_number{
  min-width: 45px;
 }
 span.ability {
-  width: 70px;
+  width: 75px;
  font-size: 14px; 
  margin-top: 3px;
 }
@@ -470,10 +478,12 @@ span.sheet-ess {
 	background: transparent;
 	border: 1px solid black;
 	border-radius: 3px;
-	resize: none;
+	resize: vertical;
 	align-self: center;
 }

+
+
 .sheet-experience {
 	border: 3px inset #EDDA74;
 	border-radius: 8px;
@@ -490,6 +500,8 @@ span.sheet-ess {
 	margin-right: 10px;
 	margin-left: 10px;
 	text-align: center;
+	font-weight: bolder;
+	font-size: 14px;
 }

 .sheet-experience-project-row {
@@ -554,11 +566,25 @@ select.sheet-project-select {
 }

 .sheet-intimacy-name {
-	width: 440px;
-	margin-left: 15px;
-	font-size: 14px;
+	max-width: 425px;
+	height: 30px;
+	margin-left: 5px;
+	margin-right: 5px;
+	font-size: 15px;	
+	background: transparent;
+	border-bottom: 2px solid black;
+	resize: vertical;
 }

+.sheet-intimacy-row {
+	min-height: 28px;
+	display: grid;
+	grid-template-columns: 440px 100px;
+	grid-template-rows: 100%;
+}	
+
+
+
 .sheet-exp-project {
 	font-size: 14px;
 }
@@ -649,11 +675,14 @@ select.sheet-health-penalty {
 	width: 30px;
 	-webkit-appearance: none;
    -moz-appearance: none;
-    text-indent: 1px;
+    text-indent: 0px;
    text-overflow: '';
 	background: transparent;
 	border: 3px ridge #DDCA64;
 	text-align: center;
+	font-size: 14px;
+	padding: 0px;
+	margin-left: 2px;
 }
 .sheet-health-section {
 	display: flex;
@@ -994,7 +1023,7 @@ div.sheet-charm-description,
 	width: 420px;
 }

-.sheet-miscbattlegroup {
+.sheet-miscbattlegroup, .sheet-miscessence {
 	border: 3px inset #EDDA74;
 	border-radius: 4px;
 	display: flex;
@@ -1003,6 +1032,7 @@ div.sheet-charm-description,
 	margin: 10px;
 	width: 420px;
 }
+
 .sheet-martialartsside2 {
 	display: flex;
 	flex-direction: column;
@@ -876,7 +876,7 @@
 			<span class="sheet-align-intimacy2" data-i18n="rating-u">Rating</span>
 		</div>
 		<div class="sheet-intimacy-row">
-			<input type="text" class="sheet-intimacy-name" name="attr_intimacyname1" value="">
+			<textarea class="sheet-intimacy-name" name="attr_intimacyname1" style="height: 20px; width: 425px;" value=""></textarea>
 			<select name="attr_intimacyrating1" class="sheet-intimacy-rating">
 				<option value="3" data-i18n="defining-u">Defining</option>
 				<option value="2" data-i18n="major-u">Major</option>
@@ -884,7 +884,7 @@
 			</select>
 		</div>
 		<div class="sheet-intimacy-row">
-			<input type="text" class="sheet-intimacy-name" name="attr_intimacyname2" value="">
+			<textarea class="sheet-intimacy-name" name="attr_intimacyname2" style="height: 20px; width: 425px;" value=""></textarea>
 			<select name="attr_intimacyrating2" class="sheet-intimacy-rating">
 				<option value="3" data-i18n="defining-u">Defining</option>
 				<option value="2" data-i18n="major-u">Major</option>
@@ -892,7 +892,7 @@
 			</select>
 		</div>
 		<div class="sheet-intimacy-row">
-			<input type="text" class="sheet-intimacy-name" name="attr_intimacyname3" value="">
+			<textarea class="sheet-intimacy-name" name="attr_intimacyname3" style="height: 20px; width: 425px;" value=""></textarea>
 			<select name="attr_intimacyrating3" class="sheet-intimacy-rating">
 				<option value="3" data-i18n="defining-u">Defining</option>
 				<option value="2" data-i18n="major-u">Major</option>
@@ -900,7 +900,7 @@
 			</select>
 		</div>
 		<div class="sheet-intimacy-row">
-			<input type="text" class="sheet-intimacy-name" name="attr_intimacyname4" value="">
+			<textarea class="sheet-intimacy-name" name="attr_intimacyname4" style="height: 20px; width: 425px;" value=""></textarea>
 			<select name="attr_intimacyrating4" class="sheet-intimacy-rating">
 				<option value="3" data-i18n="defining-u">Defining</option>
 				<option value="2" data-i18n="major-u">Major</option>
@@ -908,13 +908,15 @@
 			</select>
 		</div>
 		<fieldset class="repeating_intimacies">
-			<input type="text" name="attr_intimacyrepeatingname" class="sheet-intimacy-name" value="">
+		<div class="sheet-intimacy-row">
+			<textarea name="attr_intimacyrepeatingname" class="sheet-intimacy-name" style="height: 20px; width: 425px;"  value=""></textarea>
 			<select name="attr_intimacyrepeatingtype" class="sheet-intimacy-rating">
 				<option value=""></option>
 				<option value="Defining" data-i18n="defining-u">Defining</option>
 				<option value="Major" data-i18n="major-u">Major</option>
 				<option value="Minor" data-i18n="minor-u">Minor</option>
 			</select>
+		</div>
 		</fieldset>
 	</div>
  </div>
@@ -929,7 +931,7 @@
  <div class="sheet-merspec-inner">
  <div class="sheet-specializations">
 	<div class="sheet-spec-inner">
-	<span class="sheet-headtext" style="margin-left: 60px; font-weight: bold" data-i18n="specialties-u">Specialties</span>
+	<span class="sheet-headtext" style="margin-left: 60px;" data-i18n="specialties-u">Specialties</span>
 	<div class="sheet-special-content">
 		<fieldset class="repeating_specialty">
 			<span data-i18n="specialty-u">Specialty:</span>
@@ -940,7 +942,7 @@
 	</div>
  </div>
  <div class="sheet-limit">
-	<span class="sheet-ess" data-i18n="willpower-u">Willpower</span>
+	<span class="sheet-ess sheet-headtext" data-i18n="willpower-u"`>Willpower</span>
 	<div class="sheet-essence-row2">
 		<span class="sheet-will-inner" data-i18n="current-willpower-u">Current:</span>
 		<input type="number" class="big_number" name="attr_will_current" value="5"/>
@@ -950,7 +952,7 @@
 	<span class="sheet-ess" data-i18n="limit-u">Limit</span>
 	<textarea style='height: 80px; width: 220px;' name='attr_limittrigger' class='sheet-limit-text' rows='4' cols='25' placeholder="Limit Description" data-i18n-placeholder="limit-description-place"></textarea>
 	<div class="sheet-essence-row">
-		<span class="sheet-ess-inner" data-i18n="limit-break-u">Break:</span>
+		<span class="sheet-ess-inner" data-i18n="limit-colon-u">Limit:</span>
        <div class="dots">
 			<input type="hidden" name="attr_limit" class="dot" value="1" />
 			<button type="action" name="act_limit_1" class="dot">
@@ -989,7 +991,7 @@
  </div>
  <div class="sheet-merits">
 	<div class="sheet-merits-inner">
-	<span class="sheet-headtext" style="margin-left: 85px; font-weight: bold" data-i18n="merits-u">Merits</span>
+	<span class="sheet-headtext" style="margin-left: 85px; " data-i18n="merits-u">Merits</span>
 	<div class="sheet-merit-content">
 		<fieldset class="repeating_merits">
 		   <div class="sheet-charm-row" style="margin-bottom: 10px;">
@@ -1043,7 +1045,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1065,7 +1067,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1087,7 +1089,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1109,7 +1111,7 @@
                <option value="-2" selected="selected">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1131,7 +1133,7 @@
                <option value="-2" selected="selected">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1153,7 +1155,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4" selected="selected">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1175,7 +1177,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" selected="selected" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" selected="selected" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1197,7 +1199,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1219,7 +1221,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1241,7 +1243,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1263,7 +1265,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1285,7 +1287,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1307,7 +1309,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1329,7 +1331,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1351,7 +1353,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1373,7 +1375,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1395,7 +1397,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1417,7 +1419,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1439,7 +1441,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1461,7 +1463,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1483,7 +1485,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1505,7 +1507,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1527,7 +1529,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1549,7 +1551,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1571,7 +1573,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1593,7 +1595,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 		<div class="sheet-health-section">
@@ -1615,7 +1617,7 @@
                <option value="-2">-2</option>
                <option value="-3">-3</option>
                <option value="-4">-4</option>
-                <option value="I" data-i18n="incapacitated-u">Incapacitated</option>
+                <option value="I" data-i18n="incapacitated-u">Inc</option>
 			</select>
 		</div>
 	</div>
@@ -2777,6 +2779,17 @@
                <input type="number" name="attr_battlegroup-health-levels" value="7">
            </div>
 		</div>
+		<div class="sheet-miscessence">
+			<span class="sheet-headtext" data-il8n="essence-pool-changes-u">Essence Pool Mods.</span>
+			<div class="sheet-abilities-miscrownew4">
+				<span>Additional Max Personal Essence:</span>
+				<input type="number" name="attr_max_pers_mod" value="0">
+			</div>
+			<div class="sheet-abilities-miscrownew4">
+				<span>Additional Max Peripheral Essence:</span>
+				<input type="number" name="attr_max_periph_mod" value="0">
+			</div>		
+		</div>
 	  </div>
 	</div>
 </div>
@@ -2835,31 +2848,33 @@ const buttonlist = ["character","charms","combat","misc"];
            });
        });
    });
-on("change:essence change:exalted_type change:commit_personal change:commit_peripheral sheet:opened", function() {  
-  getAttrs(["essence","exalted_type", "commit_personal", "commit_peripheral"], function(values) {
+on("change:essence change:exalted_type change:commit_personal change:commit_peripheral change:max_pers_mod change:max_periph_mod sheet:opened", function() {  
+  getAttrs(["essence","exalted_type", "commit_personal", "commit_peripheral", "max_pers_mod", "max_periph_mod"], function(values) {
    let ess = parseInt(values.essence)||0;
    let exalttype = parseInt(values.exalted_type)||0;
 	let minuspersonal = parseInt(values.commit_personal)||0;
 	let minusperipheral = parseInt(values.commit_peripheral)||0;
+	let esspersmod = parseInt(values.max_pers_mod)||0;
+	let essperiphmod = parseInt(values.max_periph_mod)||0;
    let essencepers = 0;
    let essenceperiph = 0;
    if (exalttype == 0) {
-      essencepers = (ess * 3) + 10 - minuspersonal;
-      essenceperiph = (ess * 7) + 26 - minusperipheral;
+      essencepers = (ess * 3) + 10 - minuspersonal + esspersmod;
+      essenceperiph = (ess * 7) + 26 - minusperipheral + essperiphmod;
      setAttrs({                            
        essence_personal: essencepers, essence_peripheral: essenceperiph
      });
    }
    else if (exalttype == 1) {
-      essencepers = ess + 15 - minuspersonal;
-      essenceperiph = (ess * 4) + 34 - minusperipheral;
+      essencepers = ess + 15 - minuspersonal + esspersmod;
+      essenceperiph = (ess * 4) + 34 - minusperipheral + essperiphmod ;
      setAttrs({                            
        essence_personal: essencepers, essence_peripheral: essenceperiph
      });
    }
    else if (exalttype == 2) {
-      essencepers = ess + 11 - minuspersonal;
-      essenceperiph = (ess * 4) + 23 - minusperipheral;
+      essencepers = ess + 11 - minuspersonal + esspersmod;
+      essenceperiph = (ess * 4) + 23 - minusperipheral + essperiphmod;
      setAttrs({                            
        essence_personal: essencepers, essence_peripheral: essenceperiph
      });
@@ -4,6 +4,6 @@
  "authors": "Joseph Greene",
  "preview": "Exalted3-Sheet.jpg",
  "roll20userid": "2572085",
-  "instructions": "A replacement to the character sheet currently available for Exalted 3e. Designed to facilitate faster play by providing roll buttons which will calculate dice pools and prompt the user for any necessary additional information. All character data from users of the old sheet should carry over properly into the new sheet.",
+  "instructions": "A  character sheet for Exalted 3e. Designed to facilitate faster play by providing roll buttons which will calculate dice pools and prompt the user for any necessary additional information. All character data from users of the old sheet should carry over properly into the new sheet.",
  "legacy": false
 }
@@ -125,14 +125,14 @@
   "maximum-willpower-u":"Maximum:",
   "limit-u":"Limit",
   "limit-description-place":"Limit Description",
-   "limit-break-u":"Break:",
   "merits-u":"Merits",
   "merit-u":"Merit:",
   "show-hide-description-u":"Show/Hide Description",
   "combat-u":"Combat",
   "join-battle-u":"Join Battle:",
   "health-u":"Health",
-   "incapacitated-u":"Incapacitated",
+   "incapacitated-u":"Inc",
+   "limit-colon-u":"Limit:",
   "defenses-u":"Defenses",
   "parry-u":"Parry:",
   "evasion-u":"Evasion:",
@@ -1,115 +1,115 @@
-# Final Fantasy d20 Character Sheet
-
-### Usage
-
-This character sheet requires a modern web browser. It is highly recommended to have the latest
-version of Chrome, Firefox or Edge for the best user experience.
-
-There are two distinct sheet types that come bundled with this character sheet: the Character and the Monster sheet type. The user can toggle between these modes from the dropdown box at the top center of the sheet aptly labeled "Sheet Type."
-
-#### Character Sheet Type
-
-The Character sheet type is meant for player characters and non player characters that call for a more details-oriented approach to management. This entails your typical Roll20 sheet features: a multi-tab interface, automated calculations, sheet rolling macros, repeating sections, etc.
-
-#### Monster Sheet Type
-
-The Monster sheet type is meant for monsters, to be used exclusively by the DM. It condenses everything down to one page (no tab interface), and removes autocalculations entirely in favor of giving more control to the DM with editing values. Utilizing this sheet type effectively will enable the DM to drag and drop monster tokens and keep track of their respective stats without having to wade through the tabular interface meant for more complex character types.
-
-### Changelog
-
-__Version 1.6 (pushed 7/4/2021)__
-
-A couple changes here and there; expect a bigger update in a little while!
-
-Character Sheet
-
-* Miscellaneous aesthetic changes.
-* Fixed a bug with user created macros not showing notes for certain skills.
-* Fixed a bug with CMD not adding dodge or deflection bonuses.
-* Fixed the "Extra MP" feature to be in line with the site changes to the feat.
-* Added Inherent column for Ability Scores section.
-
-__Version 1.5 (pushed 10/26/2020)__
-
-Special thanks to TamedFlame for accomplishing most of this update!
-
-Iterative attacks will be on the next update scheduled before New Years!
-
-Character Sheet
-
-* Spell failure roll on all spells if you have greater than 0% spell failure chance from equipment.
-* Size modifiers are now factored in for Fly and Stealth skills.
-* Added "Racial" trait option.
-* Added spell DC field for spell levels and a modifier for individual spells.
-* Chat display buttons for character traits/feats/class features.
-* Modifiable ability scores for character skills.
-
-Monster Sheet
-
-* Aesthetic changes.
-
-Universal
-
-* Added GM roll toggle under the Sheet Options.
-
-__Version 1.4 (pushed 6/21/2020)__
-
-##### This update was realized by TamedFlame
-
-Universal
-
-* The background color gradient is now customisable from the Options section. You can select a color for each corner, and the sheet shall use those to generate a new background gradient. These options are set per character, and as such each PC, Monster, or NPC can have a style of their own. These settings also affect the backgrounds for the rolls in the chat, and as such you can use them to identify characters. 
-
->  #### User discretion is advised when selcting colors, consider talking to your fellow players if any of them has difficulties with certain combinations.
-
-__Version 1.3 (pushed 2/23/2019)__
-
-Character Sheet
-
-*   New "Options" sections in which may be opened by clicking the various cog icons on the sheet. Allows for the user to hide any other section tab (core, combat, class, skills, etc), hide MP and/or specify additional custom energy fields to show up within the "Status" section (up to 3 types), and specify the HP threshold for limit break activation. There are also options to include the Toughness, Extra MP, and Extra Limit Break feats, as well as the Hume trait "Skilled", into their respective calculations.
-*   New "Combat" tab and section. "Status", "Combat", "Saving Throws", "Defenses", and "Weapons" subsections were moved here, while "Ability Scores" and "Miscellany" were placed into the "Core" tab. New "Traits" subsection was placed under the "Core" sheet section.
-*   Reformatted Spells section. Each spell entry now has an associated dice roll macro, along with the ability to hide non-pertinent spell information.
-*   Limit break max usage/day field is now an auto-calculating field.
-*   General aesthetic changes. FFd20 logo is smaller, some fields are larger while others are smaller, section tabs are closer together, among other things.
-*   Only one materia entry can be attuned at a time (as per the normal ruleset). Checking "Attuned?" on a materia entry will then automatically uncheck other entries if they are attuned. There is an option to turn this feature off and be able to attune to one materia, a checkbox under the Materia Options dubbed "Multiple Materia Attunement".
-*   Added a text field for Dodge and added a new AC entry for "Misc" under the AC Features section.
-*   All class features/traits/feats now have expander buttons to hide/expand information.
-*   All repeated section (ie: Traits, Feats, Spells, etc) textarea fields are now expandable.
-*   All input areas (including disabled input areas) now have tooltips in which display their associated macro reference.
-*   Fixed a bug with a negative DEX modifier not affecting flat-footed AC.
-*   Added "vs. Touch" checkbox to Weapons entries. The weapons roll template will now specify if that attack is vs AC or Touch, depending on this checkbox value.
-
-Monster Sheet
-
-*   General aesthetic changes. Some fields are larger while others are smaller.
-*   Added "Gear" textarea.
-*   Added "MP" number field.
-*   Added "Burrow Speed" number field.
-*   Specifying a CR now auto-calculates the amount of XP that creature will give.
-*   Special Abilities section now has associated dice roll macros for each entry, along with additional inputs for attack type (none, ranged touch, or touch), an attack modifier number field, and damage formula field. Expander button expands/hides ability description.
-*   Fixed a bug with craft, profession, and perform skills calculating incorrectly.
-
-__Version 1.2.1 (pushed 11/17/2018)__
-
-*	Undead characters now are supported. Use toggle at the top of the page to change Fortitude and hit point calculations from using Con to Cha
-
-__Version 1.2 (pushed 5/22/2018)__
-
-Even smaller update. Had to make some necessary changes -- hopefully I can get around to beefing up this sheet soon!
-*	Bonus MP is now calculated from your casting modifier + your spell level, as opposed to casting modifier + caster level. Please update/refresh your values to reflect these changes.
-*   Fixed a bug where skill points from your Favored Class Bonus would not factor into the total skill points of the "Totals" row within the Class page.
-
-__Version 1.1 (pushed 11/06/2017)__
-
-Small update. Changes were:
-*	Fixed CMB and CMD autocalculations
-*	Added a d4 option for class HD
-*	Added a quantity/charges (wands) field for inventory items
-*	Changed gil, monster XP and CR, to text fields to accomodate for commas
-*	Added craft, perform, and profession skills to the monster skills section
-*	Fixed the formatting for the monster skills section -- should look better for Firefox users
-
-### Bugs and Feedback
-
-Report bugs or feedback to the project’s [issue
+# Final Fantasy d20 Character Sheet
+
+### Usage
+
+This character sheet requires a modern web browser. It is highly recommended to have the latest
+version of Chrome, Firefox or Edge for the best user experience.
+
+There are two distinct sheet types that come bundled with this character sheet: the Character and the Monster sheet type. The user can toggle between these modes from the dropdown box at the top center of the sheet aptly labeled "Sheet Type."
+
+#### Character Sheet Type
+
+The Character sheet type is meant for player characters and non player characters that call for a more details-oriented approach to management. This entails your typical Roll20 sheet features: a multi-tab interface, automated calculations, sheet rolling macros, repeating sections, etc.
+
+#### Monster Sheet Type
+
+The Monster sheet type is meant for monsters, to be used exclusively by the DM. It condenses everything down to one page (no tab interface), and removes autocalculations entirely in favor of giving more control to the DM with editing values. Utilizing this sheet type effectively will enable the DM to drag and drop monster tokens and keep track of their respective stats without having to wade through the tabular interface meant for more complex character types.
+
+### Changelog
+
+__Version 1.6 (pushed 7/4/2021)__
+
+A couple changes here and there; expect a bigger update in a little while!
+
+Character Sheet
+
+* Miscellaneous aesthetic changes.
+* Fixed a bug with user created macros not showing notes for certain skills.
+* Fixed a bug with CMD not adding dodge or deflection bonuses.
+* Fixed the "Extra MP" feature to be in line with the site changes to the feat.
+* Added Inherent column for Ability Scores section.
+
+__Version 1.5 (pushed 10/26/2020)__
+
+Special thanks to TamedFlame for accomplishing most of this update!
+
+Iterative attacks will be on the next update scheduled before New Years!
+
+Character Sheet
+
+* Spell failure roll on all spells if you have greater than 0% spell failure chance from equipment.
+* Size modifiers are now factored in for Fly and Stealth skills.
+* Added "Racial" trait option.
+* Added spell DC field for spell levels and a modifier for individual spells.
+* Chat display buttons for character traits/feats/class features.
+* Modifiable ability scores for character skills.
+
+Monster Sheet
+
+* Aesthetic changes.
+
+Universal
+
+* Added GM roll toggle under the Sheet Options.
+
+__Version 1.4 (pushed 6/21/2020)__
+
+##### This update was realized by TamedFlame
+
+Universal
+
+* The background color gradient is now customisable from the Options section. You can select a color for each corner, and the sheet shall use those to generate a new background gradient. These options are set per character, and as such each PC, Monster, or NPC can have a style of their own. These settings also affect the backgrounds for the rolls in the chat, and as such you can use them to identify characters. 
+
+>  #### User discretion is advised when selcting colors, consider talking to your fellow players if any of them has difficulties with certain combinations.
+
+__Version 1.3 (pushed 2/23/2019)__
+
+Character Sheet
+
+*   New "Options" sections in which may be opened by clicking the various cog icons on the sheet. Allows for the user to hide any other section tab (core, combat, class, skills, etc), hide MP and/or specify additional custom energy fields to show up within the "Status" section (up to 3 types), and specify the HP threshold for limit break activation. There are also options to include the Toughness, Extra MP, and Extra Limit Break feats, as well as the Hume trait "Skilled", into their respective calculations.
+*   New "Combat" tab and section. "Status", "Combat", "Saving Throws", "Defenses", and "Weapons" subsections were moved here, while "Ability Scores" and "Miscellany" were placed into the "Core" tab. New "Traits" subsection was placed under the "Core" sheet section.
+*   Reformatted Spells section. Each spell entry now has an associated dice roll macro, along with the ability to hide non-pertinent spell information.
+*   Limit break max usage/day field is now an auto-calculating field.
+*   General aesthetic changes. FFd20 logo is smaller, some fields are larger while others are smaller, section tabs are closer together, among other things.
+*   Only one materia entry can be attuned at a time (as per the normal ruleset). Checking "Attuned?" on a materia entry will then automatically uncheck other entries if they are attuned. There is an option to turn this feature off and be able to attune to one materia, a checkbox under the Materia Options dubbed "Multiple Materia Attunement".
+*   Added a text field for Dodge and added a new AC entry for "Misc" under the AC Features section.
+*   All class features/traits/feats now have expander buttons to hide/expand information.
+*   All repeated section (ie: Traits, Feats, Spells, etc) textarea fields are now expandable.
+*   All input areas (including disabled input areas) now have tooltips in which display their associated macro reference.
+*   Fixed a bug with a negative DEX modifier not affecting flat-footed AC.
+*   Added "vs. Touch" checkbox to Weapons entries. The weapons roll template will now specify if that attack is vs AC or Touch, depending on this checkbox value.
+
+Monster Sheet
+
+*   General aesthetic changes. Some fields are larger while others are smaller.
+*   Added "Gear" textarea.
+*   Added "MP" number field.
+*   Added "Burrow Speed" number field.
+*   Specifying a CR now auto-calculates the amount of XP that creature will give.
+*   Special Abilities section now has associated dice roll macros for each entry, along with additional inputs for attack type (none, ranged touch, or touch), an attack modifier number field, and damage formula field. Expander button expands/hides ability description.
+*   Fixed a bug with craft, profession, and perform skills calculating incorrectly.
+
+__Version 1.2.1 (pushed 11/17/2018)__
+
+*	Undead characters now are supported. Use toggle at the top of the page to change Fortitude and hit point calculations from using Con to Cha
+
+__Version 1.2 (pushed 5/22/2018)__
+
+Even smaller update. Had to make some necessary changes -- hopefully I can get around to beefing up this sheet soon!
+*	Bonus MP is now calculated from your casting modifier + your spell level, as opposed to casting modifier + caster level. Please update/refresh your values to reflect these changes.
+*   Fixed a bug where skill points from your Favored Class Bonus would not factor into the total skill points of the "Totals" row within the Class page.
+
+__Version 1.1 (pushed 11/06/2017)__
+
+Small update. Changes were:
+*	Fixed CMB and CMD autocalculations
+*	Added a d4 option for class HD
+*	Added a quantity/charges (wands) field for inventory items
+*	Changed gil, monster XP and CR, to text fields to accomodate for commas
+*	Added craft, perform, and profession skills to the monster skills section
+*	Fixed the formatting for the monster skills section -- should look better for Firefox users
+
+### Bugs and Feedback
+
+Report bugs or feedback to the project’s [issue
 tracker](https://github.com/Azurift/roll20-character-sheets/issues).
@@ -156,6 +156,13 @@
            <input type="number" class="sheet-number" name="attr_base_personality" value='((@{charisma_mod} + @{charisma_base}) * 10)' disabled="true" />
            <input type="text"   class="sheet-number_formula" name="attr_basetext_personality" value="CHA x 10 ft" readonly />
        </div>
+	<div>
+            <input type="text" class="sheet-text_statsname" value="Resolve" readonly />
+            <input type="number" class="sheet-number" name="attr_resolve" value='@{mod_resolve} + @{base_resolve}' disabled="true"/>
+            <input type="number" class="sheet-number"name="attr_mod_resolve" value="0" />
+            <input type="number" class="sheet-number" name="attr_base_resolve" value='(((@{charisma})+(@{endurance})) + 10)' disabled="true" />
+            <input type="text"   class="sheet-number_formula" name="attr_basetext_resolve" value="CHA + END + 10" readonly />
+        </div>
        <div>
            <input type="text" class="sheet-text_statsname" value="Sequence" readonly />
            <input type="number" class="sheet-number" name="attr_sequence" value='@{mod_sequence} + @{base_sequence}' disabled="true"/>
@@ -184,13 +191,6 @@
            <input type="number" class="sheet-number" name="attr_base_vault_limit" value='((@{charisma} * 2) + 1)' disabled="true" />
            <input type="text"   class="sheet-number_formula" name="attr_basetext_vault_limit" value="(CHA x 2) + 1" readonly />
        </div>
-        <div>
-            <input type="text" class="sheet-text_statsname" value="Addiction Res." readonly />
-            <input type="number" class="sheet-number" name="attr_addiction_radiation" value='@{mod_resistance_addiction} + @{base_resistance_addiction}' disabled="true"/>
-            <input type="number" class="sheet-number"name="attr_mod_resistance_addiction" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_resistance_addiction" value='((@{endurance})*2)' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_resistance_addiction" value="END x 2" readonly />
-        </div>
        <div>
            <input type="text" class="sheet-text_statsname" value="Electricity Res." readonly />
            <input type="number" class="sheet-number" name="attr_resistance_electricity" value='@{mod_resistance_electricity} + @{base_resistance_electricity}' disabled="true"/>
@@ -1,5 +1,5 @@
 /* Gamme World 1e, made from Metamorphosis Alpha: 1e CSS */
-/* Version 1.0 */
+

 /* overall wrapper to fix moving width issues with overflow on hidden sections */
 .charsheet .sheet-overall-wrapper {
@@ -16,6 +16,16 @@
    visibility: hidden;
 }

+
+input[type=number].sheet-txtfield::-webkit-inner-spin-button,
+input[type=number].sheet-txtfield::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+input[type=number].sheet-txtfield {
+  -moz-appearance: textfield;
+}
+
 /* TEMPLATES */
 .sheet-rolltemplate-MA1e .sheet-RollTemp-wrapper {
    /*background:url(http://i.imgur.com/vhOjjFg.png) top center repeat;*/
@@ -15,7 +15,7 @@
 			<div class="sheet-col-1-8 sheet-center">&nbsp;</div>
 			<div class="sheet-col-1-8 sheet-center">&nbsp;</div>
 			<div class="sheet-col-1-8 sheet-center">&nbsp;</div>
-			<div class="sheet-col-3-8 sheet-center sheet-margin-top"><p class="sheet-last-updated">SHEET LAST UPDATED<br/>04 JAN 2018</p></div>
+			<div class="sheet-col-3-8 sheet-center sheet-margin-top"><p class="sheet-last-updated">SHEET LAST UPDATED<br/>Oct. 2021</p></div>
 		</div>

 	</div>
@@ -69,7 +69,7 @@
 		  								
 		  								<div class="sheet-ACBG">
 		  									<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-3 sheet-center"><input class="sheet-AC" type="number" name="attr_acHuman" value="10"/><br/>.</div>
+											<div class="sheet-col-1-3 sheet-center"><input class="sheet-AC sheet-txtfield" type="number" name="attr_acHuman" value="10"/><br/>.</div>
 										</div>
 									</div>

@@ -79,7 +79,7 @@
 		  								
 		  								<div class="sheet-HPmaxBG">
 											<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-3 sheet-center "><input class="sheet-HPmax" type="text" name="attr_hpMaxHuman" value="0"/><br/>.</div>
+											<div class="sheet-col-1-3 sheet-center"><input class="sheet-HPmax sheet-txtfield" type="number" name="attr_hpMaxHuman" value="0"/><br/>.</div>
 										</div>
 									</div>

@@ -87,7 +87,7 @@
 		  								
 		  								<div class="sheet-HPBG">
 											<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-3 sheet-center "><input class="sheet-HP" type="text" name="attr_hpHuman" value="0"/><br/>.</div>
+											<div class="sheet-col-1-3 sheet-center"><input class="sheet-HP sheet-txtfield" type="number" name="attr_hpHuman" value="0"/><br/>.</div>
 										</div>
 									</div>

@@ -160,8 +160,8 @@
 									<div class="sheet-col-1-8 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center sheet-left sheet-vert-middle" type="number" name="attr_intMod" value="0" title="-1 to Artifact Use for every point above 15 and +1 for every point below 7"/>+/- ARTIFACT USE</div>
 									<div class="sheet-col-1-23 sheet-center">&nbsp;</div>
 									<div class="sheet-col-1-7 sheet-center sheet-left sheet-vert-middle">
-										<button type='roll' class="sheet-initiative sheet-large-button"  
-										value="&{template:MA1e} {{name=@{characterNameHuman}}} {{title=Artifact}} {{flavortext=Artifact Use roll to determine how an Artifact operates.}}  {{rolltype=Artifact Roll : }} {{ability=[[ {{1d10 + @{intMod}, {1}}kh1, {10}}kl1 [Die Roll] ]]}}" name='Artifact' title="Artifact">ARTIFACT USE</button>
+										<button type='roll' class="sheet-initiative sheet-large-button" name="roll_ARTIFACT"
+										value="&{template:MA1e} {{name=@{characterNameHuman}}} {{title=Artifact}} {{flavortext=Artifact Use roll to determine how an Artifact operates.}}  {{rolltype=Artifact Roll : }} {{ability=[[ {{1d10 + @{intMod}, {1}}kh1, {10}}kl1 [Die Roll] ]]}}" title="Artifact %{ARTIFACT}">ARTIFACT USE</button>
 									</div>
 								</div>

@@ -173,7 +173,7 @@
 									<div class="sheet-col-1-23 sheet-center">&nbsp;</div>
 									<div class="sheet-col-1-7 sheet-center sheet-left sheet-vert-middle">
 										<button type='roll' class="sheet-initiative sheet-large-button" name="roll_INIT" 
-										value="&{template:MA1e} {{name=@{characterNameHuman}}} {{title=Initiative}} {{INIT=[[ @{selected|dex} [DEX] &{tracker}]]}}" name='Initiative' title="Initiative">INITIATIVE</button>
+										value="&{template:MA1e} {{name=@{characterNameHuman}}} {{title=Initiative}} {{INIT=[[ 1d6+(@{dex}[DEX]) &{tracker}]]}}" title="Initiative %{INIT}">INITIATIVE</button>
 									</div>
 								</div>
 								
@@ -719,7 +719,7 @@
 		  								
 		  								<div class="sheet-ACBG">
 		  									<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-3 sheet-center"><input class="sheet-AC" type="number" name="attr_acMutant" value="10"/><br/>.</div>
+											<div class="sheet-col-1-3 sheet-center"><input class="sheet-AC sheet-txtfield" type="number" name="attr_acMutant" value="10"/><br/>.</div>
 										</div>
 									</div>

@@ -729,7 +729,7 @@
 		  								
 		  								<div class="sheet-HPmaxBG">
 											<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-3 sheet-center "><input class="sheet-HPmax" type="text" name="attr_hpMaxMutant" value="0"/><br/>.</div>
+											<div class="sheet-col-1-3 sheet-center"><input class="sheet-HPmax sheet-txtfield" type="number" name="attr_hpMaxMutant" value="0"/><br/>.</div>
 										</div>
 									</div>

@@ -737,7 +737,7 @@
 		  								
 		  								<div class="sheet-HPBG">
 											<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-3 sheet-center "><input class="sheet-HP" type="text" name="attr_hpMutant" value="0"/><br/>.</div>
+											<div class="sheet-col-1-3 sheet-center"><input class="sheet-HP sheet-txtfield" type="number" name="attr_hpMutant" value="0"/><br/>.</div>
 										</div>
 									</div>

@@ -810,8 +810,8 @@
 									<div class="sheet-col-1-8 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center sheet-left sheet-vert-middle" type="number" name="attr_intMod" value="0" title="-1 to Artifact Use for every point above 15 and +1 for every point below 7"/>+/- ARTIFACT USE</div>
 									<div class="sheet-col-1-23 sheet-center">&nbsp;</div>
 									<div class="sheet-col-1-7 sheet-center sheet-left sheet-vert-middle">
-										<button type='roll' class="sheet-initiative sheet-large-button"  
-										value="&{template:MA1e} {{name=@{characterNameMutant}}} {{title=Artifact}} {{flavortext=Artifact Use roll to determine how an Artifact operates.}}  {{rolltype=Artifact Roll : }} {{ability=[[ {{1d10 + @{intMod}, {1}}kh1, {10}}kl1 [Die Roll] ]]}}" name='Artifact' title="Artifact">ARTIFACT USE</button>
+										<button type='roll' class="sheet-initiative sheet-large-button" name="roll_ARTIFACT-mutant"  
+										value="&{template:MA1e} {{name=@{characterNameMutant}}} {{title=Artifact}} {{flavortext=Artifact Use roll to determine how an Artifact operates.}}  {{rolltype=Artifact Roll : }} {{ability=[[ {{1d10 + @{intMod}, {1}}kh1, {10}}kl1 [Die Roll] ]]}}" title="Artifact %{ARTIFACT-mutant}">ARTIFACT USE</button>
 									</div>
 								</div>

@@ -822,8 +822,8 @@
 									<div class="sheet-col-1-8 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center sheet-left sheet-vert-middle" type="number" name="attr_dexMod" value="0" title="+1 to Hit for every point above 15 and -1 for every point below 6"/>+/- TO HIT BONUS</div>
 									<div class="sheet-col-1-23 sheet-center">&nbsp;</div>
 									<div class="sheet-col-1-7 sheet-center sheet-left sheet-vert-middle">
-										<button type='roll' class="sheet-initiative sheet-large-button" name="roll_INIT" 
-										value="&{template:MA1e} {{name=@{characterNameMutant}}} {{title=Initiative}} {{INIT=[[ @{selected|dex} [DEX] &{tracker}]]}}" name='Initiative' title="Initiative">INITIATIVE</button>
+										<button type='roll' class="sheet-initiative sheet-large-button" name="roll_INIT-mutant"
+										value="&{template:MA1e} {{name=@{characterNameMutant}}} {{title=Initiative}} {{INIT=[[ 1d6+(@{dex}[DEX]) &{tracker}]]}}" title="Initiative %{INIT-mutant}">INITIATIVE</button>
 									</div>
 								</div>
 								
@@ -1562,7 +1562,7 @@
 		  								
 		  							<div class="sheet-ACBG">
 		  								<div class="sheet-col-1-5 sheet-center">&nbsp;</div>
-										<div class="sheet-col-1-5 sheet-center"><input class="sheet-AC" type="number" name="attr_acMonster" value="10"/><br/>.</div>
+										<div class="sheet-col-1-5 sheet-center"><input class="sheet-AC sheet-txtfield" type="number" name="attr_acMonster" value="10"/><br/>.</div>
 									</div>
 								</div>

@@ -1572,7 +1572,7 @@
 		  								
 		  							<div class="sheet-HPmaxBG">
 										<div class="sheet-col-1-5 sheet-center">&nbsp;</div>
-										<div class="sheet-col-1-5 sheet-center "><input class="sheet-HPmax" type="text" name="attr_hpMaxMonster" value="0"/><br/>.</div>
+										<div class="sheet-col-1-5 sheet-center"><input class="sheet-HPmax sheet-txtfield" type="number" name="attr_hpMaxMonster" value="0"/><br/>.</div>
 									</div>
 								</div>

@@ -1580,7 +1580,7 @@
 		  								
 		  							<div class="sheet-HPBG">
 										<div class="sheet-col-2-9 sheet-center">&nbsp;</div>
-										<div class="sheet-col-1-6 sheet-center "><input class="sheet-HP" type="text" name="attr_hpMonster" value="0"/><br/>.</div>
+										<div class="sheet-col-1-6 sheet-center"><input class="sheet-HP sheet-txtfield" type="number" name="attr_hpMonster" value="0"/><br/>.</div>
 									</div>
 								</div>

@@ -2,11 +2,19 @@

 This is a character sheet for the 1st Edition of Gamma World.  It features 3 separate tabs for Humans, Mutants, and Monsters.

-## Current Version
-1.01

 ### Changelog

+#### 1.02 (Oct. 2021)
+* Roll updates
+  * Update initiative roll to be `1d6+@{dex}`, (from previous `@{selected|dex}`). Init rolls now work without selecting token.
+  * Init rolls can be called with `%{selected|INIT}`/`%{selected|INIT-mutant}`
+  * artifact rolls can be called with `%{selected|ARTIFACT}`/`%{selected|ARTIFACT-mutant}`
+* Armor Class input looks better
+
+#### 1.01 (2018)
+* Incorporated changes to Human and Mutant sheet to include "Artifact Use" roll button and calculation, with roll 1d10 modified by Artiface Use bonus (intMod) (-1 to Artifact Use for every Intelligence point above 15 and +1 for every point below 7), and limited to range 1 to 10, with negative numbers returned as 1 and numbers larger than 10 returned as 10 per this equation: [[ {{1d10 + @{intMod}, {1}}kh1, {10}}kl1 [Die Roll] ]].
+
 #### 1.0
 * Sheet creation per Character Sheet Request Thread.
 * Incorporated updates to Attributes, including Intelligence modifier for artifact use, Dexterity To Hit modifier, and Charisma Table for Followers, morale and reaction adjustment.
@@ -16,9 +24,6 @@ This is a character sheet for the 1st Edition of Gamma World.  It features 3 sep
 * Incorporated updates to weapons used table, including Small, Man-Sized and Large opponents damage dice.
 * Incorporated changes to Monster sheet, including modifications to the mutant generation section.

-#### 1.01
-* Incorporated changes to Human and Mutant sheet to include "Artifact Use" roll button and calculation, with roll 1d10 modified by Artiface Use bonus (intMod) (-1 to Artifact Use for every Intelligence point above 15 and +1 for every point below 7), and limited to range 1 to 10, with negative numbers returned as 1 and numbers larger than 10 returned as 10 per this equation: [[ {{1d10 + @{intMod}, {1}}kh1, {10}}kl1 [Die Roll] ]].

-
-### Credit Where Credit is Due
+### Credits
 The CSS of this sheet is from the Metamorphosis Alpha 1e character sheet.
@@ -4,6 +4,6 @@
  "authors": "MattBx8",
  "roll20userid": "115594",
  "preview": "GammaWorld1e_Human.jpg",
-  "instructions": "# Gamma World 1e Character Sheet\rThis sheet has both a Human and Mutant sheet and a Monster Sheet for the Judge that is switchable via a tab at the top left of the sheet.\r\r## Player Sheets\r\r* All of the roll buttons (shown as a d20 dice) have roll templates.\r* Attack rolls show the AC hit\r\r## Monster Sheet\r\r* All of the roll buttons have roll templates and many of them go to the GM\r* In sheet ability to create non-player creature mutations \r\r## Modified from Metamorphosis Alpha 1e character sheet by Amanda the Amazon.\r\r\r## Current Version: 1.0",
+  "instructions": "## Gamma World 1e Character Sheet\r**Current Version:** 1.02\r**[Changelog](https://github.com/Roll20/roll20-character-sheets/blob/master/GammaWorld1e/Readme.md)**\rThis sheet has both a Human and Mutant sheet, and a Monster Sheet for the Judge that is switchable via a tab at the top left of the sheet.\r\r### Player Sheets\r\r* All of the roll buttons (shown as a d20 dice) have roll templates.\r* Attack rolls show the AC hit\r\r### Monster Sheet\r\r* All of the roll buttons have roll templates and many of them go to the GM\r* In-sheet ability to create non-player creature mutations",
  "legacy": true
 }
@@ -44,9 +44,10 @@
  <h1 class="title-header">Heartbeats in Perfect Sync</h1>
  <h3>
    <span>Dice Roller</span>
-    <button class="sheet-d6-dice" type="roll" value="/roll [[@{heartrate} + ?{Your heartrate is @{heartrate}. How many bonus dice?|0}]]d6&gt;5" name="roll_BluffCheck"></button>
+    <button class="d6-dice-button" type="roll" value="/roll [[@{heartrate} + ?{Your heartrate is @{heartrate}. How many bonus dice?|0}]]d6&gt;5" name="roll_HeartrateRoll"></button>
  </h3>
  <h3><span name="attr_description"></span></h3>
+  <!-- div: button.no-icon-button(type="roll" value=spotlightmacro name="roll_TakeSpotlight") Take the Spotlight!-->
 </header>
 <main>
  <div class="col2">
@@ -144,7 +145,7 @@ on('change:move_name',function(eventInfo) {

 on('change:heartrate change:heartrate_max',function(eventInfo) {
  getAttrs(['heartrate','heartrate_max'],function(values) {
-    if (values.heartrate > values.heartrate_max) {
+    if (parseInt(values.heartrate) > parseInt(values.heartrate_max)) {
      let output = {heartrate: values.heartrate_max};
      setAttrs(output);
    };
@@ -0,0 +1,110 @@
+
+-
+  var weapons = [
+    {preselect:true, id:'weapon_punch',   damage:0, ap:1, baseattribute:'attribute_athletic', name:'Punch',  note:'Parry -3, except Punches'},
+    {preselect:false, id:'weapon_dagger',  damage:1, ap:1, baseattribute:'attribute_dexterity', name:'Daggers & Knives', note:'Giftverwendung / Parry -2, except Punches and Daggers & Knives'},
+    {preselect:false, id:'weapon_fencing', damage:2, ap:1, baseattribute:'attribute_athletic', name:'Fencing Weapons',  note:'Parry -1 per engaged enemy after the first one'},
+    {preselect:false, id:'weapon_swords' , damage:3, ap:2, baseattribute:'attribute_strength', name:'Swords',  note:'full parry'},
+    {preselect:false, id:'weapon_scimitar',damage:4, ap:2, baseattribute:'attribute_strength', name:'Scimitars',  note:'Parry -1', mounted:true, mounted_damage:5, mounted_ap:2},
+    {preselect:false, id:'weapon_impact',  damage:5, ap:2, baseattribute:'attribute_strength', name:'Impact Weapons',  note:'Parry -2'},
+    {preselect:false, id:'weapon_polearm', damage:6, ap:3, baseattribute:'attribute_strength', name:'Polearms',  note:'Parry costs 2AP', vs_mounted:true, vs_mounted:8, vs_mounted_ap:3},
+    {preselect:false, id:'weapon_lance',   damage:6, ap:3, baseattribute:'attribute_strength', name:'Lance Weapons',  note:'Parry costs 2AP', mounted:true, mounted_damage:7, mounted_ap:2},
+    {preselect:false, id:'weapon_sling' ,  damage:1, ap:2, baseattribute:'attribute_dexterity', name:'Sling',  note:'Geschossgeeignet, Thrower must be free'},
+    {preselect:false, id:'weapon_pistol',  damage:3, ap:2, baseattribute:'attribute_senses', name:'Pistol',  note:'Immer freie Schussmöglichkeit'},
+    {preselect:false, id:'weapon_crossbow',damage:5, ap:3, baseattribute:'attribute_senses', name:'Crosswbow',  note:'Shooter must be free'},
+    {preselect:false, id:'weapon_musket',  damage:8, ap:3, baseattribute:'attribute_senses', name:'Musket',  note:'Shooter and target must be free'},
+    {preselect:true, id:'weapon_dodge',   damage:0, ap:1, baseattribute:'attribute_athletic', name:'Dodge',  note:'Per engaged enemy -1, ranged attacks -1'},
+    {preselect:false, id:'weapon_shield',  damage:0, ap:1, baseattribute:'attribute_strength', name:'Shield',  note:'Only 1x per round / blocks ranged attacks'}
+  ];
+
+  var skills = [
+    {id:'skill_acrobatics', baseattribute:'attribute_athletic', name:'Akrobatik'},
+    {id:'skill_alertness', baseattribute:'attribute_senses'},
+    {id:'skill_perception', baseattribute:'attribute_senses'},
+    {id:'skill_firstaid', baseattribute:'attribute_knowledge'},
+    {id:'skill_sleightofhand', baseattribute:'attribute_dexterity'},
+    {id:'skill_mentalpower', baseattribute:'attribute_willpower'},
+    {id:'skill_crafting', baseattribute:'attribute_dexterity'},
+    {id:'skill_stealth', baseattribute:'attribute_athletic'},
+    {id:'skill_countryandpeople', baseattribute:'attribute_knowledge'},
+    {id:'skill_rhetoric', baseattribute:'attribute_willpower'},
+    {id:'skill_flexing', baseattribute:'attribute_strength'},
+    {id:'skill_reflexes', baseattribute:'attribute_senses'},
+    {id:'skill_riding', baseattribute:'attribute_athletic'},
+    {id:'skill_insensibility', baseattribute:'attribute_strength'},
+    {id:'skill_fieldsofknowledge', baseattribute:'attribute_knowledge'},
+    {id:'skill_witchcraft', baseattribute:'attribute_knowledge'}
+  ];
+
+mixin modoptions
+  <option value="0" selected="selected" data-i18n="mod_none">None</option>
+  <option value="mod_checks_all" data-i18n="mod_checks_all">Alle Proben</option>
+  <option value="hitpoints" data-i18n="hitpoints">Lebenspunkte</option>
+  <option value="ini" data-i18n="ini">Initiative</option>
+  <option value="mod_parry_all" data-i18n="mod_parry_all">Alle Paraden</option>
+  <option value="idea" data-i18n="idea">Ideen</option>
+  <option value="coup" data-i18n="coup">Coups</option>
+  <option value="attribute_strength" data-i18n="attribute_strength">attribute_strength</option>
+  <option value="attribute_athletic" data-i18n="attribute_athletic">attribute_athletic</option>
+  <option value="attribute_dexterity" data-i18n="attribute_dexterity">attribute_dexterity</option>
+  <option value="attribute_senses" data-i18n="attribute_senses">attribute_senses</option>
+  <option value="attribute_knowledge" data-i18n="attribute_knowledge">attribute_knowledge</option>
+  <option value="attribute_willpower" data-i18n="attribute_willpower">attribute_willpower</option>
+  <option value="skill_acrobatics" data-i18n="skill_acrobatics">skill_acrobatics</option>
+  <option value="skill_alertness" data-i18n="skill_alertness">skill_alertness</option>
+  <option value="skill_perception" data-i18n="skill_perception">skill_perception</option>
+  <option value="skill_firstaid" data-i18n="skill_firstaid">skill_firstaid</option>
+  <option value="skill_sleightofhand" data-i18n="skill_sleightofhand">skill_sleightofhand</option>
+  <option value="skill_mentalpower" data-i18n="skill_mentalpower">skill_mentalpower</option>
+  <option value="skill_crafting" data-i18n="skill_crafting">skill_crafting</option>
+  <option value="skill_stealth" data-i18n="skill_stealth">skill_stealth</option>
+  <option value="skill_countryandpeople" data-i18n="skill_countryandpeople">skill_countryandpeople</option>
+  <option value="skill_rhetoric" data-i18n="skill_rhetoric">skill_rhetoric</option>
+  <option value="skill_flexing" data-i18n="skill_flexing">skill_flexing</option>
+  <option value="skill_reflexes" data-i18n="skill_reflexes">skill_reflexes</option>
+  <option value="skill_riding" data-i18n="skill_riding">skill_riding</option>
+  <option value="skill_insensibility" data-i18n="skill_insensibility">skill_insensibility</option>
+  <option value="skill_fieldsofknowledge" data-i18n="skill_fieldsofknowledge">skill_fieldsofknowledge</option>
+  <option value="skill_witchcraft" data-i18n="skill_witchcraft">skill_witchcraft</option>
+  <option value="weapon_punch" data-i18n="weapon_punch">weapon_punch</option>
+  <option value="weapon_dagger" data-i18n="weapon_dagger">weapon_dagger</option>
+  <option value="weapon_fencing" data-i18n="weapon_fencing">weapon_fencing</option>
+  <option value="weapon_swords" data-i18n="weapon_swords">weapon_swords</option>
+  <option value="weapon_scimitar" data-i18n="weapon_scimitar">weapon_scimitar</option>
+  <option value="weapon_impact" data-i18n="weapon_impact">weapon_impact</option>
+  <option value="weapon_polearm" data-i18n="weapon_polearm">weapon_polearm</option>
+  <option value="weapon_lance" data-i18n="weapon_lance">weapon_lance</option>
+  <option value="weapon_sling" data-i18n="weapon_sling">weapon_sling</option>
+  <option value="weapon_pistol" data-i18n="weapon_pistol">weapon_pistol</option>
+  <option value="weapon_crossbow" data-i18n="weapon_crossbow">weapon_crossbow</option>
+  <option value="weapon_musket" data-i18n="weapon_musket">weapon_musket</option>
+  <option value="weapon_dodge" data-i18n="weapon_dodge">weapon_dodge</option>
+  <option value="weapon_shield" data-i18n="weapon_shield">weapon_shield_ma</option>
+                
+
+input(type="hidden" class="tutorialtoggle" name="attr_tutorial_done" value="0")
+input(type='hidden' class='npctoggle' name='attr_npc'  value='0')
+input(type="hidden" class="npc_type_toggle" name="attr_npc_type" value="npc_type_gang")
+
+div(class="charsheet")
+  input(type='hidden' class='tabstoggle' name='attr_sheetTab'  value='character')
+
+  div(class="sticky")
+    div(class="2colrow")
+      include src/html/sticky.pug
+      
+
+
+  include src/html/character/character.pug
+  include src/html/combat/combat.pug
+  include src/html/npc/npc.pug
+  include src/html/config.html
+
+
+//- SHEET WORKERS
+script(type="text/worker")
+    include src/js/sheetworker.js
+
+include src/html/rolltemplate_check.pug
+include src/html/rolltemplate_blood.pug
+include src/html/rolltemplate_elixir.pug
@@ -0,0 +1,8 @@
+{
+	"html": "hexxen.html",
+	"css": "hexxen.css",
+	"authors": "Ulisses Digital - special thanks to Philipp Kolhoff",
+	"roll20userid": "2555238",
+	"preview": "hexxen.png",
+	"instructions": "Offizieller charakterbogen f&uuml;r **Hexxen 1733**, von [Ulisses Spiele](https://ulisses-spiele.de/).\n\nOfficial character sheet for **Hexxen 1733**, by Ulisses Spiele."
+}
@@ -0,0 +1,78 @@
+<div class="box">
+<h2>Kleidungssets</h2>
+<input class="feathertoggle" type="checkbox" name="attr_display-skills" value="1" checked="true"/>
+<img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+<div>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+<fieldset class="repeating_armorsets counterreset">
+<div class="fieldsetcontainer">
+<div class="display">
+<label class="counter">Set No</label>
+<span class="fieldset_editmode_toggle"></span>
+<input class='textline' type="text" name="attr_name" placeholder="Name"/>           
+<span class="tooltip" name="attr_name"></span>
+<span class="tooltiptext" name="attr_description"></span>
+<input class="hideempty_toggle" type="hidden" name="attr_target"/>
+<span class="hideempty">(
+<span name="attr_target" data-i18n-dynamic=""></span>
+<span name="attr_bonus"></span>
+<span>)</span>
+</span>
+</div>
+<input class="details-flag" type="checkbox" checked="true" name="attr_details-flag"/><span>i</span>
+<div class="wrapper">
+<span class="fieldset_editmode_toggle"></span>
+<div>
+<textarea name="attr_description" placeholder="Description"></textarea>
+<label>Modifikator:</label>
+<select name="attr_target">
+<option value="0" selected="selected">None</option>
+<option value="hitpoints" >Lebenspunkte</option>
+<option value="ini" >Initiative</option>
+<option value="parry_all" >Alle Paraden</option>
+<option value="attribute_strength" data-i18n="attribute_strength">attribute_strength</option>
+<option value="attribute_athletic" data-i18n="attribute_athletic">attribute_athletic</option>
+<option value="attribute_dexterity" data-i18n="attribute_dexterity">attribute_dexterity</option>
+<option value="attribute_senses" data-i18n="attribute_senses">attribute_senses</option>
+<option value="attribute_knowledge" data-i18n="attribute_knowledge">attribute_knowledge</option>
+<option value="attribute_willpower" data-i18n="attribute_willpower">attribute_willpower</option>
+<option value="skill_acrobatics" data-i18n="skill_acrobatics">skill_acrobatics</option>
+<option value="skill_alertness" data-i18n="skill_alertness">skill_alertness</option>
+<option value="skill_perception" data-i18n="skill_perception">skill_perception</option>
+<option value="skill_firstaid" data-i18n="skill_firstaid">skill_firstaid</option>
+<option value="skill_sleightofhand" data-i18n="skill_sleightofhand">skill_sleightofhand</option>
+<option value="skill_mentalpower" data-i18n="skill_mentalpower">skill_mentalpower</option>
+<option value="skill_crafting" data-i18n="skill_crafting">skill_crafting</option>
+<option value="skill_stealth" data-i18n="skill_stealth">skill_stealth</option>
+<option value="skill_countryandpeople" data-i18n="skill_countryandpeople">skill_countryandpeople</option>
+<option value="skill_rhetoric" data-i18n="skill_rhetoric">skill_rhetoric</option>
+<option value="skill_flexing" data-i18n="skill_flexing">skill_flexing</option>
+<option value="skill_reflexes" data-i18n="skill_reflexes">skill_reflexes</option>
+<option value="skill_riding" data-i18n="skill_riding">skill_riding</option>
+<option value="skill_insensibility" data-i18n="skill_insensibility">skill_insensibility</option>
+<option value="skill_fieldsofknowledge" data-i18n="skill_fieldsofknowledge">skill_fieldsofknowledge</option>
+<option value="weapon_punch" data-i18n="weapon_punch">weapon_punch</option>
+<option value="weapon_dagger" data-i18n="weapon_dagger">weapon_dagger</option>
+<option value="weapon_fencing" data-i18n="weapon_fencing">weapon_fencing</option>
+<option value="weapon_swords" data-i18n="weapon_swords">weapon_swords</option>
+<option value="weapon_scimitar" data-i18n="weapon_scimitar">weapon_scimitar</option>
+<option value="weapon_impact" data-i18n="weapon_impact">weapon_impact</option>
+<option value="weapon_polearm" data-i18n="weapon_polearm">weapon_polearm</option>
+<option value="weapon_lance" data-i18n="weapon_lance">weapon_lance</option>
+<option value="weapon_sling" data-i18n="weapon_sling">weapon_sling</option>
+<option value="weapon_pistol" data-i18n="weapon_pistol">weapon_pistol</option>
+<option value="weapon_crossbow" data-i18n="weapon_crossbow">weapon_crossbow</option>
+<option value="weapon_musket" data-i18n="weapon_musket">weapon_musket</option>
+<option value="weapon_dodge" data-i18n="weapon_dodge">weapon_dodge</option>
+<option value="weapon_shield" data-i18n="weapon_shield">weapon_shield_ma</option>
+</select>
+<input class="number" type="number" name="attr_bonus" />
+</div>
+<div>
+<span class="text" name="attr_description"></span>
+</div>
+</div>
+</div>
+</fieldset>
+</div>
+</div>
@@ -0,0 +1,40 @@
+<div class="box">
+    <h2 data-i18n="heading_armorsets">Kleidungssets</h2>
+    <input class="feathertoggle" type="checkbox" name="attr_display-armorsets" value="1" checked="true"/>
+    <img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    <div>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+        <fieldset class="repeating_armorsets counterreset">
+            <div class="fieldsetcontainer">
+            <div class="display">
+                <label class="counter" data-i18n="label_amorset_prefix">Set No</label>
+                <span class="fieldset_editmode_toggle"></span>
+                <input class='textline' type="text" name="attr_name" placeholder="Name"/>           
+                <span class="tooltip" name="attr_name"></span>
+                <span class="tooltiptext" name="attr_description"></span>
+                <input class="hideempty_toggle" type="hidden" name="attr_target"/>
+                <span class="hideempty">(
+                    <span name="attr_target" data-i18n-dynamic=""></span>
+                    <span name="attr_bonus"></span>
+                    <span>)</span>
+                </span>
+            </div>
+            <input class="details-flag" type="checkbox" checked="true" name="attr_details-flag"/><span>i</span>
+            <div class="wrapper">
+                <span class="fieldset_editmode_toggle"></span>
+                <div>
+                    <textarea name="attr_description" placeholder="Description"></textarea>
+                    <label data-i18n="label_modifier">Modifikator:</label>
+                    <select class="textline" name="attr_target">
+                        +modoptions
+                    </select>
+                    <input class="number" type="number" name="attr_bonus" />
+                </div>
+                <div>
+                    <span class="text" name="attr_description"></span>
+                </div>
+            </div>
+            </div>
+        </fieldset>
+    </div>
+</div>
@@ -0,0 +1,43 @@
+<div class="box">
+<h2 data-i18n="heading_attributes">Attribute</h2>
+<input class="feathertoggle" type="checkbox" name="attr_display-attributes" value="1" checked="true"/>
+<img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+<div class="attributes">
+<h4 data-i18n="heading_physical">Körperliche</h4>
+<h4></h4>
+<h4></h4>
+<h4 data-i18n="heading_mental">Geistige</h4>
+<h4></h4>
+<h4></h4>
+<label data-i18n="attribute_strength">Strength</label>
+<label class='short pureattribute' data-i18n="attribute_strength_short">Str</label>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+<input class="number" type="number" name="attr_attribute_strength" />
+<span class="number" name="attr_attribute_strength"></span>
+<label data-i18n="attribute_senses">Senses</label>
+<label class='short pureattribute' data-i18n="attribute_senses_short">Sen</label>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+<input class="number" type="number" name="attr_attribute_senses" />
+<span class="number" name="attr_attribute_senses"></span>    
+<label data-i18n="attribute_athletic">Athletics</label>
+<label class='short pureattribute' data-i18n="attribute_athletic_short">Ath</label>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+<input class="number" type="number" name="attr_attribute_athletic" />
+<span class="number" name="attr_attribute_athletic"></span>
+<label data-i18n="attribute_knowledge">Knowledge</label>
+<label class='short pureattribute' data-i18n="attribute_knowledge_short">Kno</label>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+<input class="number" type="number" name="attr_attribute_knowledge" />
+<span class="number" name="attr_attribute_knowledge"></span>     
+<label data-i18n="attribute_dexterity">Dexterity</label>
+<label class='short pureattribute' data-i18n="attribute_dexterity_short">Dex</label>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+<input class="number" type="number" name="attr_attribute_dexterity" />
+<span class="number" name="attr_attribute_dexterity"></span>
+<label data-i18n="attribute_willpower">Willpower</label>
+<label class='short pureattribute' data-i18n="attribute_willpower_short">Wil</label>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+<input class="number" type="number" name="attr_attribute_willpower" />
+<span class="number" name="attr_attribute_willpower"></span>
+</div>
+</div>
@@ -0,0 +1,63 @@
+<div class="box">
+    <h2 data-i18n="heading_attributes">Attribute</h2>
+    <input class="feathertoggle" type="checkbox" name="attr_display-attributes" value="1" checked="true"/>
+    <img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    
+    <div class="attributes">
+        
+        <h4 data-i18n="heading_physical">Körperliche</h4>
+        <h4></h4>
+        <h4></h4>
+        <h4 data-i18n="heading_mental">Geistige</h4>
+        <h4></h4>
+        <h4></h4>
+
+        <label data-i18n="attribute_strength">Strength</label>
+        <label class='short pureattribute' data-i18n="attribute_strength_short">Str</label>
+
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="number" type="number" name="attr_attribute_strength" />
+        <span class="number" name="attr_attribute_strength"></span>
+    
+
+        <label data-i18n="attribute_senses">Senses</label>
+        <label class='short pureattribute' data-i18n="attribute_senses_short">Sen</label>
+
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="number" type="number" name="attr_attribute_senses" />
+        <span class="number" name="attr_attribute_senses"></span>    
+
+
+        <label data-i18n="attribute_athletic">Athletics</label>
+        <label class='short pureattribute' data-i18n="attribute_athletic_short">Ath</label>
+
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="number" type="number" name="attr_attribute_athletic" />
+        <span class="number" name="attr_attribute_athletic"></span>
+
+
+        <label data-i18n="attribute_knowledge">Knowledge</label>
+        <label class='short pureattribute' data-i18n="attribute_knowledge_short">Kno</label>
+
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="number" type="number" name="attr_attribute_knowledge" />
+        <span class="number" name="attr_attribute_knowledge"></span>     
+
+
+        <label data-i18n="attribute_dexterity">Dexterity</label>
+        <label class='short pureattribute' data-i18n="attribute_dexterity_short">Dex</label>
+
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="number" type="number" name="attr_attribute_dexterity" />
+        <span class="number" name="attr_attribute_dexterity"></span>
+
+
+        <label data-i18n="attribute_willpower">Willpower</label>
+        <label class='short pureattribute' data-i18n="attribute_willpower_short">Wil</label>
+
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="number" type="number" name="attr_attribute_willpower" />
+        <span class="number" name="attr_attribute_willpower"></span>
+
+    </div>
+</div>
@@ -0,0 +1,40 @@
+
+<div class='sheet-character'>
+    input(type="hidden" class="tutorialtoggle" name="attr_tutorial_done" value="0")
+    div(class="tutorial")
+        div(style="display:inline-block;position:relative")
+            button(type="action" name="act_nexttutorial" data-i18n="button_next_tutorial") Next Hint
+            button(type="action" name="act_toggletutorial" data-i18n="button_exit_tutorial") Toggle Hints
+        
+    <div class="2colrow">
+        <div class="col">
+            include personal.pug
+            include roles.pug
+            include equipment.pug
+            include armorsets.pug  
+            include hunterpowers.pug
+            include powers.pug
+            include effects.pug   
+        </div>
+        <div class="col">
+            include attributes.pug    
+            include skills.pug
+        </div>
+    </div>
+</div>
+
+//-
+    <div class='sheet-character'>
+        <div class="container">
+            include personal.pug
+            include skills.pug   
+            include attributes.pug
+            include hunterpowers.pug
+            include powers.pug
+            include roles.pug
+            include equipment.pug
+            include armorsets.pug
+            include effects.pug
+        </div>
+    </div>
+
@@ -0,0 +1,38 @@
+<div class="box">
+    <h2 data-i18n="heading_effects">Aktive Effekte</h2>
+    <input class="feathertoggle" type="checkbox" name="attr_display-effects" value="1" checked="true"/>
+    <img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    <div>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+        <fieldset class="repeating_effects">
+            <div class="fieldsetcontainer">
+                <div class="display">
+                    <span class="fieldset_editmode_toggle"></span>
+                    <input class='textline'  type="text" name="attr_name" data-i18n-placeholder="label_name" placeholder="Name"/>
+                    <span name="attr_name"></span>
+                    <input class="hideempty_toggle" type="hidden" name="attr_target"/>
+                    <span class="hideempty">(
+                        <span name="attr_target" data-i18n-dynamic=""></span>
+                        <span name="attr_bonus"></span>
+                        <span>)</span>
+                    </span>
+                </div>
+                <input class="details-flag" type="checkbox" checked="true" name="attr_details-flag"/><span>i</span>
+                <div class="wrapper">
+                    <span class="fieldset_editmode_toggle"></span>
+                    <div>
+                        <textarea name="attr_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea>
+                        <label data-i18n="label_modifier">Modifikator:</label>
+                        <select class="textline" name="attr_target">
+                            +modoptions
+                        </select>
+                        <input class="number" type="number" name="attr_bonus" />
+                    </div>
+                    <div>
+                        <span class="text" name="attr_description"></span>
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+</div>
@@ -0,0 +1,8 @@
+<div class="box">
+<h2 data-i18n="heading_equipment">Restliche Ausrüstung</h2>
+<input class="feathertoggle" type="checkbox" name="attr_display-equipment" value="1" checked="true"/>
+<img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+<div>
+<textarea name="attr_equipment" data-i18n-placeholder="heading_equipment" placeholder="Restliche Ausrüstung"></textarea>
+</div>
+</div>
@@ -0,0 +1,8 @@
+<div class="box">
+    <h2 data-i18n="heading_equipment">Restliche Ausrüstung</h2>
+    <input class="feathertoggle" type="checkbox" name="attr_display-equipment" value="1" checked="true"/>
+    <img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    <div>
+        <textarea name="attr_equipment" data-i18n-placeholder="heading_equipment" placeholder="Restliche Ausrüstung"></textarea>
+    </div>
+</div>
@@ -0,0 +1,38 @@
+<div class="box">
+    <h2 data-i18n="heading_hunterpowers">Jägerkräfte</h2>
+    <input class="feathertoggle" type="checkbox" name="attr_display-hunterpowers" value="1" checked="true"/>
+    <img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    <div>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+        <fieldset class="repeating_hunterpowers">
+            <div class="fieldsetcontainer">
+                <div class="display">
+                    <span class="fieldset_editmode_toggle"></span>
+                    <input class="textline" type="text" name="attr_name" data-i18n-placeholder="label_name" placeholder="Name"/>
+                    <span name="attr_name"></span>
+                    <input class="hideempty_toggle" type="hidden" name="attr_target"/>
+                    <span class="hideempty">(
+                        <span name="attr_target" data-i18n-dynamic=""></span>
+                        <span name="attr_bonus"></span>
+                        <span>)</span>
+                    </span>
+                </div>
+                <input class="details-flag" type="checkbox" checked="true" name="attr_details-flag"/><span>i</span>
+                <div class="wrapper">
+                    <span class="fieldset_editmode_toggle"></span>
+                    <div>
+                        <textarea name="attr_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea>
+                        <label data-i18n="label_modifier">Modifikator:</label>
+                        <select class="textline" name="attr_target">
+                            +modoptions
+                        </select>
+                    <input class="number" type="number" name="attr_bonus" />
+                    </div>
+                    <div>
+                        <span class="text" name="attr_description"></span>
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+</div>
@@ -0,0 +1,56 @@
+<div class="box">     
+    <h2 data-i18n="heading_personal">Charakter</h2>
+    input(type="hidden" class="tutorialstep1" name="attr_tutorial_step")
+    <div class="hintcontainer">
+        <span class="hinttext hinttextright" data-i18n="collapsehint"></span>
+    </div>
+    <input class="feathertoggle" type="checkbox" name="attr_display-personal" value="1" checked="true"/>
+    input(type="hidden" class="tutorialstep1" name="attr_tutorial_step")
+    <img class="feather hintborder" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    
+    <div class="personalgrid">
+        <label data-i18n="label_rank">Jägerstufe</label>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="number" type="number" name="attr_rank" />
+        <span class="number" name="attr_rank"></span>
+
+        <label data-i18n="label_profession">Profession</label>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>
+        <input class="textline" type="text" name="attr_profession" />
+        <span class="label" name="attr_profession"></span>
+        
+        <label data-i18n="label_motivation">Motivation</label>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>   
+        <div>
+            <input class='textline'  type="text" name="attr_motivation_name" data-i18n-placeholder="label_motivation" placeholder="Motivation"/>
+        </div>
+        <div>
+            <span name="attr_motivation_name"></span>
+            <input class="hideempty_toggle" type="hidden" name="attr_motivation_target"/>
+            <span class="hideempty">(
+                <span name="attr_motivation_target" data-i18n-dynamic=""></span>
+                <span> +</span>
+                <span name="attr_motivation_bonus"></span>
+                <span>)</span>
+            </span>
+        </div>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>   
+        <div><label data-i18n="label_modifier">Modifikator:</label></div>
+        <div></div>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1"/>   
+        <div>
+            <select class="textline" name="attr_motivation_target">
+                +modoptions
+            </select>
+            <input class="number" type="number" name="attr_motivation_bonus" min="0" />
+        </div>
+        <div></div>
+
+        <label data-i18n="label_corruption">Verderbnis:</label>
+        <input class="number" type="number" name="attr_corruption" />
+        <label data-i18n="label_upkeep">Unterhalt</label>
+        <input class="number" type="number" name="attr_upkeep" />
+        <label data-i18n="label_wealth">Vermögen</label>
+        <input class="number" type="number" name="attr_wealth" />
+    </div>
+</div>
@@ -0,0 +1,141 @@
+<div class="box">
+<h2 data-i18n="heading_powers">Ausbaukräfte</h2>
+<input class="feathertoggle" type="checkbox" name="attr_display-powers" value="1" checked="true"/>
+<img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+<div>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+<fieldset class="repeating_powers">
+<div class="fieldsetcontainer">
+<input class="details-flag" type="checkbox" checked="true" name="attr_details-flag"/><span>i</span>
+<div class="display">
+<span class="fieldset_editmode_toggle"></span>
+<input class='textline'  type="text" name="attr_name" placeholder="Name"/>
+<span name="attr_name"></span>
+<input class="hideempty_toggle" type="hidden" name="attr_target"/>
+<span class="hideempty">(
+<span name="attr_target" data-i18n-dynamic=""></span>
+<span name="attr_bonus"></span>
+<span>)</span>
+</span>
+</div>
+<div class="wrapper">
+<span class="fieldset_editmode_toggle"></span>
+<div>
+<input class='textline'  type="text" name="attr_baseeffect" data-i18n-placeholder="label_power_baseeffect" placeholder="Stammeffekt"/>
+<textarea name="attr_baseeffect_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea>
+<hr/>
+<input class="normal" type="checkbox" name="attr_apprenticeeffect1_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_apprenticeeffect1" data-i18n-placeholder="label_power_apprenticeeffect" placeholder="Geselleneffekt"/><br/>
+<textarea name="attr_apprenticeeffect1_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_apprenticeeffect2_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_apprenticeeffect2" data-i18n-placeholder="label_power_apprenticeeffect" placeholder="Geselleneffekt"/><br/>
+<textarea name="attr_apprenticeeffect2_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_apprenticeeffect3_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_apprenticeeffect3" data-i18n-placeholder="label_power_apprenticeeffect" placeholder="Geselleneffekt"/><br/>
+<textarea name="attr_apprenticeeffect3_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_experteffect1_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_experteffect1" data-i18n-placeholder="label_power_experteffect" placeholder="Experteneffekt"/><br/>
+<textarea name="attr_experteffect1_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_experteffect2_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_experteffect2" data-i18n-placeholder="label_power_experteffect" placeholder="Experteneffekt"/><br/>
+<textarea name="attr_experteffect2_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_experteffect3_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_experteffect3" data-i18n-placeholder="label_power_experteffect" placeholder="Experteneffekt"/><br/>
+<textarea name="attr_experteffect3_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_mastereffect1_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_mastereffect1" data-i18n-placeholder="label_power_mastereffect" placeholder="Mastereffekt"/><br/>
+<textarea name="attr_mastereffect1_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_mastereffect2_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_mastereffect2" data-i18n-placeholder="label_power_mastereffect" placeholder="Mastereffekt"/><br/>
+<textarea name="attr_mastereffect2_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/>
+<input class="normal" type="checkbox" name="attr_mastereffect3_active" value="1"/><span></span>
+<input class="textline" type="text" name="attr_mastereffect3" data-i18n-placeholder="label_power_mastereffect" placeholder="Mastereffekt"/><br/>
+<textarea name="attr_mastereffect3_description" data-i18n-placeholder="label_description" placeholder="Description"></textarea><br/></div>
+<div class="powercontainer">
+<div class="basepowerbox">
+  <input type="radio" name="attr_details" value="10"/><span name="attr_baseeffect"></span>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect10"><span class="text" name="attr_baseeffect_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<hr class="powerdivider"/>
+<input type="hidden" name="attr_apprenticeeffect1_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="1"/><span name="attr_apprenticeeffect1"></span><br/>
+</div>
+<input type="hidden" name="attr_apprenticeeffect2_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="2"/><span name="attr_apprenticeeffect2"></span><br/>
+</div>
+<input type="hidden" name="attr_apprenticeeffect3_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="3"/><span name="attr_apprenticeeffect3"></span><br/>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect1"><span class="text" name="attr_apprenticeeffect1_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect2"><span class="text" name="attr_apprenticeeffect2_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect3"><span class="text" name="attr_apprenticeeffect3_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<hr class="powerdivider"/>
+<input type="hidden" name="attr_experteffect1_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="4"/><span name="attr_experteffect1"></span><br/>
+</div>
+<input type="hidden" name="attr_experteffect2_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="5"/><span name="attr_experteffect2"></span><br/>
+</div>
+<input type="hidden" name="attr_experteffect3_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="6"/><span name="attr_experteffect3"></span><br/>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect4"><span class="text" name="attr_experteffect1_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect5"><span class="text" name="attr_experteffect2_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect6"><span class="text" name="attr_experteffect3_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<hr class="powerdivider"/>
+<input type="hidden" name="attr_mastereffect1_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="7"/><span name="attr_mastereffect1"></span><br/>
+</div>
+<input type="hidden" name="attr_mastereffect2_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="8"/><span name="attr_mastereffect2"></span><br/>
+</div>
+<input type="hidden" name="attr_mastereffect3_active" value="1"/>
+<div class="powerbox">
+  <input type="radio" name="attr_details" value="9"/><span name="attr_mastereffect3"></span><br/>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect7"><span class="text" name="attr_mastereffect1_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect8"><span class="text" name="attr_mastereffect2_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div>
+<input class="effectselector" type="hidden" name="attr_details"/>
+<div class="effect9"><span class="text" name="attr_mastereffect3_description"></span>
+  <input class="hidedetails" type="radio" name="attr_details" value="0"/><span>{</span>
+</div></div>
+</div>
+</div>
+</fieldset>
+</div>
+</div>
@@ -0,0 +1,110 @@
+<div class="box">
+    <h2 data-i18n="heading_powers">Ausbaukräfte</h2>
+    <input class="feathertoggle" type="checkbox" name="attr_display-powers" value="1" checked="true"/>
+    <img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    <div>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+        <fieldset class="repeating_powers">
+            <div class="fieldsetcontainer">
+                <input class="details-flag" type="checkbox" checked="true" name="attr_details-flag"/><span>i</span>
+                <div class="display">
+                    <span class="fieldset_editmode_toggle"></span>
+                    <input class='textline'  type="text" name="attr_name" placeholder="Name"/>
+                    <span name="attr_name"></span>
+                    <input class="hideempty_toggle" type="hidden" name="attr_target"/>
+                    <span class="hideempty">(
+                        <span name="attr_target" data-i18n-dynamic=""></span>
+                        <span name="attr_bonus"></span>
+                        <span>)</span>
+                    </span>
+                </div>
+                <div class="wrapper">
+                    <span class="fieldset_editmode_toggle"></span>
+                    <div>
+                        <input class='textline'  type="text" name="attr_baseeffect" data-i18n-placeholder="label_power_baseeffect" placeholder="Stammeffekt"/>
+                        textarea(name="attr_baseeffect_description" data-i18n-placeholder="label_description" placeholder="Description")
+                        hr
+                        each val in [1,2,3]
+                            input(class="normal" type="checkbox" name="attr_apprenticeeffect"+val+"_active" value="1" checked=false)
+                            span
+                            input(class='textline'  type="text" name="attr_apprenticeeffect"+val data-i18n-placeholder="label_power_apprenticeeffect" placeholder="Geselleneffekt")
+                            br
+                            textarea(name="attr_apprenticeeffect"+val+"_description" data-i18n-placeholder="label_description" placeholder="Description")
+                            br
+                        
+                        each val in [1,2,3]
+                            input(class="normal" type="checkbox" name="attr_experteffect"+val+"_active" value="1" checked=false)
+                            span
+                            input(class='textline'  type="text" name="attr_experteffect"+val data-i18n-placeholder="label_power_experteffect" placeholder="Experteneffekt")
+                            br
+                            textarea(name="attr_experteffect"+val+"_description" data-i18n-placeholder="label_description" placeholder="Description")
+                            br
+                        
+                        each val in [1,2,3]
+                            input(class="normal" type="checkbox" name="attr_mastereffect"+val+"_active" value="1" checked=false)
+                            span
+                            input(class='textline'  type="text" name="attr_mastereffect"+val data-i18n-placeholder="label_power_mastereffect" placeholder="Mastereffekt")
+                            br
+                            textarea(name="attr_mastereffect"+val+"_description" data-i18n-placeholder="label_description" placeholder="Description")
+                            br
+                        
+                    </div>
+                    <div class="powercontainer">
+                        div(class="basepowerbox")
+                            input(type="radio" name="attr_details" value=10)
+                            <span name="attr_baseeffect"></span>
+
+                        input(class="effectselector" type="hidden" name="attr_details")
+                        div(class="effect10")
+                            span(class="text" name="attr_baseeffect_description")
+                            input(class="hidedetails" type="radio" name="attr_details" value=0)
+                            span {
+
+                        hr(class="powerdivider")
+                        each val in [1,2,3]
+                            input(type="hidden" name="attr_apprenticeeffect"+val+"_active" value="1")
+                            div(class="powerbox")
+                                input(type="radio" name="attr_details" value=val)
+                                span(name="attr_apprenticeeffect"+val)
+                                br                        
+                        each val in [1,2,3]
+                            input(class="effectselector" type="hidden" name="attr_details")
+                            div(class="effect"+val)
+                                span(class="text" name="attr_apprenticeeffect"+val+"_description")
+                                input(class="hidedetails" type="radio" name="attr_details" value=0)
+                                span {
+
+                        hr(class="powerdivider")
+                        each val in [1,2,3]
+                            input(type="hidden" name="attr_experteffect"+val+"_active" value="1")
+                            div(class="powerbox")
+                                input(type="radio" name="attr_details" value=(val+3))
+                                span(name="attr_experteffect"+val)
+                                br
+                        each val in [1,2,3]
+                            input(class="effectselector" type="hidden" name="attr_details")
+                            div(class="effect"+(val+3))
+                                span(class="text" name="attr_experteffect"+val+"_description")
+                                input(class="hidedetails" type="radio" name="attr_details" value=0)
+                                span {
+
+
+                        hr(class="powerdivider")
+                        each val in [1,2,3]
+                            input(type="hidden" name="attr_mastereffect"+val+"_active" value="1")
+                            div(class="powerbox")
+                                input(type="radio" name="attr_details" value=(val+6))
+                                span(name="attr_mastereffect"+val)
+                                br
+                        each val in [1,2,3]
+                            input(class="effectselector" type="hidden" name="attr_details")
+                            div(class="effect"+(val+6))
+                                span(class="text" name="attr_mastereffect"+val+"_description")
+                                input(class="hidedetails" type="radio" name="attr_details" value=0)
+                                span {
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+</div>
@@ -0,0 +1,33 @@
+<div class="box">
+<h2 data-i18n="heading_roles">Rollen</h2>
+<input class="feathertoggle" type="checkbox" name="attr_display-roles" value="1" checked="true"/>
+<img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+<div>
+<input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+<fieldset class="repeating_roles counterreset">
+<div class="fieldsetcontainer">
+<div class="display">
+<label class="counter" data-i18n="label_role_prefix">Rolle No</label>
+<span class="fieldset_editmode_toggle"></span>
+<select class="textline" name="attr_role">
+<option value="0" selected="selected" data-i18n="role_none">None</option>
+<option value="role_alchemist"  data-i18n="role_alchemist">Alchemist</option>
+<option value="role_assassin"  data-i18n="role_assassin">Attentäter</option>
+<option value="role_guard"  data-i18n="role_guard">Beschützer</option>
+<option value="role_zealot"  data-i18n="role_zealot">Eiferer</option>
+<option value="role_fencer"  data-i18n="role_fencer">Fechter</option>
+<option value="role_range"  data-i18n="role_range">Fernkämpfer</option>
+<option value="role_witchfoe"  data-i18n="role_witchfoe">Hexenfeind</option>
+<option value="role_witchmystic"  data-i18n="role_witchmystic">Hexenmystiker</option>
+<option value="role_constructor"  data-i18n="role_constructor">Konstrukteur</option>
+<option value="role_scout"  data-i18n="role_scout">Kundschafter</option>
+<option value="role_melee"  data-i18n="role_melee">Nahkämpfer</option>
+<option value="role_priest"  data-i18n="role_priest">Priester</option>
+<option value="role_strategist"  data-i18n="role_strategist">Stratege</option>       
+</select>
+<span name="attr_role" data-i18n-dynamic></span>
+</div>
+</div>
+</fieldset>
+</div>
+</div>
@@ -0,0 +1,33 @@
+<div class="box">
+    <h2 data-i18n="heading_roles">Rollen</h2>
+    <input class="feathertoggle" type="checkbox" name="attr_display-roles" value="1" checked="true"/>
+    <img class="feather" src="https://ulisses-digital.de/R20/hexxen/images/Feather.png" />
+    <div>
+        <input type="hidden" class="editmode_toggle" name="attr_editmode" value="1" checked=true/>
+        <fieldset class="repeating_roles counterreset">
+            <div class="fieldsetcontainer">
+                <div class="display">
+                    <label class="counter" data-i18n="label_role_prefix">Rolle No</label>
+                    <span class="fieldset_editmode_toggle"></span>
+                    <select class="textline" name="attr_role">
+                        <option value="0" selected="selected" data-i18n="role_none">None</option>
+                        <option value="role_alchemist"  data-i18n="role_alchemist">Alchemist</option>
+                        <option value="role_assassin"  data-i18n="role_assassin">Attentäter</option>
+                        <option value="role_guard"  data-i18n="role_guard">Beschützer</option>
+                        <option value="role_zealot"  data-i18n="role_zealot">Eiferer</option>
+                        <option value="role_fencer"  data-i18n="role_fencer">Fechter</option>
+                        <option value="role_range"  data-i18n="role_range">Fernkämpfer</option>
+                        <option value="role_witchfoe"  data-i18n="role_witchfoe">Hexenfeind</option>
+                        <option value="role_witchmystic"  data-i18n="role_witchmystic">Hexenmystiker</option>
+                        <option value="role_constructor"  data-i18n="role_constructor">Konstrukteur</option>
+                        <option value="role_scout"  data-i18n="role_scout">Kundschafter</option>
+                        <option value="role_melee"  data-i18n="role_melee">Nahkämpfer</option>
+                        <option value="role_priest"  data-i18n="role_priest">Priester</option>
+                        <option value="role_strategist"  data-i18n="role_strategist">Stratege</option>       
+                    </select>
+                    <span name="attr_role" data-i18n-dynamic></span>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+</div>
--- a/Show More
+++ b/Show More