From e0f407c9ad5f7fc7f2abf88c65b145ab9c4e8b2e Mon Sep 17 00:00:00 2001
From: LilLiteralist <104447108+LilLiteralist@users.noreply.github.com>
Date: Fri, 21 Apr 2023 01:00:23 +0300
Subject: [PATCH 1/2] Rounding corners, code cleanup of roll templates

Changed roll templates so that the common properties were grouped together.
Fixed the corners of roll templates so that corners didn't poke out of the rounded borders.
Rounded the corners of the inline rolls and did some slight color changes.
Adjusted the statBlock template rolls to imitate normal text.
Added dark mode color changes for roll templates for when the sheet is updated from Legacy to CSE.
---
 .../StarWarsSagaEdition.css                   | 492 ++++++++----------
 1 file changed, 227 insertions(+), 265 deletions(-)

diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.css b/Star Wars Saga Edition/StarWarsSagaEdition.css
index 366c866cce..58902f9bb2 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.css	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.css	
@@ -5,6 +5,11 @@
   src: local('Play-Bold'), url(http://themes.googleusercontent.com/static/fonts/play/v4/ZzUearZLklGfoL18Ti0GaQ.woff) format('woff');
 }
  
+/* Insert color variables here when the sheet is updated from Legacy to CSE.
+	https://github.com/Roll20/roll20-character-sheets/blob/master/HarnMaster3/harnstyle.css
+	Use something like this.
+*/
+ 
 .charsheet {
     background-image: url("");
     background-color: white;
@@ -396,106 +401,40 @@ input.sheet-skillsNotes{
     width: 100%; 
 }
  
-/* sheet roll template for Saga Default */
-.sheet-rolltemplate-sagadefault table {
+/* ROLL TEMPLATES */
+
+	/* All roll templates (or most of them, anyway) */
+.sheet-rolltemplate-sagadefault table,
+.sheet-rolltemplate-attack table,
+.sheet-rolltemplate-skill table,
+.sheet-rolltemplate-second-wind table,
+.sheet-rolltemplate-statBlock table {
     width:100%;
     font-size: 1em;
+	background-color: transparent;
+	color: black;
     font-family: "Helvetica Neue", Helvetica, sans-serif;
     border-collapse:separate;
     border:solid black 1px;
-    border-top-right-radius:5px;
-    border-top-left-radius:5px;
-    -moz-border-radius-topleft: 5px;
-    -moz-border-radius-topright: 5px;
-    -webkit-border-top-left-radius: 5px;
-    -webkit-border-top-right-radius: 5px;
+	border-top-left-radius:5px;
+	border-top-right-radius:5px;
 }
- 
-.sheet-rolltemplate-sagadefault th {
+
+.sheet-rolltemplate-sagadefault th,
+.sheet-rolltemplate-attack th,
+.sheet-rolltemplate-skill th,
+.sheet-rolltemplate-second-wind th,
+.sheet-rolltemplate-statBlock th {
     background-color: #000000;
     color: #ffffff;
-    padding: 2px;
+	text-align: center;
     line-height: 1.6em;
     font-size: 1.2em;   
-    border-top: none;
-}
-.sheet-rolltemplate-sagadefault .sheet-subheader {
-    background-color: #333333;
-    color: #ffffff;
-    font-size: 1em;
-    font-style: italic;
-    text-align: center;
-}
-.sheet-rolltemplate-sagadefault .sheet-tcat {
-    font-weight: bold;
-}
- 
-.sheet-rolltemplate-sagadefault td {
-    padding: 5px;
-    border: 1px solid black;
-    color: black;
-    text-align: left;
-}
- 
-.sheet-rolltemplate-sagadefault tr:nth-child(odd) {
-    background-color: #ffffff;
-}
- 
-.sheet-rolltemplate-sagadefault tr:nth-child(even) {
-    background-color: #ededed;
-}
- 
-.sheet-rolltemplate-sagadefault .inlinerollresult  {
-    display: inline-block;
-    min-width: 1.5em;
-    text-align: center; 
-    border: 2px solid #000000; /*Cool Gray 6 C*/
-    background-color: #000000; /*Cool Gray 6 C*/
-    color: whitesmoke;
-}
- 
-.sheet-rolltemplate-sagadefault .inlinerollresult.fullcrit {
-    background-color: #3FB315;
-    color: #f5f5f5;
-}
- 
-.sheet-rolltemplate-sagadefault .inlinerollresult.fullfail {
-    background-color: #B31515;
-    color: white;
-}
- 
-.sheet-rolltemplate-sagadefault .inlinerollresult.importantroll {
-    background-color: #4A57ED;
-    color: white;
-}
-.sheet-rolltemplate-sagadefault div{ 
-    width:100%; 
-    max-width:400px; 
-}
-/* Sheet roll template for Attacks */
-.sheet-rolltemplate-attack table {
-    width:100%;
-    font-size: 1em;
-    color: black;
-    font-family: "Helvetica Neue", Helvetica, sans-serif;
-    border-collapse:separate;
-    border:solid black 1px;
-    border-top-right-radius:5px;
-    border-top-left-radius:5px;
-    -moz-border-radius-topleft: 5px;
-    -moz-border-radius-topright: 5px;
-    -webkit-border-top-left-radius: 5px;
-    -webkit-border-top-right-radius: 5px;
-}
- 
-.sheet-rolltemplate-attack th {
-    background-color: #000000;
-    color: #ffffff;
-    padding: 2px;
-    line-height: 1.6em;
-    font-size: 1.2em;   
-    border-top: none;
+    border-top-left-radius: 2.5px;
+	border-top-right-radius: 2.5px;
 }
+
+.sheet-rolltemplate-sagadefault .sheet-subheader,
 .sheet-rolltemplate-attack .sheet-subheader {
     background-color: #333333;
     color: #ffffff;
@@ -503,228 +442,251 @@ input.sheet-skillsNotes{
     font-style: italic;
     text-align: center;
 }
-.sheet-rolltemplate-attack .sheet-tcat {
+
+.sheet-rolltemplate-sagadefault .sheet-tcat,
+.sheet-rolltemplate-attack .sheet-tcat,
+.sheet-rolltemplate-skill .sheet-tcat,
+.sheet-rolltemplate-second-wind .sheet-tcat,
+.sheet-rolltemplate-statBlock .sheet-tcat {
     font-weight: bold;
 }
- 
-.sheet-rolltemplate-attack td {
+
+.sheet-rolltemplate-sagadefault td,
+.sheet-rolltemplate-attack td,
+.sheet-rolltemplate-skill td,
+.sheet-rolltemplate-second-wind td {
     padding: 5px;
     border: 1px solid black;
     text-align: left;
 }
- 
-.sheet-rolltemplate-attack tr:nth-child(odd) {
+.sheet-rolltemplate-sagadefault tr:nth-child(odd),
+.sheet-rolltemplate-attack tr:nth-child(odd),
+.sheet-rolltemplate-skill tr:nth-child(odd),
+.sheet-rolltemplate-second-wind tr:nth-child(odd) {
     background-color: #ffffff;
 }
  
-.sheet-rolltemplate-attack tr:nth-child(even) {
+.sheet-rolltemplate-sagadefault tr:nth-child(even),
+.sheet-rolltemplate-attack tr:nth-child(even),
+.sheet-rolltemplate-skill tr:nth-child(even),
+.sheet-rolltemplate-second-wind tr:nth-child(even) {
     background-color: #ededed;
 }
- 
-.sheet-rolltemplate-attack .inlinerollresult  {
-    display: inline-block;
-    min-width: 1.5em;
-    text-align: center;
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color: #000000; /*Cool Gray 6 C*/
-    color: #f5f5f5;
-}
- 
-.sheet-rolltemplate-attack .inlinerollresult.fullcrit {
-    background-color: #3FB315;
-    color: white;
-}
- 
-.sheet-rolltemplate-attack .inlinerollresult.fullfail {
-    background-color: #B31515;
-    color: white;
-}
- 
-.sheet-rolltemplate-attack .inlinerollresult.importantroll {
-    background-color: #4A57ED;
-    color: white;
-}
-.sheet-rolltemplate-attack div{ 
-    width:100%; 
-    max-width:400px; 
-}
- 
-/* sheet roll template for skills */
-.sheet-rolltemplate-skill table {
-    background-color: #ffffff;
-    color: #000000;
-    width:100%;
-    font-size: 1em;
-    font-family: "Helvetica Neue", Helvetica, sans-serif;
-    border-collapse:separate;
-    border:solid black 1px;
-    border-radius:5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-}
-.sheet-rolltemplate-skill .sheet-tcat {
-    font-weight: bold;
-}
-.sheet-rolltemplate-skill th {
-    background-color: #000000;
-    color: #ffffff;
-    padding: 2px;       
-    border-top: none;
-    line-height: 1.6em;
-    font-size: 1.2em;
-    text-align: center;
-}
- 
-.sheet-rolltemplate-skill td {
-    padding: 5px;           
-    border:solid black 1px;
-    text-align:left;
-}
- 
-.sheet-rolltemplate-skill tr:nth-child(odd) {
-    background-color: #ffffff;
-}
- 
-.sheet-rolltemplate-skill tr:nth-child(even) {
-    background-color: #ededed;
-}
- 
-.sheet-rolltemplate-skill tr:first-child td{
-    text-align: center;
-    border-left: none;
-    width: 75px;
-}
-.sheet-rolltemplate-skill .inlinerollresult  {
+
+		/*inline roll formatting for most templates*/
+.sheet-rolltemplate-sagadefault .inlinerollresult,
+.sheet-rolltemplate-attack .inlinerollresult,
+.sheet-rolltemplate-skill .inlinerollresult,
+.sheet-rolltemplate-second-wind .inlinerollresult {
     display: inline-block;
     min-width: 1.5em;
     text-align: center; 
     border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color:  #000000;
-    color: #f5f5f5;
+	border-radius: 5px;
+    background-color: #000000;
+    color: whitesmoke;
 }
  
-.sheet-rolltemplate-skill .inlinerollresult.fullcrit {  
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color: #008000;
+.sheet-rolltemplate-sagadefault .inlinerollresult.fullcrit,
+.sheet-rolltemplate-attack .inlinerollresult.fullcrit,
+.sheet-rolltemplate-skill .inlinerollresult.fullcrit,
+.sheet-rolltemplate-second-wind .inlinerollresult.fullcrit {
+    background-color: #3fb315;
 }
- 
-.sheet-rolltemplate-skill .inlinerollresult.fullfail {
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color: #FF0000;
+
+.sheet-rolltemplate-sagadefault .inlinerollresult.fullfail,
+.sheet-rolltemplate-attack .inlinerollresult.fullfail,
+.sheet-rolltemplate-skill .inlinerollresult.fullfail,
+.sheet-rolltemplate-second-wind .inlinerollresult.fullfail {
+    background-color: #B31515;
 }
- 
-.sheet-rolltemplate-skill .inlinerollresult.importantroll {
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color: #c5c6c7;
+
+.sheet-rolltemplate-sagadefault .inlinerollresult.importantroll,
+.sheet-rolltemplate-attack .inlinerollresult.importantroll,
+.sheet-rolltemplate-skill .inlinerollresult.importantroll,
+.sheet-rolltemplate-second-wind .inlinerollresult.importantroll {
+    background-color: #4A57ED;
 }
-.sheet-rolltemplate-skill div{ 
+
+.sheet-rolltemplate-sagadefault div,
+.sheet-rolltemplate-attack div,
+.sheet-rolltemplate-skill div,
+.sheet-rolltemplate-second-wind div { 
     width:100%; 
     max-width:400px; 
 }
-/* sheet roll template for Second Wind */
+
+/* INDIVIDUAL ROLL TEMPLATES*/
+
+	/* Sheet roll template for Saga Default */
+		/* There are no special elements for Saga Default template.*/
+
+	/* Sheet roll template for Attacks */
+		/* There are no special elements for Attack template.*/
+
+	/* Sheet roll template for Skills */
+.sheet-rolltemplate-skill table {
+    border-radius: 5px;
+}
+
+.sheet-rolltemplate-skill th {
+	/* Most properties defined in general section */
+    border-top-left-radius: 2.5px;
+	border-top-right-radius: 0px;
+	text-align: center;
+}
+
+		/* All of the border-(location)-radius elements are to make it nice and rounded, both by itself and when there are notes. */
+.sheet-rolltemplate-skill tr:first-child td {
+    text-align: center;
+    border-left: none;
+	border-top-right-radius: 2.5px;
+    width: 75px;
+}
+
+.sheet-rolltemplate-skill tr:last-child td {
+    border-bottom-left-radius: 2.5px;
+	border-bottom-right-radius: 2.5px;
+}
+
+.sheet-rolltemplate-skill tr:only-child th{
+	border-bottom-left-radius: 2.5px;
+}
+
+.sheet-rolltemplate-skill tr:only-child td{
+	border-top-right-radius: 2.5px;
+	border-bottom-right-radius: 2.5px;
+	border-bottom-left-radius: 0px;
+}
+
+	/* Sheet roll template for Second Wind */
 .sheet-rolltemplate-second-wind table {
-    width:100%;
-    font-size: 1em;
-    color: black;
-    font-family: "Helvetica Neue", Helvetica, sans-serif;
-    border-collapse:separate;
-    border:solid black 1px;
     border-radius:5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
 }
 .sheet-rolltemplate-second-wind .sheet-tcat {
     font-weight: bold;
 }
 .sheet-rolltemplate-second-wind th {
-    background-color: #000000;
-    color: #ffffff;
-    padding: 2px;
-    border-top: none;
-    line-height: 1.6em;
-    font-size: 1.2em;
     text-align: center;
 }
 
-.sheet-rolltemplate-second-wind td {
-    padding: 5px;
-    border:solid black 1px;
-    text-align:left;
-}
-
-.sheet-rolltemplate-second-wind tr:nth-child(odd) {
-    background-color: #ffffff;
-}
-
-.sheet-rolltemplate-second-wind tr:nth-child(even) {
-    background-color: #ededed;
-}
-
 .sheet-rolltemplate-second-wind tr:first-child td{
     text-align: center;
     border-left: none;
     width: 75px;
 }
-.sheet-rolltemplate-second-wind .inlinerollresult  {
-    display: inline-block;
-    min-width: 1.5em;
-    text-align: center;
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color:  #000000;
-    color: #f5f5f5;
+
+.sheet-rolltemplate-second-wind tr:last-child td {
+    border-bottom-left-radius: 2.5px;
+	border-bottom-right-radius: 2.5px;
 }
 
-.sheet-rolltemplate-second-wind .inlinerollresult.fullcrit {
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color: #008000;
-}
-
-.sheet-rolltemplate-second-wind .inlinerollresult.fullfail {
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color: #FF0000;
-}
-
-.sheet-rolltemplate-second-wind .inlinerollresult.importantroll {
-    border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-    background-color: #c5c6c7;
-}
-.sheet-rolltemplate-second-wind div{
-    width:100%;
-    max-width:400px;
-}
-/* sheet roll template for stat block */
-.sheet-rolltemplate-statBlock table {
-    width:100%;
-    font-size: 1em;
-    font-family: "Helvetica Neue", Helvetica, sans-serif;
-    border-collapse:separate;
-    border:solid black 1px;
-    border-radius:5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-}
-.sheet-rolltemplate-statBlock .sheet-tcat {
-    font-weight: bold;
-}
-.sheet-rolltemplate-statBlock th {
-    background-color: #000000;
-    color: #ffffff;
-    padding: 2px;       
-    border-top: none;
-    line-height: 1.6em;
-    font-size: 1.2em;
-    text-align: center;
-}
- 
+	/* Sheet roll template for stat block */
 .sheet-rolltemplate-statBlock td {
     text-align:left;
     background-color: #ffffff;
+	padding: 2px;
 }
  
 .sheet-rolltemplate-statBlock .inlinerollresult  {
-    display: inline-block;
-    text-align: left;
-    background-color: #ffffff;
+	/* This makes the roll appear as regular text, though the formula is still displayed if hovered. */
+    display: inline;
+    background-color: transparent;
     font-weight: normal;
+	font-size: 1em;
+	padding: 0px;
     border: 0px;
 }
+
+/* DARK MODE FOR ROLL TEMPLATES*/
+	/* This section is for when the sheet is updated from Legacy to CSE, but is useless until then. */
+
+.sheet-darkmode .sheet-rolltemplate-sagadefault th,
+.sheet-darkmode .sheet-rolltemplate-attack th,
+.sheet-darkmode .sheet-rolltemplate-second-wind th {
+    color: #e6e6e6;
+}
+
+.sheet-darkmode .sheet-rolltemplate-sagadefault .sheet-subheader,
+.sheet-darkmode .sheet-rolltemplate-attack .sheet-subheader {
+    background-color: #06063c;
+    color: #e3e3e3;
+}
+
+.sheet-darkmode .sheet-rolltemplate-sagadefault tr:nth-child(odd),
+.sheet-darkmode .sheet-rolltemplate-attack tr:nth-child(odd),
+.sheet-darkmode .sheet-rolltemplate-skill tr:nth-child(odd) {
+    background-color: #2e2e46;
+}
+ 
+.sheet-darkmode .sheet-rolltemplate-sagadefault tr:nth-child(even),
+.sheet-darkmode .sheet-rolltemplate-attack tr:nth-child(even),
+.sheet-darkmode .sheet-rolltemplate-skill tr:nth-child(even) {
+    background-color: #404062;
+}
+
+	/* dark mode inline roll results */
+.sheet-darkmode .sheet-rolltemplate-sagadefault .inlinerollresult,
+.sheet-darkmode .sheet-rolltemplate-attack .inlinerollresult,
+.sheet-darkmode .sheet-rolltemplate-skill .inlinerollresult,
+.sheet-darkmode .sheet-rolltemplate-second-wind .inlinerollresult {
+    border: 2px solid #732d95;
+    background-color: #4a206c;
+    color: whitesmoke;
+}
+ 
+.sheet-darkmode .sheet-rolltemplate-sagadefault .inlinerollresult.fullcrit,
+.sheet-darkmode ..sheet-rolltemplate-attack .inlinerollresult.fullcrit,
+.sheet-darkmode .sheet-rolltemplate-skill .inlinerollresult.fullcrit,
+.sheet-darkmode .sheet-rolltemplate-second-wind .inlinerollresult.fullcrit {
+    border: 2px solid #46c419;
+	background-color: #247905;
+}
+ 
+.sheet-darkmode .sheet-rolltemplate-sagadefault .inlinerollresult.fullfail,
+.sheet-darkmode .sheet-rolltemplate-attack .inlinerollresult.fullfail,
+.sheet-darkmode .sheet-rolltemplate-skill .inlinerollresult.fullfail,
+.sheet-darkmode .sheet-rolltemplate-second-wind .inlinerollresult.fullfail {
+    border: 2px solid #b31515;
+	background-color: #7b0e0e;
+}
+ 
+.sheet-darkmode .sheet-rolltemplate-sagadefault .inlinerollresult.importantroll,
+.sheet-darkmode .sheet-rolltemplate-attack .inlinerollresult.importantroll,
+.sheet-darkmode .sheet-rolltemplate-skill .inlinerollresult.importantroll,
+.sheet-darkmode .sheet-rolltemplate-second-wind .inlinerollresult.importantroll {
+    border: 2px solid #4a57ed;
+	background-color: #3944ca;
+}
+
+	/* DARK MODE for Saga Default Roll Template */
+.sheet-darkmode .sheet-rolltemplate-sagadefault td {
+    color: #dddddd;
+}
+
+	/* DARK MODE for Attack Roll Template*/
+		/* There are no special elements for dark mode Attack template. */
+
+	/* DARK MODE for Skill Roll Template */
+.sheet-darkmode .sheet-rolltemplate-skill table {
+    background-color: #000000;
+    color: #e6e6e6;
+}
+
+.sheet-darkmode .sheet-rolltemplate-skill th {
+    background-color: #000000;
+    color: #whitesmoke;
+}
+
+.sheet-darkmode .sheet-rolltemplate-skill tr:first-child td{
+    background-color: #404061;
+}
+
+	/* DARK MODE for Second Wind Roll Template */
+.sheet-darkmode .sheet-rolltemplate-second-wind tr:first-child td{
+    text-align: center;
+    border-left: none;
+    width: 75px;
+}
+	/* DARK MODE for statBlock Template*/
+		/* Still need to do these. */

From 58fa0d22b350f3622d1cb003878639d3b6b44452 Mon Sep 17 00:00:00 2001
From: LilLiteralist <104447108+LilLiteralist@users.noreply.github.com>
Date: Fri, 21 Apr 2023 02:11:28 +0300
Subject: [PATCH 2/2] Tweaked statBlock code

Changed "Last updated" date
Removed a bunch of semicolons from the statBlock template
Changed the wiki URL to a disabled text input
---
 .../StarWarsSagaEdition.html                  | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 0c05a5d869..4f11df0a14 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -2857,10 +2857,10 @@
 <br />
 <!-- start help section --> 
 <div> 
-For Help, please see the wiki page. <input type="text" name="attr_vehicle-EquipmentLocation" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/> <br/>
-<b>Last updated</b>26/03/2023
+For Help, please see the wiki page. <input type="text" disabled="true" name="attr_vehicle-EquipmentLocation" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/> <br/>
+<b>Last updated</b> 20 April 2023
 </div>
-
+<!-- Why the hell is the wiki URL in an input named "vehicle-EquipmentLocation"? -->
 <!-- start roll templates --> 
 
 <rolltemplate class="sheet-rolltemplate-attack">
@@ -2904,47 +2904,47 @@ For Help, please see the wiki page. <input type="text" name="attr_vehicle-Equipm
 		<tr>	<th>{{name}}</th>	</tr>
 		<tr>	<td>
 			{{size}} {{#gender}}{{gender}} {{/gender}}{{race}} {{#class}}{{class}}{{/class}}				<br/>			
-			<div>{{#destiny}}<span class="tcat">Destiny </span>{{destiny}};	{{/destiny}} 
-				{{#background}}	<span class="tcat">Background </span>{{background}}; 	{{/background}}
-				{{#force}}	<span class="tcat">Force </span>{{force}} ({{forcedice}}); 	{{/force}}
-				{{#dsp}}	<span class="tcat">Dark Side </span>{{dsp}};	{{/dsp}}			</div>
-			
-			<span class="tcat">Init </span>{{init}}; 		<span class="tcat">Senses </span>Perception {{perception}}; {{#perception-notes}}{{perception-notes}};{{/perception-notes}}			<br />			
-			{{#language}}	<span class="tcat">Languages </span>	{{language}};	{{/language}}
+			<div>{{#destiny}}<span class="tcat">Destiny </span>{{destiny}}{{/destiny}}
+				{{#background}}{{#destiny}}; {{/destiny}}	<span class="tcat">Background </span>{{background}}{{/background}}
+				{{#force}}; 	<span class="tcat">Force </span>{{force}} ({{forcedice}}){{/force}}
+				{{#dsp}}; <span class="tcat">Dark Side </span>{{dsp}}	{{/dsp}}			</div>
+			<!-- Figure out this section above works with semicolons. Maybe split up the Force and DSP onto another line. -->
+			<span class="tcat">Init </span>{{init}}; 		<span class="tcat">Senses </span>{{#perception-notes}}{{perception-notes}}; {{/perception-notes}}Perception {{perception}}			<br />			
+			{{#language}}	<span class="tcat">Languages </span>	{{language}}	{{/language}}
 			<hr />			
-			<span class="tcat">Defenses </span>Ref {{ref}} (flat-footed {{flatref}}), Fort {{fort}} {{#will}}, Will {{will}}	{{/will}}; {{#vehicle-armor}}	+{{vehicle-armor}} Armor;	{{/vehicle-armor}}	<br /> 		
+			<span class="tcat">Defenses </span>Ref {{ref}} (flat-footed {{flatref}}), Fort {{fort}}{{#will}}, Will {{will}}{{/will}}{{#vehicle-armor}};	+{{vehicle-armor}} Armor	{{/vehicle-armor}}	<br /> 		
 			
-			<span class="tcat">HP </span>{{hp}}; <span class="tcat">CT Penalty </span> {{ct}}; {{#dr}}<span class="tcat">DR </span>{{dr}}; {{/dr}}{{#sr}}<span class="tcat">SR </span>{{sr}}; {{/sr}}<span class="tcat">Threshold </span>{{dt}};			<br />	
+			<span class="tcat">HP </span>{{hp}}; <span class="tcat">CT Penalty </span> {{ct}}{{#dr}}; <span class="tcat">DR </span>{{dr}}{{/dr}}{{#sr}}; <span class="tcat">SR </span>{{sr}}{{/sr}}; <span class="tcat">Threshold </span>{{dt}}			<br />	
 			
-			{{#immune}}	<span class="tcat">Immune </span>{{immune}};	{{/immune}}			
+			{{#immune}}	<span class="tcat">Immune </span>{{immune}}	{{/immune}}			
 			<hr />			
-			<span class="tcat">Speed </span>{{speed}};			
-			{{#fightingspace}}<br />	<span class="tcat">Fighting Space </span>{{fightingspace}};	{{/fightingspace}}
-				{{#cover}} <span class="tcat">Cover </span>{{cover}};	{{/cover}}
+			<span class="tcat">Speed </span>{{speed}}			
+			{{#fightingspace}}<br />	<span class="tcat">Fighting Space </span>{{fightingspace}}	{{/fightingspace}}
+				{{#cover}} <span class="tcat">Cover </span>{{cover}}	{{/cover}}
 			<br />	
-			<span class="tcat">Melee by Weapon </span>{{meleeatk}} (dmg {{meleedmg}});			<br />	
+			<span class="tcat">Melee by Weapon </span>{{meleeatk}} (dmg {{meleedmg}})			<br />	
 			
-			<span class="tcat">Ranged by Weapon </span>{{rangedatk}} (dmg {{rangeddmg}});			<br />
+			<span class="tcat">Ranged by Weapon </span>{{rangedatk}} (dmg {{rangeddmg}})			<br />
 			
-			<span class="tcat">Base Atk </span>{{bab}}; 	<span class="tcat">Grp </span>{{grapple}};			<br />
+			<span class="tcat">Base Atk </span>{{bab}}; 	<span class="tcat">Grp </span>{{grapple}}			<br />
 			
-			{{#atkoptions}}	<span class="tcat">Atk Options </span>{{atkoptions}};	<br />	{{/atkoptions}}
+			{{#atkoptions}}	<span class="tcat">Atk Options </span>{{atkoptions}}	<br />	{{/atkoptions}}
 			
-			{{#specialactions}}	<span class="tcat">Special Actions </span>{{specialactions}};	<br />	{{/specialactions}}		
+			{{#specialactions}}	<span class="tcat">Special Actions </span>{{specialactions}}	<br />	{{/specialactions}}		
 			
-			{{#powers}}	<span class="tcat">Force Powers Known </span>(Use the Force +{{utf}}) {{powers}};	<br />	{{/powers}}		
+			{{#powers}}	<span class="tcat">Force Powers Known </span>(Use the Force +{{utf}}) {{powers}}	<br />	{{/powers}}		
 			
-			{{#regimens}}	<span class="tcat">Regimens Known </span>{{regimens}};	<br />	{{/regimens}}		
+			{{#regimens}}	<span class="tcat">Regimens Known </span>{{regimens}}	<br />	{{/regimens}}		
 			
-			{{#techniques}}	<span class="tcat">Force Techniques </span>{{techniques}};	<br />	{{/techniques}}	
+			{{#techniques}}	<span class="tcat">Force Techniques </span>{{techniques}}	<br />	{{/techniques}}	
 			
-			{{#secrets}}	<span class="tcat">Force Secrets </span>{{secrets}};	<br />	{{/secrets}}
+			{{#secrets}}	<span class="tcat">Force Secrets </span>{{secrets}}	<br />	{{/secrets}}
 			
-			{{#maneuvers}}	<span class="tcat">Starship Maneuvers </span>{Pilot +{{pilot}}) {{maneuvers}};	<br />	{{/maneuvers}}			
+			{{#maneuvers}}	<span class="tcat">Starship Maneuvers </span>{Pilot +{{pilot}}) {{maneuvers}}	<br />	{{/maneuvers}}			
 			<hr />			
 			<span class="tcat">Abilities </span> Str {{str}}, Dex {{dex}}, Con {{con}}, Int {{int}}, Wis {{wis}}, Cha {{cha}}
 			
-			{{#specialqualities}}	<br />	<span class="tcat">Special Qualities </span>{{specialqualities}};{{/specialqualities}}		
+			{{#specialqualities}}	<br />	<span class="tcat">Special Qualities </span>{{specialqualities}}{{/specialqualities}}		
 			
 			{{#talent}}	<br />	<span class="tcat">Talents </span> {{talent}}	{{/talent}}
 			
@@ -2952,7 +2952,7 @@ For Help, please see the wiki page. <input type="text" name="attr_vehicle-Equipm
 			
 			{{#skills}}	<br />	<span class="tcat">Skills </span> {{skills}}	{{/skills}}
 			
-			{{#systems}}	<br />	<span class="tcat">Systems/Updrades </span>{{systems}};		{{/systems}}
+			{{#systems}}	<br />	<span class="tcat">Systems/Updrades </span>{{systems}}		{{/systems}}
 			
 			{{#crew}}	<hr />	<span class="tcat">Crew </span>{{crew}};	{{/crew}} 	
 				{{#passengers}}<span class="tcat">Passengers </span>{{passengers}};	{{/passengers}}