diff --git a/src/003-assets/CSS/tabs.css b/src/003-assets/CSS/tabs.css
index 9f857f236db77b252b0db10cc200f936b2575f1a..2e52d21325ebb9c4ad8fd49562e1e56c010b9986 100644
--- a/src/003-assets/CSS/tabs.css
+++ b/src/003-assets/CSS/tabs.css
@@ -1,8 +1,8 @@
-div.tabbar {
+div.tab-bar {
 	overflow: hidden;
 }
 
-div.tabbar button {
+div.tab-bar button {
 	background-color: var(--button-color);
 	border: solid 2px var(--button-color);
 	color: var(--link-color);
@@ -14,58 +14,58 @@ div.tabbar button {
 	font-size: large;
 }
 
-div.tabbar button.card {
+div.tab-bar button.card {
 	border-top-left-radius: 15px;
 	border-top-right-radius: 15px;
 	border: none;
 }
 
-div.tabbar button.card.active {
+div.tab-bar button.card.active {
 	background-color: #1a1a1a;
 }
 
-div.tabbar button:hover {
+div.tab-bar button:hover {
 	background-color: var(--button-hover-color);
 }
 
-div.tabbar button.active {
+div.tab-bar button.active {
 	background-color: var(--button-selected-color);
 	color: #c7cedf;
 }
 
-div.tabbar button.show-warning { /* dumb name, but warning and error already exist */
+div.tab-bar button.show-warning { /* dumb name, but warning and error already exist */
 	background-color: #b30000;
 	border-color: #b30000;
 }
 
-div.tabbar button.show-warning:hover {
+div.tab-bar button.show-warning:hover {
 	background-color: #e60000
 }
 
-div.tabbar button.show-warning.active {
+div.tab-bar button.show-warning.active {
 	background-color: #4d0000;
 }
 
-div.tabbar a.active {
+div.tab-bar a.active {
 	color: white;
 	pointer-events: none;
 	cursor: default;
 }
 
-.tabcontent:not(.noFade) {
+.tab-content:not(.noFade) {
 	display: none;
 	padding: 6px 12px;
 	-webkit-animation: fadeEffect 0.3s;
 	animation: fadeEffect 0.3s;
 }
 
-.tabcontent.card {
+.tab-content.card {
 	border-radius: 0 8px 8px 8px;
 	background-color: #1a1a1a;
 	border: 0;
 }
 
-.tabcontent.card .slaveSummary.card {
+.tab-content.card .slaveSummary.card {
 	background-color: #252525;
 }
 
diff --git a/src/Mods/SecExp/attackOptions.tw b/src/Mods/SecExp/attackOptions.tw
index 33c4b31bc86a9999ac4b2d78b73ccf0108bef52f..8ea89c1acba6cf54ca166188b0d40c7b22ca8d8c 100644
--- a/src/Mods/SecExp/attackOptions.tw
+++ b/src/Mods/SecExp/attackOptions.tw
@@ -216,10 +216,10 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
 	<</link>>
 <</if>>
 <br>For this battle you choose to follow <span id="tactic"><strong><<print $chosenTactic>></strong></span> tactics.<br>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'defensiveTactics')" id="tab defensive tactics">Defensive tactics</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'offensiveTactics')" id="tab offensiveTactics">Offensive Tactics</button>
+<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'defensiveTactics')" id="tab defensive tactics">Defensive tactics</button>
+<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'offensiveTactics')" id="tab offensiveTactics">Offensive Tactics</button>
 
-<div id="defensiveTactics" class="tabcontent">
+<div id="defensiveTactics" class="tab-content">
 	<div class="content">
 		<<link "Bait and Bleed">>
 			<<set $chosenTactic = "Bait and Bleed">>
@@ -259,7 +259,7 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
 	</div>
 </div>
 
-<div id="offensiveTactics" class="tabcontent">
+<div id="offensiveTactics" class="tab-content">
 	<div class="content">
 		<<link "Blitzkrieg">>
 			<<set $chosenTactic = "Blitzkrieg">>
@@ -424,16 +424,16 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
 	<br><br>
 <</if>>
 <<if $militiaUnits.length > 0>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'militia')" id="tab militia">Militia: ($militiaUnits.length)</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'militia')" id="tab militia">Militia: ($militiaUnits.length)</button>
 <</if>>
 <<if $slaveUnits.length > 0>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'slaves')" id="tab slaves">Slaves: ($slaveUnits.length)</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'slaves')" id="tab slaves">Slaves: ($slaveUnits.length)</button>
 <</if>>
 <<if $mercUnits.length > 0>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'mercs')" id="tab mercs">Mercs: ($mercUnits.length)</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'mercs')" id="tab mercs">Mercs: ($mercUnits.length)</button>
 <</if>>
 
-<div id="militia" class="tabcontent">
+<div id="militia" class="tab-content">
 	<div class="content">
 		<<for _i = 0; _i < _mL; _i++>>
 			<<capture _i>>
@@ -454,7 +454,7 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
 		<</for>>
 	</div>
 </div>
-<div id="slaves" class="tabcontent">
+<div id="slaves" class="tab-content">
 	<div class="content">
 		<<for _i = 0; _i < _sL; _i++>>
 		<<capture _i>>
@@ -475,7 +475,7 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
 		<</for>>
 	</div>
 </div>
-<div id="mercs" class="tabcontent">
+<div id="mercs" class="tab-content">
 	<div class="content">
 		<<for _i = 0; _i < _meL; _i++>>
 		<<capture _i>>
diff --git a/src/Mods/SecExp/buildings/secBarracks.tw b/src/Mods/SecExp/buildings/secBarracks.tw
index b1a4bf3e90496775ec1645e299cbcd91d822e2e9..301922d81cbd437fdb71e89c00b7c14a20d2a78c 100644
--- a/src/Mods/SecExp/buildings/secBarracks.tw
+++ b/src/Mods/SecExp/buildings/secBarracks.tw
@@ -138,20 +138,20 @@ Your current maximum number of units is <<print App.SecExp.battle.maxUnits()>> (
 <<if $mercenaries === 0>>
 	<br>Mercenaries are not allowed inside the arcology. You will not be able to recruit mercenary units.
 <</if>>
-<div class="tabbar">
+<div class="tab-bar">
 	<<if $arcologyUpgrade.drones == 1>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Bots')" id="tab Bots">Security Drones</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Bots')" id="tab Bots">Security Drones</button>
 	<</if>>
 	<<if $SecExp.edicts.defense.militia >= 1>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Militia')" id="tab Militia">Militia: ($militiaUnits.length)</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Militia')" id="tab Militia">Militia: ($militiaUnits.length)</button>
 	<</if>>
 	<<if $mercenaries >= 1>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mercs')" id="tab Mercs">Mercenaries: ($mercUnits.length)</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Mercs')" id="tab Mercs">Mercenaries: ($mercUnits.length)</button>
 	<</if>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Slaves')" id="tab Slaves">Slaves: ($slaveUnits.length)</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Slaves')" id="tab Slaves">Slaves: ($slaveUnits.length)</button>
 </div>
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.secBarracks)>>
-<div id="Bots" class="tabcontent">
+<div id="Bots" class="tab-content">
 	<div class="content">
 		<<set _secBotsCost = 500, _secBotsUpgradeCost = 250>>
 		<<= App.SecExp.getUnit("Bots").describe()>> <br>
@@ -211,7 +211,7 @@ Your current maximum number of units is <<print App.SecExp.battle.maxUnits()>> (
 		<</if>>
 	</div>
 </div>
-<div id="Slaves" class="tabcontent">
+<div id="Slaves" class="tab-content">
 	<div class="content">
 		You are free to organize your menial slaves into fighting units. Currently you have <<print num($menials)>> slaves available, while <<print num(App.SecExp.Manpower.employedSlave)>> are already employed as soldiers. During all your battles you lost a total of <<print num($slavesTotalCasualties)>>.
 		<<if $menials > 0 && App.SecExp.battle.activeUnits() < App.SecExp.battle.maxUnits()>>
@@ -289,7 +289,7 @@ Your current maximum number of units is <<print App.SecExp.battle.maxUnits()>> (
 		<</for>>
 	</div>
 </div>
-<div id="Militia" class="tabcontent">
+<div id="Militia" class="tab-content">
 	<div class="content">
 		You founded the $arcologies[0].name free militia. You are now able to organize your citizens into fighting units.
 		<<if $SecExp.edicts.defense.militia === 2>>
@@ -358,7 +358,7 @@ Your current maximum number of units is <<print App.SecExp.battle.maxUnits()>> (
 		<</for>>
 	</div>
 </div>
-<div id="Mercs" class="tabcontent">
+<div id="Mercs" class="tab-content">
 	<div class="content">
 		With the installation of a mercenary company in the arcology, many other are attracted to your free city, hoping to land a contract with you.
 		You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print num(App.SecExp.Manpower.totalMerc)>> mercenaries in your arcology, of which <<print num(App.SecExp.Manpower.employedMerc)>> actively employed and <<print num($mercFreeManpower)>> not yet under contract. In total <<print num($mercTotalCasualties)>> mercenaries have died defending your arcology.
diff --git a/src/Mods/SecExp/edicts.tw b/src/Mods/SecExp/edicts.tw
index 6be9f0a36f0c47b90beebb686cf9777b4d122043..957ac456ce08977a6318a07e161a1a95387d4ce4 100644
--- a/src/Mods/SecExp/edicts.tw
+++ b/src/Mods/SecExp/edicts.tw
@@ -5,12 +5,12 @@
 //Passing any edict will cost <<print cashFormat(5000)>> and some authority. More edicts will become available as the arcology develops.//
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.edicts)>>
 <br>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Society')" id="tab Society">Society</button>
+<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Society')" id="tab Society">Society</button>
 <<if $battlesCount > 0 || $rebellionsCount > 0 || $mercenaries > 0>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Military')" id="tab Military">Military</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Military')" id="tab Military">Military</button>
 <</if>>
 
-<div id="Society" class="tabcontent">
+<div id="Society" class="tab-content">
 	<div class="content">
 	<<if $SecExp.edicts.alternativeRents == 1>>
 		<br>''Alternative rent payment:'' you are allowing citizens to pay for their rents in menial slaves rather than cash.
@@ -316,7 +316,7 @@
 	</div>
 </div>
 
-<div id="Military" class="tabcontent">
+<div id="Military" class="tab-content">
 	<div class="content">
 	<<if $SecExp.edicts.defense.soldierWages === 0>>
 		<br>''Low wages for soldiers:'' wages for soldiers are set to a low level compared to market standards.
diff --git a/src/Mods/SpecialForce/Firebase.tw b/src/Mods/SpecialForce/Firebase.tw
index 68e85c00ecc247dcbb188e5efd088b7fb130df94..a477569fe8325d86bd103fd78073c1b4ce3dc10b 100644
--- a/src/Mods/SpecialForce/Firebase.tw
+++ b/src/Mods/SpecialForce/Firebase.tw
@@ -28,15 +28,15 @@
 	<<if $SF.FS.Tension !== -1>> The Colonel's current Tension: $SF.FS.Tension<</if>>
 
 	<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Firebase)>>
-	<div class="tabbar">
+	<div class="tab-bar">
 		<<if _size !== _max>>
-			<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Upgrades')" id="tab Upgrades">Upgrades</button>
+			<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Upgrades')" id="tab Upgrades">Upgrades</button>
 		<</if>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Actions')" id="tab Actions">Actions</button>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FS')" id="tab FS">Future Societies</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Actions')" id="tab Actions">Actions</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'FS')" id="tab FS">Future Societies</button>
 	</div>
 
-	<div id="Upgrades" class="tabcontent">
+	<div id="Upgrades" class="tab-content">
 		<div class="content">
 			<<set _T1 = App.SF.unlocked.secondTier()>>
 			Total upgrade progress: <<print App.SF.progress(_size,_max)>> _size/_max(<<print (_size/_max).toFixed(2)*100>>%) <<if _size < 30>> <br>//<<print (30-_size)>> more upgrades is needed until the next tier unlocks.// <</if>>
@@ -50,7 +50,7 @@
 		</div>
 	</div>
 
-	<div id="Actions" class="tabcontent">
+	<div id="Actions" class="tab-content">
 		<div class="content">
 			<<if $SF.MercCon.CanAttend === 0 || $SF.MercCon.History >= 1 && ((Math.trunc($week/24) === ($week/24)) && $SF.MercCon.CanAttend === -1)>>
 				Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>
@@ -106,7 +106,7 @@
 		</div>
 	</div>
 
-	<div id="FS" class="tabcontent">
+	<div id="FS" class="tab-content">
 		<div class="content"> <<= App.SF.fsIntegration()>> </div>
 	</div>
 <</if>>
\ No newline at end of file
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 6e7d67402070b710898e99e800d5b25cafa1af52..8f268af067f0a75cddb306aebc34e958ed2ecaca 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -97,14 +97,14 @@ You may review your settings before clicking "Continue" to begin.<br>
 
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.IntroSummary)>>
 
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'World')" id="tab World">World</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'slaves')" id="tab slaves">Slaves</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'PC')" id="tab PC">Player Character</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'UI')" id="tab UI">UI</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'World')" id="tab World">World</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'slaves')" id="tab slaves">Slaves</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'PC')" id="tab PC">Player Character</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'UI')" id="tab UI">UI</button>
 </div>
 
-<div id="UI" class="tabcontent">
+<div id="UI" class="tab-content">
 	<div class="content">
 
 	<<set _options = new App.UI.OptionsGroup()>>
@@ -182,7 +182,7 @@ You may review your settings before clicking "Continue" to begin.<br>
 	</div>
 </div>
 
-<div id="World" class="tabcontent">
+<div id="World" class="tab-content">
 	<div class="content">
 
 	<h2>Economy</h2>
@@ -366,7 +366,7 @@ You may review your settings before clicking "Continue" to begin.<br>
 	</div>
 </div>
 
-<div id="slaves" class="tabcontent">
+<div id="slaves" class="tab-content">
 	<div class="content">
 
 	<<set _options = new App.UI.OptionsGroup()>>
@@ -454,7 +454,7 @@ You may review your settings before clicking "Continue" to begin.<br>
 	</div>
 </div>
 
-<div id="PC" class="tabcontent">
+<div id="PC" class="tab-content">
 	<div class="content">
 
 	<<set _options = new App.UI.OptionsGroup()>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 4d6636dd9a822c7403a704a431e223b9f15b12ff..01b3b0cfddc21fce09d56d89afc843f2146c2338 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -96,14 +96,14 @@
 	<</if>>
 </p>
 
-<div class="tabbar">
-	/* <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'nannies')" id="tab nannies">Nannies</button> */
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'pregnantSlaves')" id="tab pregnantSlaves">Pregnant Slaves</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'children')" id="tab children">Children</button>
+<div class="tab-bar">
+	/* <button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'nannies')" id="tab nannies">Nannies</button> */
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'pregnantSlaves')" id="tab pregnantSlaves">Pregnant Slaves</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'children')" id="tab children">Children</button>
 </div>
 
 /*
-<div id="nannies" class="tabcontent">
+<div id="nannies" class="tab-content">
 	<div id="content">
 	*/
 		<<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>>
@@ -157,7 +157,7 @@
 </div>
 */
 
-<div id="pregnantSlaves" class="tabcontent">
+<div id="pregnantSlaves" class="tab-content">
 	<div id="content">
 		<br><br>
 		Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $nursery rooms, <<print _freecribs>> <<if _freecribs == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildrenNursery room<<if $reservedChildrenNursery == 1>> is<<else>>s are<</if>> reserved.
@@ -290,7 +290,7 @@
 	</div>
 </div>
 
-<div id="children" class="tabcontent">
+<div id="children" class="tab-content">
 	<div id="content">
 		<p>
 			Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery">>
diff --git a/src/gui/multipleInspect.js b/src/gui/multipleInspect.js
index 552529e88e700ecfe04cc01a062a472b9d909e09..f4c106b7f586fdf757cef357ae24e79c504de2d7 100644
--- a/src/gui/multipleInspect.js
+++ b/src/gui/multipleInspect.js
@@ -9,7 +9,7 @@ App.UI.MultipleInspect = (function() {
 	 */
 	function MultipleInspectDOM(slaves, showFamilyTree, market) {
 		const frag = document.createDocumentFragment();
-		const tabbar = App.UI.DOM.appendNewElement("div", frag, "", "tabbar");
+		const tabbar = App.UI.DOM.appendNewElement("div", frag, "", "tab-bar");
 
 		for (const slave of slaves) {
 			tabbar.append(App.UI.tabbar.tabButtonDOM(`slave${slave.ID}`, slave.slaveName));
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
index e04ae581a80e5c7e4e258547358975c09e8dc173..d955bfbaa3156fa622a1ccc4faae5df4f41c211c 100644
--- a/src/gui/options/options.tw
+++ b/src/gui/options/options.tw
@@ -69,15 +69,15 @@
 
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
 
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Display')" id="tab Display">Display</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'CONTENT&FLAVOR')" id="tab CONTENT&FLAVOR">Content & flavour</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'MODS')" id="tab MODS">Mods</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'DEBUG/CHEATING')" id="tab DEBUG/CHEATING">Debug/cheating</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Experimental')" id="tab Experimental">Experimental</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Display')" id="tab Display">Display</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'CONTENT&FLAVOR')" id="tab CONTENT&FLAVOR">Content & flavour</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'MODS')" id="tab MODS">Mods</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'DEBUG/CHEATING')" id="tab DEBUG/CHEATING">Debug/cheating</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Experimental')" id="tab Experimental">Experimental</button>
 </div>
 
-<div id="Display" class="tabcontent">
+<div id="Display" class="tab-content">
 	<div class="content">
 		<h2>Reports</h2>
 
@@ -262,7 +262,7 @@
 	</div>
 </div>
 
-<div id="CONTENT&FLAVOR" class="tabcontent">
+<div id="CONTENT&FLAVOR" class="tab-content">
 	<div class="content">
 		<h2>Content</h2>
 
@@ -384,7 +384,7 @@
 	</div>
 </div>
 
-<div id="MODS" class="tabcontent">
+<div id="MODS" class="tab-content">
 	<div class="content">
 		<<set _options = new App.UI.OptionsGroup()>>
 
@@ -608,7 +608,7 @@
 	</div>
 </div>
 
-<div id="DEBUG/CHEATING" class="tabcontent">
+<div id="DEBUG/CHEATING" class="tab-content">
 	<div class="content">
 		<h2>Debug</h2>
 
@@ -710,7 +710,7 @@
 	</div>
 </div>
 
-<div id="Experimental" class="tabcontent">
+<div id="Experimental" class="tab-content">
 	<div style="fontWeight:bold">
 		Experimental means just that: experimental. Options below are likely to be in an <span class="yellow">even more incomplete or broken state than usual.</span> <span class="red">THEY MAY NOT WORK AT ALL.</span> Make sure you back up your save before enabling any of these, and if you are that interested, consider helping to improve them.
 	</div>
diff --git a/src/interaction/policies/policies.tw b/src/interaction/policies/policies.tw
index 42e0b874f800f0d06bad3dcd10cf4c942173a695..260306b0563707c6b3c03fc7d7db61de54cb6d7e 100644
--- a/src/interaction/policies/policies.tw
+++ b/src/interaction/policies/policies.tw
@@ -27,16 +27,16 @@
 	<</if>>
 	More policies will become available as the arcology develops.
 </p>
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'SMRs')" id="tab SMRs">Slave Market Regulations</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'ST')" id="tab ST">Sexual Trendsetting</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Population')" id="tab Population">Population & Domestic</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Education')" id="tab Education">Education</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FS')" id="tab FS">Future Societies</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'SRP')" id="tab SRP">Slave Retirement Planning</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'SMRs')" id="tab SMRs">Slave Market Regulations</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'ST')" id="tab ST">Sexual Trendsetting</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Population')" id="tab Population">Population & Domestic</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Education')" id="tab Education">Education</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'FS')" id="tab FS">Future Societies</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'SRP')" id="tab SRP">Slave Retirement Planning</button>
 </div>
 
-<div id="SMRs" class="tabcontent">
+<div id="SMRs" class="tab-content">
 	<div class="content">
 	<p class="scene-intro">
 		Slave Market Regulations (SMRs) will affect slaves that come through the official slave markets in your arcology. The markets themselves will bear the cost of these regulations, but the minimum practicable slave prices may rise as a result.
@@ -48,7 +48,7 @@
 	</div>
 </div>
 
-<div id="ST" class="tabcontent">
+<div id="ST" class="tab-content">
 	<div class="content">
 		<span id="SexualTrendsetting"></span>
 		<script>
@@ -57,7 +57,7 @@
 	</div>
 </div>
 
-<div id="Population" class="tabcontent">
+<div id="Population" class="tab-content">
 	<div class="content">
 
 		<h1>Population</h1>
@@ -75,7 +75,7 @@
 	</div>
 </div>
 
-<div id="Education" class="tabcontent">
+<div id="Education" class="tab-content">
 	<div class="content">
 		<<if $schoolSuggestion == 0>>
 			<p>
@@ -89,7 +89,7 @@
 	</div>
 </div>
 
-<div id="SRP" class="tabcontent">
+<div id="SRP" class="tab-content">
 	<div class="content">
 		<<if $policies.retirement.customAgePolicy == 0 && $policies.retirement.physicalAgePolicy == 0>>
 			<br>''Default Retirement Age:'' in the absence of a defined slave retirement age, slaves will not remain sex slaves after reaching age $retirementAge.
@@ -109,7 +109,7 @@
 	</div>
 </div>
 
-<div id="FS" class="tabcontent">
+<div id="FS" class="tab-content">
 	<div class="content">
 		<span id="FutureSocietiesTab"></span>
 		<script>
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index ab1f4c98150f6bd7e69b5f0bcd0af133632de32c..340cbd2fe3f84283f4b5cbd2c841850276cb9bbe 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -148,7 +148,7 @@ App.UI.SlaveInteract.fucktoyPref = function(slave) {
 			linkDesc.text,
 			() => {
 				slave.toyHole = linkDesc.toyHole;
-				jQuery('#fucktoypref').empty().append(App.UI.SlaveInteract.fucktoyPref(slave));
+				jQuery('#fucktoy-pref').empty().append(App.UI.SlaveInteract.fucktoyPref(slave));
 			},
 		);
 
@@ -203,7 +203,7 @@ App.UI.SlaveInteract.work = function(slave) {
 		p.appendChild(App.UI.DOM.link(`Recall ${him}`, () => { removeJob(slave, slave.assignment, false); App.UI.SlaveInteract.work(slave); }));
 	} else {
 		div = document.createElement('div');
-		div.id = "miniscene";
+		div.id = "mini-scene";
 		p.appendChild(div);
 
 		span = document.createElement('span');
@@ -271,7 +271,7 @@ App.UI.SlaveInteract.work = function(slave) {
 			}
 
 			div = document.createElement('div');
-			div.id = "fucktoypref";
+			div.id = "fucktoy-pref";
 			div.append(App.UI.SlaveInteract.fucktoyPref(slave));
 			span.appendChild(div);
 	}
@@ -1377,7 +1377,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
 				App.UI.SlaveInteract.refreshAll(V.slaves[V.slaveIndices[V.activeSlave.ID]]);
 
 				// Display scene render results
-				$("#miniscene").append(frag);
+				$("#mini-scene").append(frag);
 			} else {
 				// just refresh
 				App.UI.SlaveInteract.refreshAll(V.slaves[V.slaveIndices[V.activeSlave.ID]]);
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index ee6a875b4b8b3812b41a7668857ebcd8ed74227b..a12f0ca42cca2cbbf52be9c011728243153623a8 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -204,7 +204,7 @@ globalThis.rulesAssistantOptions = (function() {
 		render(name) {
 			const tab = document.createElement("div");
 			tab.id = name;
-			tab.className = "tabcontent";
+			tab.className = "tab-content";
 
 			this.tabContent_ = document.createElement("div");
 			this.tabContent_.classList.add("content");
@@ -222,7 +222,7 @@ globalThis.rulesAssistantOptions = (function() {
 
 		static makeTabButton(name, text) {
 			const btn = document.createElement("button");
-			btn.className = "tablinks";
+			btn.className = "tab-links";
 			btn.id = `tab ${name}`;
 			btn.innerHTML = text;
 			btn.onclick = (event) => App.UI.tabbar.openTab(event, name);
@@ -1574,7 +1574,7 @@ globalThis.rulesAssistantOptions = (function() {
 			const element = document.createElement("div");
 			element.className = "ra-setters";
 			this.tabButtons_ = document.createElement("div");
-			this.tabButtons_.className = "tabbar";
+			this.tabButtons_.className = "tab-bar";
 			element.appendChild(this.tabButtons_);
 			return element;
 		}
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 8052c5bd80847693811a8fe70788bb23d958ffcb..f6df4dfb166f5ffe87977ed713ccad2ecb4067c4 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -622,7 +622,7 @@ App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, show
 	if (V.sortSlavesMain) {
 		frag.append(this.sortingLinks(facilityPassage));
 	}
-	const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tabbar");
+	const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tab-bar");
 	tabbar.append(
 		App.UI.tabbar.tabButtonDOM('assign', tabCaptions.assign),
 		App.UI.tabbar.tabButtonDOM('remove', tabCaptions.remove),
@@ -710,7 +710,7 @@ App.UI.SlaveList.listNGPSlaves = function() {
 
 	const frag = document.createDocumentFragment();
 	frag.append(this.sortingLinks(thisPassage));
-	const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tabbar");
+	const tabbar = App.UI.DOM.appendNewElement("div", frag, '', "tab-bar");
 	tabbar.append(
 		App.UI.tabbar.tabButtonDOM('assign', "Import a slave"),
 		App.UI.tabbar.tabButtonDOM('remove', "Remove from import")
@@ -1032,7 +1032,7 @@ App.UI.SlaveList.penthousePage = function() {
 	}
 
 	const div = document.createElement("div");
-	div.classList.add("tabbar");
+	div.classList.add("tab-bar");
 	if (V.useSlaveSummaryTabs === 0) {
 		const links = [];
 		for (const tab of tabs) {
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index c424d660b07a8ad10dd97262ec90e1717fb751bd..a5319a21cf3f1023b9103e99d867df0feb899050 100644
--- a/src/js/utilsSC.js
+++ b/src/js/utilsSC.js
@@ -156,11 +156,11 @@ App.UI.tabbar = function() {
 
 	function openTab(evt, tabName) {
 		/* var passage = passage().trim().replace(/ /g,"+");*/
-		const tabcontent = document.getElementsByClassName("tabcontent");
+		const tabcontent = document.getElementsByClassName("tab-content");
 		for (let i = 0; i < tabcontent.length; i++) {
 			tabcontent[i].style.display = "none";
 		}
-		const tablinks = document.getElementsByClassName("tablinks");
+		const tablinks = document.getElementsByClassName("tab-links");
 		for (let i = 0; i < tablinks.length; i++) {
 			tablinks[i].className = tablinks[i].className.replace(" active", "");
 		}
@@ -175,7 +175,7 @@ App.UI.tabbar = function() {
 	 * @returns {string}
 	 */
 	function tabButton(name, text) {
-		return `<button class="tablinks" onclick="App.UI.tabbar.openTab(event, '${name}')" id="tab ${name}">${text}</button>`;
+		return `<button class="tab-links" onclick="App.UI.tabbar.openTab(event, '${name}')" id="tab ${name}">${text}</button>`;
 	}
 
 	/**
@@ -187,7 +187,7 @@ App.UI.tabbar = function() {
 	function tabButtonDOM(name, text, plainLink = false) {
 		if (plainLink) {
 			const link = document.createElement("a");
-			link.classList.add("tablinks", "pure");
+			link.classList.add("tab-links", "pure");
 			link.id = `tab ${name}`;
 			link.textContent = text;
 			link.addEventListener('click', event => {
@@ -196,7 +196,7 @@ App.UI.tabbar = function() {
 			return link;
 		} else {
 			const button = document.createElement("button");
-			button.classList.add("tablinks");
+			button.classList.add("tab-links");
 			button.id = `tab ${name}`;
 			button.textContent = text;
 			button.addEventListener('click', event => {
@@ -212,7 +212,7 @@ App.UI.tabbar = function() {
 	 * @returns {string}
 	 */
 	function makeTab(name, content) {
-		return `<div id="${name}" class="tabcontent"><div class="content">${content}</div></div>`;
+		return `<div id="${name}" class="tab-content"><div class="content">${content}</div></div>`;
 	}
 
 	/**
@@ -223,7 +223,7 @@ App.UI.tabbar = function() {
 	function makeTabDOM(name, content) {
 		const outerDiv = document.createElement("div");
 		outerDiv.id = name;
-		outerDiv.classList.add("tabcontent");
+		outerDiv.classList.add("tab-content");
 		const innerDiv = document.createElement("div");
 		innerDiv.classList.add("content");
 		innerDiv.append(content);
diff --git a/src/npc/children/childInteract.tw b/src/npc/children/childInteract.tw
index 1d1ebaaef9a768af6a84b8449b826910e4e6dcb5..0b0609be3f41b5262d739428f4f8feeb98907ff1 100644
--- a/src/npc/children/childInteract.tw
+++ b/src/npc/children/childInteract.tw
@@ -69,16 +69,16 @@ FIXME:
 /*TODO: These will most likely need to be reworked*/
 <<if $extremeUnderage && $childSex>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<span id="miniscene"><i>Or use $him here:</i></span>
+	<span id="mini-scene"><i>Or use $him here:</i></span>
 	<span id="sexoption">
 	<<if ($activeChild.vagina > -1)>>
 		<<if canDoVaginal($activeChild)>>
 		<<link "Fuck $him">>
-			<<replace "#miniscene">><<include "FVagina">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "FVagina">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 		<<if canDoAnal($activeChild)>>
 			<<link "Use $his holes">>
-				<<replace "#miniscene">><<include "FButt">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+				<<replace "#mini-scene">><<include "FButt">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>> |
 			<</if>>
 		<<else>>
@@ -89,49 +89,49 @@ FIXME:
 	<span id="analsexoption">
 	<<if canDoAnal($activeChild)>>
 		<<link "Fuck $his ass">>
-			<<replace "#miniscene">><<include "FAnus">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "FAnus">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 	<<else>>
 		| <i>Remove $his chastity belt if you wish to fuck $his ass</i>
 	<</if>>
 	</span>
 	<<link "Use $his mouth">>
-		<<replace "#miniscene">><<include "FLips">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+		<<replace "#mini-scene">><<include "FLips">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 	<</link>> |
 	<<link "Kiss $him">>
-		<<replace "#miniscene">><<include "FKiss">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+		<<replace "#mini-scene">><<include "FKiss">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 	<</link>> |
 	<<link "Play with $his tits">>
-		<<replace "#miniscene">><<include "FBoobs">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+		<<replace "#mini-scene">><<include "FBoobs">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 	<</link>> |
 	<<link "Caress $him">>
-		<<replace "#miniscene">><<include "FCaress">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+		<<replace "#mini-scene">><<include "FCaress">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 	<</link>> |
 	<<link "Give $him a hug">>
-		<<replace "#miniscene">><<include "FEmbrace">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+		<<replace "#mini-scene">><<include "FEmbrace">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 	<</link>> |
 	<<if $cheatMode>>
 		<<link "Pat $his head">>
-			<<replace "#miniscene">><<include "FPat">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "FPat">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 	<</if>>
 	<<link "Grope $his boobs">>
-		<<replace "#miniscene">><<include "FondleChildBoobs">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+		<<replace "#mini-scene">><<include "FondleChildBoobs">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 	<</link>> |
 	<<if $activeChild.nipples == "fuckable" && $PC.dick>>
 		<<link "Fuck $his nipples">>
-			<<replace "#miniscene">><<include "FNippleFuck">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "FNippleFuck">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 	<</if>>
 	<<if $activeChild.lactation && $activeChild.boobs >= 2000 && $activeChild.belly < 60000>>
 		<<link "Drink $his milk">>
-			<<replace "#miniscene">><<include "FSuckle">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "FSuckle">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 	<</if>>
 	<span id="analgropeoption">
 	<<if canDoAnal($activeChild)>>
 		<<link "Grope $his butt">>
-			<<replace "#miniscene">><<include "FondleChildButt">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "FondleChildButt">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 	<</if>>
 	</span>
@@ -139,10 +139,10 @@ FIXME:
 	<<if ($activeChild.vagina > -1)>>
 		<<if canDoVaginal($activeChild)>>
 			<<link "Grope $his pussy">>
-				<<replace "#miniscene">><<include "FondleChildVagina">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+				<<replace "#mini-scene">><<include "FondleChildVagina">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>> |
 			<<link "Eat $him out">>
-				<<replace "#miniscene">><<include "FLickPussy">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+				<<replace "#mini-scene">><<include "FLickPussy">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>> |
 		<</if>>
 	<</if>>
@@ -151,11 +151,11 @@ FIXME:
 	<<if $activeChild.dick>>
 		<<if !$activeChild.chastityPenis>>
 		<<link "Grope $his dick">>
-			<<replace "#miniscene">><<include "FondleChildDick">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "FondleChildDick">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 			<<if canPenetrate($activeChild) && $policies.sexualOpenness == 1>>
 				<<link "Ride $his dick">>
-					<<replace "#miniscene">><<include "FDick">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+					<<replace "#mini-scene">><<include "FDick">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 				<</link>> |
 			<</if>>
 		<<else>>
@@ -164,7 +164,7 @@ FIXME:
 	<</if>>
 	</span>
 	<<if (hasAnyLegs($activeChild)) && $PC.dick != 0>>
-		<<link "Get a footjob">><<replace "#miniscene">><<set $childSex = 1>><<include "FFeet">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><</link>> |
+		<<link "Get a footjob">><<replace "#mini-scene">><<set $childSex = 1>><<include "FFeet">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><</link>> |
 	<</if>>
 
 	/* TODO: will children be able to be inflated? */
@@ -175,7 +175,7 @@ FIXME:
 					|	<<link "Fill $his ass with water">>
 						<<set $activeChild.inflationType = "water">>
 						<<set $activeChild.inflationMethod = 2>>
-							<<replace "#miniscene">>
+							<<replace "#mini-scene">>
 							<<include "FillUpButt">><br><</replace>>
 							<</link>>
 				<</if>>
@@ -184,7 +184,7 @@ FIXME:
 						|	<<link "Fill $his ass with aphrodisiacs">>
 							<<set $activeChild.inflationType = "aphrodisiac">>
 							<<set $activeChild.inflationMethod = 2>>
-								<<replace "#miniscene">>
+								<<replace "#mini-scene">>
 								<<include "FillUpButt">><br><</replace>>
 								<</link>>
 					<</if>>
@@ -192,7 +192,7 @@ FIXME:
 						|	<<link "Fill $his ass with curatives">>
 							<<set $activeChild.inflationType = "curative">>
 							<<set $activeChild.inflationMethod = 2>>
-								<<replace "#miniscene">>
+								<<replace "#mini-scene">>
 								<<include "FillUpButt">><br><</replace>>
 								<</link>>
 					<</if>>
@@ -200,7 +200,7 @@ FIXME:
 						|	<<link "Fill $his ass with rectal tighteners">>
 							<<set $activeChild.inflationType = "tightener">>
 							<<set $activeChild.inflationMethod = 2>>
-								<<replace "#miniscene">>
+								<<replace "#mini-scene">>
 								<<include "FillUpButt">><br><</replace>>
 								<</link>>
 					<</if>>
@@ -214,13 +214,13 @@ FIXME:
 						|	<<link "Fill $his ass with milk">>
 							<<set $activeChild.inflationType = "milk">>
 							<<set $activeChild.inflationMethod = 2>>
-								<<replace "#miniscene">>
+								<<replace "#mini-scene">>
 								<<include "FillUpButt">><br><</replace>>
 								<</link>>
 						|	<<link "Force-feed $him milk">>
 							<<set $activeChild.inflationType = "milk">>
 							<<set $activeChild.inflationMethod = 1>>
-								<<replace "#miniscene">>
+								<<replace "#mini-scene">>
 								<<include "FillUpFace">><br><</replace>>
 								<</link>>
 					<</if>>
@@ -234,13 +234,13 @@ FIXME:
 						|	<<link "Fill $his ass with cum">>
 							<<set $activeChild.inflationType = "cum">>
 							<<set $activeChild.inflationMethod = 2>>
-								<<replace "#miniscene">>
+								<<replace "#mini-scene">>
 								<<include "FillUpButt">><br><</replace>>
 								<</link>>
 						|	<<link "Force-feed $him cum">>
 							<<set $activeChild.inflationType = "cum">>
 							<<set $activeChild.inflationMethod = 1>>
-								<<replace "#miniscene">>
+								<<replace "#mini-scene">>
 								<<include "FillUpFace">><br><</replace>>
 								<</link>>
 					<</if>>
@@ -255,7 +255,7 @@ FIXME:
 				|	<<link "Fill $his ass with urine">>
 					<<set $activeChild.inflationType = "urine">>
 					<<set $activeChild.inflationMethod = 2>>
-					<<replace "#miniscene">><<include "FillUpButt">><br><</replace>>
+					<<replace "#mini-scene">><<include "FillUpButt">><br><</replace>>
 					<</link>>
 				<</if>>
 			<</if>>
@@ -269,20 +269,20 @@ FIXME:
 				<<set $activeChild.inflationType = "food">>
 				<<set $activeChild.inflationMethod = 1>>
 				<<set $activeChild.inflation = 1>>
-					<<replace "#miniscene">><<include "ForceFeeding">><br><</replace>>
+					<<replace "#mini-scene">><<include "ForceFeeding">><br><</replace>>
 					<</link>>
 			<<if $activeChild.pregKnown == 0>>
 				|	<<link "Force $him to consume a gallon of slave food">>
 					<<set $activeChild.inflationType = "food">>
 					<<set $activeChild.inflationMethod = 1>>
 					<<set $activeChild.inflation = 2>>
-						<<replace "#miniscene">><<include "ForceFeeding">><br><</replace>>
+						<<replace "#mini-scene">><<include "ForceFeeding">><br><</replace>>
 						<</link>>
 				|	<<link "Force two gallons of slave food into $him">>
 					<<set $activeChild.inflationType = "food">>
 					<<set $activeChild.inflationMethod = 1>>
 					<<set $activeChild.inflation = 3>>
-						<<replace "#miniscene">><<include "ForceFeeding">><br><</replace>>
+						<<replace "#mini-scene">><<include "ForceFeeding">><br><</replace>>
 						<</link>>
 			<</if>>
 		<</if>>
@@ -302,35 +302,35 @@ FIXME:
 		<<if $farmyardKennels > 0 && $activeCanine != 0>>
 			<<link "Have a $activeCanine.species mount $him">>
 				<<set $animalType = "canine">>
-				<<replace "#miniscene">><<include "BeastFucked">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+				<<replace "#mini-scene">><<include "BeastFucked">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>> |
 		<</if>>
 		<<if $farmyardStables > 0 && $activeHooved.species != 0>>
 			<<link "Let a $activeHooved.species mount $him">>
 				<<set $animalType = "hooved">>
-				<<replace "#miniscene">><<include "BeastFucked">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+				<<replace "#mini-scene">><<include "BeastFucked">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>> |
 		<</if>>
 		<<if $farmyardCages > 0 && $activeFeline != 0>>
 			<<link "Have a $activeFeline.species mount $him">>
 				<<set $animalType = "feline">>
-				<<replace "#miniscene">><<include "BeastFucked">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+				<<replace "#mini-scene">><<include "BeastFucked">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>> |
 		<</if>>
 	<</if>>
 	<<if $cheatMode>>
 		<<link "Check $his deadliness">>
-			<<replace "#miniscene">><<include "Deadliness">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+			<<replace "#mini-scene">><<include "Deadliness">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 		<</link>> |
 	<</if>>
 	<<link "Abuse $him">>
-		<<replace "#miniscene">><<include "FAbuse">><</replace>>
+		<<replace "#mini-scene">><<include "FAbuse">><</replace>>
 	<</link>>
 	<<if $seeIncest == 1>>
 		<<set _availRelatives = availableRelatives($activeChild)>>
 		<<if _availRelatives.mother>>
 		|	<<link "Fuck $him with $his mother">>
-			<<replace "#miniscene">>
+			<<replace "#mini-scene">>
 			<<set $partner = "mother">>
 			<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>>
@@ -340,7 +340,7 @@ FIXME:
 		/*
 		<<if _availRelatives.father>>
 		|	<<link "Fuck $him with $his father">>
-			<<replace "#miniscene">><<set $partner = "father">>
+			<<replace "#mini-scene">><<set $partner = "father">>
 			<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>>
 		<<elseif _availRelatives.fatherName !== null>>
@@ -357,13 +357,13 @@ FIXME:
 			<<else>>
 				<<if $activeChild.sisters == 1>>
 				|	<<link "Fuck $him with $his _sister2">>
-					<<replace "#miniscene">>
+					<<replace "#mini-scene">>
 					<<set $partner = "sister">>
 					<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 					<</link>>
 				<<else>>
 				|	<<link "Fuck $him with one of $his sisters">>
-					<<replace "#miniscene">>
+					<<replace "#mini-scene">>
 					<<set $partner = "sister">>
 					<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 					<</link>>
@@ -377,31 +377,31 @@ FIXME:
 			<<setLocalPronouns $slaves[_si] 2>>
 			<<if ($activeChild.relationship)>>
 				|	<<link `"Fuck $him with $his friend <<= SlaveFullName($slaves[_si])>>"`>>
-						<<replace "#miniscene">>
+						<<replace "#mini-scene">>
 							<<set $partner = "relationship">>
 							<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 						<</link>>
 			<<elseif ($activeChild.relationship == 2)>>
 				|	<<link `"Fuck $him with $his best friend <<= SlaveFullName($slaves[_si])>>"`>>
-						<<replace "#miniscene">>
+						<<replace "#mini-scene">>
 							<<set $partner = "relationship">>
 							<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 						<</link>>
 			<<elseif ($activeChild.relationship == 3)>>
 				|	<<link `"Fuck $him with $his FWB <<= SlaveFullName($slaves[_si])>>"`>>
-						<<replace "#miniscene">>
+						<<replace "#mini-scene">>
 							<<set $partner = "relationship">>
 							<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 						<</link>>
 			<<elseif ($activeChild.relationship == 4)>>
 				|	<<link `"Fuck $him with $his lover <<= SlaveFullName($slaves[_si])>>"`>>
-						<<replace "#miniscene">>
+						<<replace "#mini-scene">>
 							<<set $partner = "relationship">>
 							<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 						<</link>>
 			<<else>>
 				|	<<link `"Fuck $him with $his slave _wife2 <<= SlaveFullName($slaves[_si])>>"`>>
-						<<replace "#miniscene">>
+						<<replace "#mini-scene">>
 							<<set $partner = "relationship">>
 							<<include "FRelation">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 						<</link>>
@@ -410,11 +410,11 @@ FIXME:
 	<</if>>
 	<<if ($activeChild.rivalryTarget != 0) && canWalk($activeChild)>>
 		|	<<link "Abuse $his rival with $him">>
-				<<replace "#miniscene">><<include "FRival">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
+				<<replace "#mini-scene">><<include "FRival">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>>
 			<</link>>
 	<</if>>
 	<<if ($activeChild.fetish != "mindbroken") && (canTalk($activeChild) || hasAnyArms($activeChild))>>
-		| <<link "Ask $him about $his feelings">><<replace "#miniscene">><<set $childSex = 1>><<include "FFeelings">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><</link>>
+		| <<link "Ask $him about $his feelings">><<replace "#mini-scene">><<set $childSex = 1>><<include "FFeelings">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><</link>>
 	<</if>>
 	<<if $activeChild.devotion >= 100 && $activeChild.relationship < 0 && $activeChild.relationship > -3>>
 		|	<<link "Talk to $him about relationships" "Matchmaking">>
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index d07ae3a36e6872d7f87cc100acc6b95dfdc3291e..5a72a97d45fd8a4176b6b9be3496d31023916688 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -71,17 +71,17 @@ Income: <<= num($activeSlave.lifetimeRepIncome)>>
 Expenses: <<= num($activeSlave.lastWeeksRepExpenses)>>,
 Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Porn')" id="tab Porn">Porn</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Implants_Piercings_Tattoos')" id="tab Implants_Piercings_Tattoos">Implants, piercings & tattoos</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Family')" id="tab Family">Family</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Misc')" id="tab Misc">Misc</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Porn')" id="tab Porn">Porn</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Implants_Piercings_Tattoos')" id="tab Implants_Piercings_Tattoos">Implants, piercings & tattoos</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Family')" id="tab Family">Family</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Misc')" id="tab Misc">Misc</button>
 </div>
 
-<div id="Skills" class="tabcontent">
+<div id="Skills" class="tab-content">
 	<div class="content">
 			Vaginal: $activeSlave.skill.vaginal,
 			<br>Oral: $activeSlave.skill.oral,
@@ -113,7 +113,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 	</div>
 </div>
 
-<div id="Mental" class="tabcontent">
+<div id="Mental" class="tab-content">
 	<div class="content">
 		Intelligence: $activeSlave.intelligence
 		<br>Attraction:
@@ -143,7 +143,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 	</div>
 </div>
 
-<div id="Body" class="tabcontent">
+<div id="Body" class="tab-content">
 	<div class="content">
 		Health: $activeSlave.health.health,
 		Condition: $activeSlave.health.condition,
@@ -338,7 +338,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 	</div>
 </div>
 
-<div id="Porn" class="tabcontent">
+<div id="Porn" class="tab-content">
 	<div class="content">
 		Focus: $activeSlave.porn.focus,
 		Feed: $activeSlave.porn.feed
@@ -396,7 +396,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 	</div>
 </div>
 
-<div id="Implants_Piercings_Tattoos" class="tabcontent">
+<div id="Implants_Piercings_Tattoos" class="tab-content">
 	<div class="content">
 
 		<h2>Implants</h2>
@@ -449,7 +449,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 	</div>
 </div>
 
-<div id="Family" class="tabcontent">
+<div id="Family" class="tab-content">
 	<div class="content">
 		Genes: $activeSlave.genes
 		<br><br>BirthName: $activeSlave.birthName,
@@ -511,7 +511,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 	</div>
 </div>
 
-<div id="Misc" class="tabcontent">
+<div id="Misc" class="tab-content">
 	<div class="content">
 		<br>Deadliness <<print Deadliness($activeSlave)>>
 		<br>Count: Penetrative: $activeSlave.counter.penetrative,
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 15845de1eb71f610de218374cde130427ef729fe..38fac03a614de472590f881124cd245dd3a5bcfa 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -364,23 +364,23 @@
 
 <h2>You are customizing this slave:</h2> <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
 
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Overview')" id="tab Overview">Overview</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Physical')" id="tab Physical">Physical</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Family', App.StartingGirls.uncommittedFamilyTree(V.activeSlave))" id="tab Family">Family</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customization')" id="tab Customization">Customization</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Overview')" id="tab Overview">Overview</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Physical')" id="tab Physical">Physical</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Family', App.StartingGirls.uncommittedFamilyTree(V.activeSlave))" id="tab Family">Family</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Customization')" id="tab Customization">Customization</button>
 	<<if $cash >= _slaveCost>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'assignRemove')" id="tab assignRemove">Finalize</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'assignRemove')" id="tab assignRemove">Finalize</button>
 	<<else>>
-		<button class="tablinks, show-warning" onclick="App.UI.tabbar.openTab(event, 'assignRemove')" id="tab assignRemove">Finalize</button>
+		<button class="tab-links, show-warning" onclick="App.UI.tabbar.openTab(event, 'assignRemove')" id="tab assignRemove">Finalize</button>
 	<</if>>
 </div>
 
 <<setLocalPronouns $activeSlave>>
 
-<div id="Overview" class="tabcontent">
+<div id="Overview" class="tab-content">
 	<div class="content">
 
 	<<set _options = new App.UI.OptionsGroup()>>
@@ -514,7 +514,7 @@
 	</div>
 </div>
 
-<div id="Physical" class="tabcontent">
+<div id="Physical" class="tab-content">
 	<div class="content">
 
 	<<set _options = new App.UI.OptionsGroup()>>
@@ -881,7 +881,7 @@
 	</div>
 </div>
 
-<div id="Mental" class="tabcontent">
+<div id="Mental" class="tab-content">
 	<div class="content">
 
 	<<set _options = new App.UI.OptionsGroup()>>
@@ -975,7 +975,7 @@
 	</div>
 </div>
 
-<div id="Skills" class="tabcontent">
+<div id="Skills" class="tab-content">
 	<div class="content">
 	<<set _options = new App.UI.OptionsGroup()>>
 
@@ -1047,13 +1047,13 @@
 	</div>
 </div>
 
-<div id="Family" class="tabcontent">
+<div id="Family" class="tab-content">
 	<div class="content">
 	<<editFamily>>
 	</div>
 </div>
 
-<div id="Customization" class="tabcontent">
+<div id="Customization" class="tab-content">
 	<div class="content">
 
 	''Birth name:'' <<textbox "$activeSlave.birthName" $activeSlave.birthName "Starting Girls">>
@@ -1168,7 +1168,7 @@
 	</div>
 </div>
 
-<div id="assignRemove" class="tabcontent">
+<div id="assignRemove" class="tab-content">
 	<div class="content">
 
 	<<if $cash >= _slaveCost>>
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index d7a2fa55d62b81f8af9f49f6710b39e46968a640..3b5819c7501942ec492ab8de5de8231182dad503 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -28,17 +28,17 @@ Seated at your desk, you glance at the visual representation of
 <br><br>
 
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Assistant)>>
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
 	<<if $week >= 11>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
 		<<if $assistant.personality != 0>>
-			<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
+			<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
 		<</if>>
 	<</if>>
 </div>
 
-<div id="upgrades" class="tabcontent">
+<div id="upgrades" class="tab-content">
 <div class="content">
 	<<if $assistant.power == 0>>
 		The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistant.name gathers.
@@ -58,7 +58,7 @@ Seated at your desk, you glance at the visual representation of
 </div>
 </div>
 
-<div id="settings" class="tabcontent">
+<div id="settings" class="tab-content">
 <div class="content">
 	<h3>Behavior:</h3>
 	<<if $assistant.personality == 0>>
@@ -112,7 +112,7 @@ Seated at your desk, you glance at the visual representation of
 </div>
 </div>
 
-<div id="appearance" class="tabcontent">
+<div id="appearance" class="tab-content">
 <div class="content">
 	_HeA is currently using the ''$assistant.appearance'' avatar, which <<set _seed = []>>
 	<<if $policies.publicPA == 1>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 43fd40fe338cda6f42ca4fd33eabdee742728f1b..6921cffd81da539eaab87b6382dd5bba4d0c3b20 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -48,40 +48,40 @@
 <<else>>
 <body>
 
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Management')">Arcology Management</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Management')">Arcology Management</button>
 	<<if $FSAnnounced > 0>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Societies')">Society Development</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Societies')">Society Development</button>
 	<</if>>
 	<<if $corp.Incorporated == 1>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Corporation')">Corporation Developments</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Corporation')">Corporation Developments</button>
 	<</if>>
 	<<if $secExpEnabled > 0>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Authority')">Authority</button>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'securityReport')">Security</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Authority')">Authority</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'securityReport')">Security</button>
 	<</if>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Reputation')">Reputation</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Business')">Personal Business</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Reputation')">Reputation</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Business')">Personal Business</button>
 	<<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Personal')">Personal Notes</button>
+		<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Personal')">Personal Notes</button>
 	<</if>>
 </div>
 
-<div id="Arcologies" class="tabcontent">
+<div id="Arcologies" class="tab-content">
 	<div class="content">
 		<<include "Neighbors Development">>
 	</div>
 </div>
 
-<div id="Management" class="tabcontent">
+<div id="Management" class="tab-content">
 	<div class="content">
 		<<include "Arcology Management">>
 	</div>
 </div>
 
 <<if $FSAnnounced > 0>>
-	<div id="Societies" class="tabcontent">
+	<div id="Societies" class="tab-content">
 		<div class="content">
 			<<include "FS Developments">>
 		</div>
@@ -89,7 +89,7 @@
 <</if>>
 
 <<if $corp.Incorporated == 1>>
-	<div id="Corporation" class="tabcontent">
+	<div id="Corporation" class="tab-content">
 		<div class="content">
 			<<include "Corporation Developments">>
 		</div>
@@ -97,33 +97,33 @@
 <</if>>
 
 <<if $secExpEnabled > 0>>
-	<div id="Authority" class="tabcontent">
+	<div id="Authority" class="tab-content">
 		<div class="content">
 			<<include "authorityReport">>
 		</div>
 	</div>
 
-	<div id="securityReport" class="tabcontent">
+	<div id="securityReport" class="tab-content">
 		<div class="content">
 			<<include "securityReport">>
 		</div>
 	</div>
 <</if>>
 
-<div id="Reputation" class="tabcontent">
+<div id="Reputation" class="tab-content">
 	<div class="content">
 		<<include "Reputation">>
 	</div>
 </div>
 
-<div id="Business" class="tabcontent">
+<div id="Business" class="tab-content">
 	<div class="content">
 		<<include "Personal Business">>
 	</div>
 </div>
 
 <<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
-	<div id="Personal" class="tabcontent">
+	<div id="Personal" class="tab-content">
 		<div class="content">
 			<<include "Personal Notes">>
 		</div>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index fb5f73c654bf65c8f9fcf785f5d5dfe28ccd89a3..b314d960197ea8db5ea6f3e1008b84e60b2941ec 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -62,16 +62,16 @@
 	<</if>>
 </div>
 
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'hairFace')" id="tab hairFace">Hair and Face</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upper')" id="tab upper">Upper</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'lower')" id="tab lower">Lower</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Race')" id="tab Race">Race</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Structural')" id="tab Structural">Structural</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'ExtremeSurgery')" id="tab ExtremeSurgery">Extreme Surgery</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'hairFace')" id="tab hairFace">Hair and Face</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'upper')" id="tab upper">Upper</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'lower')" id="tab lower">Lower</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Race')" id="tab Race">Race</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Structural')" id="tab Structural">Structural</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'ExtremeSurgery')" id="tab ExtremeSurgery">Extreme Surgery</button>
 </div>
 
-<div id="hairFace" class="tabcontent">
+<div id="hairFace" class="tab-content">
 <div class="content">
 	/* 000-250-006 */
 	<<if $seeImages == 1>>
@@ -767,7 +767,7 @@
 	</div>
 </div>
 
-<div id="upper" class="tabcontent">
+<div id="upper" class="tab-content">
 	<div class="content">
 		/* 000-250-006 */
 		<<if $seeImages == 1>>
@@ -1214,7 +1214,7 @@
 	</div>
 </div>
 
-<div id="lower" class="tabcontent">
+<div id="lower" class="tab-content">
 	<div class="content">
 		/* 000-250-006 */
 		<<if $seeImages == 1>>
@@ -1740,7 +1740,7 @@
 	</div>
 </div>
 
-<div id="Race" class="tabcontent">
+<div id="Race" class="tab-content">
 	<div class="content">
 		/* 000-250-006 */
 		<<if $seeImages == 1>>
@@ -1800,7 +1800,7 @@
 	</div>
 </div>
 
-<div id="Structural" class="tabcontent">
+<div id="Structural" class="tab-content">
 	<div class="content">
 		/* 000-250-006 */
 		<<if $seeImages == 1>>
@@ -2309,7 +2309,7 @@
 	</div>
 </div>
 
-<div id="ExtremeSurgery" class="tabcontent">
+<div id="ExtremeSurgery" class="tab-content">
 	<div class="content">
 		/* 000-250-006 */
 		<<if $seeImages == 1>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index b1e4f5796a89830351634b5ffd4e35321cfaa205..991607d00275b80d73c5f31ee679e9ee089b5f13 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -80,16 +80,16 @@
 		<<print App.UI.Hotkeys.hotkeys("nextSlave")>>
 	</span>
 </p>
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave(getSlave(V.activeSlave.ID)))" id="tab Description">Description</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Modify')" id="tab Modify">Modify</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Work')" id="tab Work">Work</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'PhysicalRegimen')" id="tab PhysicalRegimen">Physical Regimen</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave(getSlave(V.activeSlave.ID)))" id="tab Description">Description</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Modify')" id="tab Modify">Modify</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Work')" id="tab Work">Work</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'PhysicalRegimen')" id="tab PhysicalRegimen">Physical Regimen</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
 </div>
 
 <div id="artFrame">
@@ -102,7 +102,7 @@
 	<</if>>
 </div>
 
-<div id="Description" class="tabcontent">
+<div id="Description" class="tab-content">
 	<div class="content">
 		<<if $seeDetails == 1>>
 			<div style="font-style:italic">
@@ -132,7 +132,7 @@
 	</div>
 </div>
 
-<div id="Modify" class="tabcontent">
+<div id="Modify" class="tab-content">
 	<div class="content">
 		<p id="modifySection"></p>
 		<script>
@@ -142,7 +142,7 @@
 </div>
 
 
-<div id="Work" class="tabcontent">
+<div id="Work" class="tab-content">
 	<div class="content">
 		<p id="work"></p>
 		<script>
@@ -151,7 +151,7 @@
 	</div>
 </div>
 
-<div id="Appearance" class="tabcontent">
+<div id="Appearance" class="tab-content">
 	<div class="content">
 		<p>
 			<span id="clothes"></span>
@@ -211,7 +211,7 @@
 	</div>
 </div>
 
-<div id="PhysicalRegimen" class="tabcontent">
+<div id="PhysicalRegimen" class="tab-content">
 	<div class="content">
 		<p>
 			<span id="drugs"></span>
@@ -257,14 +257,14 @@
 	</div>
 </div>
 
-<div id="Rules" class="tabcontent">
+<div id="Rules" class="tab-content">
 	<div class="content">
 		<span id="rules"></span>
 		<script>App.UI.SlaveInteract.rules(getSlave(V.activeSlave.ID))</script>
 	</div>
 </div>
 
-<div id="Financial" class="tabcontent">
+<div id="Financial" class="tab-content">
 	<div class="content">
 
 		<<if $studio == 1>>
@@ -361,7 +361,7 @@
 	</div>
 </div>
 
-<div id="Customize" class="tabcontent">
+<div id="Customize" class="tab-content">
 	<div class="content">
 		<span id="custom"></span>
 		<script>App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))</script>
@@ -370,7 +370,7 @@
 	</div>
 </div>
 
-<div id="FamilyTab" class="tabcontent">
+<div id="FamilyTab" class="tab-content">
 	<div class="content">
 		<p id="family">
 			<div id="familyTree"></div>
diff --git a/src/uncategorized/underperformingSlaves.tw b/src/uncategorized/underperformingSlaves.tw
index 5fc39bb79b88343d17662c48e4678fa42608a6a9..9effeb9039ae836da1afa4d677afdadf8162a377 100644
--- a/src/uncategorized/underperformingSlaves.tw
+++ b/src/uncategorized/underperformingSlaves.tw
@@ -20,18 +20,18 @@
 	</div>
 </p>
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
-<div class="tabbar">
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'highSale')" id="tab highSale">Worth much but earning little</button>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'expensive')" id="tab expensive">Costing vs earning</button>
+<div class="tab-bar">
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'highSale')" id="tab highSale">Worth much but earning little</button>
+	<button class="tab-links" onclick="App.UI.tabbar.openTab(event, 'expensive')" id="tab expensive">Costing vs earning</button>
 </div>
 
-<div id="highSale" class="tabcontent">
+<div id="highSale" class="tab-content">
 	<div class="content">
 		<<includeDOM App.Underperformers.highSale()>>
 	</div>
 </div>
 
-<div id="expensive" class="tabcontent">
+<div id="expensive" class="tab-content">
 	<div class="content">
 		<<includeDOM App.Underperformers.expensive()>>
 	</div>