diff --git a/Cyberrats/Cyberrats.css b/Cyberrats/Cyberrats.css
index d96b4affdd..73e24f23f5 100644
--- a/Cyberrats/Cyberrats.css
+++ b/Cyberrats/Cyberrats.css
@@ -1155,6 +1155,7 @@ input.sheet-briny:not(:checked) ~ .campaignsheet .lieutenants {
   content: counter(repitem) '. ';
 }
 
+
 .spacebefore {
 	margin-top: 35px;
 }
@@ -1282,6 +1283,15 @@ label.narrow {
 	width: fit-content;
 }
 
+h2.narrow {
+	width:fit-content;
+}
+
+span.spacer {
+		display: flex;
+		justify-content: space-between;
+}
+
 input.subdamaged[value="on"] ~ label.damagelabel {
     color: red;
     display: inline;
@@ -1814,11 +1824,12 @@ input.sheet-briny:not(:checked) + .brinyhide {
 		grid-template-areas:
 			"weapontitle  weapontitle"
 			"operName     harm"
-			"weaponName   pdesc"
+			"weaponName   ."
+			"pdesc   pdesc"
 			"range        range"
 			"ammo         ammo";
 		grid-template-columns: 2fr 1fr;
-		grid-template-rows: .5fr .5fr .5fr .25fr .25fr;
+		grid-template-rows: auto auto auto auto auto auto;
 		grid-column-gap: 3px;
 }
 
@@ -1835,6 +1846,7 @@ input.sheet-briny:not(:checked) + .brinyhide {
 	grid-area: range;
 	font-size: .86em;
 	margin-bottom: 15px;
+	margin-top:11px;
 }
 
 .sheet-rolltemplate-weapon .sheet-title {
diff --git a/Cyberrats/Cyberrats.html b/Cyberrats/Cyberrats.html
index 5963c10949..1272e1ea78 100644
--- a/Cyberrats/Cyberrats.html
+++ b/Cyberrats/Cyberrats.html
@@ -1,10 +1,18 @@
 	<section class="tabs borderless">
 		<input type="hidden" class="tabstoggle" name="attr_sheetTab"  value="charactersheet"  />
-		<div class="tabholder">
+		<div class="hidden tabholder">
 				<button class="charsheetbtn" type="action" name="act_charactersheet" >Character</button>
 				<button class="basesheetbtn" type="action" name="act_basesheet" >Base</button>
 				<button class="campaignsheetbtn" type="action" name="act_campaignsheet" >Campaign</button>
 		</div>
+		<div class="character_sheet_type">
+			<label for="attr_sheet_type">What type of sheet is this?</label>
+			<select name="attr_sheet_type">
+				<option value="charactersheet">Character</option>
+				<option value="basesheet">Base</option>
+				<option value="campaignsheet">Campaign Tracker</option>
+			</select>
+		</div>
 		<span class="briny-setting">
 			<label class="inline setting">Briny Bastards?</label>
 			<input class="sheet-briny" name="attr_briny" type="checkbox">
@@ -71,10 +79,13 @@
 	</section>
 
 	<section class="powers">
-		<h2>All Known Powers</h2>
+		<span class="spacer">
+			<h2 class="narrow">All Known Powers</h2>
+			<h3 class="right">Equipped <span class="powersused" value="0" name="attr_powersEquipped"></span>/5</h3>
+		</span>
 	<fieldset class="repeating_powers">
 		<label class="inline">Equipped?</label>
-		<input type="checkbox" name="attr_equipped">
+		<input class="equippedpower" type="checkbox" name="attr_equipped">
 		<button type="roll"  name="roll_power" value="&{template:powers} {{title=Power}} {{name=@{character_name}}} {{description=@{powertext}}} {{cost=@{powercost}}} {{powerName=@{powername}}}"></button>
 		<input class="powername" spellcheck="false" type="text" name="attr_powername" value="Name">
 		<span class="right">
@@ -1100,11 +1111,11 @@
 					<div class="victory">
 						<div class="threat status victory">
 							<input type="radio" id="valvic-0" value="0" name="attr_valvic" class="threatbar" checked>
-							<label for="valvic-0" class="threatlabel">0</label>
+							<label for="valvic-0" class="threatlabel threat1">0</label>
 							<input type="radio" id="valvic-1" value="1" name="attr_valvic" class="threatbar">
-							<label for="valvic-1" class="threatlabel">1</label>
+							<label for="valvic-1" class="threatlabel threat1">1</label>
 							<input type="radio" id="valvic-2" value="2" name="attr_valvic" class="threatbar">
-							<label for="valvic-2" class="threatlabel">2</label>
+							<label for="valvic-2" class="threatlabel threat1">2</label>
 							<input type="radio" id="valvic-3" value="3" name="attr_valvic" class="threatbar">
 							<label for="valvic-3" class="threatlabel threat2">3</label>
 							<input type="radio" id="valvic-4" value="4" name="attr_valvic" checked class="threatbar">
@@ -1172,11 +1183,11 @@
 					<div class="victory">
 						<div class="threat status victory">
 							<input type="radio" id="intvic-0" value="0" name="attr_intvic" class="threatbar" checked>
-							<label for="intvic-0" class="threatlabel">0</label>
+							<label for="intvic-0" class="threatlabel threat1">0</label>
 							<input type="radio" id="intvic-1" value="1" name="attr_intvic" class="threatbar">
-							<label for="intvic-1" class="threatlabel">1</label>
+							<label for="intvic-1" class="threatlabel threat1">1</label>
 							<input type="radio" id="intvic-2" value="2" name="attr_intvic" class="threatbar">
-							<label for="intvic-2" class="threatlabel">2</label>
+							<label for="intvic-2" class="threatlabel threat1">2</label>
 							<input type="radio" id="intvic-3" value="3" name="attr_intvic" class="threatbar">
 							<label for="intvic-3" class="threatlabel threat2">3</label>
 							<input type="radio" id="intvic-4" value="4" name="attr_intvic" class="threatbar">
@@ -1921,6 +1932,7 @@ on("change:cyber", function(eventInfo) {
 	});
 });
 
+
 on("clicked:corpMiss", function(eventInfo) {
 	getSectionIDs("repeating_cutback", function(idarray) {
       for(var i=0; i < idarray.length; i++) {
@@ -2059,6 +2071,22 @@ on("change:repeating_adversaries:adversaryname", function(eventInfo) {
 	});
 });
 
+on("change:repeating_powers:equipped", function(eventInfo) {
+	console.log(eventInfo);
+	const changeval = eventInfo.newValue === "on" ? 1 : -1;
+
+
+	getAttrs(["powersEquipped"], (values) => {
+		setAttrs(
+			{
+				powersEquipped: values.powersEquipped + changeval
+			}
+		);
+	});
+
+
+});
+
 on("change:buildingnameroom1 change:buildingnameroom2 change:buildingnameroom3 change:buildingnameroom4 change:buildingnameroom5 change:buildingnameroom6 change:buildingnameroom7 change:buildingnameroom8 change:buildingnameroom9 change:buildingnameroom10 change:buildingnameroom11 change:buildingnameroom12 change:buildingnameroom13 change:buildingnameroom14 change:buildingnameroom15 change:buildingnameroom16 ", function(eventInfo){
 	const roomNumber = eventInfo.sourceAttribute.match(/\d+/).shift(); // regex to grab the number from a string. Relies on naming scheme.
 	const room = eventInfo.newValue;
@@ -2190,6 +2218,8 @@ on("clicked:reset", function() {
 	});
 });
 
+
+
 on("clicked:griefbtn", function() {
         startRoll("&{template:grief} {{name=@{character_name}}} {{roll=[[1d6cf>6cs<1]]}}", (results) => {
             const total = results.results.roll.result
@@ -2207,6 +2237,13 @@ on("clicked:griefbtn", function() {
 });
 
 <!-- Tab Switching -->
+on("change:sheet_type", function(eventInfo) {
+		setAttrs({
+					sheetTab: eventInfo.newValue
+			});
+});
+
+
 const buttonlist = ["charactersheet","basesheet","campaignsheet"];
     buttonlist.forEach(button => {
         on(`clicked:${button}`, function() {
diff --git a/Cyberrats/sheet.json b/Cyberrats/sheet.json
index fec8750829..7d424a2f68 100644
--- a/Cyberrats/sheet.json
+++ b/Cyberrats/sheet.json
@@ -4,6 +4,6 @@
   "authors": "Alex Rinehart (@asr1)",
   "roll20userid": "1458276",
   "preview": "Preview.png",
-  "instructions": "This character sheet has 3 tabs: one for characters, one for basebuilding, and for tracking the campaign. Each group only needs one copy of the second and third tabs. If you are playing with the Briny Bastards expansion, check the box for additional content.",
+  "instructions": "Create one shared sheet of type Campaign for tracking the campaign, one shared sheet of type Headquarters for buildings, and two Character sheets for each player. If you are playing with the Briny Bastards expansion, check the box on each sheet for additional content.",
   "legacy": false
 }
\ No newline at end of file