diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index b94acd0ca644580a39885a7cd0d955465704a46f..f85feb380655fa47bccb030e8467df99e03e4ea2 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -5,112 +5,147 @@
 <<if $cellblockName != "the Cellblock">>
 	<<set $cellblockNameCaps = $cellblockName.replace("the ", "The ")>>
 <</if>>
-$cellblockNameCaps
-<<switch $cellblockDecoration>>
-<<case "Roman Revivalist">>
-	is designed to resemble the holding pens beneath the old Coliseum. Whenever there's a fight in the arcology, screens in each cell helpfully keep inmates informed of what awaits (otherwise) useless slaves.
-<<case "Aztec Revivalist">>
-	is designed to frighten the prisoners to submission. All the cells look to the center of the facility, where a sacrificial altar stands, adorned with ceremonial <<if $arcologies[0].FSPaternalist != "unset">>ropes and penetrators<<else>>knives, ropes and blunt instruments<</if>>.
-<<case "Egyptian Revivalist">>
-	uses the climate of Egypt as an additional source of discomfort. The air here is hot and dry, and inmates can easily imagine themselves confined in mud brick cells in a baking desert.
-<<case "Edo Revivalist">>
-	is furnished in a severely medieval Japanese style. There is one refinement, but it's of exquisite cruelty. At the end of the hall, there's a fountain with a traditional bamboo boar scarer. As it fills with water, it tips against a stone with a thunk... thunk... thunk... thunk...
-<<case "Arabian Revivalist">>
-	is furnished as imagined Arabian slave pens, all set around a central pillar. This pillar is capped by shackles, so that slaves can be bound by their hands and whipped on the backs, buttocks, and thighs in clear view of all their fellow chattel.
-<<case "Chinese Revivalist">>
-	is furnished in a severely medieval Chinese style. There is one refinement, but it's of exquisite cruelty. Somewhere out of sight, water is dripping into an urn, drop by drop... drop... drop... drop...
-<<case "Chattel Religionist">>
-	is built of cold stone. Most of the cells are unfurnished little cubes inside which the only bed is the bare floor. A few are smaller still, so that the inmates can neither stand nor lie flat.
-<<case "Degradationist">>
-	is a nightmare. Everything is made of metal, and almost everything menaces with spikes of steel. Inmates must carefully avoid the walls of their own cells if they wish to avoid being stabbed.
-<<case "Asset Expansionist">>
-	is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's expansion. Day and night, inmates are confronted with the sight of themselves transformed.
-<<case "Transformation Fetishist">>
-	is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's expansion. Day and night, inmates are confronted with the sight of themselves transformed.
-<<case "Gender Radicalist">>
-	is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's bimbofication. Day and night, inmates are confronted with the sight of themselves dyed, pierced, tattooed, gaped, filled with implants, or all of these.
-<<case "Gender Fundamentalist">>
-	is a block of barred cells whose sides, offering a clear view of the whole prison, provide much menace. Anyone who abuses an inmate does so in full view of every other slave here, keeping the jailbirds in a state of constant fear that they're next.
-<<case "Physical Idealist">>
-	is a block of barred cells whose sides, offering a clear view of the whole prison, provide much menace. Anyone who rapes an inmate does so in full view of every other slave here, keeping the bitches in a state of constant fear that their asses are next.
-<<case "Supremacist">>
-	is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. Everyone outside the cells is $arcologies[0].FSSupremacistRace, and everyone inside them is not. The darkness of history is palpable here.
-<<case "Subjugationist">>
-	is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. The inmates inside the cells are $arcologies[0].FSSubjugationistRace, and everyone outside them is not. The darkness of history is palpable here.
-<<case "Repopulation Focus">>
-	is a straightforward prison, with two exceptions. One cell style features a screen displaying plans for its inmate's impregnation, the other is covered with mirrors for its inmate to watch her pregnancy grow. Day and night, inmates are confronted with the sight of themselves transformed.
-<<case "Eugenics">>
-	is designed to make very clear to its inmates that they are subhuman. Many screens showcasing their inadequacy intermingled with propaganda play on nonstop loops.
-<<case "Paternalist">>
-	is a prison, but a modern and scientific one. The cells, the common areas, and even the color of the walls are all carefully designed to communicate the feeling that inmates can better themselves.
-<<case "Pastoralist">>
-	requires its inmates to drink as much breast milk as they can hold. This sounds like a small thing, but for an unbroken slave, conquering the revulsion of drinking another slave's milk is an important step.
-<<case "Maturity Preferentialist">>
-	is subtly designed to make very clear to its inmates that they are sex objects. Many screens showing pornography make it clear to the maturest slave here that they're still an object of lust, and will be used to slake others' pleasure.
-<<case "Youth Preferentialist">>
-	is subtly designed to make the breadth of sex acts performed in the arcology clear to its inmates. A cacophony of pornography makes clear to the most innocent inmate that <<if $seeDicks != 100>>her pussy is a fuck hole, <</if>>her mouth is a fuck hole, her anus is a fuck hole, and, in fact, <<if $seeDicks != 100>>all three<<else>>both<</if>> can be fuck holes at once.
-<<case "Body Purist">>
-	requires its inmates to drink as much filtered water as they can, all the time. This sounds like a petty thing, but most inmates are very aware that they're being flushed out. Cleaned. It is an oddly menacing thought.
-<<case "Slimness Enthusiast">>
-	is torture for chubby slaves. Fat bitches that pass through here soon learn that they're going to be slim and pretty one day, but that it isn't going to be much fun getting there.
-<<case "Hedonistic">>
-	is torture for thin slaves. The first thing they notice is the heavily reinforced cot they will reside upon. The second is the feeding tube that will be anchored in their stomach for the duration of their stay. Slaves imprisoned here will have their body stuffed to capacity with concentrated slave food, ensuring a plump, docile slave by the end of their sentence.
-<<case "Intellectual Dependency">>
-	is a straightforward prison, with one exception. Each cell comes equipped with sound dampening shutters so slaves may be cut off from all outside stimulation. They are forced to be alone with their thoughts for most of their stay.
-<<case "Slave Professionalism">>
-	is torture for dumb slaves. Everything in the cell is a puzzle, from the food dispenser to the cot cover. Slaves are frequently rotated so that they may never become accustomed to any solutions.
-<<case "Petite Admiration">>
-	is designed to make tall slaves know they are unwelcome. What amounts a basic prison for a short slave is positively torturous when one is far too large to even move in it.
-<<case "Statuesque Glorification">>
-	is designed to make short slaves know they are unwelcome. Where a tall slave will find nothing more than a standard cell, the vertically challenged while will find an insurmountable trial designed to teach them their place.
-<<default>>
-	could be mistaken for a modern prison. A close inspection, however, reveals restraints in each cell that will hold inmates in sexually compromising positions, and compliance systems to force them to place their wrists and ankles in them.
-<</switch>>
 
-<<if _CL > 2>>
-	$cellblockNameCaps is full of slaves, though it's difficult to tell at first. In many of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
-<<elseif _CL > 0>>
-	$cellblockNameCaps holds a few slaves, though it's difficult to tell at first. In several of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
-<<elseif $Wardeness != 0>>
-	$Wardeness.slaveName is alone in the cellblock, and seems rather lonely without anyone to oppress.
-<<else>>
-	None of your slaves are confined in the cellblock.
-	<div class="choices" style="font-style:normal">
-		[[Decommission the cellblock|Main][$cellblock = 0, $cellblockDecoration = "standard", $cellblockUpgrade = 0]]
-	</div>
-<</if>>
+<p class="scene-intro">
+	$cellblockNameCaps
+	<<switch $cellblockDecoration>>
+		<<case "Roman Revivalist">>
+			is designed to resemble the holding pens beneath the old Coliseum. Whenever there's a fight in the arcology, screens in each cell helpfully keep inmates informed of what awaits (otherwise) useless slaves.
+		<<case "Aztec Revivalist">>
+			is designed to frighten the prisoners to submission. All the cells look to the center of the facility, where a sacrificial altar stands, adorned with ceremonial <<if $arcologies[0].FSPaternalist != "unset">>ropes and penetrators<<else>>knives, ropes and blunt instruments<</if>>.
+		<<case "Egyptian Revivalist">>
+			uses the climate of Egypt as an additional source of discomfort. The air here is hot and dry, and inmates can easily imagine themselves confined in mud brick cells in a baking desert.
+		<<case "Edo Revivalist">>
+			is furnished in a severely medieval Japanese style. There is one refinement, but it's of exquisite cruelty. At the end of the hall, there's a fountain with a traditional bamboo boar scarer. As it fills with water, it tips against a stone with a thunk... thunk... thunk... thunk...
+		<<case "Arabian Revivalist">>
+			is furnished as imagined Arabian slave pens, all set around a central pillar. This pillar is capped by shackles, so that slaves can be bound by their hands and whipped on the backs, buttocks, and thighs in clear view of all their fellow chattel.
+		<<case "Chinese Revivalist">>
+			is furnished in a severely medieval Chinese style. There is one refinement, but it's of exquisite cruelty. Somewhere out of sight, water is dripping into an urn, drop by drop... drop... drop... drop...
+		<<case "Chattel Religionist">>
+			is built of cold stone. Most of the cells are unfurnished little cubes inside which the only bed is the bare floor. A few are smaller still, so that the inmates can neither stand nor lie flat.
+		<<case "Degradationist">>
+			is a nightmare. Everything is made of metal, and almost everything menaces with spikes of steel. Inmates must carefully avoid the walls of their own cells if they wish to avoid being stabbed.
+		<<case "Asset Expansionist">>
+			is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's expansion. Day and night, inmates are confronted with the sight of themselves transformed.
+		<<case "Transformation Fetishist">>
+			is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's expansion. Day and night, inmates are confronted with the sight of themselves transformed.
+		<<case "Gender Radicalist">>
+			is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's bimbofication. Day and night, inmates are confronted with the sight of themselves dyed, pierced, tattooed, gaped, filled with implants, or all of these.
+		<<case "Gender Fundamentalist">>
+			is a block of barred cells whose sides, offering a clear view of the whole prison, provide much menace. Anyone who abuses an inmate does so in full view of every other slave here, keeping the jailbirds in a state of constant fear that they're next.
+		<<case "Physical Idealist">>
+			is a block of barred cells whose sides, offering a clear view of the whole prison, provide much menace. Anyone who rapes an inmate does so in full view of every other slave here, keeping the bitches in a state of constant fear that their asses are next.
+		<<case "Supremacist">>
+			is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. Everyone outside the cells is $arcologies[0].FSSupremacistRace, and everyone inside them is not. The darkness of history is palpable here.
+		<<case "Subjugationist">>
+			is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. The inmates inside the cells are $arcologies[0].FSSubjugationistRace, and everyone outside them is not. The darkness of history is palpable here.
+		<<case "Repopulation Focus">>
+			is a straightforward prison, with two exceptions. One cell style features a screen displaying plans for its inmate's impregnation, the other is covered with mirrors for its inmate to watch her pregnancy grow. Day and night, inmates are confronted with the sight of themselves transformed.
+		<<case "Eugenics">>
+			is designed to make very clear to its inmates that they are subhuman. Many screens showcasing their inadequacy intermingled with propaganda play on nonstop loops.
+		<<case "Paternalist">>
+			is a prison, but a modern and scientific one. The cells, the common areas, and even the color of the walls are all carefully designed to communicate the feeling that inmates can better themselves.
+		<<case "Pastoralist">>
+			requires its inmates to drink as much breast milk as they can hold. This sounds like a small thing, but for an unbroken slave, conquering the revulsion of drinking another slave's milk is an important step.
+		<<case "Maturity Preferentialist">>
+			is subtly designed to make very clear to its inmates that they are sex objects. Many screens showing pornography make it clear to the maturest slave here that they're still an object of lust, and will be used to slake others' pleasure.
+		<<case "Youth Preferentialist">>
+			is subtly designed to make the breadth of sex acts performed in the arcology clear to its inmates. A cacophony of pornography makes clear to the most innocent inmate that <<if $seeDicks != 100>>her pussy is a fuck hole, <</if>>her mouth is a fuck hole, her anus is a fuck hole, and, in fact, <<if $seeDicks != 100>>all three<<else>>both<</if>> can be fuck holes at once.
+		<<case "Body Purist">>
+			requires its inmates to drink as much filtered water as they can, all the time. This sounds like a petty thing, but most inmates are very aware that they're being flushed out. Cleaned. It is an oddly menacing thought.
+		<<case "Slimness Enthusiast">>
+			is torture for chubby slaves. Fat bitches that pass through here soon learn that they're going to be slim and pretty one day, but that it isn't going to be much fun getting there.
+		<<case "Hedonistic">>
+			is torture for thin slaves. The first thing they notice is the heavily reinforced cot they will reside upon. The second is the feeding tube that will be anchored in their stomach for the duration of their stay. Slaves imprisoned here will have their body stuffed to capacity with concentrated slave food, ensuring a plump, docile slave by the end of their sentence.
+		<<case "Intellectual Dependency">>
+			is a straightforward prison, with one exception. Each cell comes equipped with sound dampening shutters so slaves may be cut off from all outside stimulation. They are forced to be alone with their thoughts for most of their stay.
+		<<case "Slave Professionalism">>
+			is torture for dumb slaves. Everything in the cell is a puzzle, from the food dispenser to the cot cover. Slaves are frequently rotated so that they may never become accustomed to any solutions.
+		<<case "Petite Admiration">>
+			is designed to make tall slaves know they are unwelcome. What amounts a basic prison for a short slave is positively torturous when one is far too large to even move in it.
+		<<case "Statuesque Glorification">>
+			is designed to make short slaves know they are unwelcome. Where a tall slave will find nothing more than a standard cell, the vertically challenged while will find an insurmountable trial designed to teach them their place.
+		<<default>>
+			could be mistaken for a modern prison. A close inspection, however, reveals restraints in each cell that will hold inmates in sexually compromising positions, and compliance systems to force them to place their wrists and ankles in them.
+	<</switch>>
+
+	<<if _CL > 2>>
+		$cellblockNameCaps is full of slaves, though it's difficult to tell at first. In many of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
+	<<elseif _CL > 0>>
+		$cellblockNameCaps holds a few slaves, though it's difficult to tell at first. In several of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
+	<<elseif $Wardeness != 0>>
+		$Wardeness.slaveName is alone in the cellblock, and seems rather lonely without anyone to oppress.
+	<<else>>
+		None of your slaves are confined in the cellblock.
+		<div class="choices" style="font-style:normal">
+			[[Decommission the cellblock|Main][$cellblock = 0, $cellblockDecoration = "standard", $cellblockUpgrade = 0]]
+		</div>
+	<</if>>
+</p>
 
 <<if _CL > 0>>
 	<<removeFacilityWorkers "cellblock" "rest" "stay confined">>
 <</if>>
+<div>
+	<<set _Tmult0 = Math.trunc($cellblock*1000*$upgradeMultiplierArcology)>>
+	$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement.
+	There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slaves<<if _CL != 1>>s<</if>> kept in close confinement in $cellblockName.
+	<div class="choices">
+		[[Expand the cellblock|Cellblock][cashX(forceNeg(_Tmult0), "capEx"), $cellblock += 5, $PC.skill.engineering += .1]] 
+		<span class="note">
+			Costs <<print cashFormat(_Tmult0)>>
+		</span>
+	</div>
+</div>
 
-<<set _Tmult0 = Math.trunc($cellblock*1000*$upgradeMultiplierArcology)>>
-<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement. There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slaves<<if _CL != 1>>s<</if>> kept in close confinement in $cellblockName.
-[[Expand the cellblock|Cellblock][cashX(forceNeg(_Tmult0), "capEx"), $cellblock += 5, $PC.skill.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
-
-<br>
-<<if $cellblockUpgrade == 1>>
-	Its compliance systems have been upgraded to allow slaves no mental respite, painstakingly correcting the tiniest misbehaviors to soften flaws into quirks at the cost of considerable anguish to inmates denied any rest from correction.
-<<else>>
-	<<set _Tmult1 = Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
-	Its compliance systems are standard. [[Upgrade them to soften slave flaws|Cellblock][cashX(forceNeg(_Tmult1), "capEx"), $cellblockUpgrade = 1, $PC.skill.engineering += 0.1, $PC.skill.hacking += 0.1]] //Costs <<print cashFormat(_Tmult1)>>//
-<</if>>
-
-<<if $Wardeness != 0 && canPenetrate($Warden)>>
-<<setLocalPronouns $Wardeness>>
-<br><br>
-	<<if $cellblockWardenCumsInside == 1>>
-		$Warden.slaveName is permitted to cum inside $his inmates when $he disciplines them.
-		<<link "Forbid $him from cumming inside" "Cellblock">><<set $cellblockWardenCumsInside = 0>><</link>>
+<div>
+	<<if $cellblockUpgrade == 1>>
+		Its compliance systems have been upgraded to allow slaves no mental respite, painstakingly correcting the tiniest misbehaviors to soften flaws into quirks at the cost of considerable anguish to inmates denied any rest from correction.
 	<<else>>
-		$Warden.slaveName is not permitted to cum inside $his inmates.
-		<<link "Let $him cum inside" "Cellblock">><<set $cellblockWardenCumsInside = 1>><</link>> //May result in pregnancies//
+		<<set _Tmult1 = Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
+		Its compliance systems are standard.
+		<div class="choices">
+			[[Upgrade them to soften slave flaws|Cellblock][cashX(forceNeg(_Tmult1), "capEx"), $cellblockUpgrade = 1, $PC.skill.engineering += 0.1, $PC.skill.hacking += 0.1]] 
+			<span class="note">
+				Costs <<print cashFormat(_Tmult1)>>
+			</span>
+		</div>
 	<</if>>
-<</if>>
+</div>
+
+<p>
+	<<if $Wardeness != 0 && canPenetrate($Warden)>>
+		<<setLocalPronouns $Wardeness>>
+		<<if $cellblockWardenCumsInside == 1>>
+			$Warden.slaveName is permitted to cum inside $his inmates when $he disciplines them.
+			<div class="choices">
+				<<link "Forbid $him from cumming inside" "Cellblock">>
+					<<set $cellblockWardenCumsInside = 0>>
+				<</link>>
+			</div>
+		<<else>>
+			$Warden.slaveName is not permitted to cum inside $his inmates.
+			<div class="choices">
+				<<link "Let $him cum inside" "Cellblock">>
+					<<set $cellblockWardenCumsInside = 1>>
+				<</link>>
+				<span class="note">
+					May result in pregnancies
+				</span>
+			</div>
+		<</if>>
+	<</if>>
+</p>
 
-<br><br>
-<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.cellblock)>>
+<p>
+	<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.cellblock)>>
+</p>
 
-<br><br>Rename $cellblockName: <<textbox "$cellblockName" $cellblockName "Cellblock">> //Use a noun or similar short phrase//
+<p>
+	Rename $cellblockName: <<textbox "$cellblockName" $cellblockName "Cellblock">> 
+	<span class="note">
+		Use a noun or similar short phrase
+	</span>
+</p>
 
 <<run App.UI.SlaveList.ScrollPosition.restore()>>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 47269969ce827c3fe5a878e6a212d61c0627904d..1e0ec5a7aeedf850189260f5f55d8f6ee8ab91c7 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -5,141 +5,200 @@
 <<if $clinicName != "the Clinic">>
 	<<set $clinicNameCaps = $clinicName.replace("the ", "The ")>>
 <</if>>
-$clinicNameCaps
-<<switch $clinicDecoration>>
-<<case "Roman Revivalist">>
-	is open and airy; a breeze wafts through the space, and Roman theories on natural cleanliness are very much on display.
-<<case "Aztec Revivalist">>
-	is open and airy; a light hint of herbs and natural oil permeates the air. Everything is incredibly sterile, especially the blood management equipment.
-<<case "Egyptian Revivalist">>
-	is open and airy; clean rushes are strewn across the floor, making a gentle susurration when anyone crosses the space.
-<<case "Edo Revivalist">>
-	is clean and spartan to the point of featurelessness. Spotless tatami mats cover the floor, and partitions divide the space into cubicles.
-<<case "Arabian Revivalist">>
-	is open and airy; a thin trail of smoke wafts through the space on a gentle breeze, coming from a brazier burning incense.
-<<case "Chinese Revivalist">>
-	is open and airy; a thin trail of smoke wafts through the space on a gentle breeze, coming from a brazier burning medicinal herbs.
-<<case "Chattel Religionist">>
-	is open and airy; shaded beams of sunlight shine through skylights to bathe each bed in a pool of healing warmth.
-<<case "Degradationist">>
-	is clean and cold, all scrubbed tile and cool steel. The beds have prominent restraint attachment points to force patients into any position desired.
-<<case "Repopulation Focus">>
-	is warm and inviting, with wide corridors and ample seating for its pregnant clientèle. All the equipment is designed to accommodate heavily pregnant women.
-<<case "Eugenics">>
-	is warm and inviting on one side, cold and utilitarian on the other. Only the toys of the elite are allowed the best of care.
-<<case "Asset Expansionist">>
-	is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for equipment specialized to support growth.
-<<case "Transformation Fetishist">>
-	is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for equipment specialized to support radical surgery.
-<<case "Gender Radicalist">>
-	is comfortable and feminine. Its curving walls and soft colors are designed to present slaves coming out of anesthesia with an impression of girlishness.
-<<case "Gender Fundamentalist">>
-	is comfortable and feminine. Its curving walls and soft colors are designed to keep slaves here for their female health nice and comfortable.
-<<case "Physical Idealist">>
-	is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for some piece of equipment useful in making the human body faster or stronger.
-<<case "Supremacist">>
-	is clean and cold, all scrubbed tile and cool steel. The only hint of its radical uses are the pseudoscientific racialist charts on the walls.
-<<case "Subjugationist">>
-	is clean and cold, all scrubbed tile and cool steel. The only hint of its radical uses are the pseudoscientific racialist charts on the walls.
-<<case "Paternalist">>
-	is warm and inviting, with curved walls and warm colors designed to put patients at their ease. Each bed is well provided with entertainment options.
-<<case "Pastoralist">>
-	is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for equipment specialized for human veterinary medicine.
-<<case "Maturity Preferentialist">>
-	is comfortable and soothing, with curved walls and cool colors designed to keep patients relaxed. Each bed is provided with refined yet invariably pornographic entertainment options.
-<<case "Youth Preferentialist">>
-	is bright and cheerful, with curved walls and pastel colors designed to keep patients in good spirits. Each bed is provided with light entertainment options.
-<<case "Body Purist">>
-	is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is filled with equipment designed to make medicine as low-impact as possible.
-<<case "Slimness Enthusiast">>
-	is warm and inviting, with curved walls and warm colors designed to put patients at their ease. Each bed is well provided with entertainment options.
-<<case "Hedonistic">>
-	is warm and comfortable, with extra wide, soft, heated beds and ample morphine. Pleasant smells are pumped into the recovery wards, plenty of entertainment is available and chubby nurse in a too small dress with a big bowl of slave food is only a button press away. It can be quite difficult to convince patients to leave.
-<<case "Intellectual Dependency">>
-	is bright and cheerful, with plenty of simple amusements to keep bimbos distracted and in bed. A complex locking mechanism promises no chance of a slave wandering off to slake their lust.
-<<case "Slave Professionalism">>
-	is clean and cold, all scrubbed tile and cool steel. Any delays in recovery are nothing more than time spent not honing one's talents.
-<<case "Petite Admiration">>
-	is open and airy due to all the extra space freed up by shortening the beds. A footrest is the only accommodation made for tall slaves.
-<<case "Statuesque Glorification">>
-	is warm and comfortable, if a little cramped; tall slaves require long beds, after all. A meager footstool is the only accommodation made for short slaves.
-<<default>>
-	is a well-equipped modern medical facility. Each patient has their own area, with heavy automation to provide them treatment without any human intervention at all.
-<</switch>>
+<p class="scene-intro">
+	$clinicNameCaps
+	<<switch $clinicDecoration>>
+		<<case "Roman Revivalist">>
+			is open and airy; a breeze wafts through the space, and Roman theories on natural cleanliness are very much on display.
+		<<case "Aztec Revivalist">>
+			is open and airy; a light hint of herbs and natural oil permeates the air. Everything is incredibly sterile, especially the blood management equipment.
+		<<case "Egyptian Revivalist">>
+			is open and airy; clean rushes are strewn across the floor, making a gentle susurration when anyone crosses the space.
+		<<case "Edo Revivalist">>
+			is clean and spartan to the point of featurelessness. Spotless tatami mats cover the floor, and partitions divide the space into cubicles.
+		<<case "Arabian Revivalist">>
+			is open and airy; a thin trail of smoke wafts through the space on a gentle breeze, coming from a brazier burning incense.
+		<<case "Chinese Revivalist">>
+			is open and airy; a thin trail of smoke wafts through the space on a gentle breeze, coming from a brazier burning medicinal herbs.
+		<<case "Chattel Religionist">>
+			is open and airy; shaded beams of sunlight shine through skylights to bathe each bed in a pool of healing warmth.
+		<<case "Degradationist">>
+			is clean and cold, all scrubbed tile and cool steel. The beds have prominent restraint attachment points to force patients into any position desired.
+		<<case "Repopulation Focus">>
+			is warm and inviting, with wide corridors and ample seating for its pregnant clientèle. All the equipment is designed to accommodate heavily pregnant women.
+		<<case "Eugenics">>
+			is warm and inviting on one side, cold and utilitarian on the other. Only the toys of the elite are allowed the best of care.
+		<<case "Asset Expansionist">>
+			is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for equipment specialized to support growth.
+		<<case "Transformation Fetishist">>
+			is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for equipment specialized to support radical surgery.
+		<<case "Gender Radicalist">>
+			is comfortable and feminine. Its curving walls and soft colors are designed to present slaves coming out of anesthesia with an impression of girlishness.
+		<<case "Gender Fundamentalist">>
+			is comfortable and feminine. Its curving walls and soft colors are designed to keep slaves here for their female health nice and comfortable.
+		<<case "Physical Idealist">>
+			is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for some piece of equipment useful in making the human body faster or stronger.
+		<<case "Supremacist">>
+			is clean and cold, all scrubbed tile and cool steel. The only hint of its radical uses are the pseudoscientific racialist charts on the walls.
+		<<case "Subjugationist">>
+			is clean and cold, all scrubbed tile and cool steel. The only hint of its radical uses are the pseudoscientific racialist charts on the walls.
+		<<case "Paternalist">>
+			is warm and inviting, with curved walls and warm colors designed to put patients at their ease. Each bed is well provided with entertainment options.
+		<<case "Pastoralist">>
+			is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is used for equipment specialized for human veterinary medicine.
+		<<case "Maturity Preferentialist">>
+			is comfortable and soothing, with curved walls and cool colors designed to keep patients relaxed. Each bed is provided with refined yet invariably pornographic entertainment options.
+		<<case "Youth Preferentialist">>
+			is bright and cheerful, with curved walls and pastel colors designed to keep patients in good spirits. Each bed is provided with light entertainment options.
+		<<case "Body Purist">>
+			is utilitarian, without any concession to style. Every available <<if $showInches == 2>>inch<<else>>centimeter<</if>> of space is filled with equipment designed to make medicine as low-impact as possible.
+		<<case "Slimness Enthusiast">>
+			is warm and inviting, with curved walls and warm colors designed to put patients at their ease. Each bed is well provided with entertainment options.
+		<<case "Hedonistic">>
+			is warm and comfortable, with extra wide, soft, heated beds and ample morphine. Pleasant smells are pumped into the recovery wards, plenty of entertainment is available and chubby nurse in a too small dress with a big bowl of slave food is only a button press away. It can be quite difficult to convince patients to leave.
+		<<case "Intellectual Dependency">>
+			is bright and cheerful, with plenty of simple amusements to keep bimbos distracted and in bed. A complex locking mechanism promises no chance of a slave wandering off to slake their lust.
+		<<case "Slave Professionalism">>
+			is clean and cold, all scrubbed tile and cool steel. Any delays in recovery are nothing more than time spent not honing one's talents.
+		<<case "Petite Admiration">>
+			is open and airy due to all the extra space freed up by shortening the beds. A footrest is the only accommodation made for tall slaves.
+		<<case "Statuesque Glorification">>
+			is warm and comfortable, if a little cramped; tall slaves require long beds, after all. A meager footstool is the only accommodation made for short slaves.
+		<<default>>
+			is a well-equipped modern medical facility. Each patient has their own area, with heavy automation to provide them treatment without any human intervention at all.
+	<</switch>>
 
-<<if _CL > 2>>
-	$clinicNameCaps is busy. Patients occupy many of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
-<<elseif _CL > 0>>
-	$clinicNameCaps is sparsely populated. Patients occupy a few of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
-<<elseif $Nurse != 0>>
-	$Nurse.slaveName is alone in the clinic, and has nothing to do but keep the place spotlessly clean and ready for its next patients.
-<<else>>
-	$clinicNameCaps is empty and quiet.
-	<div class="choices" style="font-style:normal">
-		[[Decommission the Clinic|Main][$clinic = 0, $clinicDecoration = "standard", $clinicUpgradeScanner = 0, $clinicUpgradeFilters = 0, $clinicUpgradePurge = 0, $clinicInflateBelly = 0, $clinicSpeedGestation = 0]]
-	</div>
-<</if>>
-
-<<if _CL > 0>>
-	<<removeFacilityWorkers "clinic" "rest" "rest">>
-<</if>>
+	<<if _CL > 2>>
+		$clinicNameCaps is busy. Patients occupy many of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
+	<<elseif _CL > 0>>
+		$clinicNameCaps is sparsely populated. Patients occupy a few of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
+	<<elseif $Nurse != 0>>
+		$Nurse.slaveName is alone in the clinic, and has nothing to do but keep the place spotlessly clean and ready for its next patients.
+	<<else>>
+		$clinicNameCaps is empty and quiet.
+		<div class="choices" style="font-style:normal">
+			[[Decommission the Clinic|Main][$clinic = 0, $clinicDecoration = "standard", $clinicUpgradeScanner = 0, $clinicUpgradeFilters = 0, $clinicUpgradePurge = 0, $clinicInflateBelly = 0, $clinicSpeedGestation = 0]]
+		</div>
+	<</if>>
+</p>
 
-<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
-<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slave<<if _CL != 1>>s<</if>> receiving treatment in $clinicName.
-[[Expand the clinic|Clinic][cashX(forceNeg(_Tmult0), "capEx"), $clinic += 5, $PC.skill.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
+<div>
+	<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
+	$clinicNameCaps has room to support $clinic slaves while they receive treatment.
+	There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slave<<if _CL != 1>>s<</if>> receiving treatment in $clinicName.
+	<div class="choices">
+		[[Expand the clinic|Clinic][cashX(forceNeg(_Tmult0), "capEx"), $clinic += 5, $PC.skill.engineering += .1]] 
+		<span class="note">
+			Costs <<print cashFormat(_Tmult0)>>
+		</span>
+	</div>
+	<div class="choices">
+		<<if _CL > 0>>
+			<<removeFacilityWorkers "clinic" "rest" "rest">>
+		<</if>>
+	</div>
+</div>
 
-<br>
-<<if $clinicUpgradeScanner == 1>>
-	$clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's body.
-<<else>>
-	<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
-	It mounts powerful medical scanning technology. [[Upgrade the scanners to help detect genomic damage|Clinic][cashX(forceNeg(_Tmult1), "capEx"), $clinicUpgradeScanner = 1, $PC.skill.hacking += 0.1]] //Costs <<print cashFormat(_Tmult1)>>//
-<</if>>
+<div>
+	<<if $clinicUpgradeScanner == 1>>
+		$clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's body.
+	<<else>>
+		<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
+		It mounts powerful medical scanning technology.
+		<div class="choices">
+			[[Upgrade the scanners to help detect genomic damage|Clinic][cashX(forceNeg(_Tmult1), "capEx"), $clinicUpgradeScanner = 1, $PC.skill.hacking += 0.1]] 
+			<span class="note">
+				Costs <<print cashFormat(_Tmult1)>>
+			</span>
+		</div>
+	<</if>>
+</div>
 
-<br>
-<<if $clinicUpgradeFilters == 1>>
-	<<if $clinicUpgradePurge >= 1>>
-		The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities.
-		<<if $clinicUpgradePurge > 1>>
-			Microscopic magnets have been added to better facilitate the leeching of impurities from cells.
+<div>
+	<<if $clinicUpgradeFilters == 1>>
+		<<if $clinicUpgradePurge >= 1>>
+			The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities.
+			<<if $clinicUpgradePurge > 1>>
+				Microscopic magnets have been added to better facilitate the leeching of impurities from cells.
+			<</if>>
+			The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatibility. Patients will likely be ill for the duration of the treatment.
 		<</if>>
-		The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatibility. Patients will likely be ill for the duration of the treatment.
-	<</if>>
-	<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
-	<<if $clinicUpgradePurge === 0>>
-		<br>The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3), "capEx"), $clinicUpgradePurge = 1, $PC.skill.hacking += 0.1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves.//
-	<<elseif $clinicUpgradePurge === 1>>
-		<br>Add nano magnets into the process to increase the rate that impurities are pulled from the body. [[Further increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3*2), "capEx"), $clinicUpgradePurge = 3, $PC.skill.hacking += 0.1]] //Costs <<print cashFormat(_Tmult3*2)>>//
-	<</if>>
-	<<if $Nurse == 0>>
-		<br>However, without a nurse in attendance, the @@.yellow;blood treatment equipment remains idle.@@
+		<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
+		<<if $clinicUpgradePurge === 0>>
+			The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities.
+			<div class="choices">
+				[[Increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3), "capEx"), $clinicUpgradePurge = 1, $PC.skill.hacking += 0.1]] 
+				<span class="note">
+					Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves.
+				</span>
+			</div>
+		<<elseif $clinicUpgradePurge === 1>>
+			Add nano magnets into the process to increase the rate that impurities are pulled from the body.
+			<div class="choices">
+				[[Further increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3*2), "capEx"), $clinicUpgradePurge = 3, $PC.skill.hacking += 0.1]] 
+				<span class="note">
+					Costs <<print cashFormat(_Tmult3*2)>>
+				</span>
+			</div>
+		<</if>>
+		<<if $Nurse == 0>>
+			<div>
+				However, without a nurse in attendance, the @@.yellow;blood treatment equipment remains idle.@@
+			</div>
+		<</if>>
+	<<else>>
+		<<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
+		It includes standard dialysis equipment.
+		<div class="choices">
+			[[Install advanced blood treatment equipment to help address drug side effects|Clinic][cashX(forceNeg(_Tmult2), "capEx"), $clinicUpgradeFilters = 1, $PC.skill.hacking += 0.1]] 
+			<span class="note">
+				Costs <<print cashFormat(_Tmult2)>>
+			</span>
+		</div>
 	<</if>>
-<<else>>
-	<<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
-	It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][cashX(forceNeg(_Tmult2), "capEx"), $clinicUpgradeFilters = 1, $PC.skill.hacking += 0.1]] //Costs <<print cashFormat(_Tmult2)>>//
-<</if>>
+</div>
 
-<br>
-<<if $bellyImplants == 1 && $Nurse == 0>>
-	A resident nurse could be used to safely regulate the rate a slave's fillable belly implant for maximum size with minimum health loss.
-<<elseif $bellyImplants == 1 && $clinicInflateBelly == 1>>
-	$clinicNameCaps is useful for keeping slaves healthy during long term procedures. Slaves in $clinicName with inflatable belly implants will be filled during their time under $Nurse.slaveName's supervision to maximize growth with minimized health complications. [[Do not fill belly implants|Clinic][$clinicInflateBelly = 0]]
-<<elseif $bellyImplants == 1 && $Nurse != 0 && $clinicInflateBelly != 1>>
-	$clinicNameCaps is useful for keeping slaves healthy during long term procedures. $Nurse.slaveName can supervise weekly filling regiments for clinic slaves with fillable belly implants during their stay to maximize growth with minimal health complications. [[Fill belly implants|Clinic][$clinicInflateBelly = 1]]
-<</if>>
+<div>
+	<<if $bellyImplants == 1 && $Nurse == 0>>
+		A resident nurse could be used to safely regulate the rate a slave's fillable belly implant for maximum size with minimum health loss.
+	<<elseif $bellyImplants == 1 && $clinicInflateBelly == 1>>
+		$clinicNameCaps is useful for keeping slaves healthy during long term procedures. Slaves in $clinicName with inflatable belly implants will be filled during their time under $Nurse.slaveName's supervision to maximize growth with minimized health complications.
+		<div class="choices">
+			[[Do not fill belly implants|Clinic][$clinicInflateBelly = 0]]
+		</div>
+	<<elseif $bellyImplants == 1 && $Nurse != 0 && $clinicInflateBelly != 1>>
+		$clinicNameCaps is useful for keeping slaves healthy during long term procedures. $Nurse.slaveName can supervise weekly filling regiments for clinic slaves with fillable belly implants during their stay to maximize growth with minimal health complications.
+		<div class="choices">
+			[[Fill belly implants|Clinic][$clinicInflateBelly = 1]]
+		</div>
+	<</if>>
+</div>
 
-<br>
-<<if $pregSpeedControl == 1 && $Nurse == 0>>
-	A resident nurse could be used to supervise patients under rapid gestation agents while minimizing strain and health complications.
-<<elseif $pregSpeedControl == 1 && $clinicSpeedGestation == 1>>
-	It's exceedingly dangerous to speed up gestation without constant supervision. In $clinicName, $Nurse.slaveName will monitor slaves on rapid gestation agents; making sure the growing patients' food demands are met, monitoring their skin and womb and, if need be, perform an emergency c-section should the need arise. [[Limit rapid gestation agents to selected slaves only|Clinic][$clinicSpeedGestation = 0]]
-<<elseif $pregSpeedControl == 1 && $Nurse != 0 && $clinicSpeedGestation != 1>>
-	$clinicNameCaps is currently not applying rapid gestation agents to pregnant patients. Only individually selected slaves will undergo this procedure [[Speed up gestation for all pregnant patients|Clinic][$clinicSpeedGestation = 1]]
-<</if>>
+<div>
+	<<if $pregSpeedControl == 1 && $Nurse == 0>>
+		A resident nurse could be used to supervise patients under rapid gestation agents while minimizing strain and health complications.
+	<<elseif $pregSpeedControl == 1 && $clinicSpeedGestation == 1>>
+		It's exceedingly dangerous to speed up gestation without constant supervision. In $clinicName, $Nurse.slaveName will monitor slaves on rapid gestation agents; making sure the growing patients' food demands are met, monitoring their skin and womb and, if need be, perform an emergency c-section should the need arise.
+		<div class="choices">
+			[[Limit rapid gestation agents to selected slaves only|Clinic][$clinicSpeedGestation = 0]]
+		</div>
+	<<elseif $pregSpeedControl == 1 && $Nurse != 0 && $clinicSpeedGestation != 1>>
+		$clinicNameCaps is currently not applying rapid gestation agents to pregnant patients. Only individually selected slaves will undergo this procedure
+		<div class="choices">
+			[[Speed up gestation for all pregnant patients|Clinic][$clinicSpeedGestation = 1]]
+		</div>
+	<</if>>
+</div>
 
-<br><br>
-<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.clinic, true)>>
+<p>
+	<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.clinic, true)>>
+</p>
 
-<br><br>Rename $clinicName: <<textbox "$clinicName" $clinicName "Clinic">> //Use a noun or similar short phrase//
+<p>
+	Rename $clinicName: <<textbox "$clinicName" $clinicName "Clinic">> 
+	<span class="note">
+		Use a noun or similar short phrase
+	</span>
+</p>
 
 <<run App.UI.SlaveList.ScrollPosition.restore()>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 48fb364b068cf8796ef747effe0ed4dd377b0713..331b703c812938e145627d647ab1de2c4827e3fe 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -5,128 +5,157 @@
 <<if $spaName != "the Spa">>
 	<<set $spaNameCaps = $spaName.replace("the ", "The ")>>
 <</if>>
-$spaNameCaps
-<<switch $spaDecoration>>
-<<case "Roman Revivalist">>
-	is built as a Roman bath. The flooring is pleasantly warm due to a modernized version of hypocaust heating, and is covered in mosaic depicting slaves enjoying sex.
-<<case "Aztec Revivalist">>
-	is built as an Aztec bathhouse. Water steams from the middle of the room and the air is heavy with the scent of herbs and essences. The idols by the door glisten with moisture.
-<<case "Egyptian Revivalist">>
-	is decorated like an Egyptian water garden. All but the hottest pools include aquatic plants around their edges, and the atmosphere is heavy with perfume.
-<<case "Edo Revivalist">>
-	is decorated like a traditional onsen. The stone-lined pools are surrounded by meticulously kept gardens, and there are proper provisions for bathing in the old Japanese style.
-<<case "Arabian Revivalist">>
-	looks like a dream of an Arabian palace garden. Every surface is richly tiled in vibrant colors, and the beguiling scents of perfumes from the Levant hang in the air.
-<<case "Chinese Revivalist">>
-	is gloomy and hot, filled with an oppressive steam that immediately dulls the senses. Though relaxation is possible and indeed easy here, it is a stultifying relaxation whose humid warmth seems to suppress independence.
-<<case "Chattel Religionist">>
-	is dedicated to the purification of the body and the spirit. The pools are arranged for the completion of self-purification procedures which include ritual masturbation.
-<<case "Degradationist">>
-	is utilitarian. There are waterproof cameras positioned throughout the spa so that anyone who wants to can watch the nude slaves. One wall has a screen showing the current viewer count to keep the slaves aware of this.
-<<case "Asset Expansionist">>
-	is utilitarian. It is equipped with all sorts of devices to help slaves care for huge assets, including lifts to help them in and out of the water, and all around showers to help clean and moisturize difficult to reach spots.
-<<case "Transformation Fetishist">>
-	is utilitarian. It is equipped with special devices to help speed surgical recovery, including a series of baths designed to prevent scarring.
-<<case "Repopulation Focus">>
-	is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid pregnant slaves, including lifts to help them in and out of the water, baths just for their feet, and all around showers to help clean and moisturize difficult to reach spots.
-<<case "Eugenics">>
-	is comfortable, albeit split in half. One side for the lower classes' slaves, and the other for the Elite and their pets.
-<<case "Gender Radicalist">>
-	is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing slave girls with all different varieties of genitalia orgasming from penetration, to keep the idea at the forefront of the slaves' minds.
-<<case "Gender Fundamentalist">>
-	is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring a lot of beautiful women and handsome men for the slaves' edification.
-<<case "Physical Idealist">>
-	is not the gym, but it does have some workout equipment, mostly low-impact machines designed to speed recovery. There are special hot baths to ease sore muscles.
-<<case "Supremacist">>
-	is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring $arcologies[0].FSSupremacistRace main characters.
-<<case "Subjugationist">>
-	is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring $arcologies[0].FSSubjugationistRace characters in comic relief roles.
-<<case "Paternalist">>
-	is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment written by and intended for smart, loyal slaves.
-<<case "Pastoralist">>
-	is utilitarian. It is equipped with all sorts of devices to help slaves care for huge assets, including lifts to help them in and out of the water, and all around showers to help clean and moisturize difficult to reach spots.
-<<case "Maturity Preferentialist">>
-	is comfortable, but surprisingly businesslike. It's all about beautification here; there's a bewildering array of mud baths, resting pools, and massage setups, all designed to keep mature slaves looking their very best.
-<<case "Youth Preferentialist">>
-	is comfortable and fun. There are hot tubs and massage tables for slaves who feel like relaxing, but there's also a colder pool with pool toys for slaves who want to play. It even has a small waterslide.
-<<case "Body Purist">>
-	is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
-<<case "Slimness Enthusiast">>
-	is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
-<<case "Hedonistic">>
-	is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid hefty slaves, including lifts to help them in and out of the water, specialized moisturizers to keep their skin healthy and smooth, and all around showers to help clean difficult to reach spots and between folds. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food and treats are readily available around the tubs so that relaxing slaves never have to strain to grab a bite to eat<<else>>Feeders connected to the slave food reserves line the pools so that so that relaxing slaves never have to strain to suck down their fill of food<</if>>.
-<<case "Intellectual Dependency">>
-	is comfortable, fun and, most importantly, safe; even the dumbest slave can enjoy the pools without worrying their <<= properTitle()>>. There are screens on the walls showing simple entertainment designed to arouse more than titillate.
-<<case "Slave Professionalism">>
-	is comfortable, with waterproof cushions lining the pools. It is a place where a weary slave can rest their mind after a hards day's work. There are screens on the walls showing documentaries intended for smart, skilled slaves.
-<<case "Petite Admiration">>
-	is comfortable, but designed with short slaves in mind. The pools are shallow and easy to slip in and out of; taller slaves are likely to find them more frustrating than enjoyable.
-<<case "Statuesque Glorification">>
-	is comfortable, but designed with tall slaves in mind. The pools are deep; too deep for a short slave to find relaxing.
-<<default>>
-	is well-appointed, with massage tables, hot tubs, and a cold pool.
-<</switch>>
+<p class="scene-intro">
+	$spaNameCaps
+	<<switch $spaDecoration>>
+		<<case "Roman Revivalist">>
+			is built as a Roman bath. The flooring is pleasantly warm due to a modernized version of hypocaust heating, and is covered in mosaic depicting slaves enjoying sex.
+		<<case "Aztec Revivalist">>
+			is built as an Aztec bathhouse. Water steams from the middle of the room and the air is heavy with the scent of herbs and essences. The idols by the door glisten with moisture.
+		<<case "Egyptian Revivalist">>
+			is decorated like an Egyptian water garden. All but the hottest pools include aquatic plants around their edges, and the atmosphere is heavy with perfume.
+		<<case "Edo Revivalist">>
+			is decorated like a traditional onsen. The stone-lined pools are surrounded by meticulously kept gardens, and there are proper provisions for bathing in the old Japanese style.
+		<<case "Arabian Revivalist">>
+			looks like a dream of an Arabian palace garden. Every surface is richly tiled in vibrant colors, and the beguiling scents of perfumes from the Levant hang in the air.
+		<<case "Chinese Revivalist">>
+			is gloomy and hot, filled with an oppressive steam that immediately dulls the senses. Though relaxation is possible and indeed easy here, it is a stultifying relaxation whose humid warmth seems to suppress independence.
+		<<case "Chattel Religionist">>
+			is dedicated to the purification of the body and the spirit. The pools are arranged for the completion of self-purification procedures which include ritual masturbation.
+		<<case "Degradationist">>
+			is utilitarian. There are waterproof cameras positioned throughout the spa so that anyone who wants to can watch the nude slaves. One wall has a screen showing the current viewer count to keep the slaves aware of this.
+		<<case "Asset Expansionist">>
+			is utilitarian. It is equipped with all sorts of devices to help slaves care for huge assets, including lifts to help them in and out of the water, and all around showers to help clean and moisturize difficult to reach spots.
+		<<case "Transformation Fetishist">>
+			is utilitarian. It is equipped with special devices to help speed surgical recovery, including a series of baths designed to prevent scarring.
+		<<case "Repopulation Focus">>
+			is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid pregnant slaves, including lifts to help them in and out of the water, baths just for their feet, and all around showers to help clean and moisturize difficult to reach spots.
+		<<case "Eugenics">>
+			is comfortable, albeit split in half. One side for the lower classes' slaves, and the other for the Elite and their pets.
+		<<case "Gender Radicalist">>
+			is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing slave girls with all different varieties of genitalia orgasming from penetration, to keep the idea at the forefront of the slaves' minds.
+		<<case "Gender Fundamentalist">>
+			is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring a lot of beautiful women and handsome men for the slaves' edification.
+		<<case "Physical Idealist">>
+			is not the gym, but it does have some workout equipment, mostly low-impact machines designed to speed recovery. There are special hot baths to ease sore muscles.
+		<<case "Supremacist">>
+			is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring $arcologies[0].FSSupremacistRace main characters.
+		<<case "Subjugationist">>
+			is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring $arcologies[0].FSSubjugationistRace characters in comic relief roles.
+		<<case "Paternalist">>
+			is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment written by and intended for smart, loyal slaves.
+		<<case "Pastoralist">>
+			is utilitarian. It is equipped with all sorts of devices to help slaves care for huge assets, including lifts to help them in and out of the water, and all around showers to help clean and moisturize difficult to reach spots.
+		<<case "Maturity Preferentialist">>
+			is comfortable, but surprisingly businesslike. It's all about beautification here; there's a bewildering array of mud baths, resting pools, and massage setups, all designed to keep mature slaves looking their very best.
+		<<case "Youth Preferentialist">>
+			is comfortable and fun. There are hot tubs and massage tables for slaves who feel like relaxing, but there's also a colder pool with pool toys for slaves who want to play. It even has a small waterslide.
+		<<case "Body Purist">>
+			is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
+		<<case "Slimness Enthusiast">>
+			is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
+		<<case "Hedonistic">>
+			is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid hefty slaves, including lifts to help them in and out of the water, specialized moisturizers to keep their skin healthy and smooth, and all around showers to help clean difficult to reach spots and between folds. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food and treats are readily available around the tubs so that relaxing slaves never have to strain to grab a bite to eat<<else>>Feeders connected to the slave food reserves line the pools so that so that relaxing slaves never have to strain to suck down their fill of food<</if>>.
+		<<case "Intellectual Dependency">>
+			is comfortable, fun and, most importantly, safe; even the dumbest slave can enjoy the pools without worrying their <<= properTitle()>>. There are screens on the walls showing simple entertainment designed to arouse more than titillate.
+		<<case "Slave Professionalism">>
+			is comfortable, with waterproof cushions lining the pools. It is a place where a weary slave can rest their mind after a hards day's work. There are screens on the walls showing documentaries intended for smart, skilled slaves.
+		<<case "Petite Admiration">>
+			is comfortable, but designed with short slaves in mind. The pools are shallow and easy to slip in and out of; taller slaves are likely to find them more frustrating than enjoyable.
+		<<case "Statuesque Glorification">>
+			is comfortable, but designed with tall slaves in mind. The pools are deep; too deep for a short slave to find relaxing.
+		<<default>>
+			is well-appointed, with massage tables, hot tubs, and a cold pool.
+	<</switch>>
 
-<<set _spaUtilization = 1 - ($spaSpots / ($spa * 20))>>
-<<if _spaUtilization >= 1>>
-	It's crowded in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all. Unfortunately there is not enough space for all of your slaves to enjoy the spa.
-<<elseif _spaUtilization >= 0.5>>
-	It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.
-<<elseif _spaUtilization > 0>>
-	It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
-<<elseif $SpaiIDs.length / $spa > 0.5>>
-	It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.
-<<elseif $SpaiIDs.length > 0>>
-	It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
-<<elseif $Attendant != 0>>
-	<<setLocalPronouns $Attendant>>
-	$Attendant.slaveName is alone here, and has nothing to do but keep the place (and $his own soft, wet body) spotlessly clean.
-<<else>>
-	It's empty and quiet.
-<</if>>
-<<if $SpaiIDs.length == 0 && $Attendant == 0>>
-	<div class="choices" style="font-style:normal">
-		[[Decommission the Spa|Main][$spa = 0, $spaDecoration = "standard", $spaUpgrade = 0, $spaFix = 0]]
-	</div>
-<</if>>
-
-<<if $SpaiIDs.length > 0>>
-	<<removeFacilityWorkers "spa" "rest" "rest">>
-<</if>>
-
-<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
-<br>$spaNameCaps can house $spa slaves while they recuperate here. There <<if $SpaiIDs.length == 1>>is<<else>>are<</if>> currently $SpaiIDs.length slave<<if $SpaiIDs.length != 1>>s<</if>> recuperating in $spaName.
-[[Expand the spa|Spa][cashX(forceNeg(_Tmult0), "capEx"), $spa += 5]] //Costs <<print cashFormat(_Tmult0)>>//
+	<<set _spaUtilization = 1 - ($spaSpots / ($spa * 20))>>
+	<<if _spaUtilization >= 1>>
+		It's crowded in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all. Unfortunately there is not enough space for all of your slaves to enjoy the spa.
+	<<elseif _spaUtilization >= 0.5>>
+		It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.
+	<<elseif _spaUtilization > 0>>
+		It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
+	<<elseif $SpaiIDs.length / $spa > 0.5>>
+		It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.
+	<<elseif $SpaiIDs.length > 0>>
+		It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
+	<<elseif $Attendant != 0>>
+		<<setLocalPronouns $Attendant>>
+		$Attendant.slaveName is alone here, and has nothing to do but keep the place (and $his own soft, wet body) spotlessly clean.
+	<<else>>
+		It's empty and quiet.
+	<</if>>
+	<<if $SpaiIDs.length == 0 && $Attendant == 0>>
+		<div class="choices" style="font-style:normal">
+			[[Decommission the Spa|Main][$spa = 0, $spaDecoration = "standard", $spaUpgrade = 0, $spaFix = 0]]
+		</div>
+	<</if>>
+</p>
 
-<br>
-<<if $spaUpgrade == 1>>
-	$spaNameCaps has been upgraded with state of the art temperature treatment options, from hot and cold mineral water pools to baking saunas and dense steam rooms.
-<<else>>
-	<<set _Tmult1 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
-	$spaNameCaps is a standard spa. [[Upgrade the spa with saunas, steam rooms, and mineral water baths|Spa][cashX(forceNeg(_Tmult1), "capEx"), $spaUpgrade = 1]] //Costs <<print cashFormat(_Tmult1)>>//
-<</if>>
+<div>
+	<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
+	$spaNameCaps can house $spa slaves while they recuperate here. There <<if $SpaiIDs.length == 1>>is<<else>>are<</if>> currently $SpaiIDs.length slave<<if $SpaiIDs.length != 1>>s<</if>> recuperating in $spaName.
+	<div class="choices">
+		[[Expand the spa|Spa][cashX(forceNeg(_Tmult0), "capEx"), $spa += 5]]
+		<span class="note">
+			Costs <<print cashFormat(_Tmult0)>>
+		</span>
+	</div>
+	<div class="choices">
+		<<if $SpaiIDs.length > 0>>
+			<<removeFacilityWorkers "spa" "rest" "rest">>
+		<</if>>
+	</div>
+</div>
 
-<<if $Attendant != 0>>
-<<setLocalPronouns $Attendant>>
-<br>
-<<if $spaFix == 2>>
-	$Attendant.slaveName is focusing only on the health and wellness of the slaves under $his care, obeying your orders to avoid attempting to right mental flaws.
-	[["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]] |
-	[["Let " + $him + " tend as " + $he + " sees fit"|Spa][$spaFix = 0]]
-<<elseif $spaFix == 1>>
-	$Attendant.slaveName is focusing on the health and wellness of the slaves under $his care, as well as trying to bring mindbroken slaves back, while ignoring any mental hang-ups a slave may have.
-	[["Order " + $him + " to not fix flaws"|Spa][$spaFix = 2]] |
-	[["Let " + $him + " tend as " + $he + " sees fit"|Spa][$spaFix = 0]]
-<<else>>
-	$Attendant.slaveName is not following any special orders and is tending to your slaves as $he sees fit.
-	[["Order " + $him + " to not fix any flaws"|Spa][$spaFix = 2]] |
-	[["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]]
-<</if>>
-<</if>>
+<div>
+	<<if $spaUpgrade == 1>>
+		$spaNameCaps has been upgraded with state of the art temperature treatment options, from hot and cold mineral water pools to baking saunas and dense steam rooms.
+	<<else>>
+		<<set _Tmult1 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
+		$spaNameCaps is a standard spa.
+		<div class="choices">
+			[[Upgrade the spa with saunas, steam rooms, and mineral water baths|Spa][cashX(forceNeg(_Tmult1), "capEx"), $spaUpgrade = 1]]
+			<span class="note">
+				Costs <<print cashFormat(_Tmult1)>>
+			</span>
+		</div>
+	<</if>>
+</div>
+<div>
+	<<if $Attendant != 0>>
+		<<setLocalPronouns $Attendant>>
+		<<if $spaFix == 2>>
+			$Attendant.slaveName is focusing only on the health and wellness of the slaves under $his care, obeying your orders to avoid attempting to right mental flaws.
+			<div class="choices">
+				[["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]] |
+				[["Let " + $him + " tend as " + $he + " sees fit"|Spa][$spaFix = 0]]
+			</div>
+		<<elseif $spaFix == 1>>
+			$Attendant.slaveName is focusing on the health and wellness of the slaves under $his care, as well as trying to bring mindbroken slaves back, while ignoring any mental hang-ups a slave may have.
+			<div class="choices">
+				[["Order " + $him + " to not fix flaws"|Spa][$spaFix = 2]] |
+				[["Let " + $him + " tend as " + $he + " sees fit"|Spa][$spaFix = 0]]
+			</div>
+		<<else>>
+			$Attendant.slaveName is not following any special orders and is tending to your slaves as $he sees fit.
+			<div class="choices">
+				[["Order " + $him + " to not fix any flaws"|Spa][$spaFix = 2]] |
+				[["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]]
+			</div>
+		<</if>>
+	<</if>>
+</div>
 
-<br><br>
-<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.spa, true)>>
+<p>
+	<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.spa, true)>>
+</p>
 
-<br><br>Rename $spaName: <<textbox "$spaName" $spaName "Spa">> //Use a noun or similar short phrase//
+<p>
+	Rename $spaName: <<textbox "$spaName" $spaName "Spa">>
+	<span class="note">
+		Use a noun or similar short phrase
+	</span>
+</p>
 
 <<run App.UI.SlaveList.ScrollPosition.restore()>>