From bed77a00a4adf5c1191405a2f3e763d6fb8a0519 Mon Sep 17 00:00:00 2001
From: Ulrik Vander <ulrik@vander-web.com>
Date: Wed, 10 Feb 2021 15:30:17 +0100
Subject: [PATCH] Updated

---
 Carbon-2185/carbon-2185.css  |  33 ++
 Carbon-2185/carbon-2185.html | 779 ++++++++++++++++++++++++++---------
 Carbon-2185/sheet.json       |   6 +-
 3 files changed, 623 insertions(+), 195 deletions(-)

diff --git a/Carbon-2185/carbon-2185.css b/Carbon-2185/carbon-2185.css
index 47731678ab..a01e95cbed 100644
--- a/Carbon-2185/carbon-2185.css
+++ b/Carbon-2185/carbon-2185.css
@@ -31,6 +31,7 @@
 	background-color: #EEE;
 	display: table-header-group;
 	font-weight: bold;
+	text-align: center;
 }
 .sheet-divTableFoot {
 	background-color: #EEE;
@@ -83,6 +84,37 @@
 .sheet-spacer {
 	height: 3px;
 }
+.sheet-auto-expand {
+	position: relative;
+	cursor: text;
+	word-wrap: break-word;
+}
+.sheet-auto-expand span {
+	visibility: hidden;
+	white-space: pre-wrap;
+	display: block;
+}
+.sheet-auto-expand textarea {
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	margin: 0;
+	overflow: hidden;
+	resize: none;
+    min-height:18px;
+	height: 100%;
+	width: 100%;
+	display: block;
+	box-sizing: border-box;
+	background: transparent;
+	color: inherit;
+	font: inherit;
+	letter-spacing: inherit;
+	padding: inherit;
+	text-align: inherit;
+	text-transform: inherit;
+}
 .sheet-smallft { font-size: small; }
 .sheet-w5 { width: 5%; }
 .sheet-w10 { width: 10%; }
@@ -96,6 +128,7 @@
 .sheet-w45 { width: 45%; }
 .sheet-w50 { width: 50%; }
 .sheet-w60 { width: 60%; }
+.sheet-w70 { width: 70%; }
 .sheet-w80 { width: 80%; }
 .sheet-w85 { width: 85%; }
 .sheet-w90 { width: 90%; }
diff --git a/Carbon-2185/carbon-2185.html b/Carbon-2185/carbon-2185.html
index 4b18d3c592..512bce4c40 100644
--- a/Carbon-2185/carbon-2185.html
+++ b/Carbon-2185/carbon-2185.html
@@ -4,13 +4,15 @@
 		<div class="divTableRow">
 			<div class="divTableCell">
 				<div class="divTable">
-				<div class="divTableRow">
-					<div class="divTableCell"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/carbon-2185-quickstart/logo.png"></div>
-				</div>
-				<div class="divTableRow">
-					<div class="divTableCell">Character Name: <input type="text" spellcheck="false" name="attr_character_name"></div>
-				</div>
-				
+					<div class="divTableRow">
+						<div class="divTableCell"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/carbon-2185-quickstart/logo.png"></div>
+					</div>
+					<div class="divTableRow">
+						<div class="divTableCell">Character Name: <input type="text" spellcheck="false" name="attr_character_name"></div>
+					</div>
+					<div class="divTableRow">
+						<div class="divTableCell">Inspiration: <input type="checkbox" name="attr_inspiration" class="w20p"></div>
+					</div>
 				</div>
 			</div>
 			<div class="divTableCell">
@@ -18,30 +20,44 @@
 					<div class="divTable">
 						<div class="divTableRow">
 							<div class="divTableCell">
-							<div class="w33"><input type="text" spellcheck="false" name="attr_character_class" class="w90"> 
-							</div><div class="w33"><input type="text" spellcheck="false" name="attr_character_level" class="w90">
-							</div><div class="w33"><input type="text" spellcheck="false" name="attr_character_origin" class="w90"></div>
-							<div class="w33">Class</div><div class="w33">Level</div><div class="w33">Origin</div>
+								<input type="text" spellcheck="false" name="attr_character_class" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Class</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_level" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Level</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_origin" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Origin</span></div>
 							</div>
 						</div>
-					</div>
-					<div class="divTable">
 						<div class="divTableRow">
 							<div class="divTableCell">
-								<div class="w33"><input type="text" spellcheck="false" name="attr_player_name" class="w90"> 
-								</div><div class="w33"><input type="text" spellcheck="false" name="attr_character_age" class="w90">
-								</div><div class="w33"><input type="text" spellcheck="false" name="attr_character_experience" class="w90"></div>
-								<div class="w33">Player</div><div class="w33">Age</div><div class="w33">Experience</div>
+								<input type="text" spellcheck="false" name="attr_subclass" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Subclass</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_age" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Age</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_experience" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Experience</span></div>
 							</div>
 						</div>
-					</div>
-					<div class="divTable">
 						<div class="divTableRow">
 							<div class="divTableCell">
-							<div class="w33"><input type="text" spellcheck="false" name="attr_wonlongs" class="w90"> 
-								</div><div class="w33"><input type="text" spellcheck="false" name="attr_influence_street" class="w90">
-								</div><div class="w33"><input type="text" spellcheck="false" name="attr_influence_corporate" class="w90"></div>
-								<div class="w33">Wonlongs</div><div class="w33">Infl. Street</div><div class="w33">Infl. Corporate</div>
+								<input type="text" spellcheck="false" name="attr_wonlongs" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Wonlongs</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_influence_street" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Infl. Street</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_influence_corporate" class="w90 inpcntr">
+								<div class="cntrtxt"><span class="smallft">Infl. Corporate</span></div>
 							</div>
 						</div>
 					</div>
@@ -57,42 +73,36 @@
             			<div class="divTableCell">STRENGTH<br>
             				<button class="rollerlink2" type="roll" value='&{template:default} {{name=Ability Check}} {{Strength=[[1d20 + @{strength_modifier}]]}}' name='roll_strength'><span class="attmodlg" name="attr_strength_modifier">0</span></button><br>
             				<input type="number" value="10" class="attribute_score" name="attr_strength">
-            				
             			</div>
             		</div>
             		<div class="divTableRow">
             			<div class="divTableCell">DEXTERITY<br>
             				<button class="rollerlink2" type="roll" value='&{template:default} {{name=Ability Check}} {{Dexterity=[[1d20 + @{dexterity_modifier}]]}}' name='roll_dexterity'><span class="attmodlg" name="attr_dexterity_modifier">0</span></button><br>
             				<input type="number" value="10" class="attribute_score" name="attr_dexterity">
-            				
             			</div>
             		</div>
             		<div class="divTableRow">
             			<div class="divTableCell">CONSTITUTION<br>
             				<button class="rollerlink2" type="roll" value='&{template:default} {{name=Ability Check}} {{Constitution=[[1d20 + @{constitution_modifier}]]}}' name='roll_constitution'><span class="attmodlg" name="attr_constitution_modifier">0</span></button><br>
             				<input type="number" value="10" class="attribute_score" name="attr_constitution">
-            				
             			</div>
             		</div>
             		<div class="divTableRow">
             			<div class="divTableCell">INTELLIGENCE<br>
             				<button class="rollerlink2" type="roll" value='&{template:default} {{name=Ability Check}} {{Intelligence=[[1d20 + @{intelligence_modifier}]]}}' name='roll_intelligence'><span class="attmodlg" name="attr_intelligence_modifier">0</span></button><br>
             				<input type="number" value="10" class="attribute_score" name="attr_intelligence">
-            				
             			</div>
             		</div>
             		<div class="divTableRow">
             			<div class="divTableCell">TECHNOLOGY<br>
             				<button class="rollerlink2" type="roll" value='&{template:default} {{name=Ability Check}} {{Technology=[[1d20 + @{technology_modifier}]]}}' name='roll_technology'><span class="attmodlg" name="attr_technology_modifier">0</span></button><br>
             				<input type="number" value="10" class="attribute_score" name="attr_technology">
-            				
             			</div>
             		</div>
             		<div class="divTableRow">
             			<div class="divTableCell">PEOPLE<br>
             				<button class="rollerlink2" type="roll" value='&{template:default} {{name=Ability Check}} {{People=[[1d20 + @{people_modifier}]]}}' name='roll_people'><span class="attmodlg" name="attr_people_modifier">0</span></button><br>
             				<input type="number" value="10" class="attribute_score" name="attr_people">
-            				
             			</div>
             		</div>
             	</div>
@@ -113,33 +123,33 @@
             		</div>
             		<div class="divTableRow">
             		    <div class="divTableCell" style="text-align: left; font-size: 10px; min-width: 180px;">SKILLS<br>
-            		    <input type="checkbox" name="attr_acrobatics_proficiency" value="1"> <span class="scoresp" name="attr_acrobatics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Acrobatics=[[1d20 + @{acrobatics}]]}}' name='roll_ability_acrobatics'>Acrobatics</button><br>
-                            <input type="checkbox" name="attr_athletics_proficiency" value="1"> <span class="scoresp" name="attr_athletics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Athletics=[[1d20 + @{athletics}]]}}' name='roll_ability_athletics'>Athletics</button><br>
-                            <input type="checkbox" name="attr_bureaucracy_proficiency" value="1"> <span class="scoresp" name="attr_bureaucracy">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Bureaucracy=[[1d20 + @{bureaucracy}]]}}' name='roll_ability_bureaucracy'>Bureaucracy</button><br>
-                            <input type="checkbox" name="attr_computing_proficiency" value="1"> <span class="scoresp" name="attr_computing">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Computing=[[1d20 + @{computing}]]}}' name='roll_ability_computing'>Computing</button><br>
-                            <input type="checkbox" name="attr_deception_proficiency" value="1"> <span class="scoresp" name="attr_deception">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Deception=[[1d20 + @{deception}]]}}' name='roll_ability_deception'>Deception</button><br>
-                            <input type="checkbox" name="attr_engineering_proficiency" value="1"> <span class="scoresp" name="attr_engineering">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Engineering=[[1d20 + @{engineering}]]}}' name='roll_ability_engineering'>Engineering</button><br>
-                            <input type="checkbox" name="attr_gambling_proficiency" value="1"> <span class="scoresp" name="attr_gambling">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Gambling=[[1d20 + @{gambling}]]}}' name='roll_ability_gambling'>Gambling</button><br>
-                            <input type="checkbox" name="attr_hacking_proficiency" value="1"> <span class="scoresp" name="attr_hacking">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Hacking=[[1d20 + @{hacking}]]}}' name='roll_ability_hacking'>Hacking</button><br>
-                            <input type="checkbox" name="attr_history_proficiency" value="1"> <span class="scoresp" name="attr_history">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{History=[[1d20 + @{history}]]}}' name='roll_ability_history'>History</button><br>
-                            <input type="checkbox" name="attr_intimidation_proficiency" value="1"> <span class="scoresp" name="attr_intimidation">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Intimidation=[[1d20 + @{intimidation}]]}}' name='roll_ability_intimidation'>Intimidation</button><br>
-                            <input type="checkbox" name="attr_investigation_proficiency" value="1"> <span class="scoresp" name="attr_investigation">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Investigation=[[1d20 + @{investigation}]]}}' name='roll_ability_investigation'>Investigation</button><br>
-                            <input type="checkbox" name="attr_mechanics_proficiency" value="1"> <span class="scoresp" name="attr_mechanics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Mechanics=[[1d20 + @{mechanics}]]}}' name='roll_ability_mechanics'>Mechanics</button><br>
-                            <input type="checkbox" name="attr_medicine_proficiency" value="1"> <span class="scoresp" name="attr_medicine">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Medicine=[[1d20 + @{medicine}]]}}' name='roll_ability_medicine'>Medicine</button><br>
-                            <input type="checkbox" name="attr_navigation_proficiency" value="1"> <span class="scoresp" name="attr_navigation">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Navigation=[[1d20 + @{navigation}]]}}' name='roll_ability_navigation'>Navigation</button><br>
-                            <input type="checkbox" name="attr_perception_proficiency" value="1"> <span class="scoresp" name="attr_perception">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Perception=[[1d20 + @{perception}]]}}' name='roll_ability_perception'>Perception</button><br>
-                            <input type="checkbox" name="attr_performance_proficiency" value="1"> <span class="scoresp" name="attr_performance">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Performance=[[1d20 + @{performance}]]}}' name='roll_ability_performance'>Performance</button><br>
-                            <input type="checkbox" name="attr_persuasion_proficiency" value="1"> <span class="scoresp" name="attr_persuasion">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Persuasion=[[1d20 + @{persuasion}]]}}' name='roll_ability_persuasion'>Persuasion</button><br>
-                            <input type="checkbox" name="attr_presence_proficiency" value="1"> <span class="scoresp" name="attr_presence">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Presence=[[1d20 + @{presence}]]}}' name='roll_ability_presence'>Presence</button><br>
-                            <input type="checkbox" name="attr_religion_proficiency" value="1"> <span class="scoresp" name="attr_religion">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Religion=[[1d20 + @{religion}]]}}' name='roll_ability_religion'>Religion</button><br>
-                            <input type="checkbox" name="attr_robotics_proficiency" value="1"> <span class="scoresp" name="attr_robotics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Robotics=[[1d20 + @{robotics}]]}}' name='roll_ability_robotics'>Robotics</button><br>
-                            <input type="checkbox" name="attr_sensemotive_proficiency" value="1"> <span class="scoresp" name="attr_sensemotive">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Sense Motive=[[1d20 + @{sensemotive}]]}}' name='roll_ability_sensemotive'>Sense Motive</button><br>
-                            <input type="checkbox" name="attr_sleightofhand_proficiency" value="1"> <span class="scoresp" name="attr_sleightofhand">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Sleight of Hand=[[1d20 + @{sleightofhand}]]}}' name='roll_ability_sleightofhand'>Sleight of Hand</button><br>
-                            <input type="checkbox" name="attr_stealth_proficiency" value="1"> <span class="scoresp" name="attr_stealth">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Stealth=[[1d20 + @{stealth}]]}}' name='roll_ability_stealth'>Stealth</button><br>
-                            <input type="checkbox" name="attr_streetwise_proficiency" value="1"> <span class="scoresp" name="attr_streetwise">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Streetwise=[[1d20 + @{streetwise}]]}}' name='roll_ability_streetwise'>Streetwise</button><br>
-                            <input type="checkbox" name="attr_tracking_proficiency" value="1"> <span class="scoresp" name="attr_tracking">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Tracking=[[1d20 + @{tracking}]]}}' name='roll_ability_tracking'>Tracking</button><br>
-                            <input type="checkbox" name="attr_airvehicles_proficiency" value="1"> <span class="scoresp" name="attr_airvehicles">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Vehicles (Air)=[[1d20 + @{airvehicles}]]}}' name='roll_ability_airvehicles'>Vehicles (Air)</button><br>
-                            <input type="checkbox" name="attr_landvehicles_proficiency" value="1"> <span class="scoresp" name="attr_landvehicles">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Vehicles (Land)=[[1d20 + @{landvehicles}]]}}' name='roll_ability_landvehicles'>Vehicles (Land)</button><br>
+							<input type="checkbox" name="attr_acrobatics_proficiency" value="1"><input type="checkbox" name="attr_acrobatics_expertise" value="1"><span class="scoresp" name="attr_acrobatics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Acrobatics=[[1d20 + @{acrobatics}]]}}' name='roll_ability_acrobatics'>Acrobatics</button><br>
+                            <input type="checkbox" name="attr_athletics_proficiency" value="1"><input type="checkbox" name="attr_athletics_expertise" value="1"><span class="scoresp" name="attr_athletics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Athletics=[[1d20 + @{athletics}]]}}' name='roll_ability_athletics'>Athletics</button><br>
+                            <input type="checkbox" name="attr_bureaucracy_proficiency" value="1"><input type="checkbox" name="attr_bureaucracy_expertise" value="1"><span class="scoresp" name="attr_bureaucracy">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Bureaucracy=[[1d20 + @{bureaucracy}]]}}' name='roll_ability_bureaucracy'>Bureaucracy</button><br>
+                            <input type="checkbox" name="attr_computing_proficiency" value="1"><input type="checkbox" name="attr_computing_expertise" value="1"><span class="scoresp" name="attr_computing">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Computing=[[1d20 + @{computing}]]}}' name='roll_ability_computing'>Computing</button><br>
+                            <input type="checkbox" name="attr_deception_proficiency" value="1"><input type="checkbox" name="attr_deception_expertise" value="1"><span class="scoresp" name="attr_deception">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Deception=[[1d20 + @{deception}]]}}' name='roll_ability_deception'>Deception</button><br>
+                            <input type="checkbox" name="attr_engineering_proficiency" value="1"><input type="checkbox" name="attr_engineering_expertise" value="1"><span class="scoresp" name="attr_engineering">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Engineering=[[1d20 + @{engineering}]]}}' name='roll_ability_engineering'>Engineering</button><br>
+                            <input type="checkbox" name="attr_gambling_proficiency" value="1"><input type="checkbox" name="attr_gambling_expertise" value="1"><span class="scoresp" name="attr_gambling">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Gambling=[[1d20 + @{gambling}]]}}' name='roll_ability_gambling'>Gambling</button><br>
+                            <input type="checkbox" name="attr_hacking_proficiency" value="1"><input type="checkbox" name="attr_hacking_expertise" value="1"><span class="scoresp" name="attr_hacking">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Hacking=[[1d20 + @{hacking}]]}}' name='roll_ability_hacking'>Hacking</button><br>
+                            <input type="checkbox" name="attr_history_proficiency" value="1"><input type="checkbox" name="attr_history_expertise" value="1"><span class="scoresp" name="attr_history">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{History=[[1d20 + @{history}]]}}' name='roll_ability_history'>History</button><br>
+                            <input type="checkbox" name="attr_intimidation_proficiency" value="1"><input type="checkbox" name="attr_intimidation_expertise" value="1"><span class="scoresp" name="attr_intimidation">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Intimidation=[[1d20 + @{intimidation}]]}}' name='roll_ability_intimidation'>Intimidation</button><br>
+                            <input type="checkbox" name="attr_investigation_proficiency" value="1"><input type="checkbox" name="attr_investigation_expertise" value="1"><span class="scoresp" name="attr_investigation">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Investigation=[[1d20 + @{investigation}]]}}' name='roll_ability_investigation'>Investigation</button><br>
+                            <input type="checkbox" name="attr_mechanics_proficiency" value="1"><input type="checkbox" name="attr_mechanics_expertise" value="1"><span class="scoresp" name="attr_mechanics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Mechanics=[[1d20 + @{mechanics}]]}}' name='roll_ability_mechanics'>Mechanics</button><br>
+                            <input type="checkbox" name="attr_medicine_proficiency" value="1"><input type="checkbox" name="attr_medicine_expertise" value="1"><span class="scoresp" name="attr_medicine">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Medicine=[[1d20 + @{medicine}]]}}' name='roll_ability_medicine'>Medicine</button><br>
+                            <input type="checkbox" name="attr_navigation_proficiency" value="1"><input type="checkbox" name="attr_navigation_expertise" value="1"><span class="scoresp" name="attr_navigation">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Navigation=[[1d20 + @{navigation}]]}}' name='roll_ability_navigation'>Navigation</button><br>
+                            <input type="checkbox" name="attr_perception_proficiency" value="1"><input type="checkbox" name="attr_perception_expertise" value="1"><span class="scoresp" name="attr_perception">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Perception=[[1d20 + @{perception}]]}}' name='roll_ability_perception'>Perception</button><br>
+                            <input type="checkbox" name="attr_performance_proficiency" value="1"><input type="checkbox" name="attr_performance_expertise" value="1"><span class="scoresp" name="attr_performance">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Performance=[[1d20 + @{performance}]]}}' name='roll_ability_performance'>Performance</button><br>
+                            <input type="checkbox" name="attr_persuasion_proficiency" value="1"><input type="checkbox" name="attr_persuasion_expertise" value="1"><span class="scoresp" name="attr_persuasion">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Persuasion=[[1d20 + @{persuasion}]]}}' name='roll_ability_persuasion'>Persuasion</button><br>
+                            <input type="checkbox" name="attr_presence_proficiency" value="1"><input type="checkbox" name="attr_presence_expertise" value="1"><span class="scoresp" name="attr_presence">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Presence=[[1d20 + @{presence}]]}}' name='roll_ability_presence'>Presence</button><br>
+                            <input type="checkbox" name="attr_religion_proficiency" value="1"><input type="checkbox" name="attr_religion_expertise" value="1"><span class="scoresp" name="attr_religion">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Religion=[[1d20 + @{religion}]]}}' name='roll_ability_religion'>Religion</button><br>
+                            <input type="checkbox" name="attr_robotics_proficiency" value="1"><input type="checkbox" name="attr_robotics_expertise" value="1"><span class="scoresp" name="attr_robotics">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Robotics=[[1d20 + @{robotics}]]}}' name='roll_ability_robotics'>Robotics</button><br>
+                            <input type="checkbox" name="attr_sensemotive_proficiency" value="1"><input type="checkbox" name="attr_sensemotive_expertise" value="1"><span class="scoresp" name="attr_sensemotive">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Sense Motive=[[1d20 + @{sensemotive}]]}}' name='roll_ability_sensemotive'>Sense Motive</button><br>
+                            <input type="checkbox" name="attr_sleightofhand_proficiency" value="1"><input type="checkbox" name="attr_sleightofhand_expertise" value="1"><span class="scoresp" name="attr_sleightofhand">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Sleight of Hand=[[1d20 + @{sleightofhand}]]}}' name='roll_ability_sleightofhand'>Sleight of Hand</button><br>
+                            <input type="checkbox" name="attr_stealth_proficiency" value="1"><input type="checkbox" name="attr_stealth_expertise" value="1"><span class="scoresp" name="attr_stealth">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Stealth=[[1d20 + @{stealth}]]}}' name='roll_ability_stealth'>Stealth</button><br>
+                            <input type="checkbox" name="attr_streetwise_proficiency" value="1"><input type="checkbox" name="attr_streetwise_expertise" value="1"><span class="scoresp" name="attr_streetwise">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Streetwise=[[1d20 + @{streetwise}]]}}' name='roll_ability_streetwise'>Streetwise</button><br>
+                            <input type="checkbox" name="attr_tracking_proficiency" value="1"><input type="checkbox" name="attr_tracking_expertise" value="1"><span class="scoresp" name="attr_tracking">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Tracking=[[1d20 + @{tracking}]]}}' name='roll_ability_tracking'>Tracking</button><br>
+                            <input type="checkbox" name="attr_airvehicles_proficiency" value="1"><input type="checkbox" name="attr_airvehicles_expertise" value="1"><span class="scoresp" name="attr_airvehicles">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Vehicles (Air)=[[1d20 + @{airvehicles}]]}}' name='roll_ability_airvehicles'>Vehicles (Air)</button><br>
+                            <input type="checkbox" name="attr_landvehicles_proficiency" value="1"><input type="checkbox" name="attr_landvehicles_expertise" value="1"><span class="scoresp" name="attr_landvehicles">0</span><button class="rollerlink" type="roll" value='&{template:default} {{name=Skill Check}} {{Vehicles (Land)=[[1d20 + @{landvehicles}]]}}' name='roll_ability_landvehicles'>Vehicles (Land)</button><br>
             		    </div>
             		</div>
             	</div>
@@ -159,6 +169,10 @@
             				<input type="number" spellcheck="false" name="attr_hit_die" class="hp">
             				<div class="cntrtxt"><span class="smallft">Hit Die</span></div>
             			</div>
+            			 <div class="divTableCell">
+            				<input type="text" spellcheck="false" name="attr_hit_die_roll" class="hp">
+            				<div class="cntrtxt"><span class="smallft">Hit Die Roll</span></div>
+            			</div>
             		</div>
                     <div class="divTableRow">
                         <div class="divTableCell">
@@ -167,52 +181,166 @@
             			</div>
             			<div class="divTableCell">
             				<input type="number" spellcheck="false" name="attr_initiative" class="attribute_mod"><br>
-            				<button type="roll"  class="rollerlink" style="font-size: 0; height: 0px;" value='&{template:default} {{name=@{character_name}}} {{Initiative=[[1d20 + @{initiative} &{tracker}]]}}' name='roll_initiative'>
-            			    <div class="cntrtxt" style="position: relative; top: -20px;"><span class="smallft">Initiative</span></div></button>
+            				<button type="roll"  class="rollerlink" style="position: relative; font-size: 0; height: 0px;" value='&{template:default} {{name=@{character_name}}} {{Initiative=[[1d20 + @{initiative} &{tracker}]]}}' name='roll_initiative'>
+								<div class="cntrtxt" style="position: relative; top: -20px;"><span class="smallft">Initiative</span></div>
+							</button>
             			</div>
             			<div class="divTableCell">
             				<input type="number" spellcheck="false" name="attr_speed" class="attribute_mod"><br>
             				<div class="cntrtxt"><span class="smallft">Speed</span></div>
             			</div>
                     </div>
-                    
                 </div>
-                
-            
                 <div class="contain" style="min-width: 400px;">
 					<div class="cntrtxt">
-					<table>
-                    <tr><td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_1}}} {{Damage Type=@{attack_type_1}}} {{Attack Roll 1 =[[1d20 + @{attack_bonus_1}]]}} {{Attack Roll 2 =[[1d20 + @{attack_bonus_1}]]}} {{Damage Roll=[[@{attack_damage_1} + @{attack_dmod_1}]]}}' name='roll_attack_1'></button></td><td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_1" placeholder="KHMA Hvy Pistol" class="w70"></td><td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_1" placeholder="3" class="w90 inpcntr"></td><td class="w35"><input type="text" spellcheck="false" name="attr_attack_damage_1"  placeholder="2d6" class="w50p inpcntr"> + <input type="number" name="attr_attack_dmod_1" placeholder="3" class="w15p inpcntr"></td><td><input type="text" name="attr_attack_type_1" placeholder="Ballistic" class="w25p"></td></tr>
-                    <tr><td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_2}}} {{Damage Type=@{attack_type_2}}} {{Attack Roll=[[1d20 + @{attack_bonus_2}]]}} {{Damage Roll=[[@{attack_damage_2} + @{attack_dmod_2}]]}}' name='roll_attack_2'></button></td><td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_2" class="w70"></td><td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_2" class="w90 inpcntr"></td><td class="w35"><input type="text" spellcheck="false" name="attr_attack_damage_2" class="w50p inpcntr"> + <input type="number" name="attr_attack_dmod_2" class="w15p inpcntr"></td><td><input type="text" name="attr_attack_type_2" class="w25p"></td></tr>
-                    <tr><td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_3}}} {{Damage Type=@{attack_type_3}}} {{Attack Roll=[[1d20 + @{attack_bonus_3}]]}} {{Damage Roll=[[@{attack_damage_3} + @{attack_dmod_3}]]}}' name='roll_attack_3'></button></td><td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_3" class="w70"></td><td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_3" class="w90 inpcntr"></td><td class="w35"><input type="text" spellcheck="false" name="attr_attack_damage_3" class="w50p inpcntr"> + <input type="number" name="attr_attack_dmod_3" class="w15p inpcntr"></td><td><input type="text" name="attr_attack_type_3" class="w25p"></td></tr>
-                    <tr><td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_4}}} {{Damage Type=@{attack_type_4}}} {{Attack Roll=[[1d20 + @{attack_bonus_4}]]}} {{Damage Roll=[[@{attack_damage_4} + @{attack_dmod_4}]]}}' name='roll_attack_4'></button></td><td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_4" class="w70"></td><td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_4" class="w90 inpcntr"></td><td class="w35"><input type="text" spellcheck="false" name="attr_attack_damage_4" class="w50p inpcntr"> + <input type="number" name="attr_attack_dmod_4" class="w15p inpcntr"></td><td><input type="text" name="attr_attack_type_4" class="w25p"></td></tr>
-
-                    <tr><td></td></td><td>Attack Name</td><td>Atk</td><td>Damage / Mod</td><td>Type</td></tr>
-					</table>
-			
+						<table>
+							<tr>
+								<td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_1}}} {{Damage Type=@{attack_type_1}}} {{Attack Roll 1 =[[1d20 + @{attack_bonus_1}]]}} {{Attack Roll 2 =[[1d20 + @{attack_bonus_1}]]}} {{Damage Roll=[[@{attack_damage_1} + @{attack_dmod_1}]]}}' name='roll_attack_1'></button></td>
+								<td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_1" class="w100 inpcntr"></td>
+								<td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_1" class="w90 inpcntr"></td>
+								<td class="w25"><input type="text" spellcheck="false" name="attr_attack_damage_1" class="w40 inpcntr"> + <input type="text" name="attr_attack_dmod_1" class="w40 inpcntr"></td>
+								<td class ="w35 inpcntr"><input type="text" name="attr_attack_type_1" class="w80 inpcntr"></td>
+							</tr>
+							<tr>
+								<td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_2}}} {{Damage Type=@{attack_type_2}}} {{Attack Roll 1 =[[1d20 + @{attack_bonus_2}]]}} {{Attack Roll 2 =[[1d20 + @{attack_bonus_2}]]}} {{Damage Roll=[[@{attack_damage_2} + @{attack_dmod_2}]]}}' name='roll_attack_2'></button></td>
+								<td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_2" class="w100 inpcntr"></td>
+								<td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_2" class="w90 inpcntr"></td>
+								<td class="w25"><input type="text" spellcheck="false" name="attr_attack_damage_2" class="w40 inpcntr"> + <input type="text" name="attr_attack_dmod_2" class="w40 inpcntr"></td>
+								<td class ="w35 inpcntr"><input type="text" name="attr_attack_type_2" class="w80 inpcntr"></td>
+							</tr>
+							<tr>
+								<td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_3}}} {{Damage Type=@{attack_type_3}}} {{Attack Roll 1 =[[1d20 + @{attack_bonus_3}]]}} {{Attack Roll 2 =[[1d20 + @{attack_bonus_3}]]}} {{Damage Roll=[[@{attack_damage_3} + @{attack_dmod_3}]]}}' name='roll_attack_3'></button></td>
+								<td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_3" class="w100 inpcntr"></td>
+								<td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_3" class="w90 inpcntr"></td>
+								<td class="w25"><input type="text" spellcheck="false" name="attr_attack_damage_3" class="w40 inpcntr"> + <input type="text" name="attr_attack_dmod_3" class="w40 inpcntr"></td>
+								<td class ="w35 inpcntr"><input type="text" name="attr_attack_type_3" class="w80 inpcntr"></td>
+							</tr>
+							<tr>
+								<td><button type="roll" value='&{template:default} {{name=Attack}} {{Weapon=@{attack_name_4}}} {{Damage Type=@{attack_type_4}}} {{Attack Roll 1 =[[1d20 + @{attack_bonus_4}]]}} {{Attack Roll 2 =[[1d20 + @{attack_bonus_4}]]}} {{Damage Roll=[[@{attack_damage_4} + @{attack_dmod_4}]]}}' name='roll_attack_4'></button></td>
+								<td class="w40"><input type="text" spellcheck="false" name="attr_attack_name_4" class="w100 inpcntr"></td>
+								<td class="w10"><input type="text" spellcheck="false" name="attr_attack_bonus_4" class="w90 inpcntr"></td>
+								<td class="w25"><input type="text" spellcheck="false" name="attr_attack_damage_4" class="w40 inpcntr"> + <input type="text" name="attr_attack_dmod_4" class="w40 inpcntr"></td>
+								<td class ="w35 inpcntr"><input type="text" name="attr_attack_type_4" class="w80 inpcntr"></td>
+							</tr>
+							<tr>
+								<td></td>
+								<td class="w30 inpcntr">Attack Name</td>
+								<td class="w10 inpcntr">Atk</td>
+								<td class="w25 inpcntr">Damage / Mod</td>
+								<td class ="w10 inpcntr">Type</td>
+							</tr>
+						</table> 
 					</div>
 				</div>
 				<div class="spacer"></div>
 				<div class="contain">
-				<input type="text" spellcheck="false" name="attr_augmentation_1_slot" class="w10"><input type="text" spellcheck="false" name="attr_augmentation_1" class="w35" placeholder="Augmentation"><input type="text" spellcheck="false" name="attr_augmentation_2" class="w35" placeholder="Augmentation"><input type="text" spellcheck="false" name="attr_augmentation_2_slot" class="w10"><br>
-                <input type="text" spellcheck="false" name="attr_augmentation_3_slot" class="w10"><input type="text" spellcheck="false" name="attr_augmentation_3" class="w35"><input type="text" spellcheck="false" name="attr_augmentation_4" class="w35"><input type="text" spellcheck="false" name="attr_augmentation_4_slot" class="w10"><br>
-                <input type="text" spellcheck="false" name="attr_augmentation_5_slot" class="w10"><input type="text" spellcheck="false" name="attr_augmentation_5" class="w35"><input type="text" spellcheck="false" name="attr_augmentation_6" class="w35"><input type="text" spellcheck="false" name="attr_augmentation_6_slot" class="w10"><br>
-                <input type="text" spellcheck="false" name="attr_augmentation_7_slot" class="w10"><input type="text" spellcheck="false" name="attr_augmentation_7" class="w35"><input type="text" spellcheck="false" name="attr_augmentation_8" class="w35"><input type="text" spellcheck="false" name="attr_augmentation_8_slot" class="w10"><br>
+					<table>
+						<tr>
+							<td class="w30"><input type="text" spellcheck="false" name="attr_resource_1_type" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_resource_1_current" value="0"></td>
+							<td class="w15"><input type="number" name="attr_resource_1_max"value="0" class="w10"></td>
+							<td class="w30"><input type="text" spellcheck="false" name="attr_resource_2_type" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_resource_2_current" value="0"></td>
+							<td class="w10"><input type="number" name="attr_resource_2_max"value="0"></td>
+						</tr>
+						<tr>
+							<td class="w30"><input type="text" spellcheck="false" name="attr_resource_3_type" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_resource_3_current" value="0"></td>
+							<td class="w15"><input type="number" name="attr_resource_3_max"value="0" class="w10"></td>
+							<td class="w30"><input type="text" spellcheck="false" name="attr_resource_4_type" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_resource_4_current" value="0"></td>
+							<td class="w10"><input type="number" name="attr_resource_4_max"value="0"></td>
+						</tr>
+						<tr>
+							<td class="w30 inpcntr">Resource</td>
+							<td class="w10">Uses</td>
+							<td class="w15">Max</td>
+							<td class="w30 inpcntr">Resource</td>
+							<td class="w10">Uses</td>
+							<td class="w10">Max</td>
+						</tr>							
+					</table>
+					<div class="cntrtxt">RESOURCE TRACKER</div>
 				</div>
 				<div class="spacer"></div>
 				<div class="contain">
-					<textarea name="attr_info"></textarea>
-					<div class="cntrtxt">Feats and Abilities</div>
+					<table>
+						<tr>
+							<td class="w15"><input type="text" spellcheck="false" name="attr_ammo_1_type" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_1_cliptype" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_1_slot" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_ammo_1_current"></td>
+							<td class="w10"><input type="number" name="attr_ammo_1_max"></td>
+						</tr>
+						<tr>
+							<td class="w15"><input type="text" spellcheck="false" name="attr_ammo_2_type" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_2_cliptype" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_2_slot" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_ammo_2_current"></td>
+							<td class="w10"><input type="number" name="attr_ammo_2_max"></td>
+						</tr>
+						<tr>
+							<td class="w15"><input type="text" spellcheck="false" name="attr_ammo_3_type" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_3_cliptype" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_3_slot" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_ammo_3_current"></td>
+							<td class="w10"><input type="number" name="attr_ammo_3_max"></td>
+						</tr>
+						<tr>
+							<td class="w15"><input type="text" spellcheck="false" name="attr_ammo_4_type" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_4_cliptype" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_4_slot" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_ammo_4_current"></td>
+							<td class="w10"><input type="number" name="attr_ammo_4_max"></td>
+						</tr>
+						<tr>
+							<td class="w15"><input type="text" spellcheck="false" name="attr_ammo_5_type" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_5_cliptype" class="w100 inpcntr"></td>
+							<td class="w40 inpcntr"><input type="text" spellcheck="false" name="attr_ammo_5_slot" class="w100 inpcntr"></td>
+							<td class="w10"><input type="number" name="attr_ammo_5_current"></td>
+							<td class="w10"><input type="number" name="attr_ammo_5_max"></td>
+						</tr>
+						<tr>
+							<td class="w15 inpcntr">Ammo</td>
+							<td class="w40 inpcntr">Weapon Clip</td>
+							<td class="w40 inpcntr">Location</td>
+							<td class="w10 inpcntr">Current</td>
+							<td class="w10 inpcntr">Max</td>
+						</tr>
+					</table>
+					<div class="cntrtxt">AMMO TRACKER</div>
 				</div>
-				
 				<div class="spacer"></div>
-				<div class="contain">
-					<input type="text" class="w60" name="attr_career1_name"><input type="text" class="w30" name="attr_career1_years"><br>
-					<input type="text" class="w60" name="attr_career2_name"><input type="text" class="w30" name="attr_career2_years"><br>
-					<input type="text" class="w60" name="attr_career3_name"><input type="text" class="w30" name="attr_career3_years"><br>
-					<input type="text" class="w60" name="attr_career4_name"><input type="text" class="w30" name="attr_career4_years"><br>
-                    <div class="w60" style="display: inline-block;">Career</div> <div class="w30" style="display: inline-block;">Years Served</div>
+				<div class="contain" style="min-width: 400px">
+					<table>
+						<tr>
+							<td>Armor: </td>
+							<td class="w100"><input type="text" spellcheck="false" name="attr_armor_proficiency_slot" class="w100"></td>
+						</tr>
+						<tr>
+							<td>Weapons: </td>
+							<td class="w100"><input type="text" spellcheck="false" name="attr_weapon_proficiency_slot" class="w100"></td>
+						</tr>
+						<tr>
+							<td>Tools: </td>
+							<td class="w100"><input type="text" spellcheck="false" name="attr_tools_proficiency_slot" class="w100"></td>
+						</tr>
+						<tr>
+							<td></td>
+							<td class="w100"><input type="text" spellcheck="false" name="attr_languages_tools_2_slot" class="w100"></td>
+						</tr>
+						<tr>
+							<td>Languages: </td>
+							<td class="w100"><input type="text" spellcheck="false" name="attr_languages_proficiency_slot" class="w100"></td>
+						</tr>
+						<tr>
+							<td></td>
+							<td class="w100"><input type="text" spellcheck="false" name="attr_languages_proficiency_2_slot" class="w100"></td>
+						</tr>
+					</table>
+					<div class="cntrtxt">PROFICIENCIES AND LANGUAGES</div>
 				</div>
+				<div class="spacer"></div>
             </div>
         </div>
     </div>
@@ -253,29 +381,41 @@
 		<div class="divTableRow">
 			<div class="divTableCell">
 				<div class="divTable">
-				<div class="divTableRow">
-					<div class="divTableCell"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/carbon-2185-quickstart/logo.png"></div>
-				</div>
-				<div class="divTableRow">
-					<div class="divTableCell">Character Name: <input type="text" spellcheck="false" name="attr_character_name"></div>
-				</div>
-				
+					<div class="divTableRow">
+						<div class="divTableCell"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/carbon-2185-quickstart/logo.png"></div>
+					</div>
 				</div>
 			</div>
 			<div class="divTableCell">
-				<div class="contain">
-					<div class="divTable">
-						<div class="divTableRow">
-							<div class="divTableCell">Height <input type="text" spellcheck="false" name="attr_character_height" class="w20"> Skin: <input type="number" spellcheck="false" name="attr_character_skin" class="w10">
-							Hair <input type="text" spellcheck="false" name="attr_character_hair" class="w20"></div>
-						</div>
-					</div>
+				<div class="contain" style="min-width: 400px">
 					<div class="divTable">
 						<div class="divTableRow">
 							<div class="divTableCell">
-							Eyes <input type="text" spellcheck="false" class="w20" name="attr_character_eyes">
-							Weight <input type="text" spellcheck="false" name="attr_character_weight" class="w20">
-							Religion <input type="text" spellcheck="false" class="w20" name="attr_character_religion"></div>
+								<input type="text" spellcheck="false" name="attr_character_height" class="w90 inpcntr"> 
+								<div class="cntrtxt"><span class="smallft">Height</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_weight" class="w90 inpcntr"> 
+								<div class="cntrtxt"><span class="smallft">Weight</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_hair" class="w90 inpcntr"> 
+								<div class="cntrtxt"><span class="smallft">Hair</span></div>
+							</div>
+						</div>
+						<div class="divTableRow">
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_eyes" class="w90 inpcntr"> 
+								<div class="cntrtxt"><span class="smallft">Eyes</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_skin" class="w90 inpcntr"> 
+								<div class="cntrtxt"><span class="smallft">Skin</span></div>
+							</div>
+							<div class="divTableCell">
+								<input type="text" spellcheck="false" name="attr_character_religion" class="w90 inpcntr"> 
+								<div class="cntrtxt"><span class="smallft">Religion</span></div>
+							</div>
 						</div>
 					</div>
 				</div>	
@@ -287,75 +427,238 @@
             <div class="divTableCell">
             	<div class="cntrtxt">Gear</div>
 				<table class="w100">
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item1" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item1weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item2" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item2weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item3" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item3weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item4" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item4weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item5" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item5weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item6" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item6weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item7" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item7weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item8" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item8weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item9" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item9weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item10" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item10weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item11" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item11weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item12" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item12weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item13" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item13weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item14" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item14weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item15" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item15weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item16" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item16weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item17" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item17weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item18" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item18weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item19" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item19weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item20" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item20weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item21" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item21weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item22" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item22weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item23" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item23weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item24" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item24weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item25" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item25weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item26" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item26weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item27" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item27weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item28" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item28weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item29" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item29weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item30" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item30weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item31" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item31weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item32" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item32weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item33" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item33weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item34" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item34weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item35" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item35weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item36" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item36weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item37" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item37weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item38" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item38weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80"><input type="text" spellcheck="false" name="attr_item39" class="w95"></td><td class="w25p"><input type="number" spellcheck="false" name="attr_item39weight" value="0" class="w25p"></td></tr>
-				<tr><td class="w80">Equipment</td><td class="w20"><input type="number" name="attr_combitemweight" placeholder="weight" readonly></td></tr>
-				</table>
-				
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped1" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item1" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item1weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped2" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item2" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item2weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped3" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item3" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item3weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped4" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item4" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item4weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped5" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item5" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item5weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped6" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item6" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item6weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped7" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item7" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item7weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped8" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item8" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item8weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped9" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item9" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item9weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped10" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item10" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item10weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped11" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item11" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item11weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped12" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item12" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item12weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped13" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item13" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item13weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped14" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item14" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item14weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped15" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item15" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item15weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped16" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item16" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item16weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped17" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item17" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item17weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped18" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item18" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item18weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped19" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item19" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item19weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped20" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item20" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item20weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped21" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item21" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item21weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped22" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item22" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item22weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped23" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item23" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item23weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped24" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item24" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item24weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped25" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item25" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item25weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped26" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item26" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item26weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped27" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item27" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item27weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped28" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item28" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item28weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped29" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item29" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item29weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped30" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item30" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item30weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped31" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item31" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item31weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped32" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item32" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item32weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped33" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item33" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item33weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped34" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item34" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item34weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped35" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item35" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item35weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped36" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item36" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item36weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped37" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item37" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item37weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped38" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item38" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item38weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"><input type="checkbox" name="attr_equipped39" value="1"></td>
+						<td class="w80"><input type="text" spellcheck="false" name="attr_item39" class="w95"></td>
+						<td class="w25p"><input type="number" spellcheck="false" name="attr_item39weight" value="0" class="w25p"></td>
+					</tr>
+					<tr>
+						<td class="w15"></td>
+						<td class="w80">Equipment</td>
+						<td class="w25p"><input type="number" name="attr_combitemweight" placeholder="weight" readonly></td>
+					</tr>
+				</table>	
             </div>
             <div class="divTableCell w60">
             	<div class="divTable">
 					<div class="divTableRow">
 						<div class="divTableCell">
-							<textarea name="attr_vice"></textarea>
-							<div class="cntrtxt">Vice</div>
+							<div class="spacer"></div>
+							<div class="contain">
+								<input type="text" spellcheck="false" name="attr_augmentation_1_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_1" class="w70 inpcntr"><input type="number" name="attr_bloodtox1" value="0" class="w15 inpcntr"><br>
+								<input type="text" spellcheck="false" name="attr_augmentation_2_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_2" class="w70 inpcntr"><input type="number" name="attr_bloodtox2" value="0" class="w15 inpcntr"><br>
+								<input type="text" spellcheck="false" name="attr_augmentation_3_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_3" class="w70 inpcntr"><input type="number" name="attr_bloodtox3" value="0" class="w15 inpcntr"><br>
+								<input type="text" spellcheck="false" name="attr_augmentation_4_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_4" class="w70 inpcntr"><input type="number" name="attr_bloodtox4" value="0" class="w15 inpcntr"><br>
+								<input type="text" spellcheck="false" name="attr_augmentation_5_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_5" class="w70 inpcntr"><input type="number" name="attr_bloodtox5" value="0" class="w15 inpcntr"><br>
+								<input type="text" spellcheck="false" name="attr_augmentation_6_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_6" class="w70 inpcntr"><input type="number" name="attr_bloodtox6" value="0" class="w15 inpcntr"><br>
+								<input type="text" spellcheck="false" name="attr_augmentation_7_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_7" class="w70 inpcntr"><input type="number" name="attr_bloodtox7" value="0" class="w15 inpcntr"><br>
+								<input type="text" spellcheck="false" name="attr_augmentation_9_slot" class="w75p inpcntr"><input type="text" spellcheck="false" name="attr_augmentation_8" class="w70 inpcntr"><input type="number" name="attr_bloodtox8" value="0" class="w15 inpcntr"><br>
+								<div class="w60" style="display: inline-block;">Blood Toxicity Total:</div> <span class="scoresp" name="attr_bloodtoxicity">0</span>
+								<div class="cntrtxt">AUGMENTATIONS</div>
+							</div>
 						</div>
 					</div>
 					<div class="divTableRow">
 						<div class="divTableCell">
-							<textarea name="attr_proficiencies"></textarea>
-							<div class="cntrtxt">Proficiencies</div>
+						    <div class="spacer"></div>
+							<div class="contain">
+								<textarea style='height: 800px;' name='attr_info'></textarea>
+							</div>
+							<div class="cntrtxt">FEATS AND ABILITIES</div>
 						</div>
-					</div>
-					<div class="divTableRow">
-						<div class="divTableCell">
-							<textarea name="attr_notes"></textarea>
-							<div class="cntrtxt">Notes</div>
-						</div>
-					</div>
-					<div class="divTableRow">
-						<div class="divTableCell">
-							<textarea name="attr_backstory"></textarea>
-							<div class="cntrtxt">Backstory</div>
-						</div>
-					</div>
+					</div>	
+				</div>
+				</div>
 				</div>
             </div>
             
@@ -364,6 +667,63 @@
 
 </div>
 
+<br>
+<div class="maincontainer">
+	<div class="divTable">
+		<div class="divTableRow">
+			<div class="divTableCell">
+				<div class="divTableCell">
+					<div class="divTable">
+						<div class="divTableRow">
+							<div class="divTableCell"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/carbon-2185-quickstart/logo.png"></div>
+						</div>
+					</div>			    
+					<div class="divTable">
+						<div class="divTableRow">
+							<td rowspan="4"><textarea style='height: 880px;' name='attr_notes'></textarea></td>
+							<div class="cntrtxt">NOTES</div>
+						</div>
+					</div>
+				</div>
+				<div class="divTableCell">
+				
+					<div class="divTable" style="min-width: 400px">	
+						<div class="divTable">	
+							<div class="divTableRow">
+								<div class="divTableCell">
+									<div class="contain" style="min-width: 400px">
+										<input type="text" class="w60 inpcntr" name="attr_career1_name"><input type="text" class="w30 inpcntr" name="attr_career1_years"><br>
+										<input type="text" class="w60 inpcntr" name="attr_career2_name"><input type="text" class="w30 inpcntr" name="attr_career2_years"><br>
+										<input type="text" class="w60 inpcntr" name="attr_career3_name"><input type="text" class="w30 inpcntr" name="attr_career3_years"><br>
+										<input type="text" class="w60 inpcntr" name="attr_career4_name"><input type="text" class="w30 inpcntr" name="attr_career4_years"><br>
+										<div class="w60 inpcntr" style="display: inline-block;">Career</div> <div class="w30 inpcntr" style="display: inline-block;">Years</div>
+									</div>    
+								</div>
+							</div>
+							<div class="divTableRow">
+								<div class="divTableCell">
+									<td rowspan="4"><textarea style='height: 100px;' name='attr_vice'></textarea></td>
+									<div class="cntrtxt">VICE</div>
+								</div>
+							</div>
+							<div class="divTableRow">
+								<div class="divTableCell">
+									<td rowspan="4"><textarea style='height: 300px;' name='attr_backstory'></textarea></td>
+									<div class="cntrtxt">BACKSTORY</div>
+								</div>
+							</div>
+							<div class="divTableRow">
+								<div class="divTableCell">
+								<td rowspan="4"><textarea style='height: 300px;' name='attr_relationships'></textarea></td>
+								<div class="cntrtxt">RELATIONSHIPS</div>
+							</div>
+						</div>	 					
+                    </div>
+                </div>    
+			</div>
+		</div>
+	</div>
+</div>
 
 <script type="text/worker">
 var fortchecked=0;
@@ -407,8 +767,8 @@ on("sheet:opened change:fortitude_proficiency change:proficiency_bonus change:re
    });
 });
 
-on("sheet:opened change:strength_modifier change:dexterity_modifier change:constitution_modifier change:intelligence_modifier change:technology_modifier change:people_modifier change:acrobatics_proficiency change:athletics_proficiency change:bureaucracy_proficiency change:computing_proficiency change:deception_proficiency change:engineering_proficiency change:gambling_proficiency change:hacking_proficiency change:history_proficiency change:intimidation_proficiency change:investigation_proficiency change:mechanics_proficiency change:medicine_proficiency change:navigation_proficiency change:perception_proficiency change:performance_proficiency change:persuasion_proficiency change:presence_proficiency change:religion_proficiency change:robotics_proficiency change:sensemotive_proficiency change:sleightofhand_proficiency change:stealth_proficiency change:streetwise_proficiency change:tracking_proficiency change:airvehicles_proficiency change:landvehicles_proficiency change:strength_modifier change:dexterity_modifier change:constitution_modifier change:intelligence_modifier change:technology_modifier change:people_modifier change:proficiency_bonus", function() {
-	getAttrs(["strength_modifier", "dexterity_modifier", "constitution_modifier", "intelligence_modifier", "technology_modifier", "people_modifier", "acrobatics", "athletics", "bureaucracy", "computing", "deception", "engineering", "gambling", "hacking", "history", "intimidation", "investigation", "mechanics", "medicine", "navigation", "perception", "performance", "pursuassion", "presence", "religion", "robotics", "sensemotive", "sleightofhand", "stealth", "streetwise", "tracking", "airvehicles", "landvehicles", "acrobatics_proficiency", "athletics_proficiency", "bureaucracy_proficiency", "computing_proficiency", "deception_proficiency", "engineering_proficiency", "gambling_proficiency", "hacking_proficiency", "history_proficiency", "intimidation_proficiency", "investigation_proficiency", "mechanics_proficiency", "medicine_proficiency", "navigation_proficiency", "perception_proficiency", "performance_proficiency", "persuasion_proficiency", "presence_proficiency", "religion_proficiency", "robotics_proficiency", "sensemotive_proficiency", "sleightofhand_proficiency", "stealth_proficiency", "streetwise_proficiency", "tracking_proficiency", "airvehicles_proficiency", "landvehicles_proficiency", "proficiency_bonus"], function(values) {
+on("sheet:opened change:strength_modifier change:dexterity_modifier change:constitution_modifier change:intelligence_modifier change:technology_modifier change:people_modifier change:acrobatics_proficiency change:acrobatics_expertise change:athletics_proficiency change:athletics_expertise change:bureaucracy_proficiency change:bureaucracy_expertise change:computing_proficiency change:computing_expertise change:deception_proficiency change:deception_expertise change:engineering_proficiency change:engineering_expertise change:gambling_proficiency change:gambling_expertise change:hacking_proficiency change:hacking_expertise change:history_proficiency change:history_expertise change:intimidation_proficiency change:intimidation_expertise change:investigation_proficiency change:investigation_expertise change:mechanics_proficiency change:mechanics_expertise change:medicine_proficiency change:medicine_expertise change:navigation_proficiency change:navigation_expertise change:perception_proficiency change:perception_expertise change:performance_proficiency change:performance_expertise change:persuasion_proficiency change:persuasion_expertise change:presence_proficiency change:presence_expertise change:religion_proficiency change:religion_expertise change:robotics_proficiency change:robotics_expertise change:sensemotive_proficiency change:sensemotive_expertise change:sleightofhand_proficiency change:sleightofhand_expertise change:stealth_proficiency change:stealth_expertise change:streetwise_proficiency change:streetwise_expertise change:tracking_proficiency change:tracking_expertise change:airvehicles_proficiency change:airvehicles_expertise change:landvehicles_proficiency change:landvehicles_expertise change:strength_modifier change:dexterity_modifier change:constitution_modifier change:intelligence_modifier change:technology_modifier change:people_modifier change:proficiency_bonus change:bloodtox1  change:bloodtox2  change:bloodtox3  change:bloodtox4  change:bloodtox5  change:bloodtox6  change:bloodtox7  change:bloodtox8 change:bloodtoxicity change:bloodtox change:bloodtoxmax change:bloodtoxicitymax", function() {
+	getAttrs(["strength_modifier", "dexterity_modifier", "constitution_modifier", "intelligence_modifier", "technology_modifier", "people_modifier", "acrobatics", "athletics", "bureaucracy", "computing", "deception", "engineering", "gambling", "hacking", "history", "intimidation", "investigation", "mechanics", "medicine", "navigation", "perception", "performance", "pursuassion", "presence", "religion", "robotics", "sensemotive", "sleightofhand", "stealth", "streetwise", "tracking", "airvehicles", "landvehicles", "survival", "acrobatics_proficiency", "acrobatics_expertise", "athletics_proficiency", "athletics_expertise", "bureaucracy_proficiency", "bureaucracy_expertise", "computing_proficiency", "computing_expertise", "deception_proficiency", "deception_expertise", "engineering_proficiency", "engineering_expertise", "gambling_proficiency", "gambling_expertise", "hacking_proficiency", "hacking_expertise", "history_proficiency", "history_expertise", "intimidation_proficiency", "intimidation_expertise", "investigation_proficiency", "investigation_expertise", "mechanics_proficiency", "mechanics_expertise", "medicine_proficiency", "medicine_expertise", "navigation_proficiency", "navigation_expertise", "perception_proficiency", "perception_expertise", "performance_proficiency", "performance_expertise", "persuasion_proficiency", "persuasion_expertise", "presence_proficiency", "presence_expertise", "religion_proficiency", "religion_expertise", "robotics_proficiency", "robotics_expertise", "sensemotive_proficiency", "sensemotive_expertise", "sleightofhand_proficiency", "sleightofhand_expertise", "stealth_proficiency", "stealth_expertise", "streetwise_proficiency", "streetwise_expertise", "tracking_proficiency", "tracking_expertise", "airvehicles_proficiency","airvehicles_expertise", "landvehicles_proficiency", "landvehicles_expertise", "proficiency_bonus", "bloodtox1", "bloodtox2", "bloodtox3", "bloodtox4", "bloodtox5", "bloodtox6", "bloodtox7", "bloodtox8", "bloodtoxicity", "bloodtox", "bloodtoxicity", "bloodtoxicitymax"], function(values) {
 		let acrochecked = parseInt(values.acrobatics_proficiency)||0;
 		let athlchecked = parseInt(values.athletics_proficiency)||0;
 		let burechecked = parseInt(values.bureaucracy_proficiency)||0;
@@ -436,6 +796,33 @@ on("sheet:opened change:strength_modifier change:dexterity_modifier change:const
 		let tracchecked = parseInt(values.tracking_proficiency)||0;
 		let airvchecked = parseInt(values.airvehicles_proficiency)||0;
 		let landchecked = parseInt(values.landvehicles_proficiency)||0;
+	    let acroexpertisechecked = parseInt(values.acrobatics_expertise)||0;
+		let athlexpertisechecked = parseInt(values.athletics_expertise)||0;
+	    let bureexpertisechecked = parseInt(values.bureaucracy_expertise)||0;
+	    let compexpertisechecked = parseInt(values.computing_expertise)||0;
+	    let deceexpertisechecked = parseInt(values.deception_expertise)||0;
+	    let engiexpertisechecked = parseInt(values.engineering_expertise)||0;
+	    let gambexpertisechecked = parseInt(values.gambling_expertise)||0;
+	    let hackexpertisechecked = parseInt(values.hacking_expertise)||0;
+	    let histexpertisechecked = parseInt(values.history_expertise)||0;
+	    let intiexpertisechecked = parseInt(values.intimidation_expertise)||0;
+	    let inveexpertisechecked = parseInt(values.investigation_expertise)||0;
+	    let mechexpertisechecked = parseInt(values.mechanics_expertise)||0;
+	    let mediexpertisechecked = parseInt(values.medicine_expertise)||0;
+	    let naviexpertisechecked = parseInt(values.navigation_expertise)||0;
+	    let percexpertisechecked = parseInt(values.perception_expertise)||0;
+	    let perfexpertisechecked = parseInt(values.performance_expertise)||0;
+	    let persexpertisechecked = parseInt(values.persuasion_expertise)||0;
+	    let presexpertisechecked = parseInt(values.presence_expertise)||0;
+	    let reliexpertisechecked = parseInt(values.religion_expertise)||0;
+	    let roboexpertisechecked = parseInt(values.robotics_expertise)||0;
+	    let sensexpertisechecked = parseInt(values.sensemotive_expertise)||0;
+	    let sleiexpertisechecked = parseInt(values.sleightofhand_expertise)||0;
+	    let steaexpertisechecked = parseInt(values.stealth_expertise)||0;
+	    let streexpertisechecked = parseInt(values.streetwise_expertise)||0;
+	    let tracexpertisechecked = parseInt(values.tracking_expertise)||0;
+	    let airvexpertisechecked = parseInt(values.airvehicles_expertise)||0;
+	    let landexpertisechecked = parseInt(values.landvehicles_expertise)||0;
 		let strength_modifier = parseInt(values.strength_modifier)||0;
 		let dexterity_modifier = parseInt(values.dexterity_modifier)||0;
 		let constitution_modifier = parseInt(values.constitution_modifier)||0;
@@ -443,38 +830,45 @@ on("sheet:opened change:strength_modifier change:dexterity_modifier change:const
 		let intelligence_modifier = parseInt(values.intelligence_modifier)||0;
 		let people_modifier = parseInt(values.people_modifier)||0;
 		let proficiency_bonus = parseInt(values.proficiency_bonus)||0;
+		let bloodtox1 = parseInt(values.bloodtox1)||0;
+		let bloodtox2 = parseInt(values.bloodtox2)||0;
+		let bloodtox3 = parseInt(values.bloodtox3)||0;
+		let bloodtox4 = parseInt(values.bloodtox4)||0;
+		let bloodtox5 = parseInt(values.bloodtox5)||0;
+		let bloodtox6 = parseInt(values.bloodtox6)||0;
+		let bloodtox7 = parseInt(values.bloodtox7)||0;
+		let bloodtox8 = parseInt(values.bloodtox8)||0;
 		
 		
-		
-		
-        const athlbonus = strength_modifier + (athlchecked === 1 ? proficiency_bonus : 0);
-        const intibonus = strength_modifier + (intichecked === 1 ? proficiency_bonus : 0);
-        const acrobonus = dexterity_modifier + (acrochecked === 1 ? proficiency_bonus : 0);
-        const sleibonus = dexterity_modifier + (sleichecked === 1 ? proficiency_bonus : 0);
-        const steabonus = dexterity_modifier + (steachecked === 1 ? proficiency_bonus : 0);
-        const landbonus = dexterity_modifier + (landchecked === 1 ? proficiency_bonus : 0);
-        const burebonus = people_modifier + (burechecked === 1 ? proficiency_bonus : 0);
-        const decebonus = people_modifier + (decechecked === 1 ? proficiency_bonus : 0);
-        const perfbonus = people_modifier + (perfchecked === 1 ? proficiency_bonus : 0);
-        const persbonus = people_modifier + (perschecked === 1 ? proficiency_bonus : 0);
-        const presbonus = people_modifier + (preschecked === 1 ? proficiency_bonus : 0);
-        const sensbonus = people_modifier + (senschecked === 1 ? proficiency_bonus : 0);
-        const compbonus = technology_modifier + (compchecked === 1 ? proficiency_bonus : 0);
-        const hackbonus = technology_modifier + (hackchecked === 1 ? proficiency_bonus : 0);
-        const mechbonus = technology_modifier + (mechchecked === 1 ? proficiency_bonus : 0);
-        const medibonus = technology_modifier + (medichecked === 1 ? proficiency_bonus : 0);
-        const robobonus = technology_modifier + (robochecked === 1 ? proficiency_bonus : 0);
-        const airvbonus = technology_modifier + (airvchecked === 1 ? proficiency_bonus : 0);
-        const engibonus = intelligence_modifier + (engichecked === 1 ? proficiency_bonus : 0);
-        const gambbonus = intelligence_modifier + (gambchecked === 1 ? proficiency_bonus : 0);
-        const histbonus = intelligence_modifier + (histchecked === 1 ? proficiency_bonus : 0);
-        const invebonus = intelligence_modifier + (invechecked === 1 ? proficiency_bonus : 0);
-        const navibonus = intelligence_modifier + (navichecked === 1 ? proficiency_bonus : 0);
-        const percbonus = intelligence_modifier + (percchecked === 1 ? proficiency_bonus : 0);
-        const relibonus = intelligence_modifier + (relichecked === 1 ? proficiency_bonus : 0);
-        const strebonus = intelligence_modifier + (strechecked === 1 ? proficiency_bonus : 0);
-        const tracbonus = intelligence_modifier + (tracchecked === 1 ? proficiency_bonus : 0);
-		
+        const athlbonus = strength_modifier + (athlchecked === 1 ? proficiency_bonus : 0) + (athlexpertisechecked === 1 ? proficiency_bonus : 0);
+        const intibonus = strength_modifier + (intichecked === 1 ? proficiency_bonus : 0) + (intiexpertisechecked === 1 ? proficiency_bonus: 0);
+        const acrobonus = dexterity_modifier + (acrochecked === 1 ? proficiency_bonus : 0) + (acroexpertisechecked === 1 ? proficiency_bonus: 0);
+        const sleibonus = dexterity_modifier + (sleichecked === 1 ? proficiency_bonus : 0) + (sleiexpertisechecked === 1 ? proficiency_bonus: 0);
+        const steabonus = dexterity_modifier + (steachecked === 1 ? proficiency_bonus : 0) + (steaexpertisechecked === 1 ? proficiency_bonus: 0);
+        const landbonus = dexterity_modifier + (landchecked === 1 ? proficiency_bonus : 0) + (landexpertisechecked === 1 ? proficiency_bonus: 0);
+        const burebonus = people_modifier + (burechecked === 1 ? proficiency_bonus : 0) + (bureexpertisechecked === 1 ? proficiency_bonus: 0);
+        const decebonus = people_modifier + (decechecked === 1 ? proficiency_bonus : 0) + (deceexpertisechecked === 1 ? proficiency_bonus: 0);
+        const perfbonus = people_modifier + (perfchecked === 1 ? proficiency_bonus : 0) + (perfexpertisechecked === 1 ? proficiency_bonus: 0);
+        const persbonus = people_modifier + (perschecked === 1 ? proficiency_bonus : 0) + (persexpertisechecked === 1 ? proficiency_bonus: 0);
+        const presbonus = people_modifier + (preschecked === 1 ? proficiency_bonus : 0) + (presexpertisechecked === 1 ? proficiency_bonus: 0);
+        const sensbonus = people_modifier + (senschecked === 1 ? proficiency_bonus : 0) + (sensexpertisechecked === 1 ? proficiency_bonus: 0);
+        const compbonus = technology_modifier + (compchecked === 1 ? proficiency_bonus : 0) + (compexpertisechecked === 1 ? proficiency_bonus: 0);
+        const hackbonus = technology_modifier + (hackchecked === 1 ? proficiency_bonus : 0) + (hackexpertisechecked === 1 ? proficiency_bonus: 0);
+        const mechbonus = technology_modifier + (mechchecked === 1 ? proficiency_bonus : 0) + (mechexpertisechecked === 1 ? proficiency_bonus: 0);
+        const medibonus = technology_modifier + (medichecked === 1 ? proficiency_bonus : 0) + (mediexpertisechecked === 1 ? proficiency_bonus: 0);
+        const robobonus = technology_modifier + (robochecked === 1 ? proficiency_bonus : 0) + (roboexpertisechecked === 1 ? proficiency_bonus: 0);
+        const airvbonus = technology_modifier + (airvchecked === 1 ? proficiency_bonus : 0) + (airvexpertisechecked === 1 ? proficiency_bonus: 0);
+        const engibonus = intelligence_modifier + (engichecked === 1 ? proficiency_bonus : 0) + (engiexpertisechecked === 1 ? proficiency_bonus: 0);
+        const gambbonus = intelligence_modifier + (gambchecked === 1 ? proficiency_bonus : 0) + (gambexpertisechecked === 1 ? proficiency_bonus: 0);
+        const histbonus = intelligence_modifier + (histchecked === 1 ? proficiency_bonus : 0) + (histexpertisechecked === 1 ? proficiency_bonus: 0);
+        const invebonus = intelligence_modifier + (invechecked === 1 ? proficiency_bonus : 0) + (inveexpertisechecked === 1 ? proficiency_bonus: 0);
+        const navibonus = intelligence_modifier + (navichecked === 1 ? proficiency_bonus : 0) + (naviexpertisechecked === 1 ? proficiency_bonus: 0);
+        const percbonus = intelligence_modifier + (percchecked === 1 ? proficiency_bonus : 0) + (percexpertisechecked === 1 ? proficiency_bonus: 0);
+        const relibonus = intelligence_modifier + (relichecked === 1 ? proficiency_bonus : 0) + (reliexpertisechecked === 1 ? proficiency_bonus: 0);
+        const strebonus = intelligence_modifier + (strechecked === 1 ? proficiency_bonus : 0) + (streexpertisechecked === 1 ? proficiency_bonus: 0);
+        const tracbonus = intelligence_modifier + (tracchecked === 1 ? proficiency_bonus : 0) + (tracexpertisechecked === 1 ? proficiency_bonus: 0);
+        const bloodtox = bloodtox1 + bloodtox2 + bloodtox3 + bloodtox4 + bloodtox5 + bloodtox6 + bloodtox7 + bloodtox8;
+        
 		setAttrs({
             athletics: athlbonus,
 			intimidation: intibonus,
@@ -502,7 +896,8 @@ on("sheet:opened change:strength_modifier change:dexterity_modifier change:const
 			perception: percbonus,
 			religion: relibonus,
 			streetwise: strebonus,
-			tracking: tracbonus
+			tracking: tracbonus,
+			bloodtoxicity: bloodtox
 		});
 	});
 });
diff --git a/Carbon-2185/sheet.json b/Carbon-2185/sheet.json
index 3edb23b98d..4ba244d0ee 100644
--- a/Carbon-2185/sheet.json
+++ b/Carbon-2185/sheet.json
@@ -1,9 +1,9 @@
 {
   "html": "carbon-2185.html",
   "css": "carbon-2185.css",
-  "authors": "WizardEddas",
-  "roll20userid": "268468",
+  "authors": "vanderweb",
+  "roll20userid": "4316789",
   "preview": "carbon-2185.png",
-  "instructions": "Full Character Sheet for the Cyberpunk RPG Carbon 2185, which is based on the 5E OGL Rules. The quickstart rules can be downloaded at www.carbon2185.com Full game due to be released in July. Sheet created by @wizardeddas",
+  "instructions": "Full Character Sheet for the Cyberpunk RPG Carbon 2185, which is based on the 5E OGL Rules. The quickstart rules can be downloaded at www.carbon2185.com. Sheet originaly created by @wizardeddas, enhanced by @Ladrop and now futher updated by @vanderweb.",
   "legacy": true
 }
\ No newline at end of file