diff --git a/Shadowrun Sixth World/CHANGELOG.md b/Shadowrun Sixth World/CHANGELOG.md
index 588e2a97b5..e501ba3335 100644
--- a/Shadowrun Sixth World/CHANGELOG.md	
+++ b/Shadowrun Sixth World/CHANGELOG.md	
@@ -5,6 +5,12 @@ Change Log
 	Bugfix - Removed mention of "Force" in npc->grunt spell roll button
 	Bugfix - PC->Magic->Spells->Dicepool Modifier lost it's value constantly
 	Bugfix - Sheets were losing Attributes, Initiative values, Matrix values (ASDF, AR, DR) resulting in many roll buttons not firing correctly, this seemed to be triggered only when importing a character to another lobby and was fixable by re-entering the base attribute values.
+	Bugfix - roll20 can't make up their mind whether rolltemplate classes need to have sheet- or not.  Have templates now with and without, because, why not?
+	Bugfix - Fixed a bug causing weapon dicepool to be displayed incorrectly (example: 2+0 was showing up as 20)  Rolls were correct.
+	Bugfix - Display of essence cost was incorrect, fixed this.
+	Bugfix - Added indication that the rating for a skill has not been entered.  Some users were entering the Skill Rating in the Mod box, causing all sorts of mayhem with roll buttons and such.
+	NPC->Sprite sheet Added Attribute selector to Sprite skill roll button Intuition, Logic, Willpower, Charisma replaced with their ASDF equivelents.
+	NPC->Spirit sheet now exists, doesn't have sheet-worker magic like the sprite sheet...yet.
 **2021-04-19** v.28 Chuz (James Culp)
 	Removed "Astral Combat" from skills dropdown.
 	Changed "Influence" to "Connection" in Social->Contacts
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index aaeed6d067..5e72bd0cc1 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css	
@@ -78,7 +78,7 @@ img.shadowrun-logo {
     background-color: #d2d1cd !important;
     color: #1c1c1c !important; }
   .charsheet input[type='text']:placeholder-shown, input[type='number']:placeholder-shown {
-    background-color: rgba(28, 28, 28, 0.14902) !important;
+    background-color: rgba(28, 28, 28, 0.14902);
     color: white !important; }
   .charsheet input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
     -webkit-appearance: none !important;
@@ -698,6 +698,10 @@ div.matrix-device .matrixFirewall {
       width: 100%; }
   .pc div.skill-box input[name='attr_rating_modifier'], .pc div.skill-box input[name='attr_unskilled_mod'] {
     width: 3em; }
+  .pc div.skill-box span[name='attr_rating']:empty,
+  .pc div.skill-box input[name='attr_rating']:empty,
+  .pc div.skill-box label[title='rating'] input[name='attr_rating'][value='0'] {
+    background-color: pink; }
   .pc div.skill-box div.row-long {
     grid-template-columns: 1fr 3em 3em 5em 1em 1em;
     padding: 1% 0.5%;
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index c2596942b8..ef4608da9c 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -471,7 +471,7 @@
                   <span class="skill-button-hider" name="attr_expert">hideme</span><button name="roll_expert" class="skill_expert" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=@{name} +3 (Expert: @{display_expert})}}{{dice=[[((@{rating}+@{attribute}+@{mod}+3)+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=Expertise: @{expert}\n@{notes}}}{{wilddie=[[@{wild_die}d6]]}}"><span class="skill_expert" name="attr_display_expert"></span></button>
                 </div>
                 <span class="text-align-center" name="attr_rating" title="@{repeating_skills_${x}_rating}"></span>
-                <input name="attr_mod" placeholder="0" type="number" step="1" value="0" title="mod"/>
+                <input name="attr_mod" step="1" value="0" placeholder="0" type="number" title="mod"/>
                 <select class="attribute-select" name="attr_attribute" title="undefined_attribute">
                   <option data-i18n="body" value="@{body}">Body</option>
                   <option data-i18n="agility" value="@{agility}" selected="selected">Agility</option>
@@ -512,10 +512,10 @@
 							<option value="Knowledge" data-i18n="knowledge">Knowledge</option>
                   </select>
                   <label data-i18n-title="rating" title="rating">
-                    <input name="attr_rating" min="0" placeholder="0" type="number" title="rating"/>
+                    <input name="attr_rating" step="1" placeholder="Rtg" type="number" title="rating"/>
                   </label>
                   <label data-i18n-title="mod" title="mod">
-                    <input name="attr_mod" min="0" placeholder="0" step="1" value="0" type="number" title="mod"/>
+                    <input name="attr_mod" value="0" step="1" placeholder="Mod" type="number" title="mod"/>
                   </label>
                   <select class="attribute-select" name="attr_attribute" title="undefined_attribute">
                     <option data-i18n="body" value="@{body}">Body</option>