From 6f6174d93c01625342570cf1ee61d254a4d5b69b Mon Sep 17 00:00:00 2001
From: Andreas Johansson <andreas.johansson@aalto.fi>
Date: Tue, 18 May 2021 19:29:19 +0300
Subject: [PATCH 01/14] Star Wars D6 v.2.40 refactor sheet to CSE & skillname
 suggestions

---
 D6StarWars/CHANGELOG.md    |   15 +
 D6StarWars/D6StarWars.css  |  710 +++++++++---
 D6StarWars/D6StarWars.html | 2159 +++++++++++++++++++++---------------
 D6StarWars/sheet.json      |    4 +-
 4 files changed, 1836 insertions(+), 1052 deletions(-)

diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md
index 0a9a1d1d82..ef21807330 100644
--- a/D6StarWars/CHANGELOG.md
+++ b/D6StarWars/CHANGELOG.md
@@ -1,3 +1,18 @@
+### Version 2.40 (2021-5):
+- refactor sheet to be able to use the new Roll20 Sheet framework
+- Feature: Skill name auto-suggestions, suggest relevant names as you start typing
+- more code cleanup
+
+### Version 2.34 (2021-05):
+- Enhance Player Core info section's layout
+- Reformats Player Secondary Info section
+- Enhance Attributes & Skills section's layout
+- Enhance Weapons & Armors section's layout
+- Enhance Force section's layout
+- FIX: cleaning up HTML code
+- FIX: removes invalid CSS code
+- FIX: Resist Pain effect works as expected
+
 ### Version 2.33 (2021-04-06):
 - remove duplicated control force power name field
 - fix force power section width
diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index f4c806b7a7..1ae2b9c819 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -8,11 +8,23 @@
     color:white;
 }
 
-.charsheet .sheet-version::after {
-    content: '2.32';
+.charsheet div.version-top{
+    position: absolute;
+    right: 5px;
+    top: 30px;
 }
 
-.charsheet label, h1, h2, h3{
+.charsheet div.logo{
+    display: inline-block;
+    position: absolute;
+    left: 150px;
+    padding-bottom: 50px;
+}
+.charsheet img.logo{
+    max-height: 80px;
+}
+
+.charsheet :is(label, h1, h2, h3, h4, h5){
     color:white;
 }
 
@@ -25,94 +37,95 @@
     resize:none;
 }
 
-.charsheet .sheet-toppad{
+.charsheet :is(p, .txtcenter){
+    text-align: center;
+}
+
+.charsheet .toppad{
     padding:2px;
 }
 
-.charsheet .sheet-section{
+.charsheet .section{
     border-top: 5px dotted white;
     padding:10px;
     width: 100%;
 }
 
-.charsheet .sheet-shipinfo span {
-    display: inline-block;
-    margin: 5px 10px 5px 10px;
-}
 
-.charsheet .sheet-flex-box{
+.charsheet .flex-box{
     display: flex;
 }
-.charsheet .sheet-flex-col{
+.charsheet .flex-col{
     flex: 1;
 }
 
-.charsheet input[type=number].sheet-pipnumber{
-    width:33px;
-}
 
-.charsheet input[type=number].sheet-smallnumber{
-    width:40px;
-}
 
-.charsheet input[type=number].sheet-smallshortnumber{
-    width:40px;
+.charsheet input[type=number].p60{
+    width: 60px;
+    text-align: center;
     padding-top:2px;
     padding-bottom:2px;
     display: inline-block;
     float:right;
 }
-.charsheet input[type=number].sheet-shortnumber{
-    padding-top:2px;
-    padding-bottom:2px;
+
+.charsheet .p90{
+    width: 90px;
 }
 
-.charsheet input[type=number].sheet-mediumnumber{
+.charsheet input[type=number].mediumnumber{
     width:60px;
 }
 
-.charsheet input[type=number].sheet-credits,
-.charsheet span.sheet-credits {
+.charsheet input[type=number].credits,
+.charsheet span.credits {
     width: 80px;
     padding-top: 2px;
     padding-bottom: 2px;
+    text-align: center;
+}
+.charsheet input[type=number].totalcredits{
+    width: 60%;
+    float: right;
 }
 
-.charsheet input[type=text].sheet-smalltext{
+
+.charsheet input[type=text].smalltext{
     width:60px;
-    margin:0px;
+    margin:0;
 }
 
-.charsheet input[type=text].sheet-mediumtext{
+.charsheet input[type=text].mediumtext{
     width:80px;
-    margin:0px;
+    margin:0;
 }
 
-.charsheet input[type=text].sheet-shorttext{
+.charsheet input[type=text].reduce-padd{
     padding-top:2px;
     padding-bottom:2px;
 }
 
-.charsheet input[type=text].sheet-skilltext{
+.charsheet input[type=text].skilltext{
     width:115px;
     padding:2px;
     margin-left:3px;
 }
 
-.charsheet .sheet-right{
+.charsheet .right{
     float:right;
 }
 
-.charsheet .sheet-left{
+.charsheet .left{
     float:left;
 }
 
-.charsheet .sheet-bold{
+.charsheet .bold{
     font-size: 12pt;
     margin-bottom: 10px;
 }
 
-.charsheet span.sheet-num {
+.charsheet span.num {
     background: white;
     color: black;
     border-radius: 2px;
@@ -123,143 +136,163 @@
 }
 
 
-.charsheet .sheet-tdborder{
+.charsheet .tdborder{
     border: 2px solid white;
     vertical-align:top;
-    width:330px;
     padding:5px;
     margin: 5px;
 }
 
-.charsheet .sheet-rightmargin{
-    margin-right:0px;
+.charsheet .rightmargin{
+    margin-right:0;
 }
 
-.charsheet select.sheet-smallselect{
+.charsheet select.smallselect{
     width:60px;
     height:25px;
     padding-top:2px;
     padding-bottom:2px;
-    margin:0px;
+    margin:0;
     display: inline-block;
     float:right;
+    text-align: center;
 }
 
-.charsheet select.sheet-mediumselect{ /*Used for Wound levels dropdown select*/
+.charsheet select.mediumselect{ /*Used for Wound levels dropdown select*/
     width:100px;
     height:25px;
     padding-top:2px;
     padding-bottom:2px;
-    margin:0px;
+    margin:0;
     display: inline-block;
     float:right;
 }
 
-.charsheet label.sheet-areaLabel{
-    margin:0px;
+.charsheet label.areaLabel{
+    margin:0;
 }
+
+.charsheet input[type="text"].60p{
+    width: 60%;
+}
+
+.charsheet .lineblck{
+    display:inline-block;
+}
+
 /*-----------------------------------------*/
 /*----------Roll Buttons classes-----------*/
 
-.charsheet button[type=roll].sheet-d6-dice::before {    /*new die changes die roller to d6*/
-    font-family: 'dicefontd6',arial;
+.charsheet button[type=roll].d6-dice::before {    /*new die changes die roller to d6*/
+    font-family: 'dicefontd6', arial, sans-serif;
     content: 'F ';
     color: red;
 }
 
-.charsheet .sheet-forcebutton{
+.charsheet .forcebutton{
     width:90px;
     padding-right:5px;
 }
 
-.charsheet .sheet-redtxt{
+.charsheet .redtxt{
     font-size: 8px;
     color: red;
-    font-family: 'Arial';
+    font-family: 'Arial', sans-serif;
 }
 
 
 /* writing the letter 't' with this font shows an impact icon signifying physical damage */
-.charsheet button.sheet-physical{
+.charsheet button.physical{
     font-family: 'Pictos Custom';
 }
 /* writing the letter 'e' with this font shows e bolt icon signifying energy damage */
-.charsheet button.sheet-energy{
+.charsheet button.energy{
     font-family: 'Pictos';
 }
 
+.charsheet span.physical{
+    font-family: 'Pictos Custom';
+    font-size: large;
+    content: 't';
+}
+/* writing the letter 'e' with this font shows e bolt icon signifying energy damage */
+.charsheet span.energy{
+    font-family: 'Pictos';
+    font-size: large;
+    content: 'e';
+}
+
 /*-------------------------------------------*/
 /*-----Main Settings and hide classes--------*/
 /*-----------(from GUMSHOE Official)---------*/
-
-.charsheet .sheet-main-settings .sheet-input-row label {
+.charsheet .main-settings .container{
+    width: 850px;
+}
+.charsheet .main-settings .input-row label {
     display: inline-block;
     width: auto;
 }
-
-.charsheet .sheet-main-settings .sheet-input-row input {
+
+.charsheet .main-settings .input-row input {
     margin-right: 30px;
 }
 
-.charsheet .sheet-main-settings .sheet-input-row select {
+.charsheet .main-settings .input-row select {
     width: 45%;
     margin-right: 15px;
 }
 
-input.sheet-main-options.sheet-options-flag + span,/*displays the cog icon*/
-input[type=radio]:checked ~ .sheet-master-container input.sheet-options-flag + span {
+.charsheet input.main-options.options-flag + span,/*displays the cog icon*/
+.charsheet input[type=radio]:checked ~ .master-container input.options-flag + span {
     font-family: pictos;
     font-style: normal;
 }
 
-div.sheet-main-settings {
+.charsheet div.main-settings {
     display: none;
     position: relative;
     margin-left: 0;
 }
 
-input.sheet-options-flag:checked ~ div.sheet-main-settings {
+.charsheet input.options-flag:checked ~ div.main-settings {
     display: inline-block;
     width: 600px;
     height: 500px;
 }
 
-input.sheet-selector-switch ,
-input.sheet-options-flag:checked ~ div.sheet-main-container {
+.charsheet input.selector-switch ,
+.charsheet input.options-flag:checked ~ div.main-container {
     display: none;
 }
 
 /* all hide options using option menu checkboxes*/
 
-.sheet-master-container .sheet-pc,
-.sheet-master-container .sheet-npc,
-.sheet-master-container .sheet-ship,
-.sheet-master-container .sheet-shop-inventory {
+.charsheet .master-container :is(.pc, .npc, .ship, .shop-inventory) {
     display: none;
 }
 
-input.sheet-toggle[value="0"] ~ .sheet-master-container .sheet-pc,
-input.sheet-toggle[value="1"] ~ .sheet-master-container .sheet-npc,
-input.sheet-toggle[value="2"] ~ .sheet-master-container .sheet-ship,
-input.sheet-toggle[value="3"] ~ .sheet-master-container .sheet-shop-inventory {
+.charsheet input.toggle[value="0"] ~ .master-container .pc,
+.charsheet input.toggle[value="1"] ~ .master-container .npc,
+.charsheet input.toggle[value="2"] ~ .master-container .ship,
+.charsheet input.toggle[value="3"] ~ .master-container .shop-inventory {
     display: block;
 }
 
-input.sheet-toggle[value="2"] ~ .sheet-master-container .sheet-ship.sheet-shipblock{
+.charsheet input.toggle[value="2"] ~ .master-container .ship.shipblock{
     display: grid;
 }
-input.sheet-toggle[value="2"] ~ .sheet-master-container .sheet-ship.sheet-shipheader{
+.charsheet input.toggle[value="2"] ~ .master-container .ship.shipheader{
     display: flex;
 }
 
-input.sheet-background:checked  ~ .sheet-master-container .sheet-background-hide,
-input.sheet-force:checked ~ .sheet-master-container .sheet-force-hide,
-input.sheet-equipment:checked ~ .sheet-master-container .sheet-equipment-hide,
-input.sheet-gmroll:checked ~ .sheet-master-container .sheet-gmroll-hide,
-input.sheet-rollmod:checked ~ .sheet-master-container .sheet-rollmod,
-input.sheet-rollmod:not(:checked) ~ .sheet-master-container .sheet-rollmod-no,
-input.sheet-cptracker:checked ~ .sheet-master-container .sheet-cptracker-hide,
-input.sheet-credittracker:checked ~ .sheet-master-container .sheet-credittracker-hide  {
+.charsheet input.background:checked  ~ .master-container .background-hide,
+.charsheet input.force:checked ~ .master-container .force-hide,
+.charsheet input.equipment:checked ~ .master-container .equipment-hide,
+.charsheet input.gmroll:checked ~ .master-container .gmroll-hide,
+.charsheet input.rollmod:checked ~ .master-container .rollmod,
+.charsheet input.rollmod:not(:checked) ~ .master-container .rollmod-no,
+.charsheet input.cptracker:checked ~ .master-container .cptracker-hide,
+.charsheet input.credittracker:checked ~ .master-container .credittracker-hide  {
     display: none;
 }
 
@@ -267,35 +300,49 @@ input.sheet-credittracker:checked ~ .sheet-master-container .sheet-credittracker
 /*------------- General Styles---------------*/
 /*------------(from GUMSHOE Official)--------*/
 
-input[type=number]::-webkit-inner-spin-button {}
+.charsheet input[type=number].txtfield::-webkit-inner-spin-button,
+.charsheet input[type=number].txtfield::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.charsheet input[type=number].txtfield {
+  -moz-appearance: textfield;
+}
 
-.sheet-master-container {
+.charsheet .master-container {
     position: relative;
     padding: 0;
     display: inline-block;
     background-image: url(https://cdn.pixabay.com/photo/2015/09/29/15/12/stars-964022_960_720.png); /*black space with tiny stars*/
     background-color: black;
     background-repeat: repeat;
+    width: 860px;
+    top: -10px;
 }
 
-.sheet-container {
+.charsheet .container {
     padding: 5px;
     margin-left: -25px;
     position: relative;
 }
 
-.sheet-main-container {
+.charsheet .main-container {
     display: inline-block;
     padding-top: 75px;
     margin-left: 0;
 }
 
+.charsheet div.footer{
+    text-align: center;
+    padding-top:10px;
+}
+
 /*-------------------------------------------*/
 /*------------- Options Toggles--------------*/
 /*-----------(from GUMSHOE Official)---------*/
 
-input.sheet-options-flag,
-input.sheet-options-flag + span {
+.charsheet input.options-flag,
+.charsheet input.options-flag + span {
     position: absolute;
     top: 2px;
     right: 2px;
@@ -303,13 +350,13 @@ input.sheet-options-flag + span {
     height: 15px;
 }
 
-input.sheet-options-flag {
+.charsheet input.options-flag {
     z-index: 99;
     opacity: 0;
 }
 
-input.sheet-options-flag + span {
-    margin-top: 0px;
+.charsheet input.options-flag + span {
+    margin-top: 0;
     display: none;
     white-space: nowrap;
     line-height: 15px;
@@ -318,7 +365,7 @@ input.sheet-options-flag + span {
     cursor: pointer;
 }
 
-input.sheet-options-flag.sheet-main-options {
+.charsheet input.options-flag.main-options {
     width: 30px;
     height: 30px;
     top: 20px;
@@ -326,7 +373,7 @@ input.sheet-options-flag.sheet-main-options {
     z-index: 3;
 }
 
-input.sheet-options-flag.sheet-main-options + span {
+.charsheet input.options-flag.main-options + span {
     width: 30px;
     height: 30px;
     top: 20px;
@@ -338,50 +385,415 @@ input.sheet-options-flag.sheet-main-options + span {
     display: block;
 }
 
-input.sheet-options-flag.sheet-main-options:hover + span {
+.charsheet input.options-flag.main-options:hover + span {
     opacity: 1;
 }
 
-input.sheet-options-flag:checked + span {
+.charsheet input.options-flag:checked + span {
     color: white;
     display: block;
 }
 
-input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sheet-options,
-input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sheet-options-flag:checked ~ .sheet-display  {
+.charsheet input.selector-switch:checked ~ .master-container .content .options,
+.charsheet input.selector-switch:checked ~ .master-container .content .options-flag:checked ~ .display  {
     display: none;
 }
 
-input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sheet-options-flag:checked ~ .sheet-options {
+.charsheet input.selector-switch:checked ~ .master-container .content .options-flag:checked ~ .options {
     display: block;
 }
 
+.charsheet div.sheettype-title{
+    position:absolute;
+    right: 5px;
+    top:-35px;
+}
+/*-------------------------------------------*/
+/*--------------- PC Section-----------------*/
+
+.charsheet .physical-params {
+    display: flex;
+    margin-top: 25px;
+}
+
+.charsheet .physical-params label {
+    text-align: center;
+}
+
+.charsheet .physical-params input {
+    display: block;
+    width: 100% !important;
+    text-align: center;
+}
+
+.charsheet .custom-roll-table {
+    display: table;
+    width: 100%;
+}
+
+.charsheet .custom-roll-table button.d6-dice {
+    width: 35px;
+    height: 18px;
+}
+.charsheet textarea.description{
+    height:6em;
+    width:97%
+}
+.charsheet textarea.description-phys{
+    height: 6em;
+    width: 97%;
+    margin-top: 3px;
+}
+.charsheet textarea.specabilities{
+    width: 95%;
+    height: 12em;
+}
+
+.charsheet th.init{
+    vertical-align: top;
+}
+.charsheet td.init{
+    padding-left: 6px;
+    padding-bottom: 40px;
+}
+.charsheet label input[type="number"].init,
+.charsheet input[type="number"].init{
+    width: 33px;
+}
+
+/*-------------------------------------------*/
+/*--------------- NPC Section-----------------*/
+.charsheet div.section.npc div.first-col{
+    display: inline-block;
+}
+.charsheet div.section.npc .npcname{
+    width: 65%;
+}
+.charsheet label.wound{
+    text-decoration: underline;
+}
+.charsheet select.wound{
+    width: 125px;
+}
+
+/* Attributes */
+.charsheet .attributes {
+    border: 2px solid white;
+    margin: 5px;
+    padding: 10px;
+}
+
+.charsheet .attribute {
+    margin-bottom: 5px;
+}
+
+/* Unified Dice */
+.charsheet .unified-dice {
+    width: 32px;
+    height: 34px;
+    line-height: 34px;
+}
+.charsheet .unified-dice-text {
+    display: inline-flex;
+    width: calc(100% - 240px);
+    height: 40px;
+    margin: 0;
+    padding: 0 5px;
+    font-size: x-large;
+    vertical-align: top;
+    line-height: 40px;
+}
+
+.charsheet input.gmroll:checked ~ .master-container .unified-dice-text {
+    width: calc(100% - 181px);
+}
+
+.charsheet .unified-dice-roll {
+}
+
+.charsheet button[type=roll].unified-dice-roll {
+    margin: 0;
+}
+
+.charsheet input[type="number"].unified-dice-input {
+    font-size: large;
+    font-weight: bold;
+    text-align: center;
+    width: 46px;
+    padding: 2px 4px;
+}
+
+.charsheet .unified-dice-middle {
+    display: inline-flex;
+    width: 24px;
+    height: 40px;
+    line-height: 40px;
+    font-size: 1.6em;
+    vertical-align: top;
+    font-weight: bold;
+}
+
+.charsheet input[type="number"].unified-dice-pip {
+    font-size: large;
+    font-weight: bold;
+    text-align: center;
+    width: 46px;
+    padding: 2px 4px;
+}
+
+/* Skill */
+.charsheet .skill {
+    height: 28px;
+    margin: 4px 0;
+}
+.charsheet .skill * {
+    height: 28px;
+    line-height: 26px;
+    width: 100%;
+}
+.charsheet .skill input[type="text"]{
+    width: calc(100% - 5px);
+}
+
+.charsheet .skill label {
+    padding: 0 1px;
+}
+
+.charsheet .skill .unified-dice-text {
+    display: inline-flex;
+    width: calc(100% - 225px);
+    height: 28px;
+    font-size: medium;
+    font-weight: normal;
+    vertical-align: top;
+    line-height: 28px;
+}
+
+.charsheet input.gmroll:checked ~ .master-container .skill .unified-dice-text {
+    width: calc(100% - 173px);
+}
+
+.charsheet .skill button[type=roll].unified-dice-roll {
+    width: 32px;
+    height: 24px;
+    padding-top: 0;
+}
+
+.charsheet .skill input[type="number"].unified-dice-input {
+    width: 46px;
+    height: 28px;
+    font-size: inherit;
+    text-align: center;
+}
+
+.charsheet .skill .unified-dice-middle {
+    display: inline-flex;
+    width: 24px;
+    height: 28px;
+    font-size: medium;
+    vertical-align: top;
+    line-height: 28px;
+}
+
+.charsheet .repcontrol {
+    height: 28px;
+}
+
+.charsheet .skill input[type="number"].unified-dice-pip {
+    display: inline-flex;
+    width: 46px;
+    height: 28px;
+    font-size: inherit;
+    text-align: center;
+}
+
+
+.charsheet .redtxt {
+    bottom: -3px;
+    right: 5px;
+}
+
+
+/* Edit Mode */
+.charsheet .editmode .skill {
+    margin: 4px 36px 4px 34px
+}
+
+.charsheet .editmode :is(.unified-dice-roll, .unified-dice-input, .unified-dice-middle, .unified-dice-pip) {
+    display: none !important;
+}
+
+.charsheet .editmode .unified-dice-text {
+    width: 100% !important;
+}
+.charsheet .editmode .armor.sheet-row:not(:first-of-type) .cell:not(:first-of-type),
+.charsheet .editmode .weapon.sheet-row:not(:first-of-type) .cell:not(:first-of-type) {
+    display: none;
+}
+.charsheet .editmode .armor.sheet-row:not(:first-of-type) .cell:first-of-type,
+.charsheet .editmode .weapon.sheet-row:not(:first-of-type) .cell:first-of-type {
+    width: 100%;
+}
+.charsheet .force .editmode .skill input[type=checkbox] {
+    display: none;
+}
+
+
+/* Weapons & Armors */
+.charsheet .armor.sheet-row,
+.charsheet .weapon.sheet-row{
+    width: 850px;
+}
+.charsheet .armor.sheet-row:first-of-type .cell,
+.charsheet .weapon.sheet-row:first-of-type .cell {
+    height: 36px;
+    border-bottom: 5px solid white;
+}
+.charsheet .armor.sheet-row:first-of-type .cell-4,
+.charsheet .weapon.sheet-row:first-of-type .cell-4 {
+    vertical-align: bottom;
+}
+.charsheet .cell {
+    display: inline-block;
+    margin: 0 4px;
+    text-align: center;
+}
+.charsheet .cell:first-of-type {
+    margin-left: 0;
+}
+.charsheet .cell:last-of-type {
+    margin-right: 0;
+}
+.charsheet .armor.sheet-row:first-of-type .cell,
+.charsheet .weapon.sheet-row:first-of-type .cell {
+    vertical-align: top;
+    line-height: 36px;
+    font-weight: bold;
+}
+.charsheet .weapon.sheet-row:first-of-type .cell.cell-4 {
+    line-height: inherit;
+}
+.charsheet .cell-name {
+    min-width: 50px;
+    width: calc(100% - 743px);
+}
+.charsheet .cell-name .unified-dice-text {
+    width: 100%;
+}
+.charsheet .cell-dice {
+    width: 197px;
+}
+.charsheet .cell-1 {
+    width: 46px;
+}
+.charsheet .cell-2 {
+    width: 84px;
+}
+.charsheet .cell-4 {
+    width: 198px;
+}
+.charsheet .armor .cell-4 {
+    width: 218px;
+}
+.charsheet .cell-4 .part {
+    display: inline-block;
+    width: 20%;
+}
+.charsheet .cell-5 {
+    width: 219px;
+}
+
+.charsheet .repcontainer[data-groupname="repeating_weapons"] > .repitem input[type="text"].name,
+.charsheet .repcontainer[data-groupname="repeating_armors"] > .repitem input[type="text"].name{
+    width: 107px;
+}
+.charsheet .repcontainer[data-groupname="repeating_weapons"] > .repitem input[type="number"].40px,
+.charsheet .repcontainer[data-groupname="repeating_armors"] > .repitem input[type="number"].40px{
+    width: 40px;
+}
+
+/* Force */
+.charsheet .force .skill .unified-dice-text {
+    width: calc(100% - 139px);
+}
+
+.charsheet .force .skill input[type=checkbox],
+.charsheet .powers input[type=checkbox] {
+    display: inline-block;
+    height: 28px;
+    width: 44px;
+}
+.charsheet .force-powers-description {
+    width: 100%;
+    height: 14em;
+    resize: vertical;
+}
+.charsheet table.powers {
+    width: 100%;
+}
+.charsheet table.powers td {
+    text-align: end;
+}
+.charsheet .force-hide .weapon .cell.cell-name {
+    width: calc(100% - 418px);
+}
+
+
+/* Equipment  & Backgorund */
+
+.charsheet div.section.equipment-hide textarea{
+    height: 7em;
+    width: 96%;
+}
+
+.charsheet div.section.backgorund-hide td.33p{
+    width: 33.33%;
+}
+
+
+/* Char point  & credit tracking */
+
+
+.charsheet .repcontainer[data-groupname="repeating_cptable"] > .repitem div,
+.charsheet .repcontainer[data-groupname="repeating_credittable"] > .repitem div{
+    padding-top: 8px;
+}
+.charsheet .repcontainer[data-groupname="repeating_cptable"] > .repitem input[type="text"],
+.charsheet .repcontainer[data-groupname="repeating_credittable"] > .repitem input[type="text"]{
+    width:80%;
+}
+.charsheet .repcontainer[data-groupname="repeating_credittable"] > .repitem input[type="number"]{
+    width:100px;
+}
 
 /*-------------------------------------------*/
 /*------------- Ship Section-----------------*/
 
-div.sheet-ship .sheet-wborder{
+.charsheet .shipinfo span {
+    display: inline-block;
+    margin: 5px 10px 5px 10px;
+}
+
+.charsheet div.ship .wborder{
     border: 2px solid white;
     padding: 5px;
 }
 
-div.sheet-shipheader{
+.charsheet div.shipheader{
     display: flex;
     justify-content: center;
     flex-flow: row nowrap;
 }
 
-div.sheet-shipheader span:nth-child(1) input[type="text"]{
+.charsheet div.shipheader span:nth-child(1) input[type="text"]{
     width: 300px;
 }
-div.sheet-shipheader span:nth-child(2) input[type="text"]{
-    width: 150px;
-}
-div.sheet-shipheader span:nth-child(3) input[type="text"]{
+.charsheet div.shipheader span:nth-child(2) input[type="text"],
+.charsheet div.shipheader span:nth-child(3) input[type="text"]{
     width: 150px;
 }
 
-div.sheet-shipblock{
+.charsheet div.shipblock{
     padding: 5px;
     display: grid;
     grid-template-columns: 3fr 7fr;
@@ -395,23 +807,23 @@ div.sheet-shipblock{
     height: 550px;
 }
 
-div.sheet-shipblock div.sheet-price{
+.charsheet div.shipblock div.price{
     grid-area: price;
     flex-flow: column nowrap;
     justify-content: space-between;
 }
 
-div.sheet-shipblock div.sheet-price span{
+.charsheet div.shipblock div.price span{
     width: 100px;
 }
 
-div.sheet-shipblock div.sheet-price div{
+.charsheet div.shipblock div.price div{
     display: flex;
     flex-flow: column nowrap;
     justify-content: space-between;
 }
 
-div.sheet-shipblock div.sheet-priceblock div.sheet-flex-row{
+.charsheet div.shipblock div.priceblock div.flex-row{
     flex-flow: row nowrap;
     justify-content: space-around;
     margin: 3px;
@@ -419,28 +831,29 @@ div.sheet-shipblock div.sheet-priceblock div.sheet-flex-row{
 
 
 /* Performance */
-div.sheet-shipblock div.sheet-perf{
+.charsheet div.shipblock div.perf{
     grid-area: perf;
     padding: 5px;
 }
 
-div.sheet-shipblock div.sheet-perf .sheet-medium,
-div.sheet-shipblock div.sheet-sensor .sheet-medium,
-div.sheet-shipblock div.sheet-hyperdrive input[type="text"],
-div.sheet-shipblock div.sheet-price input[type="text"]{
+.charsheet div.shipblock div.perf .medium,
+.charsheet div.shipblock div.sensor .medium,
+.charsheet div.shipblock div.hyperdrive input[type="text"],
+.charsheet div.shipblock div.price input[type="text"],
+{
     width: 80px;
 }
 
-div.sheet-shipblock div.sheet-perf label:not(.sheet-title){
+.charsheet div.shipblock div.perf label:not(.title){
     font-size: 0.8em;
 }
 
-div.sheet-shipblock div.sheet-perf div.sheet-perf,
-div.sheet-shipblock div.sheet-perf-block div.sheet-flex-col{
+.charsheet div.shipblock div.perf div.perf,
+.charsheet div.shipblock div.perf-block div.flex-col{
     display: flex;
     flex-flow: column nowrap;
 }
-div.sheet-shipblock div.sheet-perf div.sheet-perf-block{
+.charsheet div.shipblock div.perf div.perf-block{
     display: flex;
     flex-flow: row nowrap;
     justify-content: space-between;
@@ -448,18 +861,18 @@ div.sheet-shipblock div.sheet-perf div.sheet-perf-block{
 }
 
 /* Sensors */
-div.sheet-shipblock div.sheet-sensor{
+.charsheet div.shipblock div.sensor{
     grid-area: sensor;
     border: 2px solid white;
 }
 
-div.sheet-shipblock div.sheet-sensor div.sheet-flex-row{
+.charsheet div.shipblock div.sensor div.flex-row{
     display: flex;
     flex-flow: row nowrap;
 }
 
 
-div.sheet-shipblock div.sheet-sensor div.sheet-grid{
+.charsheet div.shipblock div.sensor div.grid{
     display: grid;
     grid-template-columns: repeat(5, 1fr);
     grid-template-rows: repeat(3, 1fr);
@@ -469,24 +882,24 @@ div.sheet-shipblock div.sheet-sensor div.sheet-grid{
 }
 
 /* Hyperdrive */
-div.sheet-shipblock div.sheet-hyperdrive{
+.charsheet div.shipblock div.hyperdrive{
     grid-area: hyperdrive;
     display: flex;
     flex-flow: column nowrap;
 }
 
-div.sheet-shipblock div.sheet-hyperdrive div{
+.charsheet div.shipblock div.hyperdrive div{
     display: flex;
     flex-flow: row nowrap;
     font-size: 0.8em;
 }
 
-div.sheet-shipblock div.sheet-hyperdrive .sheet-crew{
+.charsheet div.shipblock div.hyperdrive .crew{
     display: flex;
     flex-flow: column nowrap;
 }
 
-div.sheet-shipblock div.sheet-hyperdrive .sheet-hyper-grid{
+.charsheet div.shipblock div.hyperdrive .hyper-grid{
     display: grid;
     grid-template-columns: repeat(3, 1fr);
     grid-template-rows: repeat(4, 1fr);
@@ -495,34 +908,66 @@ div.sheet-shipblock div.sheet-hyperdrive .sheet-hyper-grid{
     width: 440px;
 }
 
-div.sheet-shipblock div.sheet-hyper-grid label{
+.charsheet div.shipblock div.hyper-grid label{
     width: 110px;
 }
 
-div.sheet-shipblock div.sheet-hyperdrive input[type="text"]{
+.charsheet div.shipblock div.hyperdrive input[type="text"]{
     height: 22px;
 }
 
 
-div.sheet-shipblock div.sheet-consume{
+.charsheet div.shipblock div.consume{
     grid-area: consume;
 }
 
-div.sheet-shipblock div.sheet-dura{
+.charsheet div.shipblock div.dura{
     grid-area: dura;
     display: grid;
     grid-template-rows: 1fr 1fr;
     grid-template-columns: 1fr 1fr 1fr;
 }
 
-div.sheet-shipblock div.sheet-dura label{
+.charsheet div.shipblock div.dura label{
     width:80px;
 }
 
-div.sheet-section.sheet-ship div.sheet-other{
+.charsheet div.section.ship div.other{
     margin-bottom: 10px;
 }
 
+/* Ship Weapons */
+
+.charsheet .repcontainer[data-groupname="repeating_shipweapon"] > .repitem div{
+    margin-bottom:10px;
+}
+.charsheet .repcontainer[data-groupname="repeating_shipweapon"] > .repitem span.range{
+    margin-left: 15px;
+}
+
+/* Generic Ship & Vehicle section */
+
+.charsheet div.section.ship label{
+    padding-top: 4px;
+    padding-bottom: 4px;
+
+}
+.charsheet div.section.ship input[type="text"]{
+    width: 95%;
+    padding-bottom:8px;
+}
+.charsheet div.section.ship textarea{
+    width: 97%
+    height: 17em;
+}
+
+/* misc sheet styling */
+
+.charsheet input[type=number].40px{
+    width: 40px;
+}
+
+
 
 /*-------------------------------------------*/
 /*------------- Roll Templates---------------*/
@@ -571,7 +1016,7 @@ div.sheet-section.sheet-ship div.sheet-other{
 /* alt template colors */
 .sheet-rolltemplate-swd6 .sheet-container.sheet-color-green {
   --header-bg-color: #008000;
-}rgba(204, 0, 0,1)
+}
 .sheet-rolltemplate-swd6 .sheet-container.sheet-color-red {
   --header-bg-color: rgba(204, 0, 0,1);
 }
@@ -743,3 +1188,4 @@ div.sheet-section.sheet-ship div.sheet-other{
 .sheet-rolltemplate-black tr:nth-child(even) {
  background-color:#eee;
 }
+
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index f38844916a..714581a8e4 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1,3 +1,5 @@
+<input  name="attr_version" type="hidden" value="2.40">
+
 <input class="toggle" name="attr_sheettype" type="hidden" value="0">
 
 <input class="selector-switch gmroll" name="attr_gmrollswitch" type="checkbox" value="1">
@@ -6,936 +8,1251 @@
 <input class="selector-switch force" name="attr_forceswitch" type="checkbox" value="1">
 <input class="selector-switch background" name="attr_backgroundswitch" type="checkbox" value="1">
 <input class="selector-switch equipment" name="attr_equipmentswitch" type="checkbox" value="1">
-<input class="selector-switch cptracker" name="attr_cpswitch" type="checkbox" value="1" checked="checked">
-<input class="selector-switch credittracker" name="attr_creditswitch" type="checkbox" value="1" checked="checked">
+<input checked="checked" class="selector-switch cptracker" name="attr_cpswitch" type="checkbox" value="1">
+<input checked="checked" class="selector-switch credittracker" name="attr_creditswitch" type="checkbox" value="1">
 
 
 <div class="master-container">
 
-	<!-- The "Settings Menu" Cog Icon -->
-	<input class="main-options options-flag" type="checkbox" name="attr_options-flag"><span style="float:left">y</span>
-
-
-<!-- Shows which sheet type is selected -->
-
-	<div class="main-settings" style="height:1em;text-align:right;float:right;"><h2>Settings</h2></div>
-	<div class="main-container pc right" style="position:absolute;right: 5px;top:-35px"><h2>Player Sheet</h2></div>
-	<div class="main-container npc right" style="position:absolute;right: 5px;top:-35px"><h2>NPC Sheet</h2></div>
-	<div class="main-container ship right" style="position:absolute;right: 5px;top:-35px"><h2>Ship</h2></div>
-	<div class="main-container shop-inventory right" style="position:absolute;right: 5px;top:-35px"><h2>Shop/Container</h2></div>
-
-
-	<div style="position:absolute;right: 5px;top:30px"><p class="version"> </p></div>
-
-<!--  LOGO and dice images -->
-
-	<div style="display:inline-block;position:absolute;left: 150px;padding-bottom:50px"> 
-		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/D6StarWars/logo.png" style="max-height: 80px;" title="This is where the fun begins."/>
-	</div>
-
-<!-- --------------------------------------------------------- SETTINGS MENU --------------------------------------- -->
-
-	<div class="main-settings container" style="padding-top:67px">
-		<div class="section" style="width:850px">
-
-		<!-- Sheet type -->
-			<div class="input-row top-row bold">
-				<span title="Shows a more dense statblock for NPCs. Equipment sections uses the first field from the PC version">Sheet type: </span>
-				<select name="attr_sheettype" style="width:90px;">
-					<option value="0" selected="selected">PC</option>
-					<option value="1">NPC</option>
-					<option value="2">Ship</option>
-					<option value="3">Container</option>
-				</select>
-			</div>
-
-		<!-- GM roll toggle -->
-			<div class="input-row top-row bold">
-				<span title="Hides the GM rolls. They are like regular rolls but whispered to the GM">Hide GM Rolls?</span>
-				<input name="attr_gmrollswitch" type="checkbox" value="1">
-			</div>
-
-		<!-- dice roll toggle -->
-			<div class="input-row top-row bold">
-				<span title="If checked, rolls don't ask for roll modifiers and rolls right away when selected.">Disable roll modification query when rolling?</span>
-				<input name="attr_rollmodswitch" type="checkbox" value="1">
-			</div>
-
-		<!-- Wild Die toggle -->
-			<div class="input-row top-row bold">
-				<span title="If Wild Die isn't used, the die rolls wont explode or highlight critical successes nor failures">Use Wild Die in rolls?</span>
-				<select name="attr_wilddie" style="width: 70px;">
-					<option value="!cf1cs6" selected="selected">Yes</option>
-					<option value="cf0cs0">No</option>
-				</select>
-			</div>
-
-		<!-- Few optional sections to hide -->
-			<div class="input-row top-row bold">
-				<span title="Useful for those who are not Force-sensitive">Hide/Show Sections:</span>
-			</div>
-			<div class="input-row top-row bold">
-				<span title="Useful for those who are not Force-sensitive">Hide Force Section? <input name="attr_forceswitch" type="checkbox" value="1"></span>
-			</div>
-			<div class="input-row top-row bold">
-				<span>Hide Equipment Section? </span>
-				<input name="attr_equipmentswitch" type="checkbox" value="1">
-			</div>
-			<div class="input-row top-row bold">
-				<span>Hide Background Section? </span>
-				<input name="attr_backgroundswitch" type="checkbox" value="1">
-			</div>
-			<div class="input-row top-row bold">
-				<span>Hide Character Point Summary Section? </span>
-				<input name="attr_cpswitch" type="checkbox" value="1" checked="checked">
-			</div>
-			<div class="input-row top-row bold">
-				<span>Hide Credit Summary Section? </span>
-				<input name="attr_creditswitch" type="checkbox" value="1" checked="checked">
-			</div>
-		</div>
-	</div>
-
-<!--  ---------------------------------------------- MAIN SHEET --------------------------------------------------------------------  -->
-
-<div class="main-container container" style="padding-top:75px">
-		
-	<!-- ---------------------------- Player Core info ------------------ -->
-		
-		<div class="section pc">
-			<div class="2colrow">
-				<div class="col" style="display:inline-block;">
-					<label class="toppad">Character Name <input class="right shorttext" type="text" name="attr_charactername" style="width:55%"/></label>
-					<label class="toppad">Type <input class="right shorttext" type="text" name="attr_type" style="width:75%"/></label>
-					<label class="toppad;">Species <input class="right shorttext" style="width:70%;" type="text" name="attr_species"/></label>
-					<table style="margin-top:-10px; margin-left:-10px;">
-						<tr>
-							<td>
-							<label class="toppad">Age <input  class="smalltext shorttext" type="text" name="attr_age"/></label>
-							</td><td>
-							<label>Height <input class="smalltext shorttext" type="text" name="attr_height"/></label>
-							</td><td>
-							<label>Weight <input class="smalltext shorttext" type="text" name="attr_weight"/></label>
-							</td><td>
-							<label>Gender <input class="mediumtext shorttext" type="text" name="attr_gender"/></label>
-							</td>
-						</tr>
-					</table>
-				</div>
-				<div class="col">
-					<label class="right">Credits <input type="number" min="0" class="credits" name="attr_credits" /></label>
-					<label>Physical Description</label>
-					<textarea name="attr_Physical_Description" style="height:6em;width:97%" ></textarea>
-				</div>
-			</div>
-		</div>
-
-	<!-- --------------------------- Player Secondary Info ------------------------- -->
-
-		<div class="section pc">
-			<div class='3colrow'>
-				<div class='col'>
-					<label class="areaLabel">Special Abilities</label>
-					<textarea name="attr_specialAbilities" style="width:95%;height:13em" ></textarea>
-				</div>
-				<div class='col'>
-					<label>Move <input type="number" name="attr_move" class="smallshortnumber" min="0" value="10"/></label>
-					<label>Force Sensitive?
-						<select name="attr_forceSensitive" class="smallselect">
-						  <option value="1">Yes</option>
-						  <option value="0" selected="selected">No</option>
-						</select>
-					</label>
-					<label>Force Points <input type="number" name="attr_forcePoints" class="smallshortnumber" min="0" value="1"/></label> <!---On char creation everyone starts with 1 FP --->
-					<label>Dark Side Points <input type="number" name="attr_darkSidePoints" class="smallshortnumber" min="0" value="0"/></label>
-					<label>Character Points <input type="number" name="attr_characterPoints" class="smallshortnumber" min="0" value="0"/></label> <!---On char creation everyone starts with 5 CP --->
-					<button class="d6-dice gmroll-hide" type="roll" name="roll_customroll-w" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"><span class="redtxt">(GM)</span>Custom Roll</button>
-					<button class="d6-dice gmroll-hide" type="roll" name="roll_extraroll-w" value="/w gm &{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}"><span class="redtxt">(GM)</span>Extra Dice</button>
-					<button class="d6-dice gmroll-hide" type="roll" name="roll_charptroll-w" value="/w gm &{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}"><span class="redtxt">(GM)</span>Char pt</button>
-				</div>         
-				<div class='col'>
-					<label style="text-decoration:underline;">Wound Level
-						<select name="attr_WoundLevel" class="mediumselect left" style="width:135px"/>
-						  <option value="0" selected="selected">Healthy</option>
-						  <option value="1">Stunned</option>
-						  <option value="1">Wounded</option>
-						  <option value="2">Wounded Twice</option>
-						  <option value="5">Incapacitated</option> <!-- You shouldn't even be able to make checks while incapacitated or Mortally wounded, hence -5. -->
-						  <option value="5">Mortally Wounded</option>
-						</select>
-					</label>
-					<label>Initiative bonus
-						<input type="number" name="attr_initiative" class="smallnumber shortnumber" min="0" value="0"/>D+<input type="number" name="attr_initiativepip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-					</label>
-					<button class="d6-dice rollmod" type="roll" name="roll_init" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie} &{tracker}]]}}">Initiative</button>
-					<button class="d6-dice rollmod-no" type="roll" name="roll_initnomod" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + 1d6@{wilddie} &{tracker}]]}}">Initiative</button>
-					<button class="d6-dice" type="roll" name="roll_customroll" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}">Custom Roll(no modifiers)</button>
-					<button class="d6-dice" type="roll" name="roll_extraroll" value="&{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}">Extra Dice(no wild die)</button>
-					<button class="d6-dice" type="roll" name="roll_charptroll" value="&{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}">Character points roll</button>
-				</div>
-			</div>
-		</div>
-
-
-	<!-- ------------------------------ NPC info block ------------------------------ -->	
-
-		<div class="section npc"> 
-			<div class="2colrow">
-				<div class="col" style="display:inline-block;">
-					<label class="toppad">NPC Name <input class="right shorttext" type="text" name="attr_charactername" style="width:65%"></label>
-					<label style="text-decoration:underline;">Wound Level
-						<select name="attr_WoundLevel" class="mediumselect left" style="width:135px"/>
-						  <option value="0" selected="selected">Healthy</option>
-						  <option value="1">Stunned</option>
-						  <option value="1">Wounded</option>
-						  <option value="2">Wounded Twice</option>
-						  <option value="5">Incapacitated</option> <!--You shouldn't even be able to make checks while incapacitated or Mortally wounded, hence -15. Later will include option to ignore wound penalties -->
-						  <option value="5">Mortally Wounded</option>
-						</select>
-					</label>
-					<label>Initiative bonus<input type="number" name="attr_initiative" class="smallnumber shortnumber" min="0" value="0">D+<input type="number" name="attr_initiativepip" class="pipnumber shortnumber" min="0" max="2" value="0"></label>
-					<button class="d6-dice rollmod-no" type="roll" name="roll_init_n" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + 1d6@{wilddie} &{tracker}]]}}"/>Initiative</button>
-
-					<button class="d6-dice rollmod" type="roll" name="roll_init_n" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie} &{tracker}]]}}"/>Initiative</button>
-					<button class="d6-dice" type="roll" name="roll_customroll_n" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"/>Custom Roll(no mods)</button>
-					<button class="d6-dice gmroll-hide" type="roll" name="roll_customroll_n-w" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"/><span class="redtxt">(GM)</span>C Roll</button>
-				</div>
-				<div class="col">
-					<label>Physical Description & Other Info</label>
-					<textarea name="attr_Physical_Description" style="height:6em;width:97%"></textarea>
-				</div>
-			</div>
-		</div>
-
-		<div class="section shop-inventory">
-			<label><input type="text" name="attr_containername"></label>
-		</div>
-
-	<!-- ---------------------------------------------- Attributes&Skills ----------------------------------- -->
-
-		<div class="section pc npc"> 
-			<div class="flex-box">
-				<div class="flex-col">
-
-						<!---Dex Attribute --->
-
-							<div class="tdborder"> 
-										<div class="bold">
-											<button name="roll_dex" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Dexterity</button>
-											<button name="roll_dex-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
-
-											<button name="roll_dex_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" >Dexterity</button>
-											<button name="roll_dex_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
-											<div style="float:right;">
-												<input type="number" name="attr_dexterity" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_dexteritypip" class="pipnumber" min="0" max="2" value="0"/>
-											</div>
-										</div>
-										<fieldset class="repeating_dexskills"> <!---Dex Skills --->
-											<button name="roll_dexskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button name="roll_dexskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-											<button name="roll_dexskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button name="roll_dexskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-												<input class="skilltext" type="text" name="attr_dexskillname"/>
-												<div class="right">
-												<input type="number" name="attr_dexskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_dexskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-												</div>
-										</fieldset>
-							</div>
-					
-					<!---Know Attribute --->
-
-							<div class="tdborder"> 
-										<div class="bold">
-											<button name="knwo"class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Knowledge</button>
-											<button name="know-w"class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-											<button name="know_n"class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}" >Knowledge</button>
-											<button name="know_n-w"class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-											<div style="float:right;">
-												<input type="number" name="attr_knowledge" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_knowledgepip" class="pipnumber" min="0" max="2" value="0"/>
-											</div>
-										</div>
-										<fieldset class="repeating_knowskills">  <!---Know Skills --->
-											<button name="knowskill"class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button name="knoskill-w"class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-											<button name="knowskill_n"class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button name="knowskill_n-w"class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip}+ 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-											<input class="skilltext" type="text" name="attr_knowskillname"/>
-											<div class="right">
-												<input type="number" name="attr_knowskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_knowskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-											</div>
-										</fieldset>
-							</div>
-
-						<!---Mech Attribute --->
-
-							<div class="tdborder">
-									<div class="bold">
-											<button name="roll_mech" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}">Mechanical</button>
-											<button name="roll_mech-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
-
-											<button name="roll_mech_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}">Mechanical</button>
-											<button name="roll_mech_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
-											<div style="float:right;">
-												<input type="number" name="attr_mechanical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_mechanicalpip" class="pipnumber" min="0" max="2" value="0"/>
-											</div>
-										</div>
-										<fieldset class="repeating_mechskills">  <!---Mech Skills --->
-											<button name="roll_mechskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button name="roll_mechskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-											<button name="roll_mechskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button name="roll_mechskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-											<input class="skilltext" type="text" name="attr_mechskillname"/>
-											<div class="right">
-												<input type="number" name="attr_mechskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_mechskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-											</div>
-										</fieldset>
-							</div>
-				</div>
-
-
-				<div class="flex-col">
-
-						<!---Perc Attribute --->
-
-							<div class="tdborder">
-								<div class="bold">
-										<button name="roll_per" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}" >Perception</button>
-										<button name="roll_per-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-										<button name="roll_per_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}" >Perception</button>
-										<button name="roll_per_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-										<div style="float:right;">
-											<input type="number" name="attr_perception" class="smallnumber"  min="1" value="3"/>D+<input type="number" name="attr_perceptionpip" class="pipnumber" min="0" max="2" value="0"/>
-										</div>
-								</div>
-									<fieldset class="repeating_perckills"> <!---Perc Skills --->
-										<button name="roll_perskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-										<button name="roll_perskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-										<button name="roll_perskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"></button>
-										<button name="roll_perskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-											<input class="skilltext" type="text" name="attr_perckillname"/> <!-- Misspelled attr name iis to be left as it is, otherwise it wipes char sheets from perseption skills-->
-											<div class="right">
-											<input type="number" name="attr_perckilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_perckillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-											</div>
-									</fieldset>
-							</div>
-							
-						<!---Str Attribute --->
-
-							<div class="tdborder">
-								<div class="bold">
-										<button name="roll_str" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Strength</button>
-										<button name="roll_str-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-										<button name="roll_str_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}" >Strength</button>
-										<button name="roll_str_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-										<div style="float:right;">
-											<input type="number" name="attr_strength" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_strengthpip" class="pipnumber" min="0" max="2" value="0"/>
-										</div>
-									</div>
-									<fieldset class="repeating_strskills"> <!---Str Skills --->
-										<button name="roll_strskill" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-										<button name="roll_strskill-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-										<button name="roll_strskill_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"></button>
-										<button name="roll_strskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-										  <input class="skilltext" type="text" name="attr_strskillname"/>
-										  <div class="right">
-											<input type="number" name="attr_strskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_strskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-										  </div>
-									</fieldset>
-							</div>
-
-						<!---Tech Attribute --->
-
-							<div class="tdborder">
-									<div class="bold">
-											<button name="roll_tech" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Technical</button>
-											<button name="roll_tech-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-											<button name="roll_tech_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}" >Technical</button>
-											<button name="roll_tech_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-											<div style="float:right;">
-												<input type="number" name="attr_technical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_technicalpip" class="pipnumber" min="0" max="2" value="0"/>
-											</div>
-										</div>
-										<fieldset class="repeating_techskills">  <!---Tech Skills --->
-											<button name="roll_techskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button name="roll_techskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-											<button name="roll_techskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button name="roll_techskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-											  <input class="skilltext" type="text" name="attr_techskillname"/>
-											  <div class="right">
-												<input type="number" name="attr_techskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_techskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-											  </div>
-										</fieldset>
-							</div>
-				</div>
-			</div>  <!-- flexbox-->
-		</div>
-
-	<!-- -------------------------------------------------- Weapons & Armor --------------------------- -->
-
-		<div class="section pc npc shop-inventory"> 
-			<label style="text-align: center">Weapon & Armor</label>
-			<table>
-				<tr>
-					<td style="width:210px"><label>Weapon</label></td>
-					<td style="width:70px">Skill Roll</td>
-					<td style="width:72px">Damage</td>
-					<td style="width:45px">Short</td>
-					<td style="width:50px">Med</td>
-					<td style="width:45px">Long</td>
-					<td style="width:35px">ROF</td>
-					<td style="width:30px;text-align:center;">Ammo</td>
-				</tr>
-			</table>
-				<fieldset class="repeating_weapons">
-					<input class="skilltext" type="text"  style="width:200px" name="attr_weapon"/>
-					<input type="number" name="attr_weaponskill" class="smallnumber" min="1" value="1"/>D+<input type="number" name="attr_weaponskillpip" class="pipnumber" min="0" max="2" value="0"/>
-					<input type="number" name="attr_damagedice" class="smallnumber shortnumber" min="1" value="1"/>D+<input type="number" name="attr_damagepip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-					<input class="smallnumber shortnumber" type="number" name="attr_shortrange"/>
-					<input class="mediumnumber shortnumber" type="number" name="attr_medrange"/>
-					<input class="mediumnumber shortnumber" type="number" name="attr_longrange"/>
-					<input class="smallnumber shortnumber" type="number" name="attr_ROF"/>
-					<input class="mediumnumber shortnumber" type="number" name="attr_Ammo"/>
-				<!-- roll buttons with roll queries -->
-					<button class="d6-dice rollmod" name="roll_attack" type="roll" value="&{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}">Atk</button>
-					<button class="d6-dice rollmod-no" name="roll_attack" type="roll" value="&{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}">Atk</button>
-
-		
-					<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_attack-w" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
-					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_attack-w" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
-
-					<button class="d6-dice" name="roll_dmg" type="roll" value="&{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}">Dmg</button>
-					<button class="d6-dice gmroll gmroll-hide" name="roll_dmg-w" type="roll" value="/w gm &{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span>Dmg</button>								
-				</fieldset>
-			<table>
-				<tr>
-					<td style="width:200px"><label>Armor</label></td>
-					<td style="width:80px">Physical</td>
-					<td style="width:80px">Energy</td>
-					<td style="width:180px">Other</td>
-					<td style="width:180px">Damage Soak Rolls</td>
-				</tr>
-			</table>
-				<fieldset class="repeating_armors">
-					<input class="skilltext" type="text"  style="width:200px" name="attr_armorname"/>
-					<input type="number" name="attr_armorPhDice" class="smallnumber shortnumber" min="0" value="1"/>D+<input type="number" name="attr_armorPhPip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-					<input type="number" name="attr_armorEnDice" class="smallnumber shortnumber" min="0" value="1"/>D+<input type="number" name="attr_armorEnPip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-					<input class="skilltext" type="text" name="attr_armor_other"/>
-					<button class="d6-dice rollmod-no physical" name="roll_dmg_soak_en" type="roll" value="&{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +1d6@{wilddie}]]}}">t</button>
-					<button class="d6-dice rollmod-no energy" name="roll_dmg_soak_ph" type="roll" value="&{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} +1d6@{wilddie}]]}}">e</button>
-					<button class="d6-dice rollmod-no" name="roll_dmg_soak_str" type="roll" value="&{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs0 +@{strengthpip} +1d6@{wilddie}]]}}">Str only</button>
-
-					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="roll_dmg_soak_en-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 +@{strengthpip} + @{armorPhPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
-					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="roll_dmg_soak_ph-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 +@{strengthpip} + @{armorEnPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
-					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_dmg_soak_str-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs0 +@{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>
-
-					<button class="d6-dice rollmod physical" name="roll_dmg_soak_en" type="roll" value="&{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">t</button>
-					<button class="d6-dice rollmod energy" name="roll_dmg_soak_ph" type="roll" value="&{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">e</button>
-					<button class="d6-dice rollmod" name="roll_dmg_soak_str" type="roll" value="&{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">Str only</button>
-
-					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="roll_dmg_soak_en-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
-					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="roll_dmg_soak_ph-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} +?{Dice mods|0} -1)d6cf0cs0  +@{strengthpip} +@{armorEnPip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
-					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_dmg_soak_str-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>		  
-				</fieldset>
-		</div>
-
-	<!-- ------------------------------------------------ Force Section ----------------------------- -->
-
-		<div class="section force-hide pc npc"> 
-			<label style="text-align: center">Force Section</label>
-			<div class='3colrow'>
-				<div class='col'>
-					<table style="width:280px"><th><label>Force Skills</label></th>
-						<tr><!--Control -->
-							<td class="tdborder">
-								<div class="bold">
-									<button class="d6-dice rollmod forcebutton" name="roll_force_control" type='roll' value='&{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Control</button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_control" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
-
-									<button class="d6-dice rollmod-no forcebutton" name="roll_force_control" type='roll' value='&{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}'>Control</button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_control-w" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
-									<div class="bold" style="float:right;">
-										<input type="number" name="attr_control" class="smallnumber"  min="0" value="0"/>D+<input type="number" name="attr_controlpip" class="pipnumber" min="0" max="2" value="0"/>
-									</div>
-								</div>
-								<fieldset class="repeating_controlpowers">  <!---Control Powers --->      
-									<button class="d6-dice rollmod" name="roll_force_control_p" type="roll" value="&{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_control_p-w" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-									<button class="d6-dice rollmod-no" name="roll_force_control_p" type="roll" value="&{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_control_p-w" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-									<input class="skilltext" type="text" name="attr_controlpowername"/> 
-								</fieldset>								
-							</td>
-						</tr>
-						<tr><!-- Sense -->
-							<td class="tdborder">
-								<div class="bold">
-									<button class="d6-dice rollmod forcebutton" name="roll_force_sense" type='roll' value='&{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Sense</button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_sense-w" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
-
-									<button class="d6-dice rollmod-no forcebutton" name="roll_force_sense" type='roll' value='&{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'>Sense</button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_sense-w" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
-									<div class="bold" style="float:right;">
-										<input type="number" name="attr_sense" class="smallnumber" style="margin-left=100px;"  min="0" value="0"/>D+<input type="number" name="attr_sensepip" class="pipnumber" min="0" max="2" value="0"/>
-									</div>
-								</div>
-								<fieldset class="repeating_sensepowers">  <!---Sense Powers --->      
-									<button class="d6-dice rollmod" name="roll_force_sense_p" type="roll" value="&{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_sense_p-w"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-									<button class="d6-dice rollmod-no" name="roll_force_sense_p" type="roll" value="&{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_sense_p-w"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-									<input class="skilltext" type="text" name="attr_sensepowername"/> 
-								</fieldset>
-							</td>
-						</tr>
-						<tr><!-- Alter -->
-							<td class="tdborder">
-								<div class="bold">
-									<button class="d6-dice rollmod forcebutton" name="roll_force_alter" type='roll' value='&{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Alter</button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_alter-w"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
-
-									<button class="d6-dice rollmod-no forcebutton" name="roll_force_alter" type='roll' value='&{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up}-1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'>Alter</button>
-									<button class="d6-dice rollmod-no  gmroll gmroll-hide" name="roll_force_alter-w"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up}-1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
-									<div class="bold" style="float:right;">
-										<input type="number" name="attr_alter" class="smallnumber" min="0" value="0"/>D+<input type="number" name="attr_alterpip" class="pipnumber" min="0" max="2" value="0"/>
-									</div>
-								</div>
-								<fieldset class="repeating_alterpowers">  <!---Alter Powers --->      
-									<button class="d6-dice rollmod"  type="roll" name="roll_force_alter_p" value="&{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 + @{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_alter_p-w"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-
-									<button class="d6-dice rollmod-no"  type="roll" name="roll_force_alter_p" value="&{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_alter_p-w"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-									<input class="skilltext" type="text" name="attr_alterpowername"/> 
-								</fieldset>
-							</td>
-						</tr>
-					</table>
-				</div>
-				<div class='col'><!-- Force Power Trackers -->
-					<table style="position:relative;left:30px"><th><label>Force Powers Active</label></th>
-						<tr><td><!---Force Emptiness --->
-								<span style="padding-top:8px; padding-bottom:12px;" title="Force Emptiness adds +6 pips to all force skill rolls when active. Bonus is reduced by 1 for every DSP">Force Emptiness active</span><!---Force Emptiness adds +6 pips to all force skill rolls when active --->
-									<select name="attr_Force_Emptiness" class="smallselect">
-									  <option value="false" selected="selected">No</option>
-									  <option value="true">Yes</option>
-									</select>
-						</td></tr>
-						<tr><td><!---Force Powers active --->
-							<span>Resist Pain active<!---Reduces Wound penalties to -1. Doesn't need to be counted on the tracker below --->
-								<select name="attr_PainResist" class="smallselect" title="Reduces Wound penalties to -1. Doesn't need to be counted on the tracker below">
-								  <option value="false" selected="selected">No</option>
-								  <option value="true">Yes</option>
-								</select>
-							</span>
-						</td></tr>
-						<tr><td><!---Force Powers active --->
-							<span># of other powers active<!---gives penalty to all rolls thanks to concentration/distraction --->
-								<select name="attr_Force_Up" class="smallselect" title="The number of power active is subtracted from all roll as a Multiple Action Penalty. Above Force Pain doesn't need to be added">
-								  <option value="0" selected="selected">0</option>
-								  <option value="-1">1</option>
-								  <option value="-2">2</option>
-								  <option value="-3">3</option>
-								  <option value="-4">4</option>
-								  <option value="-5">5</option>
-								</select>
-							</span>
-						</td></tr>
-					</table>
-				</div>
-				<div class='col'><!-- Force Power list -->
-						<label style="padding-top:8px; padding-bottom:12px;" >Force Powers</label>
-						<textarea name="attr_forcePowers" style="width:95%;height:24em"></textarea>
-				</div>
-			</div>
-			<br>
-			<br>
-			<div class='col'>
-					<span style="padding-top:8px; padding-bottom:12px;" >Lightsaber Combat
-						<input class="skilltext" type="text" name="attr_lightsaberskill" value="lightsaber"/>
-						<input type="number" name="attr_lightsaberskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_lightsaberskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-						<button class="d6-dice rollmod" name="roll_lc_attack" type="roll" value="&{template:default} {{name=@{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} +@{sense} +?{Dice mods|0} -1)d6cf0cs0 + @{lightsaberskillpip} +@{Force_EmptinessMod} +@{sensepip} +?{Other Mods(pip)|0} +(1d6@{wilddie})]]}}">LC Attack</button>
-						<button class="d6-dice rollmod-no" name="roll_lc_attack" type="roll" value="&{template:default} {{name=@{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} +@{sense} -1)d6cf0cs0 + @{lightsaberskillpip} +@{Force_EmptinessMod} +@{sensepip} +(1d6@{wilddie})]]}}">LC Attack</button>
-						<input type="number" name="attr_lightsaberdamagedice" class="smallnumber shortnumber" min="1" value="6"/>D+<input type="number" name="attr_lightsaberdamagepip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-						<button class="d6-dice rollmod" name="roll_lc_dmg" type="roll" value="&{template:default} {{name=@{lightsaberskill} damage}} {{Roll=[[(@{lightsaberdamagedice} +?{Dice mods|0} -1)d6cf0cs0  +@{lightsaberdamagepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +(1d6@{wilddie})]]}}">LC Damage</button>
-						<button class="d6-dice rollmod-no" name="roll_lc_dmg" type="roll" value="&{template:default} {{name=@{lightsaberskill} damage}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs0 +@{lightsaberdamagepip} +@{Force_EmptinessMod} +(1d6@{wilddie})]]}}">LC Damage</button>
-					</span>		
-			</div>
-		</div>
-
-	<!-- ---------------------------------------------------------- Equipment PC ------------------------------------------- -->
-
-		<div class="section equipment-hide pc shop-inventory"> 
-				<label style="text-align: center;">Equipment</label>
-				<table style="width:97%">
-					<tr>
-						<td style="text-align: right;">
-							<textarea name="attr_geartext1"></textarea>
-							<textarea name="attr_geartext2"></textarea>
-						</td>
-						<td style="text-align: center;">
-							<textarea name="attr_geartext3"></textarea>
-							<textarea name="attr_geartext4"></textarea>
-						</td>
-						<td style="text-align: Left;">
-							<textarea name="attr_geartext5"></textarea>
-							<textarea name="attr_geartext6"></textarea>
-						</td>
-					</tr>
-				</table>
-		</div>
-
-	<!-- ---------------------------------------------------------- Equipment NPC ------------------------------------------- -->
-
-		<div class="section equipment-hide npc" >
-				<label style="text-align: center">Equipment</label>
-				<textarea style="height:7em;width:96%" name="attr_geartext1"></textarea>
-		</div>
-
-
-	<!-- ---------------------------------------------------------- Background & extended info------------------------------------ -->
-
-		<div class="section background-hide pc npc">
-			<label style="text-align: center">Background and extended info</label>
-			<table>
-				<tr>
-					<td style="width:33.33%;"><label>Background</label>
-						<div>
-							<textarea name="attr_background"></textarea>
-						</div>
-					</td>
-					<td style="width:33.33%;">
-						<label>Personality</label>
-						<div>
-							<textarea name="attr_personality"></textarea>
-						</div>
-					</td>
-					<td style="width:33.33%;">
-						<label>Objectives</label>
-						<div>
-							<textarea name="attr_objectives"></textarea>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<label>Quotes</label>
-						<div>
-							<textarea name="attr_quotes"></textarea>
-						</div>
-					</td>
-					<td>
-						<label>Connections to other characters</label>
-						<div>
-							<textarea name="attr_connections"></textarea>
-						</div>
-					</td>
-					<td>
-						<label>Additional Notes</label>
-						<div>
-							<textarea name="attr_notes"></textarea>
-						</div>
-					</td>
-				</tr>
-			</table>
-		</div>
-
-	<!-- --------------------------------------------------Character Point tracking------------------------------------ -->
-
-	<div class="section cptracker-hide pc">
-		<label>Character Point Tracker</label>
-		<span class="bold">Character Point Balance:</span>
-		<span class="num" name="attr_cp_spent"></span>
-		<fieldset class="repeating_cptable">
-				<div style="padding-top: 8px;">
-					<input type="text" name="attr_cp_desc" style="width:80%;">
-					<input type="number" name="attr_cp_amount">
-				</div>
-		</fieldset>
-	</div>
-
-	<!-- ---------------------------------------------------------- Credit tracking------------------------------------ -->
-
-	<div class="section credittracker-hide pc">
-		<label>Credit Tracker</label>
-		<span class="bold">Credit Balance:</span>
-		<span class="num credits" name="attr_credit_spent"></span>
-		<fieldset class="repeating_credittable">
-			<div style="padding-top: 8px;">
-				<input type="text" name="attr_credit_desc" style="width:80%;">
-				<input type="number" name="attr_credit_amount" style="width:100px;">
-			</div>
-		</fieldset>
-	</div>
-
-	<!-- ---------------------------------------------------------- Ship Core info------------------------------------ -->
-
-
-        <div class="section ship shipheader">
-            <span class="bold">Starship:<input type="text" name="attr_ship_name"></span>
-            <span class="bold">Scale:<input type="text" name="attr_ship_scale" ></span>
-            <span class="bold">Length:<input type="text" name="attr_ship_length" ></span>
+  <!-- The "Settings Menu" Cog Icon -->
+  <input class="main-options options-flag" name="attr_options-flag" type="checkbox"><span class="left">y</span>
+
+  <!-- Shows which sheet type is selected -->
+  <div class="main-settings" style="height:1em;text-align:right;float:right;"><h2>Settings</h2></div>
+  <div class="main-container sheettype-title pc right"><h2>Player Sheet</h2></div>
+  <div class="main-container sheettype-title npc right"><h2>NPC Sheet</h2></div>
+  <div class="main-container sheettype-title ship right"><h2>Ship</h2></div>
+  <div class="main-container sheettype-title shop-inventory right"><h2>Shop/Container</h2></div>
+
+  <div class="version-top"><p name="attr_version"></p></div>
+
+  <!--  LOGO and dice images -->
+  <div class="logo">
+    <img alt="logo" class="logo"
+         src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/D6StarWars/logo.png" title="This is where the fun begins."/>
+  </div>
+
+  <!-- ---------------------------------------------- SETTINGS MENU ------------------------------------------------- -->
+
+  <div class="main-settings container" style="padding-top:67px">
+    <div class="section" style="width:850px">
+
+      <!-- Sheet type -->
+      <div class="input-row top-row bold">
+        <span
+            title="Shows a more dense statblock for NPCs. Equipment sections uses the first field from the PC version">Sheet type: </span>
+        <select name="attr_sheettype" style="width:90px;">
+          <option selected="selected" value="0">PC</option>
+          <option value="1">NPC</option>
+          <option value="2">Ship</option>
+          <option value="3">Container</option>
+        </select>
+      </div>
+
+      <!-- GM roll toggle -->
+      <div class="input-row top-row bold">
+        <span title="Hides the GM rolls. They are like regular rolls but whispered to the GM">Hide GM Rolls?</span>
+        <input name="attr_gmrollswitch" type="checkbox" value="1">
+      </div>
+
+      <!-- dice roll toggle -->
+      <div class="input-row top-row bold">
+        <span title="If checked, rolls don't ask for roll modifiers and rolls right away when selected.">Disable roll modification query when rolling?</span>
+        <input name="attr_rollmodswitch" type="checkbox" value="1">
+      </div>
+
+      <!-- Wild Die toggle -->
+      <div class="input-row top-row bold">
+        <span title="If Wild Die isn't used, the die rolls wont explode or highlight critical successes nor failures">Use Wild Die in rolls?</span>
+        <select name="attr_wilddie" style="width: 70px;">
+          <option selected="selected" value="!cf1cs6">Yes</option>
+          <option value="cf0cs0">No</option>
+        </select>
+      </div>
+
+      <!-- Few optional sections to hide -->
+      <div class="input-row top-row bold">
+        <span title="Useful for those who are not Force-sensitive">Hide/Show Sections:</span>
+      </div>
+      <div class="input-row top-row bold">
+        <span title="Useful for those who are not Force-sensitive">Hide Force Section? <input name="attr_forceswitch"
+                                                                                              type="checkbox" value="1"></span>
+      </div>
+      <div class="input-row top-row bold">
+        <span>Hide Equipment Section? </span>
+        <input name="attr_equipmentswitch" type="checkbox" value="1">
+      </div>
+      <div class="input-row top-row bold">
+        <span>Hide Background Section? </span>
+        <input name="attr_backgroundswitch" type="checkbox" value="1">
+      </div>
+      <div class="input-row top-row bold">
+        <span>Hide Character Point Summary Section? </span>
+        <input checked="checked" name="attr_cpswitch" type="checkbox" value="1">
+      </div>
+      <div class="input-row top-row bold">
+        <span>Hide Credit Summary Section? </span>
+        <input checked="checked" name="attr_creditswitch" type="checkbox" value="1">
+      </div>
+    </div>
+  </div>
+
+  <!--  ---------------------------------------------- MAIN SHEET --------------------------------------------------- -->
+
+  <div class="main-container container" style="padding-top:75px">
+
+    <!-- --------------------------------------------- Player Core info -------------------------------------------- -->
+
+    <div class="section pc">
+      <div class="sheet-2colrow">
+        <div class="sheet-col lineblck">
+          <label class="toppad">Character Name <input class="right reduce-padd 60p" name="attr_charactername"
+                                                      type="text"/></label>
+          <label class="toppad">Type <input class="right reduce-padd 60p" name="attr_type" type="text"/></label>
+          <label class="toppad">Species <input class="right reduce-padd 60p" name="attr_species" type="text"/></label>
+
+          <div class="physical-params">
+            <label class="toppad">Age <input class="smalltext reduce-padd" name="attr_age" type="text"/></label>
+            <label class="toppad">Height <input class="smalltext reduce-padd" name="attr_height" type="text"/></label>
+            <label class="toppad">Weight <input class="smalltext reduce-padd" name="attr_weight" type="text"/></label>
+            <label class="toppad">Gender <input class="mediumtext reduce-padd" name="attr_gender" type="text"/></label>
+          </div>
+        </div>
+        <div class="sheet-col">
+          <label>Physical Description
+            <textarea class="description-phys" name="attr_Physical_Description"></textarea>
+          </label>
+          <label>Credits <input class="credits totalcredits" min="0" name="attr_credits" type="number"/></label>
+        </div>
+      </div>
+    </div>
+
+    <!-- ------------------------------------------- Player Secondary Info ----------------------------------------- -->
+
+    <div class="section pc">
+      <div class="sheet-3colrow">
+        <div class="sheet-col">
+          <label class="areaLabel">Special Abilities</label>
+          <textarea class="specabilities" name="attr_specialAbilities"></textarea>
+        </div>
+        <div class="sheet-col">
+          <label>Move <input class="p60" min="0" name="attr_move" type="number" value="10"/></label>
+          <label>Force Sensitive?
+            <select class="smallselect" name="attr_forceSensitive">
+              <option value="1">Yes</option>
+              <option selected="selected" value="0">No</option>
+            </select>
+          </label>
+          <label>Force Points <input class="p60" min="0" name="attr_forcePoints" type="number" value="1"/></label>
+          <!---On char creation everyone starts with 1 FP --->
+          <label>Dark Side Points <input class="p60" min="0" name="attr_darkSidePoints" type="number"
+                                         value="0"/></label>
+          <label>Character Points <input class="p60" min="0" name="attr_characterPoints" type="number"
+                                         value="0"/></label> <!---On char creation everyone starts with 5 CP --->
+          <label class="wound" style="padding-top: 20px">Wound Level
+            <select class="mediumselect left wound" name="attr_WoundLevel">
+              <option selected="selected" value="0">Healthy</option>
+              <option value="1">Stunned</option>
+              <option value="1">Wounded</option>
+              <option value="2">Wounded Twice</option>
+              <option value="5">Incapacitated</option>
+              <!-- You shouldn't even be able to make checks while incapacitated or Mortally wounded, hence -5. -->
+              <option value="5">Mortally Wounded</option>
+            </select>
+          </label>
+        </div>
+        <div class="sheet-col">
+          <table class="custom-roll-table">
+            <tr>
+              <th class="init">Initiative bonus</th>
+              <td colspan="2" class="init">
+                <input class="init" min="0" name="attr_initiative" type="number" value="0"/>D+<input class="init" max="2" min="0" name="attr_initiativepip" type="number" value="0"/>
+              </td>
+            </tr>
+            <tr></tr>
+            <tr>
+              <th>Initiative</th>
+              <td>
+                <button class="d6-dice rollmod" name="roll_init" type="roll"
+                        value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie} &{tracker}]]}}"></button>
+                <button class="d6-dice rollmod-no" name="roll_initnomod" type="roll"
+                        value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + 1d6@{wilddie} &{tracker}]]}}"></button>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <th>Custom Roll</th>
+              <td>
+                <button class="d6-dice" name="roll_customroll" type="roll"
+                        value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"></button>
+              </td>
+              <td>
+                <button class="d6-dice gmroll-hide" name="roll_customroll-w" type="roll"
+                        value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}">
+                  <span class="redtxt">(GM)</span></button>
+              </td>
+            </tr>
+            <tr>
+              <th>Extra Dice</th>
+              <td>
+                <button class="d6-dice" name="roll_extraroll" type="roll"
+                        value="&{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}"></button>
+              </td>
+              <td>
+                <button class="d6-dice gmroll-hide" name="roll_extraroll-w" type="roll"
+                        value="/w gm &{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}">
+                  <span class="redtxt">(GM)</span></button>
+              </td>
+            </tr>
+            <tr>
+              <th>Char Points Roll</th>
+              <td>
+                <button class="d6-dice" name="roll_charptroll" type="roll"
+                        value="&{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}"></button>
+              </td>
+              <td>
+                <button class="d6-dice gmroll-hide" name="roll_charptroll-w" type="roll"
+                        value="/w gm &{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}">
+                  <span class="redtxt">(GM)</span></button>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </div>
+
+    <!-- ---------------------------------------------- NPC info block --------------------------------------------- -->
+
+    <div class="section npc">
+      <div class="sheet-2colrow">
+        <div class="sheet-col first-col">
+          <label class="toppad">NPC Name <input class="right reduce-padd npcname" name="attr_charactername"
+                                                type="text"></label>
+          <label class="wound">Wound Level
+            <select class="mediumselect left wound" name="attr_WoundLevel">
+              <option selected="selected" value="0">Healthy</option>
+              <option value="1">Stunned</option>
+              <option value="1">Wounded</option>
+              <option value="2">Wounded Twice</option>
+              <option value="5">Incapacitated</option>
+              <!--You shouldn't even be able to make checks while incapacitated or Mortally wounded, hence -15. Later will include option to ignore wound penalties -->
+              <option value="5">Mortally Wounded</option>
+            </select>
+          </label>
+          <label>Initiative bonus<input class="init" min="0" name="attr_initiative" type="number"
+                                        value="0">D+<input class="init" max="2"
+                                                           min="0" name="attr_initiativepip" type="number"
+                                                           value="0"></label>
+          <button class="d6-dice rollmod-no" name="roll_init_n" type="roll"
+                  value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + 1d6@{wilddie} &{tracker}]]}}">
+            Initiative
+          </button>
+
+          <button class="d6-dice rollmod" name="roll_init_n" type="roll"
+                  value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie} &{tracker}]]}}">
+            Initiative
+          </button>
+          <button class="d6-dice" name="roll_customroll_n" type="roll"
+                  value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}">
+            Custom Roll(no mods)
+          </button>
+          <button class="d6-dice gmroll-hide" name="roll_customroll_n-w" type="roll"
+                  value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}">
+            <span class="redtxt">(GM)</span>C Roll
+          </button>
+        </div>
+        <div class="sheet-col">
+          <label>Physical Description & Other Info</label>
+          <textarea class="description" name="attr_Physical_Description"></textarea>
+        </div>
+      </div>
+    </div>
+
+    <div class="section shop-inventory">
+      <label><input name="attr_containername" type="text"></label>
+    </div>
+
+    <!-- --------------------------------------------- Attributes&Skills ------------------------------------------- -->
+
+    <div class="section pc npc" style="width: 830px;">
+      <label class="txtcenter">Attributes & Skills</label>
+      <div class="flex-box">
+        <div class="flex-col">
+
+          <div id="attributes-dex" class="attributes">
+            <div class="attribute">
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Dexterity</label>
+              <input type="number" name="attr_dexterity" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_dexteritypip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            </div>
+
+            <fieldset class="repeating_dexskills">
+            <div class="skill">
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">
+                <input type="text" name="attr_dexskillname" list="dexskills">
+              </label>
+              <input type="number" name="attr_dexskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice-middle">D+</div>
+              <input type="number" name="attr_dexskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            </div>
+            </fieldset>
+          </div>
+
+          <div id="attributes-know" class="attributes">
+            <div class="attribute">
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Knowledge</label>
+              <input type="number" name="attr_knowledge" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_knowledgepip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            </div>
+
+            <fieldset class="repeating_knowskills">
+              <div class="skill">
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input type="text" name="attr_knowskillname" list="knowskills">
+                </label>
+                <input type="number" name="attr_knowskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <div class="unified-dice-middle">D+</div>
+                <input type="number" name="attr_knowskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              </div>
+            </fieldset>
+          </div>
+
+          <div id="attributes-mech" class="attributes">
+            <div class="attribute">
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Mechanical</label>
+              <input type="number" name="attr_mechanical" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_mechanicalpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            </div>
+
+            <fieldset class="repeating_mechskills">
+              <div class="skill">
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input type="text" name="attr_mechskillname" list="mechskills">
+                </label>
+                <input type="number" name="attr_mechskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <div class="unified-dice-middle">D+</div>
+                <input type="number" name="attr_mechskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              </div>
+            </fieldset>
+          </div>
         </div>
 
+        <div class="flex-col">
 
-		<div class="section ship shipblock">
-            <div class="price wborder">
-                <label>Pricing:</label>
-                <label>Introduction Era</label>
-                <div class="priceblock wborder">
-                    <div class="flex-row">
-                        <span>Era</span>
-                        <input name="attr_intro_era_name" type="text">
-                    </div>
-                    <div class="flex-row">
-                        <span>New</span>
-                        <input name="attr_intro_era_price_new" type="text">
-                    </div>
-                    <div class="flex-row">
-                        <span>Used</span>
-                        <input name="attr_intro_era_price_used" type="text">
-                    </div>
-                </div>
-                <label>Current Era:</label>
-                <div class="priceblock wborder">
-                    <div class="flex-row">
-                        <span>Era</span>
-                        <input name="attr_current_era_name" type="text">
-                    </div>
-                    <div class="flex-row">
-                        <span>Reproduction</span>
-                        <input name="attr_current_era_reproduction" type="text">
-                    </div>
-                    <div class="flex-row">
-                        <span>New-Old-Stock</span>
-                        <input name="attr_current_era_new_old" type="text">
-                    </div>
-                    <div class="flex-row">
-                        <span>Restored</span>
-                        <input name="attr_current_era_price_restored" type="text">
-                    </div>
-                    <div class="flex-row">
-                        <span>Used</span>
-                        <input name="attr_current_era_price_used" type="text">
-                    </div>
-                </div>
+          <div id="attributes-perc" class="attributes">
+            <div class="attribute">
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Perception</label>
+              <input type="number" name="attr_perception" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_perceptionpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
             </div>
 
-            <div class="perf wborder">
-                <label class="title">Performance</label>
-                <div class="perf-block">
-                    <div class="flex-col wborder" style="margin-right: 7px;">
-                        <label style="width:80px;">Crew Station:</label>
-                        <input name="attr_crew_station_performance" type="text" class="medium">
-                    </div>
-                    <div class="flex-col">
-                        <label>Maneuverability:</label>
-                        <input name="attr_maneuverability" type="text" class="medium">
-                    </div>
-                    <div class="flex-col">
-                        <label>Move(Space Units)</label>
-                        <input name="attr_ship_space" type="text" class="medium">
-                    </div>
-                    <div class="flex-col">
-                        <label>Move(Ground units)</label>
-                        <input name="attr_ship_ground" type="text" class="medium">
-                    </div>
-                    <div class="flex-col">
-                        <label>Speed(Athmospheric)</label>
-                        <input name="attr_ship_athmosphere" type="text" class="medium">
-                    </div>
-                </div>
+            <fieldset class="repeating_perckills">
+              <div class="skill">
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input type="text" name="attr_perckillname" list="perskills">
+                </label>
+                <input type="number" name="attr_perckilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <div class="unified-dice-middle">D+</div>
+                <input type="number" name="attr_perckillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              </div>
+            </fieldset>
+          </div>
+
+          <div id="attributes-str" class="attributes">
+            <div class="attribute">
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Strength</label>
+              <input type="number" name="attr_strength" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_strengthpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
             </div>
 
-            <div class="sensor wborder">
-                <label>Sensors</label>
-                <div class="flex-row">
-                    <div class="wborder">
-                        <label>Crew Station</label>
-                        <input name="attr_crew_station_sensors" type="text" class="medium">
-                    </div>
-                    <div class="grid">
-                        <div></div><!-- empty placeholder in the grid-->
-                        <span>Search</span>
-                        <span>Scan</span>
-                        <span>Passive</span>
-                        <span>Focus</span>
+            <fieldset class="repeating_strskills">
+              <div class="skill">
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input type="text" name="attr_strskillname" list="strskills">
+                </label>
+                <input type="number" name="attr_strskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <div class="unified-dice-middle">D+</div>
+                <input type="number" name="attr_strskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              </div>
+            </fieldset>
+          </div>
 
-                        <span>Range</span>
-                        <input type="number" name="attr_sensor_search" class="smallnumber"/>
-                        <input type="number" name="attr_sensor_scan" class="smallnumber"/>
-                        <input type="number" name="attr_sensor_passive" class="smallnumber"/>
-                        <input type="number" name="attr_sensor_focus" class="smallnumber"/>
+          <div id="attributes-tech" class="attributes">
+            <div class="attribute">
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-                        <span>Sensitivity</span>
-                        <input type="number" name="attr_sensor_search_max" class="smallnumber"/>
-                        <input type="number" name="attr_sensor_scan_max" class="smallnumber"/>
-                        <input type="number" name="attr_sensor_passive_max" class="smallnumber"/>
-                        <input type="number" name="attr_sensor_focus_max" class="smallnumber"/>
-                    </div>               
-                </div>
-            </div>
-            
-            <div class="hyperdrive wborder">
-                <label>Hyperdrive System</label>
-                <div class="wborder">
-                    <div class="wborder crew">
-                        <label>Crew Station</label>
-                        <input name="attr_crew_station_hyperdrive" type="text" class="medium">
-                    </div>
-                    <div class="hyper-grid">
-                        <label>Astrogation System</label>
-                        <label>Hyperdrive Integration</label>
-                        <label>Hyperdrive Rating</label>
-                        
-                        <input name="attr_astrogation_system" type="text">
-                        <input name="attr_hyperdrive_integration" type="text">
-                        <input name="attr_hyperdrive_rating" type="text">
-
-                        <label>Astromech</label>
-                        <label>Jump Route Capacity</label>
-                        <label>Kilo-Parsecs / Hour</label>
-
-                        <input name="attr_astromech" type="text">
-                        <input name="attr_jump_capacity" type="text">
-                        <input name="attr_parsec_speed" type="text">
-                    </div>
-                </div>
-
-            </div>
-            
-            <div class="consume wborder">
-                <div>
-                   <label>Consumables:</label>
-                   <input name="attr_ship_consumables" type="text">
-                </div>
-                
-                <div>
-                    <label>Max:</label>
-                    <input name="attr_ship_consumables_max" type="text">
-                </div>   
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Technical</label>
+              <input type="number" name="attr_technical" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_technicalpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
             </div>
 
-            <div class="dura wborder">
-                <label>Durability:</label>
-                <label>Hull:</label>
-                <label>Shields:</label>
-                <div>
-                	<input name="attr_ship_durability" type="text">
-                </div>
-                <div>
-                	<input name="attr_ship_hull" type="text" >
-                </div>
-                <div>
-                	<input name="attr_ship_shields" type="text">
-                </div>          
-            </div>
-		</div>
+            <fieldset class="repeating_techskills">
+              <div class="skill">
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"></button>
+                <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input type="text" name="attr_techskillname"  list="techskills">
+                </label>
+                <input type="number" name="attr_techskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <div class="unified-dice-middle">D+</div>
+                <input type="number" name="attr_techskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              </div>
+            </fieldset>
+          </div>
 
-	<!-- ---------------------------------------------------------- Ship Weapons------------------------------------ -->
-
-		<div class="section ship">
-			<label>Ship Weapons</label>
-			<fieldset class="repeating_shipweapon">
-				<label class="bold">Weapon Name<input type="text" name="attr_weapon_name"></label>
-				<div style="margin-bottom:10px;">
-					<span>Scale:<input type="text" name="attr_weapon_scale" value="" class="smallnumber"></span>
-					<span>Fire Arc:<input type="text" name="attr_weapon_arc" value="" ></span>
-					<span>Crew:<input type="text" name="attr_weapon_crew" value="" ></span>					
-				</div>
-
-				<div style="margin-bottom:10px;">
-					<span>Skill:<input type="text" name="attr_weapon_skill" value=""></span>
-					<span>Fire Control:<input type="number" name="attr_weapon_fire_control" value="" class="smallnumber"> D</span>
-					<span style="margin-left: 15px;">Space Range:<input type="number" name="attr_weapon_range_space" value="" class="mediumnumber"></span>
-					<span>Atmosphere Range:<input type="number" name="attr_weapon_range_atmosphere" value="" class="smallnumber"></span>
-				</div>
-
-				<div style="margin-bottom:10px;">
-					<span>Damage:<input type="number" name="attr_weapon_damage" value="3" class="smallnumber">D+<input type="number" name="attr_weapon_damage_pip" value="0" class="smallnumber"> <button type="roll" class="d6-dice" name="roll_ship_wpn_dmg" value="&{template:swd6} {{name=Weapon: @{weapon_name} }} {{subtitle=Ship: @{ship_name} }} {{Roll=[[(@{weapon_damage}- 1)d6cf0cs0 + @{weapon_damage_pip} +(1d6@{wilddie})]] damage}}">DMG</button></span>					
-				</div>
-				
-			</fieldset>
-		</div>
-
-<!-- ---------------------------------------------------------- Unused ship stats------------------------------------ -->
-        <div class="section ship">
-            <label>Other stats</label>
-            <div class="other">
-	            <span class="bold">Craft:<input type="text" name="attr_ship_craft"></span>
-	            <span class="bold">Type:<input type="text" name="attr_ship_type"></span>
-	            <span class="bold">Crew:<input type="number" name="attr_ship_crew" class="mediumnumber"></span>        	
-            </div>
-            <div class="other">
-		        <span class="bold">Skill:<input type="text" name="attr_ship_skill"></span>   
-	            <span class="bold">Passangers:<input type="number" name="attr_ship_passangers" class="mediumnumber"></span>
-	            <span class="bold">Cargo Capacity:<input type="text" name="attr_ship_cargo_capacity"></span>            	
-            </div>
-            <div class="other">
-	            <span class="bold">Hyperdrive Multipiler:<input type="text" name="attr_hyperdrive_multi" style="width:90px;"></span>
-	            <span class="bold">Hyperdrive Backup:<input type="text" name="attr_hyperdrive_backup"></span>
-	            <span class="bold">Nav Computer:<input type="text" name="attr_nav_computer"></span>            	
-            </div>
         </div>
-            
+      </div>  <!-- flexbox-->
+    </div>
 
-<!-- -----------------------------------------------Generic Ship&Vehicle section -------------------------------- -->
+    <!-- ---------------------------------------------- Weapons & Armor -------------------------------------------- -->
 
-		<div class="section ship"> 
-			<div class='2colrow'>
-				<div class='col'><!-- Vehicle -->
-						<label style="padding-top:4px;padding-bottom:4px;" >Vehicle</label>
-						<input class="skilltext" type="text"  style="width:95%;padding-bottom:8px;" name="attr_vehiclename"/>
-						<textarea name="attr_vehicle" style="width:97%;height:17em;"></textarea>
-				</div>
-				<div class='col'><!-- Starship -->
-						<label style="padding-top:4px;padding-bottom:4px;" >Starship</label>
-						<input class="skilltext" type="text"  style="width:95%;padding-bottom:8px;" name="attr_starshipname"/>
-						<textarea name="attr_starship" style="width:97%;height:17em;"></textarea>
-				</div>
-			</div>
-		</div>
+    <div class="section pc npc shop-inventory">
+      <label class="txtcenter">Weapon & Armor</label>
+      <div>
+        <div class="weapon sheet-row">
+          <div class="cell cell-name">Weapon</div>
+          <div class="cell cell-dice">Attack</div>
+          <div class="cell cell-dice">Damage</div>
+          <div class="cell cell-4">
+            <div>Range</div>
+            <div class="part" title="Point Blank Range (Very Easy)">PB</div> - <div class="part" title="Short Range (Easy)">S</div> / <div class="part" title="Medium Range (Moderate)">M</div> / <div class="part" title="Long Range (Difficult)">L</div>
+          </div>
+          <div class="cell cell-1"><abbr title="Rate of Fire">ROF</abbr></div>
+          <div class="cell cell-1">Ammo</div>
+        </div>
 
-<!-- ----------- footer -------------------- -->
+        <fieldset class="repeating_weapons">
+          <div class="weapon sheet-row skill">
+            <div class="cell cell-name">
+              <label class="unified-dice unified-dice-text">
+                <input name="attr_weapon" type="text" class="name">
+              </label>
+            </div>
+            <div class="cell cell-dice">
+              <input name="attr_weaponskill" type="number" min="0" value="0" class="unified-dice unified-dice-input"/>D+<input name="attr_weaponskillpip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"></button>
+              <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+            </div>
+            <div class="cell cell-dice">
+              <input name="attr_damagedice" type="number" value="0" min="0" class="unified-dice unified-dice-input"/>D+<input name="attr_damagepip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{damagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{damagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{damagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{damagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}"></button>
+              <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
+            </div>
+            <div class="cell cell-4">
+              <input name="attr_pointblankrange" type="number" min="0" class="unified-dice unified-dice-input txtfield 40px"/>-<input name="attr_shortrange" type="number" min="0" class="unified-dice unified-dice-input txtfield 40px"/>/<input name="attr_medrange" type="number" min="0" class="unified-dice unified-dice-input txtfield 40px"/>/<input name="attr_longrange" type="number" min="0" class="unified-dice unified-dice-input txtfield 40px"/>
+            </div>
+            <div class="cell cell-1"><input name="attr_ROF" type="number" value="1" class="unified-dice unified-dice-input"/></div>
+            <div class="cell cell-1"><input name="attr_Ammo" type="number" value="30" class="unified-dice unified-dice-input"/></div>
+          </div>
+        </fieldset>
+      </div>
 
-	<div class="section" style="text-align: Center; padding-top:10px;"> 
-			<p class="version" style="text-align: center;"><small>Original Author: Timothy O'Driscoll | Main Editor: Andreas J. (Roll20user: 1223200) | </small></p>
-	</div>
-	</div>
+      <div>
+        <div class="armor sheet-row">
+          <div class="cell cell-name">Armor</div>
+          <div class="cell cell-dice">Physical <span class="physical"></span></div>
+          <div class="cell cell-dice">Energy <span class="energy"></span></div>
+          <div class="cell cell-2">Str</div>
+          <div class="cell cell-4">Other</div>
+        </div>
+
+        <fieldset class="repeating_armors">
+          <div class="armor sheet-row skill">
+            <div class="cell cell-name">
+              <label class="unified-dice unified-dice-text">
+                <input name="attr_armorname" type="text"  class="name">
+              </label>
+            </div>
+            <div class="cell cell-dice">
+              <input name="attr_armorPhDice" type="number" min="0" value="0" class="unified-dice unified-dice-input"/>D+<input name="attr_armorPhPip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+            </div>
+            <div class="cell cell-dice">
+              <input name="attr_armorEnDice" type="number" value="0" min="0" class="unified-dice unified-dice-input"/>D+<input name="attr_armorEnPip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <button name="roll_dmg_soak_en" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button name="roll_dmg_soak_en" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} - 1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_dmg_soak_en" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button name="roll_dmg_soak_en" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} - 1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+            </div>
+            <div class="cell cell-2">
+              <button name="roll_dmg_soak_str" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage Soak (Strength Only)}} {{Roll=[[(@{strength} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+              <button name="roll_dmg_soak_str" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage Soak (Strength Only)}} {{Roll=[[(@{strength} - 1)d6cf0cs0 +@{strengthpip} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_dmg_soak_str" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Strength Only)}} {{Roll=[[(@{strength} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button name="roll_dmg_soak_str" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Strength Only)}} {{Roll=[[(@{strength} - 1)d6cf0cs0 +@{strengthpip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+            </div>
+            <div class="cell cell-4">
+              <label class="unified-dice unified-dice-text" style="width: 100%;">
+                <input name="attr_armor_other" type="text"/>
+              </label>
+            </div>
+          </div>
+        </fieldset>
+      </div>
+
+    </div>
+
+    <!-- ----------------------------------------------- Force Section --------------------------------------------- -->
+
+    <div class="section force-hide pc npc">
+      <label class="txtcenter">Force Section</label>
+
+      <div class="flex-box">
+        <div class="flex-col">
+
+          <div id="force-control" class="force attributes">
+            <div class="attribute">
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Control</label>
+              <input type="number" name="attr_control" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_controlpip" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            </div>
+
+            <fieldset class="repeating_controlpowers">
+              <div class="skill">
+                <button name="roll_force_control_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+                <button name="roll_force_control_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button name="roll_force_control_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
+                <button name="roll_force_control_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input name="attr_controlpowername" type="text" />
+                </label>
+                <input name="attr_controlpoweractive" type="checkbox" title="Active" value="1"/>
+              </div>
+            </fieldset>
+          </div>
+
+          <div id="force-sense" class="force attributes">
+            <div class="attribute">
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Sense</label>
+              <input type="number" name="attr_sense" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_sensepip" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            </div>
+
+            <fieldset class="repeating_sensepowers">
+              <div class="skill">
+                <button name="roll_force_sense_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+                <button name="roll_force_sense_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button name="roll_force_sense_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
+                <button name="roll_force_sense_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input name="attr_sensepowername" type="text" />
+                </label>
+                <input name="attr_sensepoweractive" type="checkbox" title="Active" value="1"/>
+              </div>
+            </fieldset>
+          </div>
+
+          <div id="force-alter" class="force attributes">
+            <div class="attribute">
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <label class="unified-dice unified-dice-text">Alter</label>
+              <input type="number" name="attr_alter" min="0" class="unified-dice unified-dice-input"/>
+              <div class="unified-dice unified-dice-middle">D+</div>
+              <input type="number" name="attr_alterpip" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            </div>
+
+            <fieldset class="repeating_alterpowers">
+              <div class="skill">
+                <button name="roll_force_alter_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+                <button name="roll_force_alter_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <button name="roll_force_alter_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
+                <button name="roll_force_alter_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+                <label class="unified-dice unified-dice-text">
+                  <input name="attr_alterpowername" type="text" />
+                </label>
+                <input name="attr_alterpoweractive" type="checkbox" title="Active" value="1"/>
+              </div>
+            </fieldset>
+          </div>
+        </div>
+
+        <div class="flex-col">
+
+          <table class="powers">
+            <tr>
+              <th>Force Emptiness <em title="adds +6 pips to all force skill rolls when active. Bonus is reduced by 1 for every DSP">details</em></th>
+              <td>
+                <input name="attr_Force_Emptiness" type="checkbox" value="true"/>
+              </td>
+            </tr>
+            <tr>
+              <th>Resist Pain <em title="Reduces Wound penalties to -1.">details</em></th>
+              <td>
+                <input name="attr_PainResist" type="checkbox" value="true"/>
+              </td>
+            </tr>
+            <tr>
+              <th>Number of active powers <em title="The number of power active is subtracted from all roll as a Multiple Action Penalty.">details</em></th>
+              <td>
+                <select class="smallselect" name="attr_Force_Up"
+                        title="The number of power active is subtracted from all roll as a Multiple Action Penalty. Above Force Pain doesn't need to be added">
+                  <option selected="selected" value="0">0</option>
+                  <option value="-1">1</option>
+                  <option value="-2">2</option>
+                  <option value="-3">3</option>
+                  <option value="-4">4</option>
+                  <option value="-5">5</option>
+                </select>
+              </td>
+            </tr>
+          </table>
+
+          <h4>Force Powers</h4>
+          <textarea name="attr_forcePowers" class="force-powers-description"></textarea>
+
+        </div>
+      </div>
+
+      <div>
+        <div class="weapon sheet-row">
+          <div class="cell cell-name">Lightsaber combat</div>
+          <div class="cell cell-dice">Attack</div>
+          <div class="cell cell-dice">Damage</div>
+        </div>
+
+        <div class="weapon sheet-row skill">
+          <div class="cell cell-name">
+            <label class="unified-dice unified-dice-text">
+              <input name="attr_lightsaberskill" type="text" value="lightsaber" />
+            </label>
+          </div>
+          <div class="cell cell-dice">
+            <input name="attr_lightsaberskilldice" type="number" min="0" value="0" class="unified-dice unified-dice-input"/>D+<input name="attr_lightsaberskillpip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} + ?{Dice mods|0} -1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} - 1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + 1d6@{wilddie}]]}}"></button>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} + ?{Dice mods|0} -1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} - 1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+          </div>
+          <div class="cell cell-dice">
+            <input name="attr_lightsaberdamagedice" type="number" value="0" min="0" class="unified-dice unified-dice-input"/>D+<input name="attr_lightsaberdamagepip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{lightsaberdamagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"></button>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{lightsaberdamagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs7 + @{lightsaberdamagepip} + (1d6@{wilddie})]]}}"></button>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs7 + @{lightsaberdamagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- ------------------------------------------------ Equipment PC --------------------------------------------- -->
+
+    <div class="section equipment-hide pc shop-inventory">
+      <label class="txtcenter">Equipment</label>
+      <table style="width:97%">
+        <tr>
+          <td style="text-align: right;">
+            <textarea name="attr_geartext1"></textarea>
+            <textarea name="attr_geartext2"></textarea>
+          </td>
+          <td class="txtcenter">
+            <textarea name="attr_geartext3"></textarea>
+            <textarea name="attr_geartext4"></textarea>
+          </td>
+          <td style="text-align: left;">
+            <textarea name="attr_geartext5"></textarea>
+            <textarea name="attr_geartext6"></textarea>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <!-- ------------------------------------------------ Equipment NPC -------------------------------------------- -->
+
+    <div class="section equipment-hide npc">
+      <label class="txtcenter">Equipment</label>
+      <textarea name="attr_geartext1"></textarea>
+    </div>
+
+    <!-- ------------------------------------------- Background & extended info ------------------------------------- -->
+
+    <div class="section background-hide pc npc">
+      <label class="txtcenter">Background and extended info</label>
+      <table>
+        <tr>
+          <td class="33p">
+            <label>Background</label>
+            <div>
+              <textarea name="attr_background"></textarea>
+            </div>
+          </td>
+          <td class="33p">
+            <label>Personality</label>
+            <div>
+              <textarea name="attr_personality"></textarea>
+            </div>
+          </td>
+          <td class="33p">
+            <label>Objectives</label>
+            <div>
+              <textarea name="attr_objectives"></textarea>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <label>Quotes</label>
+            <div>
+              <textarea name="attr_quotes"></textarea>
+            </div>
+          </td>
+          <td>
+            <label>Connections to other characters</label>
+            <div>
+              <textarea name="attr_connections"></textarea>
+            </div>
+          </td>
+          <td>
+            <label>Additional Notes</label>
+            <div>
+              <textarea name="attr_notes"></textarea>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <!-- ---------------------------------------------Character Point tracking ------------------------------------- -->
+
+    <div class="section cptracker-hide pc">
+      <label>Character Point Tracker</label>
+      <span class="bold">Character Point Balance:</span>
+      <span class="num" name="attr_cp_spent"></span>
+      <fieldset class="repeating_cptable">
+        <div>
+          <input name="attr_cp_desc" type="text">
+          <input name="attr_cp_amount" type="number">
+        </div>
+      </fieldset>
+    </div>
+
+    <!-- ------------------------------------------------- Credit tracking ----------------------------------------- -->
+
+    <div class="section credittracker-hide pc">
+      <label>Credit Tracker</label>
+      <span class="bold">Credit Balance:</span>
+      <span class="num credits" name="attr_credit_spent"></span>
+      <fieldset class="repeating_credittable">
+        <div>
+          <input name="attr_credit_desc" type="text">
+          <input name="attr_credit_amount" type="number">
+        </div>
+      </fieldset>
+    </div>
+
+    <!-- ------------------------------------------------- Ship Core info ------------------------------------------ -->
+
+    <div class="section ship shipheader">
+      <span class="bold">Starship:<input name="attr_ship_name" type="text"></span>
+      <span class="bold">Scale:<input name="attr_ship_scale" type="text"></span>
+      <span class="bold">Length:<input name="attr_ship_length" type="text"></span>
+    </div>
+
+    <div class="section ship shipblock">
+      <div class="price wborder">
+        <label>Pricing:</label>
+        <label>Introduction Era</label>
+        <div class="priceblock wborder">
+          <div class="flex-row">
+            <span>Era</span>
+            <input name="attr_intro_era_name" type="text">
+          </div>
+          <div class="flex-row">
+            <span>New</span>
+            <input name="attr_intro_era_price_new" type="text">
+          </div>
+          <div class="flex-row">
+            <span>Used</span>
+            <input name="attr_intro_era_price_used" type="text">
+          </div>
+        </div>
+        <label>Current Era:</label>
+        <div class="priceblock wborder">
+          <div class="flex-row">
+            <span>Era</span>
+            <input name="attr_current_era_name" type="text">
+          </div>
+          <div class="flex-row">
+            <span>Reproduction</span>
+            <input name="attr_current_era_reproduction" type="text">
+          </div>
+          <div class="flex-row">
+            <span>New-Old-Stock</span>
+            <input name="attr_current_era_new_old" type="text">
+          </div>
+          <div class="flex-row">
+            <span>Restored</span>
+            <input name="attr_current_era_price_restored" type="text">
+          </div>
+          <div class="flex-row">
+            <span>Used</span>
+            <input name="attr_current_era_price_used" type="text">
+          </div>
+        </div>
+      </div>
+
+      <div class="perf wborder">
+        <label class="title">Performance</label>
+        <div class="perf-block">
+          <div class="flex-col wborder" style="margin-right: 7px;">
+            <label class="medium">Crew Station:</label>
+            <input class="medium" name="attr_crew_station_performance" type="text">
+          </div>
+          <div class="flex-col">
+            <label>Maneuverability:</label>
+            <input class="medium" name="attr_maneuverability" type="text">
+          </div>
+          <div class="flex-col">
+            <label>Move(Space Units)</label>
+            <input class="medium" name="attr_ship_space" type="text">
+          </div>
+          <div class="flex-col">
+            <label>Move(Ground units)</label>
+            <input class="medium" name="attr_ship_ground" type="text">
+          </div>
+          <div class="flex-col">
+            <label>Speed(Athmospheric)</label>
+            <input class="medium" name="attr_ship_athmosphere" type="text">
+          </div>
+        </div>
+      </div>
+
+      <div class="sensor wborder">
+        <label>Sensors</label>
+        <div class="flex-row">
+          <div class="wborder">
+            <label>Crew Station</label>
+            <input class="medium" name="attr_crew_station_sensors" type="text">
+          </div>
+          <div class="grid">
+            <div></div><!-- empty placeholder in the grid-->
+            <span>Search</span>
+            <span>Scan</span>
+            <span>Passive</span>
+            <span>Focus</span>
+
+            <span>Range</span>
+            <input class="40px" name="attr_sensor_search" type="number"/>
+            <input class="40px" name="attr_sensor_scan" type="number"/>
+            <input class="40px" name="attr_sensor_passive" type="number"/>
+            <input class="40px" name="attr_sensor_focus" type="number"/>
+
+            <span>Sensitivity</span>
+            <input class="40px" name="attr_sensor_search_max" type="number"/>
+            <input class="40px" name="attr_sensor_scan_max" type="number"/>
+            <input class="40px" name="attr_sensor_passive_max" type="number"/>
+            <input class="40px" name="attr_sensor_focus_max" type="number"/>
+          </div>
+        </div>
+      </div>
+
+      <div class="hyperdrive wborder">
+        <label>Hyperdrive System</label>
+        <div class="wborder">
+          <div class="wborder crew">
+            <label>Crew Station</label>
+            <input class="medium" name="attr_crew_station_hyperdrive" type="text">
+          </div>
+          <div class="hyper-grid">
+            <label>Astrogation System</label>
+            <label>Hyperdrive Integration</label>
+            <label>Hyperdrive Rating</label>
+
+            <input name="attr_astrogation_system" type="text">
+            <input name="attr_hyperdrive_integration" type="text">
+            <input name="attr_hyperdrive_rating" type="text">
+
+            <label>Astromech</label>
+            <label>Jump Route Capacity</label>
+            <label>Kilo-Parsecs / Hour</label>
+
+            <input name="attr_astromech" type="text">
+            <input name="attr_jump_capacity" type="text">
+            <input name="attr_parsec_speed" type="text">
+          </div>
+        </div>
+
+      </div>
+
+      <div class="consume wborder">
+        <div>
+          <label>Consumables:</label>
+          <input name="attr_ship_consumables" type="text">
+        </div>
+
+        <div>
+          <label>Max:</label>
+          <input name="attr_ship_consumables_max" type="text">
+        </div>
+      </div>
+
+      <div class="dura wborder">
+        <label>Durability:</label>
+        <label>Hull:</label>
+        <label>Shields:</label>
+        <div>
+          <input name="attr_ship_durability" type="text">
+        </div>
+        <div>
+          <input name="attr_ship_hull" type="text">
+        </div>
+        <div>
+          <input name="attr_ship_shields" type="text">
+        </div>
+      </div>
+    </div>
+
+    <!-- --------------------------------------------------- Ship Weapons ------------------------------------------ -->
+
+    <div class="section ship">
+      <label>Ship Weapons</label>
+      <fieldset class="repeating_shipweapon">
+        <label class="bold">Weapon Name<input name="attr_weapon_name" type="text"></label>
+        <div>
+          <span>Scale:<input class="40px" name="attr_weapon_scale" type="text" value=""></span>
+          <span>Fire Arc:<input name="attr_weapon_arc" type="text" value=""></span>
+          <span>Crew:<input name="attr_weapon_crew" type="text" value=""></span>
+        </div>
+
+        <div>
+          <span>Skill:<input name="attr_weapon_skill" type="text" value=""></span>
+          <span>Fire Control:<input class="40px" name="attr_weapon_fire_control" type="number" value=""> D</span>
+          <span class="range">Space Range:<input class="mediumnumber" name="attr_weapon_range_space" type="number"
+                                                              value=""></span>
+          <span>Atmosphere Range:<input class="40px" name="attr_weapon_range_atmosphere" type="number" value=""></span>
+        </div>
+
+        <div>
+          <span>Damage:
+            <input class="40px" name="attr_weapon_damage" type="number" value="3">D+<input
+              class="smallnumber" name="attr_weapon_damage_pip" type="number" value="0">
+            <button class="d6-dice" name="roll_ship_wpn_dmg" type="roll" value="&{template:swd6} {{name=Weapon: @{weapon_name} }} {{subtitle=Ship: @{ship_name} }} {{Roll=[[(@{weapon_damage}- 1)d6cf0cs0 + @{weapon_damage_pip} +(1d6@{wilddie})]] damage}}">DMG</button>
+          </span>
+        </div>
+
+      </fieldset>
+    </div>
+
+    <!-- ------------------------------------------------- Unused ship stats --------------------------------------- -->
+
+    <div class="section ship">
+      <label>Other stats</label>
+      <div class="other">
+        <span class="bold">Craft:<input name="attr_ship_craft" type="text"></span>
+        <span class="bold">Type:<input name="attr_ship_type" type="text"></span>
+        <span class="bold">Crew:<input class="mediumnumber" name="attr_ship_crew" type="number"></span>
+      </div>
+      <div class="other">
+        <span class="bold">Skill:<input name="attr_ship_skill" type="text"></span>
+        <span class="bold">Passangers:<input class="mediumnumber" name="attr_ship_passangers" type="number"></span>
+        <span class="bold">Cargo Capacity:<input name="attr_ship_cargo_capacity" type="text"></span>
+      </div>
+      <div class="other">
+        <span class="bold p90">Hyperdrive Multipiler:<input name="attr_hyperdrive_multi" type="text"></span>
+        <span class="bold">Hyperdrive Backup:<input name="attr_hyperdrive_backup" type="text"></span>
+        <span class="bold">Nav Computer:<input name="attr_nav_computer" type="text"></span>
+      </div>
+    </div>
+
+    <!-- -----------------------------------------------Generic Ship&Vehicle section ------------------------------- -->
+
+    <div class="section ship">
+      <div class="sheet-2colrow">
+        <div class="sheet-col"><!-- Vehicle -->
+          <label>Vehicle</label>
+          <input class="skilltext" name="attr_vehiclename" type="text"/>
+          <textarea name="attr_vehicle"></textarea>
+        </div>
+        <div class="sheet-col"><!-- Starship -->
+          <label>Starship</label>
+          <input class="skilltext" name="attr_starshipname" type="text"/>
+          <textarea name="attr_starship"></textarea>
+        </div>
+      </div>
+    </div>
+
+    <!-- ------------------------------------------------------- Footer -------------------------------------------- -->
+
+    <div class="section footer">
+      <p><small>Original Author: Timothy O'Driscoll | Main Editor: Andreas
+        J. (Roll20user: 1223200) | </small> <span name="attr_version"></span></p>
+    </div>
+
+  </div>
 </div>
 
+<!-- -------------------------------Hidden Values----------------@{WoundLevel} +@{Pain}----------------------------- -->
 
-<!-- -------------------------------Hidden Values----------------@{WoundLevel} +@{Pain}------------------------------->
-<input type="hidden" name="attr_Force_EmptinessMod" value="0">
-<input type="hidden" name="attr_WoundMod" value="0">
+<input name="attr_Force_EmptinessMod" type="hidden" value="0">
+<input name="attr_WoundMod" type="hidden" value="0">
 
 
-<!----------------------------------------------------- ROLL TEMPLATES --------------------->
+<datalist id="dexskills">
+  <option value="Acrobatics"></option>
+  <option value="Archaic Guns"></option>
+  <option value="Blaster"></option>
+  <option value="Blaster Artillery"></option>
+  <option value="Bowcaster"></option>
+  <option value="Bows"></option>
+  <option value="Brawling Parry"></option>
+  <option value="Contortions"></option>
+  <option value="Dancing"></option>
+  <option value="Dodge"></option>
+  <option value="Firearms"></option>
+  <option value="Grenade"></option>
+  <option value="Lightsaber"></option>
+  <option value="Melee Combat"></option>
+  <option value="Melee Parry"></option>
+  <option value="Missile Weapon"></option>
+  <option value="Pick Pocket"></option>
+  <option value="Running"></option>
+  <option value="Shockball Fling"></option>
+  <option value="Shockball Scoop"></option>
+  <option value="Slingshot"></option>
+  <option value="Thrown Weapons"></option>
+  <option value="Vehicle Blasters"></option>
+  <option value="Wedsphere"></option>
+</datalist>
+<datalist id="knowskills">
+  <option value="Accounting"> </option>
+  <option value="Agriculture"> </option>
+  <option value="Alien Species"> </option>
+  <option value="Artist"> </option>
+  <option value="Brainwashing"> </option>
+  <option value="Bureaucracy"> </option>
+  <option value="Business Administration"> </option>
+  <option value="Business"> </option>
+  <option value="Culinary Arts"> </option>
+  <option value="Cultures"> </option>
+  <option value="Drink Mixology"> </option>
+  <option value="Economics"> </option>
+  <option value="Home Economics"> </option>
+  <option value="Intimidation"> </option>
+  <option value="Languages"> </option>
+  <option value="Law Enforcement"> </option>
+  <option value="Military History"> </option>
+  <option value="Planetary Systems"> </option>
+  <option value="Shockball"> </option>
+  <option value="Streetwise"> </option>
+  <option value="Survival"> </option>
+  <option value="Tactics"> </option>
+  <option value="Traffic Control"> </option>
+  <option value="Torture"> </option>
+  <option value="Value"> </option>
+  <option value="Willpower"> </option>
+</datalist>
+<datalist id="mechskills">
+  <option value="Airship Operation"> </option>
+  <option value="Aquatic Ship Operation"> </option>
+  <option value="Archaic Starship Piloting"> </option>
+  <option value="Astrogation Calculating"> </option>
+  <option value="Beast Handling"> </option>
+  <option value="Beast Riding"> </option>
+  <option value="Capital Ship Gunnery"> </option>
+  <option value="Capital Ship Piloting"> </option>
+  <option value="Capital Ship Shields"> </option>
+  <option value="Ground Vehicle Operation"> </option>
+  <option value="Holorecorder Operation"> </option>
+  <option value="Household Appliance Operation"> </option>
+  <option value="Hover Vehicle Operation"> </option>
+  <option value="Jet Pack Operation"> </option>
+  <option value="Machinery Operation"> </option>
+  <option value="Musical Instrument"> </option>
+  <option value="Powersuit Operation"> </option>
+  <option value="Repulsorlift Operation"> </option>
+  <option value="Sailed Nautical Vessel Operation"> </option>
+  <option value="Sensors Operation"> </option>
+  <option value="Space Transports"> </option>
+  <option value="Starfighter Piloting"> </option>
+  <option value="Starship Gunnery"> </option>
+  <option value="Starship shields"> </option>
+  <option value="Swoop Operation"> </option>
+  <option value="Undersea Vehicle operation"> </option>
+  <option value="Walker Operation"> </option>
+</datalist>
+<datalist id="perskills">
+  <option value="Bargain"> </option>
+  <option value="Command"> </option>
+  <option value="Con"> </option>
+  <option value="Forgery"> </option>
+  <option value="Gambling"> </option>
+  <option value="Cesa"> </option>
+  <option value="Hide"> </option>
+  <option value="Investigation"> </option>
+  <option value="Persuasion"> </option>
+  <option value="Search"> </option>
+  <option value="Singing"> </option>
+  <option value="Sneak"> </option>
+</datalist>
+<datalist id="strskills">
+  <option value="Brawling"></option>
+  <option value="Cleaning"></option>
+  <option value="Climbing/Jumping"></option>
+  <option value="Digging"></option>
+  <option value="Stamina"></option>
+  <option value="Swimming"></option>
+</datalist>
+<datalist id="techskills">
+  <option value="Aquatic Vehicle Engineering"> </option>
+  <option value="Aquatic Vehicle Repair"> </option>
+  <option value="Archaic Gun Repair"> </option>
+  <option value="Armor Design"> </option>
+  <option value="Armor Repair"> </option>
+  <option value="Battle Station Engineering"> </option>
+  <option value="Battle Station Repair"> </option>
+  <option value="Battle Station Weapon Engineering"> </option>
+  <option value="Battle Station Weapon Repair"> </option>
+  <option value="Blaster Artillery Engineering"> </option>
+  <option value="Blaster Repair"> </option>
+  <option value="Blaster Engineering"> </option>
+  <option value="Bowcaster Repair"> </option>
+  <option value="Bow Repair Repairing"> </option>
+  <option value="Capital Ship Engineering"> </option>
+  <option value="Capital Ship Repair"> </option>
+  <option value="Communications Repair"> </option>
+  <option value="Computer Engineering"> </option>
+  <option value="Computer Programming/Repair"> </option>
+  <option value="Construction"> </option>
+  <option value="Cyborg Technology"> </option>
+  <option value="Demolitions"> </option>
+  <option value="Droid Engineering"> </option>
+  <option value="Droid Repair"> </option>
+  <option value="Encryption Securing"> </option>
+  <option value="Engineering"> </option>
+  <option value="Firearms Repair"> </option>
+  <option value="First Aid"> </option>
+  <option value="Ground Vehicle Engineering"> </option>
+  <option value="Ground Vehicle Repair"> </option>
+  <option value="Holorecorder Repair"> </option>
+  <option value="Hover Vehicle Engineering"> </option>
+  <option value="Hover Vehicle Repair"> </option>
+  <option value="Jet Pack Engineering"> </option>
+  <option value="Jet Pack Repair"> </option>
+  <option value="Lightsaber Repair"> </option>
+  <option value="Machinery Repair"> </option>
+  <option value="Medicine Performing"> </option>
+  <option value="Melee Weapon Construction"> </option>
+  <option value="Melee Weapon Repair"> </option>
+  <option value="Musical Instrument Repair"> </option>
+  <option value="Powersuit Repair"> </option>
+  <option value="Prosthetic Design"> </option>
+  <option value="Prosthetic Repair"> </option>
+  <option value="Repulsorlift Engineering"> </option>
+  <option value="Repulsorlift Repair"> </option>
+  <option value="Rocket Pack Repair"> </option>
+  <option value="Sailed Nautical Vessel Repair"> </option>
+  <option value="Security Bypassing"> </option>
+  <option value="Space Transports Engineering"> </option>
+  <option value="Space Transports Repair"> </option>
+  <option value="Starfighter Engineering"> </option>
+  <option value="Starfighter Repair"> </option>
+  <option value="Starship Weapon Engineering"> </option>
+  <option value="Starship Weapon Repair"> </option>
+  <option value="Swoop Engineering"> </option>
+  <option value="Swoop Repair"> </option>
+  <option value="Walker Engineering"> </option>
+  <option value="Walker Repair"> </option>
+</datalist>
+
+
+<!------------------------------------------------------- ROLL TEMPLATES ------------------------------------------- -->
 <!-- new template -->
 
 <rolltemplate class="sheet-rolltemplate-swd6">
   <div class="sheet-container sheet-color-{{color}}">
     <div class="sheet-header">
-      {{#name}}<div class="sheet-name">{{name}} </div>{{/name}}
-      {{#subtitle}}<div class="sheet-subtitle">{{subtitle}}</div>{{/subtitle}}
+      {{#name}}
+      <div class="sheet-name">{{name}}</div>
+      {{/name}}
+      {{#subtitle}}
+      <div class="sheet-subtitle">{{subtitle}}</div>
+      {{/subtitle}}
     </div>
     <div class="sheet-content">
       {{#allprops() title subtitle desc color}}
       <div class="sheet-key">{{key}}</div>
       <div class="sheet-value">{{value}}</div>
       {{/allprops() title subtitle desc color}}
-      {{#desc}}<div class="sheet-desc">{{desc}}</div>{{/desc}}
+      {{#desc}}
+      <div class="sheet-desc">{{desc}}</div>
+      {{/desc}}
     </div>
   </div>
 </rolltemplate>
@@ -943,43 +1260,50 @@
 <!-- old -->
 
 <rolltemplate class="sheet-rolltemplate-blue">
-<table>
+  <table>
     <caption>{{name}}</caption>
     {{#allprops() }}
-       <tr><td>{{key}}</td><td>{{value}}</td>
-    {{/allprops() }}
-</table>
+    <tr>
+      <td>{{key}}</td>
+      <td>{{value}}</td>
+      {{/allprops() }}
+  </table>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-green">
-<table>
+  <table>
     <caption>{{name}}</caption>
     {{#allprops() }}
-       <tr><td>{{key}}</td><td>{{value}}</td>
-    {{/allprops() }}
-</table>
+    <tr>
+      <td>{{key}}</td>
+      <td>{{value}}</td>
+      {{/allprops() }}
+  </table>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-red">
-<table>
+  <table>
     <caption>{{name}}</caption>
     {{#allprops() }}
-       <tr><td>{{key}}</td><td>{{value}}</td>
-    {{/allprops() }}
-</table>
+    <tr>
+      <td>{{key}}</td>
+      <td>{{value}}</td>
+      {{/allprops() }}
+  </table>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-black">
-<table>
+  <table>
     <caption>{{name}}</caption>
     {{#allprops() }}
-       <tr><td>{{key}}</td><td>{{value}}</td>
-    {{/allprops() }}
-</table>
+    <tr>
+      <td>{{key}}</td>
+      <td>{{value}}</td>
+      {{/allprops() }}
+  </table>
 </rolltemplate>
 
-
-<!-- ----------------------------------------------------- Sheet workers -------------------------------------- -->
+<!-- ----------------------------------------------------- Sheet workers ------------------------------------------- -->
 
 <script type="text/worker">
 /* ===== PARAMETERS ==========
@@ -1018,15 +1342,14 @@ on("change:painresist change:woundlevel", function() {
 		setAttrs(update);
 	}
 	else if(values.WoundLevel == "2"){
-		if(values.PainResist == "false"){
-			var update = {};
-			update.WoundMod = "2";
-			setAttrs(update);
-		}
 		if(values.PainResist == "true"){
 			var update = {};
 			update.WoundMod = "1";
 			setAttrs(update);
+		} else {
+		  var update = {};
+			update.WoundMod = "2";
+			setAttrs(update);
 		}
 	}
 	else if(values.WoundLevel == "5"){
@@ -1034,8 +1357,7 @@ on("change:painresist change:woundlevel", function() {
 			var update = {};
 			update.WoundMod = "1";
 			setAttrs(update);
-		}
-		if(values.PainResist == "false"){
+		} else {
 			var update = {};
 			update.WoundMod = "5";
 			setAttrs(update);
@@ -1066,4 +1388,5 @@ on("change:repeating_credittable remove:repeating_credittable", function() {
 on("change:repeating_cptable change:repeating_cptable", function() {
 	repeatingSum("cp_spent", "cptable","cp_amount");
 });
+
 </script>
diff --git a/D6StarWars/sheet.json b/D6StarWars/sheet.json
index 7b6510c8e0..f96cc874f9 100644
--- a/D6StarWars/sheet.json
+++ b/D6StarWars/sheet.json
@@ -5,7 +5,7 @@
   "roll20userid": "555352, 1223200",
   "patreon": "https://www.patreon.com/anduh",
   "preview": "d6starwarspreview.png",
-  "instructions": "\n This sheet is for Star Wars: The Roleplaying Game by West End Games(WEG) that uses the d6 pool system(**Sheet Version 2.32**).\n* Can be used for 1E, 2E, 2E R&E and REUP games, Wild Die can be disabled if wanted \n* NPC & Starship sheets available \n* Customization options include: hiding some sections, show/hide GM rolls, and disable/enable rolls to ask for modifiers before rolling \n* For more info, check out the sheet's [wiki page](https://wiki.roll20.net/Star_Wars_WEG_D6_character_sheet) \n\n Issues, Ideas & Questions can be sent to the [active editor](https://app.roll20.net/users/1223200)",
+  "instructions": "\n This sheet is for Star Wars: The Roleplaying Game by West End Games(WEG) that uses the d6 pool system.\n* Can be used for 1E, 2E, 2E R&E and REUP games, Wild Die can be disabled if wanted \n* NPC & Starship sheets available \n* Customization options include: hiding some sections, show/hide GM rolls, and disable/enable rolls to ask for modifiers before rolling \n* For more info, check out the sheet's [wiki page](https://wiki.roll20.net/Star_Wars_WEG_D6_character_sheet) \n\n Issues, Ideas & Questions can be sent to the [active editor](https://app.roll20.net/users/1223200)",
   "useroptions": [
     {
       "attribute": "sheettype",
@@ -102,5 +102,5 @@
       "description": "How many Force Points a character starts with."
     }
   ],
-  "legacy": true
+  "legacy": false
 }
\ No newline at end of file

From 7648b8c4dd75c47523936498c05e8a57ccc3776e Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Wed, 19 May 2021 14:30:26 +0200
Subject: [PATCH 02/14] D6StarWars 2.41

- Fix Weapon and Armor section
---
 D6StarWars/CHANGELOG.md    | 3 +++
 D6StarWars/D6StarWars.css  | 6 ++++++
 D6StarWars/D6StarWars.html | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md
index ef21807330..a3ad9e94c1 100644
--- a/D6StarWars/CHANGELOG.md
+++ b/D6StarWars/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Version 2.40 (2021-5):
+- fix broken styles
+
 ### Version 2.40 (2021-5):
 - refactor sheet to be able to use the new Roll20 Sheet framework
 - Feature: Skill name auto-suggestions, suggest relevant names as you start typing
diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 1ae2b9c819..e6f2429d10 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -639,6 +639,12 @@
 }
 
 
+.charsheet .overflow-auto {
+    overflow: auto;
+    padding-top: 15px;
+    padding-bottom: 10px;
+}
+
 /* Weapons & Armors */
 .charsheet .armor.sheet-row,
 .charsheet .weapon.sheet-row{
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 714581a8e4..eef7f23e4c 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -274,7 +274,7 @@
 
     <!-- --------------------------------------------- Attributes&Skills ------------------------------------------- -->
 
-    <div class="section pc npc" style="width: 830px;">
+    <div class="section pc npc">
       <label class="txtcenter">Attributes & Skills</label>
       <div class="flex-box">
         <div class="flex-col">
@@ -464,7 +464,7 @@
 
     <div class="section pc npc shop-inventory">
       <label class="txtcenter">Weapon & Armor</label>
-      <div>
+      <div class="overflow-auto">
         <div class="weapon sheet-row">
           <div class="cell cell-name">Weapon</div>
           <div class="cell cell-dice">Attack</div>
@@ -507,7 +507,7 @@
         </fieldset>
       </div>
 
-      <div>
+      <div class="overflow-auto">
         <div class="armor sheet-row">
           <div class="cell cell-name">Armor</div>
           <div class="cell cell-dice">Physical <span class="physical"></span></div>

From e412cabf8c3d2eeb63f924002aad12d9a3bb15c8 Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Thu, 20 May 2021 22:51:51 +0200
Subject: [PATCH 03/14] D6StarWars 2.41

- Fix dice input alignment
---
 D6StarWars/D6StarWars.css | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index e6f2429d10..12fe6f8b1c 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -495,11 +495,11 @@
 }
 .charsheet .unified-dice-text {
     display: inline-flex;
-    width: calc(100% - 240px);
+    width: calc(100% - 231px);
     height: 40px;
     margin: 0;
     padding: 0 5px;
-    font-size: x-large;
+    font-size: 20px;
     vertical-align: top;
     line-height: 40px;
 }
@@ -525,7 +525,7 @@
 
 .charsheet .unified-dice-middle {
     display: inline-flex;
-    width: 24px;
+    width: 29px;
     height: 40px;
     line-height: 40px;
     font-size: 1.6em;
@@ -561,7 +561,7 @@
 
 .charsheet .skill .unified-dice-text {
     display: inline-flex;
-    width: calc(100% - 225px);
+    width: calc(100% - 223px);
     height: 28px;
     font-size: medium;
     font-weight: normal;
@@ -588,8 +588,9 @@
 
 .charsheet .skill .unified-dice-middle {
     display: inline-flex;
-    width: 24px;
+    width: 25px;
     height: 28px;
+    padding-left: 4px;
     font-size: medium;
     vertical-align: top;
     line-height: 28px;
@@ -597,6 +598,7 @@
 
 .charsheet .repcontrol {
     height: 28px;
+    margin-top: 10px;
 }
 
 .charsheet .skill input[type="number"].unified-dice-pip {
@@ -740,6 +742,9 @@
 .charsheet table.powers td {
     text-align: end;
 }
+.charsheet .force-hide .weapon.sheet-row {
+    width: 100%;
+}
 .charsheet .force-hide .weapon .cell.cell-name {
     width: calc(100% - 418px);
 }

From 8e0d11caf3bb0de53fb54f2b78679236e382e61f Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Thu, 20 May 2021 23:01:32 +0200
Subject: [PATCH 04/14] D6StarWars 2.41

- Update version
---
 D6StarWars/CHANGELOG.md    | 4 ++--
 D6StarWars/D6StarWars.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md
index a3ad9e94c1..c69a3e6af8 100644
--- a/D6StarWars/CHANGELOG.md
+++ b/D6StarWars/CHANGELOG.md
@@ -1,7 +1,7 @@
-### Version 2.40 (2021-5):
+### Version 2.41 (2021-05):
 - fix broken styles
 
-### Version 2.40 (2021-5):
+### Version 2.40 (2021-05):
 - refactor sheet to be able to use the new Roll20 Sheet framework
 - Feature: Skill name auto-suggestions, suggest relevant names as you start typing
 - more code cleanup
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index eef7f23e4c..49362a37e3 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1,4 +1,4 @@
-<input  name="attr_version" type="hidden" value="2.40">
+<input  name="attr_version" type="hidden" value="2.41">
 
 <input class="toggle" name="attr_sheettype" type="hidden" value="0">
 

From 587742ade6d88bfc9742d921a72c0cc385bb235b Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Sat, 22 May 2021 00:17:16 +0200
Subject: [PATCH 05/14] D6StarWars 2.41

- Fix breaking lines
---
 D6StarWars/D6StarWars.css | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 12fe6f8b1c..29ca0d07a8 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -484,6 +484,7 @@
 }
 
 .charsheet .attribute {
+    display: flex;
     margin-bottom: 5px;
 }
 
@@ -494,8 +495,7 @@
     line-height: 34px;
 }
 .charsheet .unified-dice-text {
-    display: inline-flex;
-    width: calc(100% - 231px);
+    flex-grow: 1;
     height: 40px;
     margin: 0;
     padding: 0 5px;
@@ -525,8 +525,9 @@
 
 .charsheet .unified-dice-middle {
     display: inline-flex;
-    width: 29px;
+    width: 32px;
     height: 40px;
+    padding: 0 2px;
     line-height: 40px;
     font-size: 1.6em;
     vertical-align: top;
@@ -541,18 +542,24 @@
     padding: 2px 4px;
 }
 
+.charsheet .attributes button[type=roll].unified-dice-roll {
+    margin: 0 5px 0 0;
+}
+
 /* Skill */
 .charsheet .skill {
+    display: flex;
     height: 28px;
     margin: 4px 0;
 }
 .charsheet .skill * {
     height: 28px;
     line-height: 26px;
-    width: 100%;
 }
 .charsheet .skill input[type="text"]{
-    width: calc(100% - 5px);
+    flex-grow: 1;
+    width: inherit;
+    margin-right: 5px;
 }
 
 .charsheet .skill label {
@@ -590,7 +597,9 @@
     display: inline-flex;
     width: 25px;
     height: 28px;
+    margin: 0 2px;
     padding-left: 4px;
+    padding-right: 3px;
     font-size: medium;
     vertical-align: top;
     line-height: 28px;
@@ -649,8 +658,9 @@
 
 /* Weapons & Armors */
 .charsheet .armor.sheet-row,
-.charsheet .weapon.sheet-row{
-    width: 850px;
+.charsheet .weapon.sheet-row {
+    display: flex;
+    width: 856px;
 }
 .charsheet .armor.sheet-row:first-of-type .cell,
 .charsheet .weapon.sheet-row:first-of-type .cell {
@@ -683,25 +693,25 @@
 }
 .charsheet .cell-name {
     min-width: 50px;
-    width: calc(100% - 743px);
+    flex-grow: 1;
 }
 .charsheet .cell-name .unified-dice-text {
     width: 100%;
 }
 .charsheet .cell-dice {
-    width: 197px;
+    width: 205px;
 }
 .charsheet .cell-1 {
     width: 46px;
 }
 .charsheet .cell-2 {
-    width: 84px;
+    width: 98px;
 }
 .charsheet .cell-4 {
-    width: 198px;
+    width: 200px;
 }
 .charsheet .armor .cell-4 {
-    width: 218px;
+    width: 204px;
 }
 .charsheet .cell-4 .part {
     display: inline-block;

From b8aa427ea8b182ea954697d6520529c9a89740ac Mon Sep 17 00:00:00 2001
From: Andreas Johansson <andreas.johansson@aalto.fi>
Date: Sat, 22 May 2021 04:41:50 +0300
Subject: [PATCH 06/14] datalists for species + force power names

---
 D6StarWars/D6StarWars.html  | 903 +++++++++++++++++++++++++++++-------
 D6StarWars/src/datalist.pug |  73 +++
 2 files changed, 808 insertions(+), 168 deletions(-)
 create mode 100644 D6StarWars/src/datalist.pug

diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 49362a37e3..cbba30681f 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -109,7 +109,7 @@
           <label class="toppad">Character Name <input class="right reduce-padd 60p" name="attr_charactername"
                                                       type="text"/></label>
           <label class="toppad">Type <input class="right reduce-padd 60p" name="attr_type" type="text"/></label>
-          <label class="toppad">Species <input class="right reduce-padd 60p" name="attr_species" type="text"/></label>
+          <label class="toppad">Species <input class="right reduce-padd 60p" list="species" name="attr_species" type="text"/></label>
 
           <div class="physical-params">
             <label class="toppad">Age <input class="smalltext reduce-padd" name="attr_age" type="text"/></label>
@@ -564,10 +564,10 @@
 
           <div id="force-control" class="force attributes">
             <div class="attribute">
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
               <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
               <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Control</label>
               <input type="number" name="attr_control" min="0" class="unified-dice unified-dice-input"/>
@@ -582,7 +582,7 @@
                 <button name="roll_force_control_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
                 <button name="roll_force_control_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
                 <label class="unified-dice unified-dice-text">
-                  <input name="attr_controlpowername" type="text" />
+                  <input name="attr_controlpowername" type="text" list="forcecontrol" />
                 </label>
                 <input name="attr_controlpoweractive" type="checkbox" title="Active" value="1"/>
               </div>
@@ -591,11 +591,11 @@
 
           <div id="force-sense" class="force attributes">
             <div class="attribute">
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_control" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
               <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button name="roll_force_sense" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_sense-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Sense</label>
               <input type="number" name="attr_sense" min="0" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
@@ -609,7 +609,7 @@
                 <button name="roll_force_sense_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
                 <button name="roll_force_sense_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
                 <label class="unified-dice unified-dice-text">
-                  <input name="attr_sensepowername" type="text" />
+                  <input name="attr_sensepowername" type="text" list="forcesense" />
                 </label>
                 <input name="attr_sensepoweractive" type="checkbox" title="Active" value="1"/>
               </div>
@@ -618,11 +618,11 @@
 
           <div id="force-alter" class="force attributes">
             <div class="attribute">
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button name="roll_force_alter" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_alter-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
-              <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+              <button name="roll_force_alter" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
+              <button name="roll_force_alter-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Alter</label>
               <input type="number" name="attr_alter" min="0" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
@@ -636,7 +636,7 @@
                 <button name="roll_force_alter_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
                 <button name="roll_force_alter_p" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
                 <label class="unified-dice unified-dice-text">
-                  <input name="attr_alterpowername" type="text" />
+                  <input name="attr_alterpowername" type="text" list="forcealter" />
                 </label>
                 <input name="attr_alterpoweractive" type="checkbox" title="Active" value="1"/>
               </div>
@@ -1058,177 +1058,744 @@
   </div>
 </div>
 
-<!-- -------------------------------Hidden Values----------------@{WoundLevel} +@{Pain}----------------------------- -->
+<!-- -------------------------------Hidden Values------------------------------------------------------------------- -->
 
 <input name="attr_Force_EmptinessMod" type="hidden" value="0">
 <input name="attr_WoundMod" type="hidden" value="0">
 
 
+<!-- ----------------------------------  Datalist ------------------------------------------------------------------ -->
 <datalist id="dexskills">
-  <option value="Acrobatics"></option>
-  <option value="Archaic Guns"></option>
-  <option value="Blaster"></option>
-  <option value="Blaster Artillery"></option>
-  <option value="Bowcaster"></option>
-  <option value="Bows"></option>
-  <option value="Brawling Parry"></option>
-  <option value="Contortions"></option>
-  <option value="Dancing"></option>
-  <option value="Dodge"></option>
-  <option value="Firearms"></option>
-  <option value="Grenade"></option>
-  <option value="Lightsaber"></option>
-  <option value="Melee Combat"></option>
-  <option value="Melee Parry"></option>
-  <option value="Missile Weapon"></option>
-  <option value="Pick Pocket"></option>
-  <option value="Running"></option>
-  <option value="Shockball Fling"></option>
-  <option value="Shockball Scoop"></option>
-  <option value="Slingshot"></option>
-  <option value="Thrown Weapons"></option>
-  <option value="Vehicle Blasters"></option>
-  <option value="Wedsphere"></option>
+  <option value="Acrobatics">Acrobatics</option>
+  <option value="Archaic Guns">Archaic Guns</option>
+  <option value="Blaster">Blaster</option>
+  <option value="Blaster Artillery">Blaster Artillery</option>
+  <option value="Bowcaster">Bowcaster</option>
+  <option value="Bows">Bows</option>
+  <option value="Brawling Parry">Brawling Parry</option>
+  <option value="Contortions">Contortions</option>
+  <option value="Dancing">Dancing</option>
+  <option value="Dodge">Dodge</option>
+  <option value="Firearms">Firearms</option>
+  <option value="Grenade">Grenade</option>
+  <option value="Lightsaber">Lightsaber</option>
+  <option value="Melee Combat">Melee Combat</option>
+  <option value="Melee Parry">Melee Parry</option>
+  <option value="Missile Weapon">Missile Weapon</option>
+  <option value="Pick Pocket">Pick Pocket</option>
+  <option value="Running">Running</option>
+  <option value="Shockball Fling">Shockball Fling</option>
+  <option value="Shockball Scoop">Shockball Scoop</option>
+  <option value="Slingshot">Slingshot</option>
+  <option value="Thrown Weapons">Thrown Weapons</option>
+  <option value="Vehicle Blasters">Vehicle Blasters</option>
+  <option value="Wedsphere">Wedsphere</option>
 </datalist>
 <datalist id="knowskills">
-  <option value="Accounting"> </option>
-  <option value="Agriculture"> </option>
-  <option value="Alien Species"> </option>
-  <option value="Artist"> </option>
-  <option value="Brainwashing"> </option>
-  <option value="Bureaucracy"> </option>
-  <option value="Business Administration"> </option>
-  <option value="Business"> </option>
-  <option value="Culinary Arts"> </option>
-  <option value="Cultures"> </option>
-  <option value="Drink Mixology"> </option>
-  <option value="Economics"> </option>
-  <option value="Home Economics"> </option>
-  <option value="Intimidation"> </option>
-  <option value="Languages"> </option>
-  <option value="Law Enforcement"> </option>
-  <option value="Military History"> </option>
-  <option value="Planetary Systems"> </option>
-  <option value="Shockball"> </option>
-  <option value="Streetwise"> </option>
-  <option value="Survival"> </option>
-  <option value="Tactics"> </option>
-  <option value="Traffic Control"> </option>
-  <option value="Torture"> </option>
-  <option value="Value"> </option>
-  <option value="Willpower"> </option>
+  <option value="Accounting">Accounting</option>
+  <option value="Agriculture">Agriculture</option>
+  <option value="Alien Species">Alien Species</option>
+  <option value="Artist">Artist</option>
+  <option value="Brainwashing">Brainwashing</option>
+  <option value="Bureaucracy">Bureaucracy</option>
+  <option value="Business Administration">Business Administration</option>
+  <option value="Business">Business</option>
+  <option value="Culinary Arts">Culinary Arts</option>
+  <option value="Cultures">Cultures</option>
+  <option value="Drink Mixology">Drink Mixology</option>
+  <option value="Economics">Economics</option>
+  <option value="Home Economics">Home Economics</option>
+  <option value="Intimidation">Intimidation</option>
+  <option value="Languages">Languages</option>
+  <option value="Law Enforcement">Law Enforcement</option>
+  <option value="Military History">Military History</option>
+  <option value="Planetary Systems">Planetary Systems</option>
+  <option value="Shockball">Shockball</option>
+  <option value="Streetwise">Streetwise</option>
+  <option value="Survival">Survival</option>
+  <option value="Tactics">Tactics</option>
+  <option value="Traffic Control">Traffic Control</option>
+  <option value="Torture">Torture</option>
+  <option value="Value">Value</option>
+  <option value="Willpower">Willpower</option>
 </datalist>
 <datalist id="mechskills">
-  <option value="Airship Operation"> </option>
-  <option value="Aquatic Ship Operation"> </option>
-  <option value="Archaic Starship Piloting"> </option>
-  <option value="Astrogation Calculating"> </option>
-  <option value="Beast Handling"> </option>
-  <option value="Beast Riding"> </option>
-  <option value="Capital Ship Gunnery"> </option>
-  <option value="Capital Ship Piloting"> </option>
-  <option value="Capital Ship Shields"> </option>
-  <option value="Ground Vehicle Operation"> </option>
-  <option value="Holorecorder Operation"> </option>
-  <option value="Household Appliance Operation"> </option>
-  <option value="Hover Vehicle Operation"> </option>
-  <option value="Jet Pack Operation"> </option>
-  <option value="Machinery Operation"> </option>
-  <option value="Musical Instrument"> </option>
-  <option value="Powersuit Operation"> </option>
-  <option value="Repulsorlift Operation"> </option>
-  <option value="Sailed Nautical Vessel Operation"> </option>
-  <option value="Sensors Operation"> </option>
-  <option value="Space Transports"> </option>
-  <option value="Starfighter Piloting"> </option>
-  <option value="Starship Gunnery"> </option>
-  <option value="Starship shields"> </option>
-  <option value="Swoop Operation"> </option>
-  <option value="Undersea Vehicle operation"> </option>
-  <option value="Walker Operation"> </option>
+  <option value="Airship Operation">Airship Operation</option>
+  <option value="Aquatic Ship Operation">Aquatic Ship Operation</option>
+  <option value="Archaic Starship Piloting">Archaic Starship Piloting</option>
+  <option value="Astrogation Calculating">Astrogation Calculating</option>
+  <option value="Beast Handling">Beast Handling</option>
+  <option value="Beast Riding">Beast Riding</option>
+  <option value="Capital Ship Gunnery">Capital Ship Gunnery</option>
+  <option value="Capital Ship Piloting">Capital Ship Piloting</option>
+  <option value="Capital Ship Shields">Capital Ship Shields</option>
+  <option value="Ground Vehicle Operation">Ground Vehicle Operation</option>
+  <option value="Holorecorder Operation">Holorecorder Operation</option>
+  <option value="Household Appliance Operation">Household Appliance Operation</option>
+  <option value="Hover Vehicle Operation">Hover Vehicle Operation</option>
+  <option value="Jet Pack Operation">Jet Pack Operation</option>
+  <option value="Machinery Operation">Machinery Operation</option>
+  <option value="Musical Instrument">Musical Instrument</option>
+  <option value="Powersuit Operation">Powersuit Operation</option>
+  <option value="Repulsorlift Operation">Repulsorlift Operation</option>
+  <option value="Sailed Nautical Vessel Operation">Sailed Nautical Vessel Operation</option>
+  <option value="Sensors Operation">Sensors Operation</option>
+  <option value="Space Transports">Space Transports</option>
+  <option value="Starfighter Piloting">Starfighter Piloting</option>
+  <option value="Starship Gunnery">Starship Gunnery</option>
+  <option value="Starship shields">Starship shields</option>
+  <option value="Swoop Operation">Swoop Operation</option>
+  <option value="Undersea Vehicle operation">Undersea Vehicle operation</option>
+  <option value="Walker Operation">Walker Operation</option>
 </datalist>
 <datalist id="perskills">
-  <option value="Bargain"> </option>
-  <option value="Command"> </option>
-  <option value="Con"> </option>
-  <option value="Forgery"> </option>
-  <option value="Gambling"> </option>
-  <option value="Cesa"> </option>
-  <option value="Hide"> </option>
-  <option value="Investigation"> </option>
-  <option value="Persuasion"> </option>
-  <option value="Search"> </option>
-  <option value="Singing"> </option>
-  <option value="Sneak"> </option>
+  <option value="Bargain">Bargain</option>
+  <option value="Command">Command</option>
+  <option value="Con">Con</option>
+  <option value="Forgery">Forgery</option>
+  <option value="Gambling">Gambling</option>
+  <option value="Cesa">Cesa</option>
+  <option value="Hide">Hide</option>
+  <option value="Investigation">Investigation</option>
+  <option value="Persuasion">Persuasion</option>
+  <option value="Search">Search</option>
+  <option value="Singing">Singing</option>
+  <option value="Sneak">Sneak</option>
 </datalist>
 <datalist id="strskills">
-  <option value="Brawling"></option>
-  <option value="Cleaning"></option>
-  <option value="Climbing/Jumping"></option>
-  <option value="Digging"></option>
-  <option value="Stamina"></option>
-  <option value="Swimming"></option>
+  <option value="Brawling">Brawling</option>
+  <option value="Cleaning">Cleaning</option>
+  <option value="Climbing/Jumping">Climbing/Jumping</option>
+  <option value="Digging">Digging</option>
+  <option value="Stamina">Stamina</option>
+  <option value="Swimming">Swimming</option>
 </datalist>
 <datalist id="techskills">
-  <option value="Aquatic Vehicle Engineering"> </option>
-  <option value="Aquatic Vehicle Repair"> </option>
-  <option value="Archaic Gun Repair"> </option>
-  <option value="Armor Design"> </option>
-  <option value="Armor Repair"> </option>
-  <option value="Battle Station Engineering"> </option>
-  <option value="Battle Station Repair"> </option>
-  <option value="Battle Station Weapon Engineering"> </option>
-  <option value="Battle Station Weapon Repair"> </option>
-  <option value="Blaster Artillery Engineering"> </option>
-  <option value="Blaster Repair"> </option>
-  <option value="Blaster Engineering"> </option>
-  <option value="Bowcaster Repair"> </option>
-  <option value="Bow Repair Repairing"> </option>
-  <option value="Capital Ship Engineering"> </option>
-  <option value="Capital Ship Repair"> </option>
-  <option value="Communications Repair"> </option>
-  <option value="Computer Engineering"> </option>
-  <option value="Computer Programming/Repair"> </option>
-  <option value="Construction"> </option>
-  <option value="Cyborg Technology"> </option>
-  <option value="Demolitions"> </option>
-  <option value="Droid Engineering"> </option>
-  <option value="Droid Repair"> </option>
-  <option value="Encryption Securing"> </option>
-  <option value="Engineering"> </option>
-  <option value="Firearms Repair"> </option>
-  <option value="First Aid"> </option>
-  <option value="Ground Vehicle Engineering"> </option>
-  <option value="Ground Vehicle Repair"> </option>
-  <option value="Holorecorder Repair"> </option>
-  <option value="Hover Vehicle Engineering"> </option>
-  <option value="Hover Vehicle Repair"> </option>
-  <option value="Jet Pack Engineering"> </option>
-  <option value="Jet Pack Repair"> </option>
-  <option value="Lightsaber Repair"> </option>
-  <option value="Machinery Repair"> </option>
-  <option value="Medicine Performing"> </option>
-  <option value="Melee Weapon Construction"> </option>
-  <option value="Melee Weapon Repair"> </option>
-  <option value="Musical Instrument Repair"> </option>
-  <option value="Powersuit Repair"> </option>
-  <option value="Prosthetic Design"> </option>
-  <option value="Prosthetic Repair"> </option>
-  <option value="Repulsorlift Engineering"> </option>
-  <option value="Repulsorlift Repair"> </option>
-  <option value="Rocket Pack Repair"> </option>
-  <option value="Sailed Nautical Vessel Repair"> </option>
-  <option value="Security Bypassing"> </option>
-  <option value="Space Transports Engineering"> </option>
-  <option value="Space Transports Repair"> </option>
-  <option value="Starfighter Engineering"> </option>
-  <option value="Starfighter Repair"> </option>
-  <option value="Starship Weapon Engineering"> </option>
-  <option value="Starship Weapon Repair"> </option>
-  <option value="Swoop Engineering"> </option>
-  <option value="Swoop Repair"> </option>
-  <option value="Walker Engineering"> </option>
-  <option value="Walker Repair"> </option>
+  <option value="Aquatic Vehicle Engineering">Aquatic Vehicle Engineering</option>
+  <option value="Aquatic Vehicle Repair">Aquatic Vehicle Repair</option>
+  <option value="Archaic Gun Repair">Archaic Gun Repair</option>
+  <option value="Armor Design">Armor Design</option>
+  <option value="Armor Repair">Armor Repair</option>
+  <option value="Battle Station Engineering">Battle Station Engineering</option>
+  <option value="Battle Station Repair">Battle Station Repair</option>
+  <option value="Battle Station Weapon Engineering">Battle Station Weapon Engineering</option>
+  <option value="Battle Station Weapon Repair">Battle Station Weapon Repair</option>
+  <option value="Blaster Artillery Engineering">Blaster Artillery Engineering</option>
+  <option value="Blaster Repair">Blaster Repair</option>
+  <option value="Blaster Engineering">Blaster Engineering</option>
+  <option value="Bowcaster Repair">Bowcaster Repair</option>
+  <option value="Bow Repair Repairing">Bow Repair Repairing</option>
+  <option value="Capital Ship Engineering">Capital Ship Engineering</option>
+  <option value="Capital Ship Repair">Capital Ship Repair</option>
+  <option value="Communications Repair">Communications Repair</option>
+  <option value="Computer Engineering">Computer Engineering</option>
+  <option value="Computer Programming/Repair">Computer Programming/Repair</option>
+  <option value="Construction">Construction</option>
+  <option value="Cyborg Technology">Cyborg Technology</option>
+  <option value="Demolitions">Demolitions</option>
+  <option value="Droid Engineering">Droid Engineering</option>
+  <option value="Droid Repair">Droid Repair</option>
+  <option value="Encryption Securing">Encryption Securing</option>
+  <option value="Engineering">Engineering</option>
+  <option value="Firearms Repair">Firearms Repair</option>
+  <option value="First Aid">First Aid</option>
+  <option value="Ground Vehicle Engineering">Ground Vehicle Engineering</option>
+  <option value="Ground Vehicle Repair">Ground Vehicle Repair</option>
+  <option value="Holorecorder Repair">Holorecorder Repair</option>
+  <option value="Hover Vehicle Engineering">Hover Vehicle Engineering</option>
+  <option value="Hover Vehicle Repair">Hover Vehicle Repair</option>
+  <option value="Jet Pack Engineering">Jet Pack Engineering</option>
+  <option value="Jet Pack Repair">Jet Pack Repair</option>
+  <option value="Lightsaber Repair">Lightsaber Repair</option>
+  <option value="Machinery Repair">Machinery Repair</option>
+  <option value="Medicine Performing">Medicine Performing</option>
+  <option value="Melee Weapon Construction">Melee Weapon Construction</option>
+  <option value="Melee Weapon Repair">Melee Weapon Repair</option>
+  <option value="Musical Instrument Repair">Musical Instrument Repair</option>
+  <option value="Powersuit Repair">Powersuit Repair</option>
+  <option value="Prosthetic Design">Prosthetic Design</option>
+  <option value="Prosthetic Repair">Prosthetic Repair</option>
+  <option value="Repulsorlift Engineering">Repulsorlift Engineering</option>
+  <option value="Repulsorlift Repair">Repulsorlift Repair</option>
+  <option value="Rocket Pack Repair">Rocket Pack Repair</option>
+  <option value="Sailed Nautical Vessel Repair">Sailed Nautical Vessel Repair</option>
+  <option value="Security Bypassing">Security Bypassing</option>
+  <option value="Space Transports Engineering">Space Transports Engineering</option>
+  <option value="Space Transports Repair">Space Transports Repair</option>
+  <option value="Starfighter Engineering">Starfighter Engineering</option>
+  <option value="Starfighter Repair">Starfighter Repair</option>
+  <option value="Starship Weapon Engineering">Starship Weapon Engineering</option>
+  <option value="Starship Weapon Repair">Starship Weapon Repair</option>
+  <option value="Swoop Engineering">Swoop Engineering</option>
+  <option value="Swoop Repair">Swoop Repair</option>
+  <option value="Walker Engineering">Walker Engineering</option>
+  <option value="Walker Repair">Walker Repair</option>
+</datalist>
+<datalist id="species">
+  <option value="Aar’aa">Aar’aa</option>
+  <option value="Abinyshi">Abinyshi</option>
+  <option value="Abyssin">Abyssin</option>
+  <option value="Adarian">Adarian</option>
+  <option value="Adnerem">Adnerem</option>
+  <option value="Advozse">Advozse</option>
+  <option value="Aganof">Aganof</option>
+  <option value="Aing-Tii">Aing-Tii</option>
+  <option value="Akwin">Akwin</option>
+  <option value="Aleena">Aleena</option>
+  <option value="Amanin">Amanin</option>
+  <option value="Anguilla">Anguilla</option>
+  <option value="Annoo-dat">Annoo-dat</option>
+  <option value="Anointed People">Anointed People</option>
+  <option value="Anomid">Anomid</option>
+  <option value="Anx">Anx</option>
+  <option value="Anzat">Anzat</option>
+  <option value="Aqualish">Aqualish</option>
+  <option value="Arachnoid">Arachnoid</option>
+  <option value="Aramandi">Aramandi</option>
+  <option value="Araquia">Araquia</option>
+  <option value="Arcona">Arcona</option>
+  <option value="Arkanian">Arkanian</option>
+  <option value="Askajian">Askajian</option>
+  <option value="Avogwi (Altorian Bird)">Avogwi (Altorian Bird)</option>
+  <option value="Ayrou">Ayrou</option>
+  <option value="Balinaka">Balinaka</option>
+  <option value="Balosar">Balosar</option>
+  <option value="Barabel">Barabel</option>
+  <option value="Baragwin">Baragwin</option>
+  <option value="Bartokk">Bartokk</option>
+  <option value="Berrite">Berrite</option>
+  <option value="Besalisk">Besalisk</option>
+  <option value="Bilar">Bilar</option>
+  <option value="Bimm (near-human)">Bimm (near-human)</option>
+  <option value="Bimm">Bimm</option>
+  <option value="Bith">Bith</option>
+  <option value="Bitthævrian">Bitthævrian</option>
+  <option value="Blood Carver">Blood Carver</option>
+  <option value="Boltrunian">Boltrunian</option>
+  <option value="Borneck">Borneck</option>
+  <option value="Bosph">Bosph</option>
+  <option value="Bothan">Bothan</option>
+  <option value="Bouncer">Bouncer</option>
+  <option value="Bovorian">Bovorian</option>
+  <option value="Brizzit">Brizzit</option>
+  <option value="Brubb">Brubb</option>
+  <option value="Buzchub">Buzchub</option>
+  <option value="Caamasi">Caamasi</option>
+  <option value="Caarite">Caarite</option>
+  <option value="Calibop">Calibop</option>
+  <option value="Caridan">Caridan</option>
+  <option value="Carosite">Carosite</option>
+  <option value="Cathar">Cathar</option>
+  <option value="Celegian">Celegian</option>
+  <option value="Cerean">Cerean</option>
+  <option value="Chadra-Fan">Chadra-Fan</option>
+  <option value="Chagrian">Chagrian</option>
+  <option value="Chalactan">Chalactan</option>
+  <option value="Charon">Charon</option>
+  <option value="Charr Ontee">Charr Ontee</option>
+  <option value="Cha’wen’he">Cha’wen’he</option>
+  <option value="Chazrach">Chazrach</option>
+  <option value="Chev">Chev</option>
+  <option value="Chevin">Chevin</option>
+  <option value="Chikarri">Chikarri</option>
+  <option value="Chiss">Chiss</option>
+  <option value="Chistori">Chistori</option>
+  <option value="Chuhkyvi Iskalonian">Chuhkyvi Iskalonian</option>
+  <option value="Clawdite">Clawdite</option>
+  <option value="Cliffborer">Cliffborer</option>
+  <option value="Codru-Ji">Codru-Ji</option>
+  <option value="Colicoid">Colicoid</option>
+  <option value="Columi">Columi</option>
+  <option value="Conjeni">Conjeni</option>
+  <option value="Covallon">Covallon</option>
+  <option value="Coway">Coway</option>
+  <option value="Coynite">Coynite</option>
+  <option value="Cragmoloid">Cragmoloid</option>
+  <option value="Damaronian">Damaronian</option>
+  <option value="Dantari">Dantari</option>
+  <option value="Dashade">Dashade</option>
+  <option value="Dathomirian Rancor">Dathomirian Rancor</option>
+  <option value="Dazouri">Dazouri</option>
+  <option value="Defel">Defel</option>
+  <option value="Derriphan">Derriphan</option>
+  <option value="Devaronian">Devaronian</option>
+  <option value="Devlikk">Devlikk</option>
+  <option value="Dornean">Dornean</option>
+  <option value="Draedan">Draedan</option>
+  <option value="Draethos">Draethos</option>
+  <option value="Drall">Drall</option>
+  <option value="Dresselian">Dresselian</option>
+  <option value="Dug">Dug</option>
+  <option value="Duinuogwuin">Duinuogwuin</option>
+  <option value="Dulok">Dulok</option>
+  <option value="Duros">Duros</option>
+  <option value="Ebranite">Ebranite</option>
+  <option value="Ee">Ee</option>
+  <option value="Eirrauc">Eirrauc</option>
+  <option value="Eklaad">Eklaad</option>
+  <option value="Elom">Elom</option>
+  <option value="Elomin">Elomin</option>
+  <option value="Em’liy">Em’liy</option>
+  <option value="Entymal">Entymal</option>
+  <option value="Epicanthix">Epicanthix</option>
+  <option value="Ergesh">Ergesh</option>
+  <option value="Er’Kit">Er’Kit</option>
+  <option value="Esoomian">Esoomian</option>
+  <option value="Essastii">Essastii</option>
+  <option value="Etti">Etti</option>
+  <option value="Ewok">Ewok</option>
+  <option value="Falleen">Falleen</option>
+  <option value="Farghul">Farghul</option>
+  <option value="Feeorin">Feeorin</option>
+  <option value="Fefze">Fefze</option>
+  <option value="Fiery One">Fiery One</option>
+  <option value="Filar-Nitzan">Filar-Nitzan</option>
+  <option value="Filordus">Filordus</option>
+  <option value="Filvian">Filvian</option>
+  <option value="Firrerreo">Firrerreo</option>
+  <option value="Flakax">Flakax</option>
+  <option value="Florn Lamproid">Florn Lamproid</option>
+  <option value="Fluggrian">Fluggrian</option>
+  <option value="Fosh">Fosh</option>
+  <option value="Frog-dog">Frog-dog</option>
+  <option value="Frozian">Frozian</option>
+  <option value="Gacerite">Gacerite</option>
+  <option value="Gados">Gados</option>
+  <option value="Galidyn">Galidyn</option>
+  <option value="Gamorrean">Gamorrean</option>
+  <option value="Gand">Gand</option>
+  <option value="Gazaran">Gazaran</option>
+  <option value="Geelan">Geelan</option>
+  <option value="Gen’Dai">Gen’Dai</option>
+  <option value="Geonosian">Geonosian</option>
+  <option value="Geran">Geran</option>
+  <option value="Gerb">Gerb</option>
+  <option value="Gesaril">Gesaril</option>
+  <option value="Gigoran">Gigoran</option>
+  <option value="Givin">Givin</option>
+  <option value="Glymphid">Glymphid</option>
+  <option value="Gorm">Gorm</option>
+  <option value="Gorothite">Gorothite</option>
+  <option value="Gossam">Gossam</option>
+  <option value="Gotal">Gotal</option>
+  <option value="Gran">Gran</option>
+  <option value="Gree">Gree</option>
+  <option value="Gruvian">Gruvian</option>
+  <option value="Gungan">Gungan</option>
+  <option value="Gutratee">Gutratee</option>
+  <option value="Guudrian">Guudrian</option>
+  <option value="Hapan">Hapan</option>
+  <option value="Herglic">Herglic</option>
+  <option value="Hethas">Hethas</option>
+  <option value="H’nemthe">H’nemthe</option>
+  <option value="Ho’Din">Ho’Din</option>
+  <option value="Hoojib">Hoojib</option>
+  <option value="Horansi">Horansi</option>
+  <option value="Hortek">Hortek</option>
+  <option value="Houk">Houk</option>
+  <option value="Hrakian">Hrakian</option>
+  <option value="Human">Human</option>
+  <option value="Huralok">Huralok</option>
+  <option value="Hutt">Hutt</option>
+  <option value="Iktotchi">Iktotchi</option>
+  <option value="Iotran">Iotran</option>
+  <option value="Ipharian-Da’Lor">Ipharian-Da’Lor</option>
+  <option value="Ishi Tib">Ishi Tib</option>
+  <option value="Iskalloni">Iskalloni</option>
+  <option value="Issori">Issori</option>
+  <option value="Ithorian">Ithorian</option>
+  <option value="Ixlls">Ixlls</option>
+  <option value="Iyra">Iyra</option>
+  <option value="Jarell">Jarell</option>
+  <option value="Jawa">Jawa</option>
+  <option value="Jenet">Jenet</option>
+  <option value="Jiivahar">Jiivahar</option>
+  <option value="Jillsarian">Jillsarian</option>
+  <option value="Kadri’Ra">Kadri’Ra</option>
+  <option value="Ka’hren">Ka’hren</option>
+  <option value="Kalduu">Kalduu</option>
+  <option value="Kaleesh">Kaleesh</option>
+  <option value="Kamarian">Kamarian</option>
+  <option value="Kaminoan">Kaminoan</option>
+  <option value="Kari">Kari</option>
+  <option value="Karran">Karran</option>
+  <option value="Kel Dor">Kel Dor</option>
+  <option value="Kentra">Kentra</option>
+  <option value="Kerestian">Kerestian</option>
+  <option value="Ketton">Ketton</option>
+  <option value="Khil">Khil</option>
+  <option value="Khommite">Khommite</option>
+  <option value="Kian’thar">Kian’thar</option>
+  <option value="Kilmaulsi">Kilmaulsi</option>
+  <option value="Kitonak">Kitonak</option>
+  <option value="Klatooinian">Klatooinian</option>
+  <option value="Kluuzot">Kluuzot</option>
+  <option value="Kobok">Kobok</option>
+  <option value="Kolac">Kolac</option>
+  <option value="Koorivar">Koorivar</option>
+  <option value="Kowakian Monkey-Lizard">Kowakian Monkey-Lizard</option>
+  <option value="Krakai">Krakai</option>
+  <option value="Krevaaki">Krevaaki</option>
+  <option value="Kriek">Kriek</option>
+  <option value="Krikthasi">Krikthasi</option>
+  <option value="Krish">Krish</option>
+  <option value="Krytollak">Krytollak</option>
+  <option value="Kubaz">Kubaz</option>
+  <option value="Kurtzen">Kurtzen</option>
+  <option value="Kushiban">Kushiban</option>
+  <option value="Laboi">Laboi</option>
+  <option value="Lafrarian">Lafrarian</option>
+  <option value="Lahsbee / Huhk">Lahsbee / Huhk</option>
+  <option value="Lannik">Lannik</option>
+  <option value="Lasat">Lasat</option>
+  <option value="Lepi">Lepi</option>
+  <option value="Lorrdian">Lorrdian</option>
+  <option value="Lurrian">Lurrian</option>
+  <option value="Lutrillian">Lutrillian</option>
+  <option value="Makurth">Makurth</option>
+  <option value="Mantellian Savrip">Mantellian Savrip</option>
+  <option value="Maoi">Maoi</option>
+  <option value="Marasan">Marasan</option>
+  <option value="Massassi">Massassi</option>
+  <option value="Meerian">Meerian</option>
+  <option value="Melodie">Melodie</option>
+  <option value="Menahuun">Menahuun</option>
+  <option value="Meri">Meri</option>
+  <option value="Mimbanite">Mimbanite</option>
+  <option value="Miraluka">Miraluka</option>
+  <option value="Mirialan">Mirialan</option>
+  <option value="Mon Calamari">Mon Calamari</option>
+  <option value="Morodin">Morodin</option>
+  <option value="Morseerian">Morseerian</option>
+  <option value="Mriss">Mriss</option>
+  <option value="Mrlssi">Mrlssi</option>
+  <option value="M’shinn">M’shinn</option>
+  <option value="Multopos">Multopos</option>
+  <option value="Murachaun">Murachaun</option>
+  <option value="Muun">Muun</option>
+  <option value="Myneyrsh">Myneyrsh</option>
+  <option value="Nagai">Nagai</option>
+  <option value="Najib">Najib</option>
+  <option value="Nalrithian">Nalrithian</option>
+  <option value="Nalroni">Nalroni</option>
+  <option value="Nautolan">Nautolan</option>
+  <option value="Nazzar">Nazzar</option>
+  <option value="Neimoidian">Neimoidian</option>
+  <option value="Nelvaanian">Nelvaanian</option>
+  <option value="Neti">Neti</option>
+  <option value="Nikto">Nikto</option>
+  <option value="Nimbanel">Nimbanel</option>
+  <option value="Noehon">Noehon</option>
+  <option value="Noghri">Noghri</option>
+  <option value="Nosaurian">Nosaurian</option>
+  <option value="Nuiwit (Altorian Lizard)">Nuiwit (Altorian Lizard)</option>
+  <option value="Nuknog">Nuknog</option>
+  <option value="Oblee">Oblee</option>
+  <option value="Odenji">Odenji</option>
+  <option value="Omwati">Omwati</option>
+  <option value="Ongree">Ongree</option>
+  <option value="Orfite">Orfite</option>
+  <option value="Orgon">Orgon</option>
+  <option value="Ortolan">Ortolan</option>
+  <option value="Ossan">Ossan</option>
+  <option value="Pacithhip">Pacithhip</option>
+  <option value="Paigun">Paigun</option>
+  <option value="Pa’lowick">Pa’lowick</option>
+  <option value="Pau’an">Pau’an</option>
+  <option value="Permian">Permian</option>
+  <option value="Phindian">Phindian</option>
+  <option value="Pho Ph’eahian">Pho Ph’eahian</option>
+  <option value="Phuii">Phuii</option>
+  <option value="Polis Massan">Polis Massan</option>
+  <option value="Polydroxol">Polydroxol</option>
+  <option value="Poss’Nomin">Poss’Nomin</option>
+  <option value="Priapulin">Priapulin</option>
+  <option value="Protean">Protean</option>
+  <option value="Psadan">Psadan</option>
+  <option value="Pulra">Pulra</option>
+  <option value="P’w’eck">P’w’eck</option>
+  <option value="Qieg">Qieg</option>
+  <option value="Qiraash">Qiraash</option>
+  <option value="Quarren">Quarren</option>
+  <option value="Quermian">Quermian</option>
+  <option value="Quockran">Quockran</option>
+  <option value="Quor’sav">Quor’sav</option>
+  <option value="Qwohog">Qwohog</option>
+  <option value="Rakaan">Rakaan</option>
+  <option value="Rakatan">Rakatan</option>
+  <option value="Rakririan">Rakririan</option>
+  <option value="Ranat">Ranat</option>
+  <option value="Ranth">Ranth</option>
+  <option value="Reigat">Reigat</option>
+  <option value="Rellarin">Rellarin</option>
+  <option value="Revwien">Revwien</option>
+  <option value="Ri’Dar">Ri’Dar</option>
+  <option value="Riileb">Riileb</option>
+  <option value="Riorian ">Riorian </option>
+  <option value="Rishii">Rishii</option>
+  <option value="Rodian">Rodian</option>
+  <option value="Roonan">Roonan</option>
+  <option value="Ropagu">Ropagu</option>
+  <option value="Ruurian">Ruurian</option>
+  <option value="Ruusanian">Ruusanian</option>
+  <option value="Rybet">Rybet</option>
+  <option value="Ryn">Ryn</option>
+  <option value="Saheelindeeli">Saheelindeeli</option>
+  <option value="Sakiyan">Sakiyan</option>
+  <option value="Sanyassan">Sanyassan</option>
+  <option value="Sarkan">Sarkan</option>
+  <option value="Sarrish">Sarrish</option>
+  <option value="Saurin">Saurin</option>
+  <option value="Saurton">Saurton</option>
+  <option value="Sauvax">Sauvax</option>
+  <option value="Sebiri">Sebiri</option>
+  <option value="Sedrian">Sedrian</option>
+  <option value="Segmi">Segmi</option>
+  <option value="Seikoshan">Seikoshan</option>
+  <option value="Sekct">Sekct</option>
+  <option value="Selkath">Selkath</option>
+  <option value="Selonian">Selonian</option>
+  <option value="Shard">Shard</option>
+  <option value="Sharu">Sharu</option>
+  <option value="Shashay">Shashay</option>
+  <option value="Shatras">Shatras</option>
+  <option value="Shawda Ubb">Shawda Ubb</option>
+  <option value="Shi’ido">Shi’ido</option>
+  <option value="Shistavanen">Shistavanen</option>
+  <option value="Sic-Six">Sic-Six</option>
+  <option value="Silika">Silika</option>
+  <option value="Siniteen">Siniteen</option>
+  <option value="Skakoan">Skakoan</option>
+  <option value="Skrilling">Skrilling</option>
+  <option value="S’kytri">S’kytri</option>
+  <option value="Slith">Slith</option>
+  <option value="Sljee">Sljee</option>
+  <option value="Sludir">Sludir</option>
+  <option value="Sluissi">Sluissi</option>
+  <option value="Sneevel">Sneevel</option>
+  <option value="Snivvian">Snivvian</option>
+  <option value="Spiner">Spiner</option>
+  <option value="Squalris">Squalris</option>
+  <option value="Squib">Squib</option>
+  <option value="Srrors’tok">Srrors’tok</option>
+  <option value="Ssamb">Ssamb</option>
+  <option value="Ssi-ruu">Ssi-ruu</option>
+  <option value="Ssither">Ssither</option>
+  <option value="Stenax">Stenax</option>
+  <option value="Stennes Shifter">Stennes Shifter</option>
+  <option value="Sullustan">Sullustan</option>
+  <option value="Sunesi">Sunesi</option>
+  <option value="Svivreni">Svivreni</option>
+  <option value="Swokes Swokes">Swokes Swokes</option>
+  <option value="Sy Myrthian">Sy Myrthian</option>
+  <option value="Talid">Talid</option>
+  <option value="Talz">Talz</option>
+  <option value="Tammuz-an">Tammuz-an</option>
+  <option value="Tarasin">Tarasin</option>
+  <option value="Tarc">Tarc</option>
+  <option value="Tarong">Tarong</option>
+  <option value="Tarro">Tarro</option>
+  <option value="Tasari">Tasari</option>
+  <option value="Tchuukthai">Tchuukthai</option>
+  <option value="Teek">Teek</option>
+  <option value="Teltior">Teltior</option>
+  <option value="Temolak">Temolak</option>
+  <option value="Tempestro">Tempestro</option>
+  <option value="Thakwaash">Thakwaash</option>
+  <option value="Theelin">Theelin</option>
+  <option value="Thisspian">Thisspian</option>
+  <option value="Tikiarri">Tikiarri</option>
+  <option value="Tinnell">Tinnell</option>
+  <option value="Tirrith">Tirrith</option>
+  <option value="Tiss’shar">Tiss’shar</option>
+  <option value="T’landa Til">T’landa Til</option>
+  <option value="Togorian">Togorian</option>
+  <option value="Togruta">Togruta</option>
+  <option value="Toka">Toka</option>
+  <option value="Toong">Toong</option>
+  <option value="Toydarian">Toydarian</option>
+  <option value="Trandoshan">Trandoshan</option>
+  <option value="Trianii">Trianii</option>
+  <option value="Triffian">Triffian</option>
+  <option value="Troig">Troig</option>
+  <option value="Trunsk">Trunsk</option>
+  <option value="Tsil">Tsil</option>
+  <option value="T’surr">T’surr</option>
+  <option value="Tuhgri">Tuhgri</option>
+  <option value="Tulvarees">Tulvarees</option>
+  <option value="Tunroth">Tunroth</option>
+  <option value="Turazza">Turazza</option>
+  <option value="Tusken Raider(Sand People)">Tusken Raider(Sand People)</option>
+  <option value="Twi’lek">Twi’lek</option>
+  <option value="Tynnan">Tynnan</option>
+  <option value="Ubese">Ubese</option>
+  <option value="Ugnaught">Ugnaught</option>
+  <option value="Ugor">Ugor</option>
+  <option value="Ukian">Ukian</option>
+  <option value="Umbaran">Umbaran</option>
+  <option value="Utai">Utai</option>
+  <option value="Uukaablian">Uukaablian</option>
+  <option value="Vaathkree">Vaathkree</option>
+  <option value="Vashan">Vashan</option>
+  <option value="Veknoid">Veknoid</option>
+  <option value="Vernol">Vernol</option>
+  <option value="Verpine">Verpine</option>
+  <option value="Viska">Viska</option>
+  <option value="Vodran">Vodran</option>
+  <option value="Vor">Vor</option>
+  <option value="Vorzydiak">Vorzydiak</option>
+  <option value="Vratix">Vratix</option>
+  <option value="Vulptereen">Vulptereen</option>
+  <option value="Vultan">Vultan</option>
+  <option value="Vurk">Vurk</option>
+  <option value="Vuvrian">Vuvrian</option>
+  <option value="Weequay">Weequay</option>
+  <option value="Werbol">Werbol</option>
+  <option value="Whiphid">Whiphid</option>
+  <option value="Wookiee">Wookiee</option>
+  <option value="Woostoid">Woostoid</option>
+  <option value="Wroonian">Wroonian</option>
+  <option value="Xa Fel">Xa Fel</option>
+  <option value="Xamster">Xamster</option>
+  <option value="Xan">Xan</option>
+  <option value="Xexto">Xexto</option>
+  <option value="Xi’Dec">Xi’Dec</option>
+  <option value="Yaga">Yaga</option>
+  <option value="Yam rii">Yam rii</option>
+  <option value="Yapi">Yapi</option>
+  <option value="Yarkora">Yarkora</option>
+  <option value="Yevetha">Yevetha</option>
+  <option value="Yimi">Yimi</option>
+  <option value="Yinchorri">Yinchorri</option>
+  <option value="Yrashu">Yrashu</option>
+  <option value="Ysanna Nomad">Ysanna Nomad</option>
+  <option value="Yuuzahn Vong">Yuuzahn Vong</option>
+  <option value="Yuzzem">Yuzzem</option>
+  <option value="Yuzzum">Yuzzum</option>
+  <option value="Yvarema">Yvarema</option>
+  <option value="Zabrak">Zabrak</option>
+  <option value="Zarian">Zarian</option>
+  <option value="ZeHethbra">ZeHethbra</option>
+  <option value="Zelosian">Zelosian</option>
+  <option value="Zeltron">Zeltron</option>
+  <option value="Zexx">Zexx</option>
+  <option value="Zizimaak">Zizimaak</option>
+</datalist>
+<datalist id="forcecontrol">
+  <option value="Absorb/Dissipate Energy">Absorb/Dissipate Energy</option>
+  <option value="Accelerate Healing">Accelerate Healing</option>
+  <option value="Concentration">Concentration</option>
+  <option value="Contort/Escape">Contort/Escape</option>
+  <option value="Control Disease">Control Disease</option>
+  <option value="Control Pain">Control Pain</option>
+  <option value="Detoxify Poison">Detoxify Poison</option>
+  <option value="Emptiness">Emptiness</option>
+  <option value="Enhance Attribute">Enhance Attribute</option>
+  <option value="Force of Will">Force of Will</option>
+  <option value="Hibernation">Hibernation</option>
+  <option value="Trance">Trance</option>
+  <option value="Instinctive Astrogation">Instinctive Astrogation</option>
+  <option value="Reduce Injury">Reduce Injury</option>
+  <option value="Remain Conscious">Remain Conscious</option>
+  <option value="Remove Fatigue">Remove Fatigue</option>
+  <option value="Resist Stun">Resist Stun</option>
+  <option value="Short-Term Memory Enhancement">Short-Term Memory Enhancement</option>
+  <option value="Rage">Rage</option>
+  <option value="Farseeing">Farseeing</option>
+  <option value="Life Bond">Life Bond</option>
+  <option value="Lightsaber Combat">Lightsaber Combat</option>
+  <option value="Projective Telepathy">Projective Telepathy</option>
+  <option value="Accelerate Another's Healing">Accelerate Another's Healing</option>
+  <option value="Control Another's Disease">Control Another's Disease</option>
+  <option value="Control Another's Pain">Control Another's Pain</option>
+  <option value="Control Breathing">Control Breathing</option>
+  <option value="Detoxify Another's Poison">Detoxify Another's Poison</option>
+  <option value="Place Another in Hibernation Trance">Place Another in Hibernation Trance</option>
+  <option value="Remove Another's Fatigue">Remove Another's Fatigue</option>
+  <option value="Return Another to Consciousness">Return Another to Consciousness</option>
+  <option value="Transfer Force">Transfer Force</option>
+  <option value="Aura of Uneasiness">Aura of Uneasiness</option>
+  <option value="Electronic Manipulation">Electronic Manipulation</option>
+  <option value="Feed on Dark Side">Feed on Dark Side</option>
+  <option value="Force Lightning">Force Lightning</option>
+  <option value="Inflict Pain">Inflict Pain</option>
+  <option value="Waves of Darkness">Waves of Darkness</option>
+  <option value="Control Mind">Control Mind</option>
+  <option value="Create Force Storms">Create Force Storms</option>
+  <option value="Doppleganger">Doppleganger</option>
+  <option value="Drain Life Energy">Drain Life Energy</option>
+  <option value="Drain Life Essence">Drain Life Essence</option>
+  <option value="Memory Wipe">Memory Wipe</option>
+  <option value="Telekinetic Kill">Telekinetic Kill</option>
+  <option value="Transfer Life">Transfer Life</option>
+  <option value="Force Scream">Force Scream</option>
+</datalist>
+<datalist id="forcesense">
+  <option value="Beast Languages">Beast Languages</option>
+  <option value="Combat Sense">Combat Sense</option>
+  <option value="Danger Sense">Danger Sense</option>
+  <option value="Instinctive Astrogation">Instinctive Astrogation</option>
+  <option value="Life Detection">Life Detection</option>
+  <option value="Life Sense">Life Sense</option>
+  <option value="Life Web">Life Web</option>
+  <option value="Magnify Senses">Magnify Senses</option>
+  <option value="Merge Senses">Merge Senses</option>
+  <option value="Postcognition">Postcognition</option>
+  <option value="Predict Natural Disaster">Predict Natural Disaster</option>
+  <option value="Receptive Telepathy">Receptive Telepathy</option>
+  <option value="Sense Force">Sense Force</option>
+  <option value="Sense Force Potential">Sense Force Potential</option>
+  <option value="Sense Path">Sense Path</option>
+  <option value="Shift Sense">Shift Sense</option>
+  <option value="Translation">Translation</option>
+  <option value="Weather Sense">Weather Sense</option>
+  <option value="Farseeing">Farseeing</option>
+  <option value="Life Bond">Life Bond</option>
+  <option value="Lightsaber Combat">Lightsaber Combat</option>
+  <option value="Projective Telepathy">Projective Telepathy</option>
+  <option value="Dim Another’s Senses">Dim Another’s Senses</option>
+  <option value="Lesser Force Shield">Lesser Force Shield</option>
+  <option value="Control Mind">Control Mind</option>
+  <option value="Create Force Storms">Create Force Storms</option>
+  <option value="Doppleganger">Doppleganger</option>
+  <option value="Drain Life Energy">Drain Life Energy</option>
+  <option value="Drain Life Essence">Drain Life Essence</option>
+  <option value="Memory Wipe">Memory Wipe</option>
+  <option value="Telekinetic Kill">Telekinetic Kill</option>
+  <option value="Transfer Life">Transfer Life</option>
+  <option value="Force Scream">Force Scream</option>
+</datalist>
+<datalist id="forcealter">
+  <option value="Telekinesis">Telekinesis</option>
+  <option value="Bolt of Hatred">Bolt of Hatred</option>
+  <option value="Dark Side Web">Dark Side Web</option>
+  <option value="Injure/Kill">Injure/Kill</option>
+  <option value="Accelerate Another's Healing">Accelerate Another's Healing</option>
+  <option value="Control Another's Disease">Control Another's Disease</option>
+  <option value="Control Another's Pain">Control Another's Pain</option>
+  <option value="Control Breathing">Control Breathing</option>
+  <option value="Detoxify Another's Poison">Detoxify Another's Poison</option>
+  <option value="Place Another in Hibernation Trance">Place Another in Hibernation Trance</option>
+  <option value="Remove Another's Fatigue">Remove Another's Fatigue</option>
+  <option value="Return Another to Consciousness">Return Another to Consciousness</option>
+  <option value="Transfer Force">Transfer Force</option>
+  <option value="Aura of Uneasiness">Aura of Uneasiness</option>
+  <option value="Electronic Manipulation">Electronic Manipulation</option>
+  <option value="Feed on Dark Side">Feed on Dark Side</option>
+  <option value="Force Lightning">Force Lightning</option>
+  <option value="Inflict Pain">Inflict Pain</option>
+  <option value="Waves of Darkness">Waves of Darkness</option>
+  <option value="Dim Another’s Senses">Dim Another’s Senses</option>
+  <option value="Lesser Force Shield">Lesser Force Shield</option>
+  <option value="Control Mind">Control Mind</option>
+  <option value="Create Force Storms">Create Force Storms</option>
+  <option value="Doppleganger">Doppleganger</option>
+  <option value="Drain Life Energy">Drain Life Energy</option>
+  <option value="Drain Life Essence">Drain Life Essence</option>
+  <option value="Memory Wipe">Memory Wipe</option>
+  <option value="Telekinetic Kill">Telekinetic Kill</option>
+  <option value="Transfer Life">Transfer Life</option>
+  <option value="Force Scream">Force Scream</option>
 </datalist>
 
 
diff --git a/D6StarWars/src/datalist.pug b/D6StarWars/src/datalist.pug
new file mode 100644
index 0000000000..1312452bc9
--- /dev/null
+++ b/D6StarWars/src/datalist.pug
@@ -0,0 +1,73 @@
+-var dex = ["Acrobatics", "Archaic Guns", "Blaster", "Blaster Artillery", "Bowcaster", "Bows", "Brawling Parry", "Contortions", "Dancing", "Dodge", "Firearms", "Grenade", "Lightsaber", "Melee Combat", "Melee Parry", "Missile Weapon", "Pick Pocket", "Running", "Shockball Fling", "Shockball Scoop", "Slingshot", "Thrown Weapons", "Vehicle Blasters", "Wedsphere"];
+
+-var know =  ["Accounting", "Agriculture", "Alien Species", "Artist", "Brainwashing", "Bureaucracy", "Business Administration", "Business", "Culinary Arts", "Cultures", "Drink Mixology", "Economics", "Home Economics", "Intimidation", "Languages", "Law Enforcement", "Military History", "Planetary Systems", "Shockball", "Streetwise", "Survival", "Tactics", "Traffic Control", "Torture", "Value", "Willpower"];
+
+-var mech = ["Airship Operation", "Aquatic Ship Operation", "Archaic Starship Piloting", "Astrogation Calculating", "Beast Handling", "Beast Riding", "Capital Ship Gunnery", "Capital Ship Piloting", "Capital Ship Shields", "Ground Vehicle Operation", "Holorecorder Operation", "Household Appliance Operation", "Hover Vehicle Operation", "Jet Pack Operation", "Machinery Operation", "Musical Instrument", "Powersuit Operation", "Repulsorlift Operation", "Sailed Nautical Vessel Operation", "Sensors Operation", "Space Transports", "Starfighter Piloting", "Starship Gunnery", "Starship shields", "Swoop Operation", "Undersea Vehicle operation", "Walker Operation"];
+
+-var per= ["Bargain", "Command", "Con", "Forgery", "Gambling", "Cesa", "Hide", "Investigation", "Persuasion", "Search", "Singing", "Sneak"];
+
+-var str = ["Brawling", "Cleaning", "Climbing/Jumping", "Digging", "Stamina", "Swimming"];
+
+-var tech = ["Aquatic Vehicle Engineering", "Aquatic Vehicle Repair", "Archaic Gun Repair", "Armor Design", "Armor Repair", "Battle Station Engineering", "Battle Station Repair", "Battle Station Weapon Engineering", "Battle Station Weapon Repair", "Blaster Artillery Engineering", "Blaster Repair", "Blaster Engineering", "Bowcaster Repair", "Bow Repair Repairing", "Capital Ship Engineering", "Capital Ship Repair", "Communications Repair", "Computer Engineering", "Computer Programming/Repair", "Construction", "Cyborg Technology", "Demolitions", "Droid Engineering", "Droid Repair", "Encryption Securing", "Engineering", "Firearms Repair", "First Aid", "Ground Vehicle Engineering", "Ground Vehicle Repair", "Holorecorder Repair", "Hover Vehicle Engineering", "Hover Vehicle Repair", "Jet Pack Engineering", "Jet Pack Repair", "Lightsaber Repair", "Machinery Repair", "Medicine Performing", "Melee Weapon Construction", "Melee Weapon Repair", "Musical Instrument Repair", "Powersuit Repair", "Prosthetic Design", "Prosthetic Repair", "Repulsorlift Engineering", "Repulsorlift Repair", "Rocket Pack Repair", "Sailed Nautical Vessel Repair", "Security Bypassing", "Space Transports Engineering", "Space Transports Repair", "Starfighter Engineering", "Starfighter Repair", "Starship Weapon Engineering", "Starship Weapon Repair", "Swoop Engineering", "Swoop Repair", "Walker Engineering", "Walker Repair"];
+
+- var species = ["Aar’aa", "Abinyshi", "Abyssin", "Adarian", "Adnerem", "Advozse", "Aganof", "Aing-Tii", "Akwin", "Aleena", "Amanin", "Anguilla", "Annoo-dat", "Anointed People", "Anomid", "Anx", "Anzat", "Aqualish", "Arachnoid", "Aramandi", "Araquia", "Arcona", "Arkanian", "Askajian", "Avogwi (Altorian Bird)", "Ayrou", "Balinaka", "Balosar", "Barabel", "Baragwin", "Bartokk", "Berrite", "Besalisk", "Bilar", "Bimm (near-human)", "Bimm", "Bith", "Bitthævrian", "Blood Carver", "Boltrunian", "Borneck", "Bosph", "Bothan", "Bouncer", "Bovorian", "Brizzit", "Brubb", "Buzchub", "Caamasi", "Caarite", "Calibop", "Caridan", "Carosite", "Cathar", "Celegian", "Cerean", "Chadra-Fan", "Chagrian", "Chalactan", "Charon", "Charr Ontee", "Cha’wen’he", "Chazrach", "Chev", "Chevin", "Chikarri", "Chiss", "Chistori", "Chuhkyvi Iskalonian", "Clawdite", "Cliffborer", "Codru-Ji", "Colicoid", "Columi", "Conjeni", "Covallon", "Coway", "Coynite", "Cragmoloid", "Damaronian", "Dantari", "Dashade", "Dathomirian Rancor", "Dazouri", "Defel", "Derriphan", "Devaronian", "Devlikk", "Dornean", "Draedan", "Draethos", "Drall", "Dresselian", "Dug", "Duinuogwuin", "Dulok", "Duros", "Ebranite", "Ee", "Eirrauc", "Eklaad", "Elom", "Elomin", "Em’liy", "Entymal", "Epicanthix", "Ergesh", "Er’Kit", "Esoomian", "Essastii", "Etti", "Ewok", "Falleen", "Farghul", "Feeorin", "Fefze", "Fiery One", "Filar-Nitzan", "Filordus", "Filvian", "Firrerreo", "Flakax", "Florn Lamproid", "Fluggrian", "Fosh", "Frog-dog", "Frozian", "Gacerite", "Gados", "Galidyn", "Gamorrean", "Gand", "Gazaran", "Geelan", "Gen’Dai", "Geonosian", "Geran", "Gerb", "Gesaril", "Gigoran", "Givin", "Glymphid", "Gorm", "Gorothite", "Gossam", "Gotal", "Gran", "Gree", "Gruvian", "Gungan", "Gutratee", "Guudrian", "Hapan", "Herglic", "Hethas", "H’nemthe", "Ho’Din", "Hoojib", "Horansi", "Hortek", "Houk", "Hrakian", "Human", "Huralok", "Hutt", "Iktotchi", "Iotran", "Ipharian-Da’Lor", "Ishi Tib", "Iskalloni", "Issori", "Ithorian", "Ixlls", "Iyra", "Jarell", "Jawa", "Jenet", "Jiivahar", "Jillsarian", "Kadri’Ra", "Ka’hren", "Kalduu", "Kaleesh", "Kamarian", "Kaminoan", "Kari", "Karran", "Kel Dor", "Kentra", "Kerestian", "Ketton", "Khil", "Khommite", "Kian’thar", "Kilmaulsi", "Kitonak", "Klatooinian", "Kluuzot", "Kobok", "Kolac", "Koorivar", "Kowakian Monkey-Lizard", "Krakai", "Krevaaki", "Kriek", "Krikthasi", "Krish", "Krytollak", "Kubaz", "Kurtzen", "Kushiban", "Laboi", "Lafrarian", "Lahsbee / Huhk", "Lannik", "Lasat", "Lepi", "Lorrdian", "Lurrian", "Lutrillian", "Makurth", "Mantellian Savrip", "Maoi", "Marasan", "Massassi", "Meerian", "Melodie", "Menahuun", "Meri", "Mimbanite", "Miraluka", "Mirialan", "Mon Calamari", "Morodin", "Morseerian", "Mriss", "Mrlssi", "M’shinn", "Multopos", "Murachaun", "Muun", "Myneyrsh", "Nagai", "Najib", "Nalrithian", "Nalroni", "Nautolan", "Nazzar", "Neimoidian", "Nelvaanian", "Neti", "Nikto", "Nimbanel", "Noehon", "Noghri", "Nosaurian", "Nuiwit (Altorian Lizard)", "Nuknog", "Oblee", "Odenji", "Omwati", "Ongree", "Orfite", "Orgon", "Ortolan", "Ossan", "Pacithhip", "Paigun", "Pa’lowick", "Pau’an", "Permian", "Phindian", "Pho Ph’eahian", "Phuii", "Polis Massan", "Polydroxol", "Poss’Nomin", "Priapulin", "Protean", "Psadan", "Pulra", "P’w’eck", "Qieg", "Qiraash", "Quarren", "Quermian", "Quockran", "Quor’sav", "Qwohog", "Rakaan", "Rakatan", "Rakririan", "Ranat", "Ranth", "Reigat", "Rellarin", "Revwien", "Ri’Dar", "Riileb", "Riorian ", "Rishii", "Rodian", "Roonan", "Ropagu", "Ruurian", "Ruusanian", "Rybet", "Ryn", "Saheelindeeli", "Sakiyan", "Sanyassan", "Sarkan", "Sarrish", "Saurin", "Saurton", "Sauvax", "Sebiri", "Sedrian", "Segmi", "Seikoshan", "Sekct", "Selkath", "Selonian", "Shard", "Sharu", "Shashay", "Shatras", "Shawda Ubb", "Shi’ido", "Shistavanen", "Sic-Six", "Silika", "Siniteen", "Skakoan", "Skrilling", "S’kytri", "Slith", "Sljee", "Sludir", "Sluissi", "Sneevel", "Snivvian", "Spiner", "Squalris", "Squib", "Srrors’tok", "Ssamb", "Ssi-ruu", "Ssither", "Stenax", "Stennes Shifter", "Sullustan", "Sunesi", "Svivreni", "Swokes Swokes", "Sy Myrthian", "Talid", "Talz", "Tammuz-an", "Tarasin", "Tarc", "Tarong", "Tarro", "Tasari", "Tchuukthai", "Teek", "Teltior", "Temolak", "Tempestro", "Thakwaash", "Theelin", "Thisspian", "Tikiarri", "Tinnell", "Tirrith", "Tiss’shar", "T’landa Til", "Togorian", "Togruta", "Toka", "Toong", "Toydarian", "Trandoshan", "Trianii", "Triffian", "Troig", "Trunsk", "Tsil", "T’surr", "Tuhgri", "Tulvarees", "Tunroth", "Turazza", "Tusken Raider(Sand People)", "Twi’lek", "Tynnan", "Ubese", "Ugnaught", "Ugor", "Ukian", "Umbaran", "Utai", "Uukaablian", "Vaathkree", "Vashan", "Veknoid", "Vernol", "Verpine", "Viska", "Vodran", "Vor", "Vorzydiak", "Vratix", "Vulptereen", "Vultan", "Vurk", "Vuvrian", "Weequay", "Werbol", "Whiphid", "Wookiee", "Woostoid", "Wroonian", "Xa Fel", "Xamster", "Xan", "Xexto", "Xi’Dec", "Yaga", "Yam rii", "Yapi", "Yarkora", "Yevetha", "Yimi", "Yinchorri", "Yrashu", "Ysanna Nomad", "Yuuzahn Vong", "Yuzzem", "Yuzzum", "Yvarema", "Zabrak", "Zarian", "ZeHethbra", "Zelosian", "Zeltron", "Zexx", "Zizimaak"];
+
+- var control = ["Absorb/Dissipate Energy",  "Accelerate Healing", "Concentration", "Contort/Escape", "Control Disease", "Control Pain", "Detoxify Poison",  "Emptiness", "Enhance Attribute", "Force of Will", "Hibernation", "Trance", "Instinctive Astrogation", "Reduce Injury", "Remain Conscious", "Remove Fatigue", "Resist Stun", "Short-Term Memory Enhancement", "Rage"];
+
+- var sense = ["Beast Languages", "Combat Sense", "Danger Sense", "Instinctive Astrogation", "Life Detection", "Life Sense", "Life Web", "Magnify Senses", "Merge Senses", "Postcognition", "Predict Natural Disaster", "Receptive Telepathy", "Sense Force", "Sense Force Potential", "Sense Path", "Shift Sense", "Translation", "Weather Sense"];
+
+- var alter = ["Telekinesis", "Bolt of Hatred", "Dark Side Web", "Injure/Kill"];
+
+- var controlsense = ["Farseeing", "Life Bond", "Lightsaber Combat", "Projective Telepathy"];
+
+- var controlalter = ["Accelerate Another's Healing", "Control Another's Disease",  "Control Another's Pain", "Control Breathing", "Detoxify Another's Poison",  "Place Another in Hibernation Trance", "Remove Another's Fatigue", "Return Another to Consciousness", "Transfer Force", "Aura of Uneasiness", "Electronic Manipulation", "Feed on Dark Side", "Force Lightning", "Inflict Pain", "Waves of Darkness"];
+
+- var sensealter = ["Dim Another's Senses", "Lesser Force Shield"];
+
+- var forceall = ["Control Mind", "Create Force Storms", "Doppleganger", "Drain Life Energy", "Drain Life Essence", "Memory Wipe", "Telekinetic Kill",  "Transfer Life", "Force Scream"];
+
+- var controlall = control.concat(controlsense, controlalter, forceall);
+
+- var senseall = sense.concat(controlsense, sensealter, forceall);
+
+- var alterall = alter.concat(controlalter, sensealter, forceall);
+
+datalist#dexskills
+    each skill in dex
+        option(value=`${skill}`)=skill
+
+datalist#knowskills
+    each skill in know
+        option(value=`${skill}`)=skill 
+
+datalist#mechskills
+    each skill in mech
+        option(value=`${skill}`)=skill 
+
+datalist#perskills
+    each skill in per
+        option(value=`${skill}`)=skill 
+
+datalist#strskills
+    each skill in str
+        option(value=`${skill}`)=skill
+
+datalist#techskills
+    each skill in tech
+        option(value=`${skill}`)=skill 
+
+datalist#species
+    each race in species
+        option(value=`${race}`)=race
+
+datalist#forcecontrol
+    each power in controlall
+       option(value=`${power}`)=power
+
+datalist#forcesense
+    each power in senseall
+       option(value=`${power}`)=power
+
+datalist#forcealter
+    each power in alterall
+       option(value=`${power}`)=power
\ No newline at end of file

From f25f8d81cbeb506b12643c956fb468e3612cfc84 Mon Sep 17 00:00:00 2001
From: Andreas Johansson <andreas.johansson@aalto.fi>
Date: Sat, 22 May 2021 04:55:42 +0300
Subject: [PATCH 07/14] changelog

---
 D6StarWars/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md
index c69a3e6af8..8d0c9d9b78 100644
--- a/D6StarWars/CHANGELOG.md
+++ b/D6StarWars/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ### Version 2.40 (2021-05):
 - refactor sheet to be able to use the new Roll20 Sheet framework
-- Feature: Skill name auto-suggestions, suggest relevant names as you start typing
+- Feature: Skills, Species, Force Powers auto-suggestions, suggest relevant names as you start typing
 - more code cleanup
 
 ### Version 2.34 (2021-05):

From c1561291b0c259ccea6e76aa45a1cd148f364e8c Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Sun, 23 May 2021 08:56:22 +0200
Subject: [PATCH 08/14] D6StarWars 2.41

- Fix breaking lines when no GM rolls
---
 D6StarWars/D6StarWars.css  | 26 +++++++++++++++-----------
 D6StarWars/D6StarWars.html |  4 ++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 29ca0d07a8..408df08fb1 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -504,10 +504,6 @@
     line-height: 40px;
 }
 
-.charsheet input.gmroll:checked ~ .master-container .unified-dice-text {
-    width: calc(100% - 181px);
-}
-
 .charsheet .unified-dice-roll {
 }
 
@@ -576,10 +572,6 @@
     line-height: 28px;
 }
 
-.charsheet input.gmroll:checked ~ .master-container .skill .unified-dice-text {
-    width: calc(100% - 173px);
-}
-
 .charsheet .skill button[type=roll].unified-dice-roll {
     width: 32px;
     height: 24px;
@@ -660,8 +652,14 @@
 .charsheet .armor.sheet-row,
 .charsheet .weapon.sheet-row {
     display: flex;
-    width: 856px;
+    width: 100%;
 }
+/*.charsheet :not(input.gmroll:checked) .weapon.sheet-row {*/
+/*    width: 763px;*/
+/*}*/
+/*.charsheet :not(input.gmroll:checked) .armor.sheet-row {*/
+/*    width: 748px;*/
+/*}*/
 .charsheet .armor.sheet-row:first-of-type .cell,
 .charsheet .weapon.sheet-row:first-of-type .cell {
     height: 36px;
@@ -701,17 +699,23 @@
 .charsheet .cell-dice {
     width: 205px;
 }
+.charsheet :not(input.gmroll:checked) .cell-dice {
+    width: 158px;
+}
 .charsheet .cell-1 {
     width: 46px;
 }
 .charsheet .cell-2 {
     width: 98px;
 }
+.charsheet :not(input.gmroll:checked) .cell-2 {
+    width: 50px;
+}
 .charsheet .cell-4 {
     width: 200px;
 }
 .charsheet .armor .cell-4 {
-    width: 204px;
+    width: 250px;
 }
 .charsheet .cell-4 .part {
     display: inline-block;
@@ -723,7 +727,7 @@
 
 .charsheet .repcontainer[data-groupname="repeating_weapons"] > .repitem input[type="text"].name,
 .charsheet .repcontainer[data-groupname="repeating_armors"] > .repitem input[type="text"].name{
-    width: 107px;
+    width: 98px;
 }
 .charsheet .repcontainer[data-groupname="repeating_weapons"] > .repitem input[type="number"].40px,
 .charsheet .repcontainer[data-groupname="repeating_armors"] > .repitem input[type="number"].40px{
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index cbba30681f..0c9d9842fa 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -464,7 +464,7 @@
 
     <div class="section pc npc shop-inventory">
       <label class="txtcenter">Weapon & Armor</label>
-      <div class="overflow-auto">
+      <div>
         <div class="weapon sheet-row">
           <div class="cell cell-name">Weapon</div>
           <div class="cell cell-dice">Attack</div>
@@ -507,7 +507,7 @@
         </fieldset>
       </div>
 
-      <div class="overflow-auto">
+      <div>
         <div class="armor sheet-row">
           <div class="cell cell-name">Armor</div>
           <div class="cell cell-dice">Physical <span class="physical"></span></div>

From 93b92bb8b202d2d263d369b392c1bf9aa8be453d Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Sun, 23 May 2021 19:22:08 +0200
Subject: [PATCH 09/14] D6StarWars 2.41

- Fix regression bug
---
 D6StarWars/D6StarWars.css  | 20 +++++++++-----------
 D6StarWars/D6StarWars.html |  4 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 408df08fb1..89f0d04d08 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -654,12 +654,10 @@
     display: flex;
     width: 100%;
 }
-/*.charsheet :not(input.gmroll:checked) .weapon.sheet-row {*/
-/*    width: 763px;*/
-/*}*/
-/*.charsheet :not(input.gmroll:checked) .armor.sheet-row {*/
-/*    width: 748px;*/
-/*}*/
+.charsheet :not(input.gmroll:checked) .weapon.sheet-row ,
+.charsheet :not(input.gmroll:checked) .armor.sheet-row {
+    width: 856px;
+}
 .charsheet .armor.sheet-row:first-of-type .cell,
 .charsheet .weapon.sheet-row:first-of-type .cell {
     height: 36px;
@@ -700,7 +698,7 @@
     width: 205px;
 }
 .charsheet :not(input.gmroll:checked) .cell-dice {
-    width: 158px;
+    width: 208px;
 }
 .charsheet .cell-1 {
     width: 46px;
@@ -709,14 +707,11 @@
     width: 98px;
 }
 .charsheet :not(input.gmroll:checked) .cell-2 {
-    width: 50px;
+    width: 92px;
 }
 .charsheet .cell-4 {
     width: 200px;
 }
-.charsheet .armor .cell-4 {
-    width: 250px;
-}
 .charsheet .cell-4 .part {
     display: inline-block;
     width: 20%;
@@ -759,6 +754,9 @@
 .charsheet .force-hide .weapon.sheet-row {
     width: 100%;
 }
+.charsheet :not(input.gmroll:checked) .force-hide .weapon.sheet-row {
+    width: 100%;
+}
 .charsheet .force-hide .weapon .cell.cell-name {
     width: calc(100% - 418px);
 }
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 0c9d9842fa..cbba30681f 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -464,7 +464,7 @@
 
     <div class="section pc npc shop-inventory">
       <label class="txtcenter">Weapon & Armor</label>
-      <div>
+      <div class="overflow-auto">
         <div class="weapon sheet-row">
           <div class="cell cell-name">Weapon</div>
           <div class="cell cell-dice">Attack</div>
@@ -507,7 +507,7 @@
         </fieldset>
       </div>
 
-      <div>
+      <div class="overflow-auto">
         <div class="armor sheet-row">
           <div class="cell cell-name">Armor</div>
           <div class="cell cell-dice">Physical <span class="physical"></span></div>

From 3560e310f1bbbfc36a30c55f8ace62b2d9c3514c Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Sun, 30 May 2021 09:16:17 +0200
Subject: [PATCH 10/14] D6StarWars 2.41 v2.41.10

- Fixes default skill dice values as 3
- Fixes default dice values as 1 for weapons and armors
- Fixes default pip values for force attributes
- Fixes weapon range header misalignment
- Adds missing value highlight on every skill and attribute
---
 D6StarWars/D6StarWars.css  | 12 +++---
 D6StarWars/D6StarWars.html | 88 +++++++++++++++++++-------------------
 2 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 89f0d04d08..336369eb7f 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -60,6 +60,9 @@
 }
 
 
+.charsheet input:not(:valid) {
+    background-color: #ffcccb;
+}
 
 .charsheet input[type=number].p60{
     width: 60px;
@@ -656,7 +659,7 @@
 }
 .charsheet :not(input.gmroll:checked) .weapon.sheet-row ,
 .charsheet :not(input.gmroll:checked) .armor.sheet-row {
-    width: 856px;
+    width: 866px;
 }
 .charsheet .armor.sheet-row:first-of-type .cell,
 .charsheet .weapon.sheet-row:first-of-type .cell {
@@ -710,11 +713,11 @@
     width: 92px;
 }
 .charsheet .cell-4 {
-    width: 200px;
+    width: 210px;
 }
 .charsheet .cell-4 .part {
     display: inline-block;
-    width: 20%;
+    width: 46px;
 }
 .charsheet .cell-5 {
     width: 219px;
@@ -980,7 +983,7 @@
     padding-bottom:8px;
 }
 .charsheet div.section.ship textarea{
-    width: 97%
+    width: 97%;
     height: 17em;
 }
 
@@ -1211,4 +1214,3 @@
 .sheet-rolltemplate-black tr:nth-child(even) {
  background-color:#eee;
 }
-
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index cbba30681f..8aca90980f 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1,4 +1,4 @@
-<input  name="attr_version" type="hidden" value="2.41">
+<input  name="attr_version" type="hidden" value="2.41.10-BETA">
 
 <input class="toggle" name="attr_sheettype" type="hidden" value="0">
 
@@ -287,9 +287,9 @@
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}"></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Dexterity</label>
-              <input type="number" name="attr_dexterity" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_dexterity" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_dexteritypip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_dexteritypip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_dexskills">
@@ -301,9 +301,9 @@
               <label class="unified-dice unified-dice-text">
                 <input type="text" name="attr_dexskillname" list="dexskills">
               </label>
-              <input type="number" name="attr_dexskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_dexskilldice" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice-middle">D+</div>
-              <input type="number" name="attr_dexskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_dexskillpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
             </div>
             </fieldset>
           </div>
@@ -316,9 +316,9 @@
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Knowledge</label>
-              <input type="number" name="attr_knowledge" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_knowledge" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_knowledgepip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_knowledgepip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_knowskills">
@@ -330,9 +330,9 @@
                 <label class="unified-dice unified-dice-text">
                   <input type="text" name="attr_knowskillname" list="knowskills">
                 </label>
-                <input type="number" name="attr_knowskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <input type="number" name="attr_knowskilldice" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
                 <div class="unified-dice-middle">D+</div>
-                <input type="number" name="attr_knowskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+                <input type="number" name="attr_knowskillpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               </div>
             </fieldset>
           </div>
@@ -345,9 +345,9 @@
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}"></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Mechanical</label>
-              <input type="number" name="attr_mechanical" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_mechanical" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_mechanicalpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_mechanicalpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_mechskills">
@@ -359,9 +359,9 @@
                 <label class="unified-dice unified-dice-text">
                   <input type="text" name="attr_mechskillname" list="mechskills">
                 </label>
-                <input type="number" name="attr_mechskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <input type="number" name="attr_mechskilldice" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
                 <div class="unified-dice-middle">D+</div>
-                <input type="number" name="attr_mechskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+                <input type="number" name="attr_mechskillpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               </div>
             </fieldset>
           </div>
@@ -377,9 +377,9 @@
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + 1d6@{wilddie}]]}}"></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Perception</label>
-              <input type="number" name="attr_perception" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_perception" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_perceptionpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_perceptionpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_perckills">
@@ -391,9 +391,9 @@
                 <label class="unified-dice unified-dice-text">
                   <input type="text" name="attr_perckillname" list="perskills">
                 </label>
-                <input type="number" name="attr_perckilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <input type="number" name="attr_perckilldice" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
                 <div class="unified-dice-middle">D+</div>
-                <input type="number" name="attr_perckillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+                <input type="number" name="attr_perckillpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               </div>
             </fieldset>
           </div>
@@ -406,9 +406,9 @@
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Strength</label>
-              <input type="number" name="attr_strength" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_strength" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_strengthpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_strengthpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_strskills">
@@ -420,9 +420,9 @@
                 <label class="unified-dice unified-dice-text">
                   <input type="text" name="attr_strskillname" list="strskills">
                 </label>
-                <input type="number" name="attr_strskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <input type="number" name="attr_strskilldice" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
                 <div class="unified-dice-middle">D+</div>
-                <input type="number" name="attr_strskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+                <input type="number" name="attr_strskillpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               </div>
             </fieldset>
           </div>
@@ -435,9 +435,9 @@
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Technical</label>
-              <input type="number" name="attr_technical" value="1" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_technical" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_technicalpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_technicalpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_techskills">
@@ -449,9 +449,9 @@
                 <label class="unified-dice unified-dice-text">
                   <input type="text" name="attr_techskillname"  list="techskills">
                 </label>
-                <input type="number" name="attr_techskilldice" value="1" min="0" class="unified-dice unified-dice-input"/>
+                <input type="number" name="attr_techskilldice" value="3" min="0" required="required" class="unified-dice unified-dice-input"/>
                 <div class="unified-dice-middle">D+</div>
-                <input type="number" name="attr_techskillpip" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+                <input type="number" name="attr_techskillpip" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               </div>
             </fieldset>
           </div>
@@ -471,7 +471,7 @@
           <div class="cell cell-dice">Damage</div>
           <div class="cell cell-4">
             <div>Range</div>
-            <div class="part" title="Point Blank Range (Very Easy)">PB</div> - <div class="part" title="Short Range (Easy)">S</div> / <div class="part" title="Medium Range (Moderate)">M</div> / <div class="part" title="Long Range (Difficult)">L</div>
+            <div class="part" title="Point Blank Range (Very Easy)">PB</div>-<div class="part" title="Short Range (Easy)">S</div>/<div class="part" title="Medium Range (Moderate)">M</div>/<div class="part" title="Long Range (Difficult)">L</div>
           </div>
           <div class="cell cell-1"><abbr title="Rate of Fire">ROF</abbr></div>
           <div class="cell cell-1">Ammo</div>
@@ -485,14 +485,14 @@
               </label>
             </div>
             <div class="cell cell-dice">
-              <input name="attr_weaponskill" type="number" min="0" value="0" class="unified-dice unified-dice-input"/>D+<input name="attr_weaponskillpip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input name="attr_weaponskill" type="number" min="0" value="1" required="required" class="unified-dice unified-dice-input"/>D+<input name="attr_weaponskillpip" type="number" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
               <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"></button>
               <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
             </div>
             <div class="cell cell-dice">
-              <input name="attr_damagedice" type="number" value="0" min="0" class="unified-dice unified-dice-input"/>D+<input name="attr_damagepip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input name="attr_damagedice" type="number" value="1" min="0" required="required" class="unified-dice unified-dice-input"/>D+<input name="attr_damagepip" type="number" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{damagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{damagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{damagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{damagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
               <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}"></button>
@@ -524,14 +524,14 @@
               </label>
             </div>
             <div class="cell cell-dice">
-              <input name="attr_armorPhDice" type="number" min="0" value="0" class="unified-dice unified-dice-input"/>D+<input name="attr_armorPhPip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input name="attr_armorPhDice" type="number" min="0" value="1" required="required" class="unified-dice unified-dice-input"/>D+<input name="attr_armorPhPip" type="number" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
               <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +1d6@{wilddie}]]}}"></button>
               <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <button name="roll_dmg_soak_ph" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} - 1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
             </div>
             <div class="cell cell-dice">
-              <input name="attr_armorEnDice" type="number" value="0" min="0" class="unified-dice unified-dice-input"/>D+<input name="attr_armorEnPip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input name="attr_armorEnDice" type="number" value="1" min="0" required="required" class="unified-dice unified-dice-input"/>D+<input name="attr_armorEnPip" type="number" value="0" min="0" max="2" required="required" class="unified-dice unified-dice-pip"/>
               <button name="roll_dmg_soak_en" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
               <button name="roll_dmg_soak_en" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} - 1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} +1d6@{wilddie}]]}}"></button>
               <button name="roll_dmg_soak_en" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} + ?{Dice mods|0} - 1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
@@ -570,9 +570,9 @@
               <button name="roll_force_control" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
               <button name="roll_force_control-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Control</label>
-              <input type="number" name="attr_control" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_control" min="0" value="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_controlpip" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_controlpip" min="0" required="required" value="0" max="2" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_controlpowers">
@@ -597,9 +597,9 @@
               <button name="roll_force_sense" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
               <button name="roll_force_sense-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Sense</label>
-              <input type="number" name="attr_sense" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_sense" min="0" value="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_sensepip" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_sensepip" min="0" max="2" value="0" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_sensepowers">
@@ -624,9 +624,9 @@
               <button name="roll_force_alter" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"></button>
               <button name="roll_force_alter-w" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
               <label class="unified-dice unified-dice-text">Alter</label>
-              <input type="number" name="attr_alter" min="0" class="unified-dice unified-dice-input"/>
+              <input type="number" name="attr_alter" min="0" value="0" required="required" class="unified-dice unified-dice-input"/>
               <div class="unified-dice unified-dice-middle">D+</div>
-              <input type="number" name="attr_alterpip" min="0" max="2" class="unified-dice unified-dice-pip"/>
+              <input type="number" name="attr_alterpip" min="0" max="2" value="0" required="required" class="unified-dice unified-dice-pip"/>
             </div>
 
             <fieldset class="repeating_alterpowers">
@@ -696,17 +696,17 @@
           </div>
           <div class="cell cell-dice">
             <input name="attr_lightsaberskilldice" type="number" min="0" value="0" class="unified-dice unified-dice-input"/>D+<input name="attr_lightsaberskillpip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
-            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} + ?{Dice mods|0} -1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} - 1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + 1d6@{wilddie}]]}}"></button>
-            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} + ?{Dice mods|0} -1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
-            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} + @{sense} - 1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod"                       value=      "&{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} - @{WoundMod} + @{Force_Up} + @{sense} + ?{Dice mods|0} - 1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no"                    value=      "&{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} - @{WoundMod} + @{Force_Up} + @{sense} - 1                 )d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod}                        + 1d6@{wilddie}]]}}"></button>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide"    value="/w gm &{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} - @{WoundMod} + @{Force_Up} + @{sense} + ?{Dice mods|0} - 1)d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+            <button name="roll_attack" type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Attack: @{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} - @{WoundMod} + @{Force_Up} + @{sense} - 1                 )d6cf0cs0 + @{lightsaberskillpip} + @{sensepip} + @{Force_EmptinessMod}                        + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
           </div>
           <div class="cell cell-dice">
             <input name="attr_lightsaberdamagedice" type="number" value="0" min="0" class="unified-dice unified-dice-input"/>D+<input name="attr_lightsaberdamagepip" type="number" value="0" min="0" max="2" class="unified-dice unified-dice-pip"/>
-            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{lightsaberdamagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"></button>
-            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{lightsaberdamagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
-            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no" value="&{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs7 + @{lightsaberdamagepip} + (1d6@{wilddie})]]}}"></button>
-            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide" value="/w gm &{template:swd6} {{name=Damage: @{weapon}}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs7 + @{lightsaberdamagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod"                                          value="      &{template:swd6} {{name=Damage: @{lightsaberskill}}} {{Roll=[[(@{lightsaberdamagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{lightsaberdamagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"></button>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod gmroll gmroll-hide"                       value="/w gm &{template:swd6} {{name=Damage: @{lightsaberskill}}} {{Roll=[[(@{lightsaberdamagedice} + ?{Dice mods|0} - 1)d6cf0cs7 + @{lightsaberdamagepip} + ?{Other Mods(pip)|0} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no"                                       value="      &{template:swd6} {{name=Damage: @{lightsaberskill}}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs7 + @{lightsaberdamagepip} + (1d6@{wilddie})]]}}"></button>
+            <button type="roll" class="d6-dice unified-dice unified-dice-roll rollmod-no gmroll gmroll-hide"                    value="/w gm &{template:swd6} {{name=Damage: @{lightsaberskill}}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs7 + @{lightsaberdamagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span></button>
           </div>
         </div>
       </div>

From decf6757c7949f3746452815549e864a867ae853 Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Sun, 30 May 2021 22:46:28 +0200
Subject: [PATCH 11/14] D6StarWars 2.41

v2.41.11

- Fixes consumable box overlaid with another box
- Fixes durability hull/shields overlaid with jump route, astromech and another entry box
---
 D6StarWars/D6StarWars.css  | 10 ++++++++--
 D6StarWars/D6StarWars.html | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 336369eb7f..d8df0f59ea 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -823,14 +823,12 @@
     padding: 5px;
     display: grid;
     grid-template-columns: 3fr 7fr;
-    grid-template-rows: 4fr 2fr 4fr 4fr 2fr 1fr;
     grid-template-areas: "price   perf      "
                          "price   sensor    "
                          "price   sensor    "
                          "price   hyperdrive"
                          "consume hyperdrive"
                          "consume dura      ";
-    height: 550px;
 }
 
 .charsheet div.shipblock div.price{
@@ -878,6 +876,10 @@
 .charsheet div.shipblock div.perf-block div.flex-col{
     display: flex;
     flex-flow: column nowrap;
+    border-width: 3px 0 0 0;
+    border-style: solid;
+    border-color: transparent;
+    padding-top: 5px;
 }
 .charsheet div.shipblock div.perf div.perf-block{
     display: flex;
@@ -885,6 +887,10 @@
     justify-content: space-between;
     padding: 5px;
 }
+.charsheet div.shipblock div.perf-block div.flex-col.wborder {
+    border-width: 3px;
+    border-color: white;
+}
 
 /* Sensors */
 .charsheet div.shipblock div.sensor{
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 8aca90980f..77a2767e24 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1,4 +1,4 @@
-<input  name="attr_version" type="hidden" value="2.41.10-BETA">
+<input  name="attr_version" type="hidden" value="2.41.11-BETA">
 
 <input class="toggle" name="attr_sheettype" type="hidden" value="0">
 
@@ -880,15 +880,15 @@
             <input class="medium" name="attr_maneuverability" type="text">
           </div>
           <div class="flex-col">
-            <label>Move(Space Units)</label>
+            <label>Move (<abbr title="Space Unit">Space</abbr>)</label>
             <input class="medium" name="attr_ship_space" type="text">
           </div>
           <div class="flex-col">
-            <label>Move(Ground units)</label>
+            <label>Move (<abbr title="Atmosphere (Ground Unit)">Atm.</abbr>)</label>
             <input class="medium" name="attr_ship_ground" type="text">
           </div>
           <div class="flex-col">
-            <label>Speed(Athmospheric)</label>
+            <label>Speed (<abbr title="Atmosphere (km/h)">Atm.</abbr>)</label>
             <input class="medium" name="attr_ship_athmosphere" type="text">
           </div>
         </div>
@@ -925,7 +925,7 @@
 
       <div class="hyperdrive wborder">
         <label>Hyperdrive System</label>
-        <div class="wborder">
+        <div class="flex-row">
           <div class="wborder crew">
             <label>Crew Station</label>
             <input class="medium" name="attr_crew_station_hyperdrive" type="text">

From 7bd6b4a0456e3ac64302190bad1f2bfe3a274d81 Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Mon, 31 May 2021 00:39:58 +0200
Subject: [PATCH 12/14] D6StarWars 2.41

v2.41.12

- Fixes ship weapons layout
---
 D6StarWars/D6StarWars.css  | 16 +++++++++
 D6StarWars/D6StarWars.html | 74 +++++++++++++++++++++++++++-----------
 2 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index d8df0f59ea..dcc92896d7 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -970,6 +970,22 @@
 
 /* Ship Weapons */
 
+.charsheet .repcontainer[data-groupname="repeating_shipweapon"] > .repitem {
+    border: 2px solid white;
+    margin-bottom: 5px;
+    padding: 5px;
+
+    display: grid;
+    grid-template-areas: "label value";
+    grid-template-columns: 1fr 3fr
+}
+
+.charsheet .repcontainer[data-groupname="repeating_shipweapon"] > .repitem .range {
+    display: inline-block;
+    width: 60px;
+    text-align: center;
+    border: none;
+}
 .charsheet .repcontainer[data-groupname="repeating_shipweapon"] > .repitem div{
     margin-bottom:10px;
 }
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 77a2767e24..ce70268c94 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1,4 +1,4 @@
-<input  name="attr_version" type="hidden" value="2.41.11-BETA">
+<input  name="attr_version" type="hidden" value="2.41.12-BETA">
 
 <input class="toggle" name="attr_sheettype" type="hidden" value="0">
 
@@ -983,29 +983,63 @@
 
     <div class="section ship">
       <label>Ship Weapons</label>
+
       <fieldset class="repeating_shipweapon">
-        <label class="bold">Weapon Name<input name="attr_weapon_name" type="text"></label>
-        <div>
-          <span>Scale:<input class="40px" name="attr_weapon_scale" type="text" value=""></span>
-          <span>Fire Arc:<input name="attr_weapon_arc" type="text" value=""></span>
-          <span>Crew:<input name="attr_weapon_crew" type="text" value=""></span>
+        <label>Name</label>                 <div class="name"><input name="attr_weapon_name" type="text" placeholder="Name"></div>
+        <label>Scale</label>                <div><input name="attr_weapon_scale" type="text" value=""></div>
+        <label>Fire Arc</label>             <div><input name="attr_weapon_arc" type="text" value=""></div>
+        <label>Crew</label>                 <div><input name="attr_weapon_crew" type="text" value=""></div>
+        <label>Skill</label>                <div><input name="attr_weapon_skill" type="text" value=""></div>
+        <label></label>                     <div>
+          <abbr title="Point Blank (Very Easy)" class="range">PB</abbr> -
+          <abbr title="Short Range (Easy)" class="range">S</abbr> /
+          <abbr title="Medium Range (Moderate)" class="range">M</abbr> /
+          <abbr title="Long Range (Hard)" class="range">L</abbr>
+        </div>
+        <label>Space Range</label>       <div>
+          <input class="mediumnumber" name="attr_weapon_range_space_pb" type="number" value=""> -
+          <input class="mediumnumber" name="attr_weapon_range_space_s" type="number" value=""> /
+          <input class="mediumnumber" name="attr_weapon_range_space" type="number" value=""> /
+          <input class="mediumnumber" name="attr_weapon_range_space_l" type="number" value="">
+        </div>
+        <label>Atmosphere Range</label>  <div>
+          <input class="mediumnumber" name="attr_weapon_range_atmosphere_pb" type="number" value=""> -
+          <input class="mediumnumber" name="attr_weapon_range_atmosphere_s" type="number" value=""> /
+          <input class="mediumnumber" name="attr_weapon_range_atmosphere" type="number" value=""> /
+          <input class="mediumnumber" name="attr_weapon_range_atmosphere_l" type="number" value="">
+        </div>
+        <label>Fire Control</label>         <div>
+          <input class="mediumnumber" name="attr_weapon_fire_control" type="number" value=""> D+
+          <input class="mediumnumber" name="attr_weapon_fire_control_pip" type="number" value="">
+          <button class="d6-dice" name="roll_ship_wpn_dmg" type="roll" value="&{template:swd6} {{name=Weapon: @{weapon_name} }} {{subtitle=Ship: @{ship_name} }} {{Roll=[[(@{weapon_fire_control} + ?{Dice mods|0} - 1)d6cf0cs0 + @{weapon_fire_control_pip} + ?{Other mods (pip)|0} + (1d6@{wilddie})]] damage}}">ATK</button>
+        </div>
+        <label>Damage</label>               <div>
+          <input class="mediumnumber" name="attr_weapon_damage" type="number" value="3"> D+
+          <input class="mediumnumber" name="attr_weapon_damage_pip" type="number" value="0">
+          <button class="d6-dice" name="roll_ship_wpn_dmg" type="roll" value="&{template:swd6} {{name=Weapon: @{weapon_name} }} {{subtitle=Ship: @{ship_name} }} {{Roll=[[(@{weapon_damage} - 1)d6cf0cs0 + @{weapon_damage_pip} +(1d6@{wilddie})]] damage}}">DMG</button>
         </div>
 
-        <div>
-          <span>Skill:<input name="attr_weapon_skill" type="text" value=""></span>
-          <span>Fire Control:<input class="40px" name="attr_weapon_fire_control" type="number" value=""> D</span>
-          <span class="range">Space Range:<input class="mediumnumber" name="attr_weapon_range_space" type="number"
-                                                              value=""></span>
-          <span>Atmosphere Range:<input class="40px" name="attr_weapon_range_atmosphere" type="number" value=""></span>
-        </div>
+<!--        <div>-->
+<!--          <span>Scale:<input class="40px" name="attr_weapon_scale" type="text" value=""></span>-->
+<!--          <span>Fire Arc:<input name="attr_weapon_arc" type="text" value=""></span>-->
+<!--          <span>Crew:<input name="attr_weapon_crew" type="text" value=""></span>-->
+<!--        </div>-->
 
-        <div>
-          <span>Damage:
-            <input class="40px" name="attr_weapon_damage" type="number" value="3">D+<input
-              class="smallnumber" name="attr_weapon_damage_pip" type="number" value="0">
-            <button class="d6-dice" name="roll_ship_wpn_dmg" type="roll" value="&{template:swd6} {{name=Weapon: @{weapon_name} }} {{subtitle=Ship: @{ship_name} }} {{Roll=[[(@{weapon_damage}- 1)d6cf0cs0 + @{weapon_damage_pip} +(1d6@{wilddie})]] damage}}">DMG</button>
-          </span>
-        </div>
+<!--        <div>-->
+<!--          <span>Skill:<input name="attr_weapon_skill" type="text" value=""></span>-->
+<!--          <span>Fire Control:<input class="40px" name="attr_weapon_fire_control" type="number" value=""> D</span>-->
+<!--          <span class="range">Space Range:<input class="mediumnumber" name="attr_weapon_range_space" type="number"-->
+<!--                                                              value=""></span>-->
+<!--          <span>Atmosphere Range:<input class="40px" name="attr_weapon_range_atmosphere" type="number" value=""></span>-->
+<!--        </div>-->
+
+<!--        <div>-->
+<!--          <span>Damage:-->
+<!--            <input class="40px" name="attr_weapon_damage" type="number" value="3">D+<input-->
+<!--              class="smallnumber" name="attr_weapon_damage_pip" type="number" value="0">-->
+<!--            <button class="d6-dice" name="roll_ship_wpn_dmg" type="roll" value="&{template:swd6} {{name=Weapon: @{weapon_name} }} {{subtitle=Ship: @{ship_name} }} {{Roll=[[(@{weapon_damage}- 1)d6cf0cs0 + @{weapon_damage_pip} +(1d6@{wilddie})]] damage}}">DMG</button>-->
+<!--          </span>-->
+<!--        </div>-->
 
       </fieldset>
     </div>

From 3bcc3df685b032af2baa7040d3b1e71c2802f4ab Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Mon, 31 May 2021 00:53:01 +0200
Subject: [PATCH 13/14] D6StarWars 2.41

v2.41.12

- Fixes fire control default values
---
 D6StarWars/D6StarWars.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index ce70268c94..8f3b47493a 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1009,8 +1009,8 @@
           <input class="mediumnumber" name="attr_weapon_range_atmosphere_l" type="number" value="">
         </div>
         <label>Fire Control</label>         <div>
-          <input class="mediumnumber" name="attr_weapon_fire_control" type="number" value=""> D+
-          <input class="mediumnumber" name="attr_weapon_fire_control_pip" type="number" value="">
+          <input class="mediumnumber" name="attr_weapon_fire_control" type="number" value="0"> D+
+          <input class="mediumnumber" name="attr_weapon_fire_control_pip" type="number" value="0">
           <button class="d6-dice" name="roll_ship_wpn_dmg" type="roll" value="&{template:swd6} {{name=Weapon: @{weapon_name} }} {{subtitle=Ship: @{ship_name} }} {{Roll=[[(@{weapon_fire_control} + ?{Dice mods|0} - 1)d6cf0cs0 + @{weapon_fire_control_pip} + ?{Other mods (pip)|0} + (1d6@{wilddie})]] damage}}">ATK</button>
         </div>
         <label>Damage</label>               <div>

From e2a361554e5155632d22869abbd088b8f8575649 Mon Sep 17 00:00:00 2001
From: Moondancer83 <kalee.mark@gmail.com>
Date: Fri, 11 Jun 2021 00:54:59 +0200
Subject: [PATCH 14/14] D6StarWars 2.41

Release of v2.41.12
---
 D6StarWars/D6StarWars.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 8f3b47493a..fd975aa3fb 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1,4 +1,4 @@
-<input  name="attr_version" type="hidden" value="2.41.12-BETA">
+<input  name="attr_version" type="hidden" value="2.41.12">
 
 <input class="toggle" name="attr_sheettype" type="hidden" value="0">