From 44a91c374fdf36c41964a86c93c95656efb8b79e Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 8 Feb 2020 18:35:33 -0500
Subject: [PATCH] other forms

---
 src/facilities/nursery/infantInteract.tw    |   2 +-
 src/pregmod/newChildIntro.tw                |  42 ++---
 src/uncategorized/hgApplication.tw          |   2 +-
 src/uncategorized/hgSelect.tw               |   2 +-
 src/uncategorized/ptWorkaround.tw           |   2 +-
 src/uncategorized/schoolroomReport.tw       |   4 +-
 src/uncategorized/slaveAssignmentsReport.tw | 168 ++++++++++----------
 src/uncategorized/slaveInteract.tw          |   2 +-
 src/uncategorized/subordinateTargeting.tw   |   2 +-
 9 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/src/facilities/nursery/infantInteract.tw b/src/facilities/nursery/infantInteract.tw
index 7fe657d9bb1..7c08de26dd8 100644
--- a/src/facilities/nursery/infantInteract.tw
+++ b/src/facilities/nursery/infantInteract.tw
@@ -18,7 +18,7 @@
 	<<link "Prev" "Previous Child In Line">><</link>>
 	</b>
 </span>
-&nbsp;&nbsp;&nbsp;&nbsp;''__@@.pink;$activeChild.slaveName@@__''&nbsp;&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;&nbsp;<span class='slave-name'>$activeChild.slaveName</span>&nbsp;&nbsp;&nbsp;&nbsp;
 <span id="nextChild">
 	<b>
 	<<link "Next" "Next Child In Line">><</link>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 7899787b7dc..47232c98f37 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -36,7 +36,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 	You instruct $assistantName to register the new $girl as "<<print $activeSlave.slaveName>>" in the slave registry.
 	<</replace>>
 	<<replace "#newName">>
-		''__@@.pink;$activeSlave.slaveName@@__''
+		<span class='slave-name'>$activeSlave.slaveName</span>
 	<</replace>>
 	<</link>>
 <br><<link "Have your PA assign $him a random name">>
@@ -45,7 +45,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 	<</replace>>
 	<<replace "#newName">>
-		''__@@.pink;$activeSlave.slaveName@@__''
+		<span class='slave-name'>$activeSlave.slaveName</span>
 	<</replace>>
 <</link>>
 <<if $arcologies[0].FSPastoralist != "unset">>
@@ -56,7 +56,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -68,7 +68,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -80,7 +80,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -92,7 +92,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
@@ -103,7 +103,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
@@ -114,7 +114,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -125,7 +125,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -137,7 +137,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
-			''__@@.pink;$activeSlave.slaveName@@__''
+			<span class='slave-name'>$activeSlave.slaveName</span>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -151,7 +151,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempMom.slaveName picks a name _he2 thinks you might find attractive; from now on _his2 $daughter will be known as "<<print $activeSlave.slaveName>>".
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempMom.relationship == -3 && (_tempMom.devotion >= -20)>>
@@ -162,7 +162,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempMom.slaveName picks a name suitable for your $daughter; from now on _he2 will be known as "<<print $activeSlave.slaveName>>".
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempMom.ID == $Bodyguard.ID>>
@@ -173,7 +173,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempMom.slaveName decides on "<<print $activeSlave.slaveName>>" for _his2 $daughter. _He2 hopes you'll find it fitting $his station.
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempMom.ID == $HeadGirl.ID>>
@@ -184,7 +184,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempMom.slaveName decides on "<<print $activeSlave.slaveName>>" for _his2 $daughter, and hopes it will be a name your other slaves will learn to respect.
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempMom.devotion > 50 && _tempMom.trust > 50>>
@@ -195,7 +195,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempMom.slaveName picks a name _he2 hopes you'll like; from now on _his2 $daughter will be known as "<<print $activeSlave.slaveName>>".
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<</if>>
@@ -210,7 +210,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempDad.slaveName picks a name _he2 thinks you might find attractive; from now on _his2 $daughter will be known as "<<print $activeSlave.slaveName>>".
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempDad.relationship == -3 && (_tempDad.devotion >= -20)>>
@@ -221,7 +221,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempDad.slaveName picks a name suitable for your $daughter; from now on $he will be known as "<<print $activeSlave.slaveName>>".
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempDad.ID == $Bodyguard.ID>>
@@ -232,7 +232,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempDad.slaveName decides on "<<print $activeSlave.slaveName>>" for _his2 $daughter. _He2 hopes you'll find it fitting $his station.
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempDad.ID == $HeadGirl.ID>>
@@ -243,7 +243,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempDad.slaveName decides on "<<print $activeSlave.slaveName>>" for _his2 $daughter, and hopes it will be a name your other slaves will learn to respect.
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<<elseif _tempDad.devotion > 50 && _tempDad.trust > 50>>
@@ -254,7 +254,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				After some careful consideration, _tempDad.slaveName picks a name _he2 hopes you'll like; from now on _his2 $daughter will be known as "<<print $activeSlave.slaveName>>".
 			<</replace>>
 			<<replace "#newName">>
-				''__@@.pink;$activeSlave.slaveName@@__''
+				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
 	<</if>>
@@ -262,7 +262,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 </span>
 <br><br>
 
-<span id="newName">''__@@.pink;$activeSlave.slaveName@@__''</span> now stands before your desk
+<span id="newName"><span class='slave-name'>$activeSlave.slaveName</span></span> now stands before your desk
 <<if _tempMom != 0 && _tempDad != 0 && $activeSlave.father != $activeSlave.mother>>
 	alongside $his mother _tempMom.slaveName and father _tempDad.slaveName.
 <<elseif _tempMom != 0>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index 322c07c6d8b..59f883bc30b 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -19,7 +19,7 @@
 	<<set $activeSlave.health.tired += 25>>
 <</if>>
 
-&nbsp;&nbsp;&nbsp;&nbsp;''Your Head Girl __@@.pink;$HeadGirl.slaveName@@__'' notices that ''__@@.pink;$activeSlave.slaveName@@__''
+&nbsp;&nbsp;&nbsp;&nbsp;''Your Head Girl __@@.pink;$HeadGirl.slaveName@@__'' notices that <span class='slave-name'>$activeSlave.slaveName</span>
 <<switch $HGtraining>>
 <<case "health">>
 	is unwell.
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index 0bc0e07d468..e188e66b17e 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -9,7 +9,7 @@
 	<<set $HeadGirl = getSlave($HeadGirl.ID)>>
 	<<setLocalPronouns $HeadGirl>>
 	<<set _HGName = SlaveFullName($HeadGirl)>>
-	''__@@.pink;_HGName@@__'' is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is $his role to serve and comfort you at your side, in addition to performing normal Head Girl duties<</if>>.
+	<span class='slave-name'>_HGName</span> is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is $his role to serve and comfort you at your side, in addition to performing normal Head Girl duties<</if>>.
 	<<if ($HGSuite)>>
 		<br> Currently $he lives in <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
 	<</if>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index f3a5b12d73a..31cf3171f73 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -9,7 +9,7 @@
 <<else>>
 	''You train''
 <</if>>
-''__@@.pink;$activeSlave.slaveName@@__'' when $he isn't otherwise occupied.
+<span class='slave-name'>$activeSlave.slaveName</span> when $he isn't otherwise occupied.
 
 <<set $activeSlave.training = Math.clamp($activeSlave.training, 0, 100), _currentSlaveValue = $activeSlave.training < 100 ? 0.2 : 0.5>>
 <<set $activeSlave.training += 80-($activeSlave.intelligence+$activeSlave.intelligenceImplant)/5+(($activeSlave.devotion+$activeSlave.trust)/10)>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 564ddc48271..cfb9bd5cd9a 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -118,7 +118,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your Schoolteacher.
+		<span class='slave-name'>$slaves[_FLs].slaveName</span> is serving as your Schoolteacher.
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<run tired($slaves[$i])>>
@@ -222,7 +222,7 @@
 		<</if>>
 		/* 000-250-006 */
 		<<setLocalPronouns $slaves[$i]>>
-		''__@@.pink;$slaves[$i].slaveName@@__''
+		<span class='slave-name'>$slaves[$i].slaveName</span>
 		<<if $slaves[$i].choosesOwnAssignment == 2>>
 			<<include "SA chooses own job">>
 		<<else>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index e3bd7d82932..783e40e5c3a 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -467,28 +467,28 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be your Head Girl">>
 	<<set $HeadGirl = $slaves[$i]>>
 	<<if $HeadGirl.fetish == "mindbroken">>
-		''__@@.pink;$HeadGirl.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+		<span class='slave-name'>$HeadGirl.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Head Girl any more.@@<br>
 		<<set $HeadGirl = 0>>
 	<<elseif !canTalk($HeadGirl)>>
-		''__@@.pink;$HeadGirl.slaveName@@__'' can't give slaves verbal orders @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+		<span class='slave-name'>$HeadGirl.slaveName</span> can't give slaves verbal orders @@.yellow;and cannot serve as your Head Girl any more.@@<br>
 		<<set $HeadGirl = 0>>
 	<<elseif !canWalk($HeadGirl)>>
-		''__@@.pink;$HeadGirl.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+		<span class='slave-name'>$HeadGirl.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Head Girl any more.@@<br>
 		<<set $HeadGirl = 0>>
 	<<elseif !canHold($HeadGirl)>>
-		''__@@.pink;$HeadGirl.slaveName@@__'' is no longer able to handle your slaves @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+		<span class='slave-name'>$HeadGirl.slaveName</span> is no longer able to handle your slaves @@.yellow;and cannot serve as your Head Girl any more.@@<br>
 		<<set $HeadGirl = 0>>
 	<<elseif !canSee($HeadGirl)>>
-		''__@@.pink;$HeadGirl.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+		<span class='slave-name'>$HeadGirl.slaveName</span> can no longer see @@.yellow;and cannot serve as your Head Girl any more.@@<br>
 		<<set $HeadGirl = 0>>
 	<<elseif !canHear($HeadGirl)>>
-		''__@@.pink;$HeadGirl.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+		<span class='slave-name'>$HeadGirl.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Head Girl any more.@@<br>
 		<<set $HeadGirl = 0>>
 	<<elseif $HeadGirl.preg > 37 && $HeadGirl.broodmother == 2>>
-		''__@@.pink;$HeadGirl.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Head Girl any longer.@@
+		<span class='slave-name'>$HeadGirl.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Head Girl any longer.@@
 		<<set $HeadGirl = 0>>
 	<<elseif $HeadGirl.devotion <= 20>>
-		''__@@.pink;$HeadGirl.slaveName@@__'' is no longer even accepting of you, @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+		<span class='slave-name'>$HeadGirl.slaveName</span> is no longer even accepting of you, @@.yellow;and cannot serve as your Head Girl any more.@@<br>
 		<<set $HeadGirl = 0>>
 	<</if>>
 	<<if $HeadGirl != 0>>
@@ -517,22 +517,22 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "recruit girls">>
 	<<set $Recruiter = $slaves[$i]>>
 	<<if $Recruiter.fetish == "mindbroken">>
-		''__@@.pink;$Recruiter.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your recruiter any more.@@<br>
+		<span class='slave-name'>$Recruiter.slaveName</span> is mindbroken @@.yellow;and cannot serve as your recruiter any more.@@<br>
 		<<set $Recruiter = 0>>
 	<<elseif !canTalk($Recruiter)>>
-		''__@@.pink;$Recruiter.slaveName@@__'' can't verbally entice marks @@.yellow;and cannot serve as your recruiter any more.@@<br>
+		<span class='slave-name'>$Recruiter.slaveName</span> can't verbally entice marks @@.yellow;and cannot serve as your recruiter any more.@@<br>
 		<<set $Recruiter = 0>>
 	<<elseif $Recruiter.preg > 37 && $Recruiter.broodmother == 2>>
-		''__@@.pink;$Recruiter.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your recruiter any longer.@@
+		<span class='slave-name'>$Recruiter.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your recruiter any longer.@@
 		<<set $Recruiter = 0>>
 	<<elseif !canWalk($Recruiter)>>
-		''__@@.pink;$Recruiter.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your recruiter any more.@@<br>
+		<span class='slave-name'>$Recruiter.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your recruiter any more.@@<br>
 		<<set $Recruiter = 0>>
 	<<elseif !canSee($Recruiter)>>
-		''__@@.pink;$Recruiter.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your recruiter any more.@@<br>
+		<span class='slave-name'>$Recruiter.slaveName</span> can no longer see @@.yellow;and cannot serve as your recruiter any more.@@<br>
 		<<set $Recruiter = 0>>
 	<<elseif !canHear($Recruiter)>>
-		''__@@.pink;$Recruiter.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Recruiter any more.@@<br>
+		<span class='slave-name'>$Recruiter.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Recruiter any more.@@<br>
 		<<set $Recruiter = 0>>
 	<</if>>
 	<<if $Recruiter == 0>>
@@ -540,34 +540,34 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 	<</if>>
 <<case "be the Madam">>
 	<<if $unMadam == 1>>
-		''__@@.pink;$Madam.slaveName@@__'' can't give whores verbal orders @@.yellow;and cannot serve as your Madam any more.@@<br>
+		<span class='slave-name'>$Madam.slaveName</span> can't give whores verbal orders @@.yellow;and cannot serve as your Madam any more.@@<br>
 	<<elseif $unMadam == 2>>
-		''__@@.pink;$Madam.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Madam any longer.@@
+		<span class='slave-name'>$Madam.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Madam any longer.@@
 	<<elseif $unMadam == 3>>
-		''__@@.pink;$Madam.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Madam any more.@@<br>
+		<span class='slave-name'>$Madam.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Madam any more.@@<br>
 	<<elseif $unMadam == 4>>
-		''__@@.pink;$Madam.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Madam any more.@@<br>
+		<span class='slave-name'>$Madam.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Madam any more.@@<br>
 	<<elseif $unMadam == 5>>
-		''__@@.pink;$Madam.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Madam any more.@@<br>
+		<span class='slave-name'>$Madam.slaveName</span> can no longer see @@.yellow;and cannot serve as your Madam any more.@@<br>
 	<<elseif $unMadam == 6>>
-		''__@@.pink;$Madam.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Madam any more.@@<br>
+		<span class='slave-name'>$Madam.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Madam any more.@@<br>
 	<<elseif $unMadam == 7>>
-		''__@@.pink;$Madam.slaveName@@__'' can no longer handle $his underlings @@.yellow;and cannot serve as your Madam any more.@@<br>
+		<span class='slave-name'>$Madam.slaveName</span> can no longer handle $his underlings @@.yellow;and cannot serve as your Madam any more.@@<br>
 	<</if>>
 	<<if $Madam == 0>>
 		<<= removeJob($slaves[$i], "be the Madam")>>
 	<</if>>
 <<case "be the DJ">>
 	<<if $unDJ == 1>>
-		''__@@.pink;$slaves[$i].slaveName@@__'' can't speak @@.yellow;and cannot serve as your DJ any more.@@<br>
+		<span class='slave-name'>$slaves[$i].slaveName</span> can't speak @@.yellow;and cannot serve as your DJ any more.@@<br>
 	<<elseif $unDJ == 2>>
-		''__@@.pink;$slaves[$i].slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your DJ any longer@@.<br>
+		<span class='slave-name'>$slaves[$i].slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your DJ any longer@@.<br>
 	<<elseif $unDJ == 3>>
-		''__@@.pink;$slaves[$i].slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your DJ any more.@@<br>
+		<span class='slave-name'>$slaves[$i].slaveName</span> is mindbroken @@.yellow;and cannot serve as your DJ any more.@@<br>
 	<<elseif $unDJ == 4>>
-		''__@@.pink;$slaves[$i].slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your DJ any more.@@<br>
+		<span class='slave-name'>$slaves[$i].slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your DJ any more.@@<br>
 	<<elseif $unDJ == 5>>
-		''__@@.pink;$slaves[$i].slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your DJ any more.@@<br>
+		<span class='slave-name'>$slaves[$i].slaveName</span> can no longer hear @@.yellow;and cannot serve as your DJ any more.@@<br>
 	<</if>>
 	<<if $DJ == 0>>
 		<<= removeJob($slaves[$i], "be the DJ")>>
@@ -575,22 +575,22 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Milkmaid">>
 	<<set $Milkmaid = $slaves[$i]>>
 	<<if $Milkmaid.fetish == "mindbroken">>
-		''__@@.pink;$Milkmaid.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
+		<span class='slave-name'>$Milkmaid.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
 		<<set $Milkmaid = 0>>
 	<<elseif $Milkmaid.preg > 37 && $Milkmaid.broodmother == 2>>
-		''__@@.pink;$Milkmaid.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Milkmaid any longer.@@
+		<span class='slave-name'>$Milkmaid.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Milkmaid any longer.@@
 		<<set $Milkmaid = 0>>
 	<<elseif !canWalk($Milkmaid)>>
-		''__@@.pink;$Milkmaid.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
+		<span class='slave-name'>$Milkmaid.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
 		<<set $Milkmaid = 0>>
 	<<elseif !canHold($Milkmaid)>>
-		''__@@.pink;$Milkmaid.slaveName@@__'' can no longer handle nor milk your slaves @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
+		<span class='slave-name'>$Milkmaid.slaveName</span> can no longer handle nor milk your slaves @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
 		<<set $Milkmaid = 0>>
 	<<elseif !canSee($Milkmaid)>>
-		''__@@.pink;$Milkmaid.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
+		<span class='slave-name'>$Milkmaid.slaveName</span> can no longer see @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
 		<<set $Milkmaid = 0>>
 	<<elseif !canHear($Milkmaid)>>
-		''__@@.pink;$Milkmaid.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
+		<span class='slave-name'>$Milkmaid.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
 		<<set $Milkmaid = 0>>
 	<</if>>
 	<<if $Milkmaid == 0>>
@@ -599,22 +599,22 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Farmer">>
 	<<set $Farmer = $slaves[$i]>>
 	<<if $Farmer.fetish == "mindbroken">>
-		''__@@.pink;$Farmer.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Farmer any more.@@<br>
+		<span class='slave-name'>$Farmer.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Farmer any more.@@<br>
 		<<set $Farmer = 0>>
 	<<elseif $Farmer.preg > 37 && $Farmer.broodmother == 2>>
-		''__@@.pink;$Farmer.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Farmer any longer.@@
+		<span class='slave-name'>$Farmer.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Farmer any longer.@@
 		<<set $Farmer = 0>>
 	<<elseif !canWalk($Farmer)>>
-		''__@@.pink;$Farmer.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Farmer any more.@@<br>
+		<span class='slave-name'>$Farmer.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Farmer any more.@@<br>
 		<<set $Farmer = 0>>
 	<<elseif !canHold($Farmer)>>
-		''__@@.pink;$Farmer.slaveName@@__'' can no longer grip things @@.yellow;and cannot serve as your Farmer any more.@@<br>
+		<span class='slave-name'>$Farmer.slaveName</span> can no longer grip things @@.yellow;and cannot serve as your Farmer any more.@@<br>
 		<<set $Farmer = 0>>
 	<<elseif !canSee($Farmer)>>
-		''__@@.pink;$Farmer.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Farmer any more.@@<br>
+		<span class='slave-name'>$Farmer.slaveName</span> can no longer see @@.yellow;and cannot serve as your Farmer any more.@@<br>
 		<<set $Farmer = 0>>
 	<<elseif !canHear($Farmer)>>
-		''__@@.pink;$Farmer.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Farmer any more.@@<br>
+		<span class='slave-name'>$Farmer.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Farmer any more.@@<br>
 		<<set $Farmer = 0>>
 	<</if>>
 	<<if $Farmer == 0>>
@@ -623,25 +623,25 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Stewardess">>
 	<<set $Stewardess = $slaves[$i]>>
 	<<if !canTalk($Stewardess)>>
-		''__@@.pink;$Stewardess.slaveName@@__'' can't give servants verbal orders @@.yellow;and cannot serve as your Stewardess any more.@@<br>
+		<span class='slave-name'>$Stewardess.slaveName</span> can't give servants verbal orders @@.yellow;and cannot serve as your Stewardess any more.@@<br>
 		<<set $Stewardess = 0>>
 	<<elseif $Stewardess.preg > 37 && $Stewardess.broodmother == 2>>
-		''__@@.pink;$Stewardess.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Stewardess any longer.@@
+		<span class='slave-name'>$Stewardess.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Stewardess any longer.@@
 		<<set $Stewardess = 0>>
 	<<elseif $Stewardess.fetish == "mindbroken">>
-		''__@@.pink;$Stewardess.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Stewardess any more.@@<br>
+		<span class='slave-name'>$Stewardess.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Stewardess any more.@@<br>
 		<<set $Stewardess = 0>>
 	<<elseif !canWalk($Stewardess)>>
-		''__@@.pink;$Stewardess.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Stewardess any more.@@<br>
+		<span class='slave-name'>$Stewardess.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Stewardess any more.@@<br>
 		<<set $Stewardess = 0>>
 	<<elseif !canHold($Stewardess)>>
-		''__@@.pink;$Stewardess.slaveName@@__'' can no longer handle $his underlings nor effectively clean @@.yellow;and cannot serve as your Stewardess any more.@@<br>
+		<span class='slave-name'>$Stewardess.slaveName</span> can no longer handle $his underlings nor effectively clean @@.yellow;and cannot serve as your Stewardess any more.@@<br>
 		<<set $Stewardess = 0>>
 	<<elseif !canSee($Stewardess)>>
-		''__@@.pink;$Stewardess.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Stewardess any more.@@<br>
+		<span class='slave-name'>$Stewardess.slaveName</span> can no longer see @@.yellow;and cannot serve as your Stewardess any more.@@<br>
 		<<set $Stewardess = 0>>
 	<<elseif !canHear($Stewardess)>>
-		''__@@.pink;$Stewardess.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Stewardess any more.@@<br>
+		<span class='slave-name'>$Stewardess.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Stewardess any more.@@<br>
 		<<set $Stewardess = 0>>
 	<</if>>
 	<<if $Stewardess == 0>>
@@ -650,19 +650,19 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Schoolteacher">>
 	<<set $Schoolteacher = $slaves[$i]>>
 	<<if !canTalk($Schoolteacher)>>
-		''__@@.pink;$Schoolteacher.slaveName@@__'' can't give verbal instruction @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
+		<span class='slave-name'>$Schoolteacher.slaveName</span> can't give verbal instruction @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
 		<<set $Schoolteacher = 0>>
 	<<elseif $Schoolteacher.preg > 37 && $Schoolteacher.broodmother == 2>>
-		''__@@.pink;$Schoolteacher.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Schoolteacher any longer.@@
+		<span class='slave-name'>$Schoolteacher.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Schoolteacher any longer.@@
 		<<set $Schoolteacher = 0>>
 	<<elseif $Schoolteacher.fetish == "mindbroken">>
-		''__@@.pink;$Schoolteacher.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
+		<span class='slave-name'>$Schoolteacher.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
 		<<set $Schoolteacher = 0>>
 	<<elseif !canSee($Schoolteacher)>>
-		''__@@.pink;$Schoolteacher.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
+		<span class='slave-name'>$Schoolteacher.slaveName</span> can no longer see @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
 		<<set $Schoolteacher = 0>>
 	<<elseif !canHear($Schoolteacher)>>
-		''__@@.pink;$Schoolteacher.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
+		<span class='slave-name'>$Schoolteacher.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Schoolteacher any more.@@<br>
 		<<set $Schoolteacher = 0>>
 	<</if>>
 	<<if $Schoolteacher == 0>>
@@ -671,19 +671,19 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Wardeness">>
 	<<set $Wardeness = $slaves[$i]>>
 	<<if !canWalk($Wardeness)>>
-		''__@@.pink;$Wardeness.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Wardeness any more.@@<br>
+		<span class='slave-name'>$Wardeness.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Wardeness any more.@@<br>
 		<<set $Wardeness = 0>>
 	<<elseif !canHold($Wardeness)>>
-		''__@@.pink;$Wardeness.slaveName@@__'' can no longer handle $his charges @@.yellow;and cannot serve as your Wardeness any more.@@<br>
+		<span class='slave-name'>$Wardeness.slaveName</span> can no longer handle $his charges @@.yellow;and cannot serve as your Wardeness any more.@@<br>
 		<<set $Wardeness = 0>>
 	<<elseif $Wardeness.preg > 37 && $Wardeness.broodmother == 2>>
-		''__@@.pink;$Wardeness.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Wardeness any longer.@@
+		<span class='slave-name'>$Wardeness.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Wardeness any longer.@@
 		<<set $Wardeness = 0>>
 	<<elseif !canSee($Wardeness)>>
-		''__@@.pink;$Wardeness.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Wardeness any more.@@<br>
+		<span class='slave-name'>$Wardeness.slaveName</span> can no longer see @@.yellow;and cannot serve as your Wardeness any more.@@<br>
 		<<set $Wardeness = 0>>
 	<<elseif !canHear($Wardeness)>>
-		''__@@.pink;$Wardeness.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Wardeness any more.@@<br>
+		<span class='slave-name'>$Wardeness.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Wardeness any more.@@<br>
 		<<set $Wardeness = 0>>
 	<</if>>
 	<<if $Wardeness == 0>>
@@ -692,19 +692,19 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Attendant">>
 	<<set $Attendant = $slaves[$i]>>
 	<<if $Attendant.fetish == "mindbroken">>
-		''__@@.pink;$Attendant.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<span class='slave-name'>$Attendant.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Attendant any more.@@<br>
 		<<set $Attendant = 0>>
 	<<elseif $Attendant.preg > 37 && $Attendant.broodmother == 2>>
-		''__@@.pink;$Attendant.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Attendant any longer.@@
+		<span class='slave-name'>$Attendant.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Attendant any longer.@@
 		<<set $Attendant = 0>>
 	<<elseif !canWalk($Attendant)>>
-		''__@@.pink;$Attendant.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<span class='slave-name'>$Attendant.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Attendant any more.@@<br>
 		<<set $Attendant = 0>>
 	<<elseif !canHold($Attendant)>>
-		''__@@.pink;$Attendant.slaveName@@__'' can no longer support $his charges @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<span class='slave-name'>$Attendant.slaveName</span> can no longer support $his charges @@.yellow;and cannot serve as your Attendant any more.@@<br>
 		<<set $Attendant = 0>>
 	<<elseif !canHear($Attendant)>>
-		''__@@.pink;$Attendant.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<span class='slave-name'>$Attendant.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Attendant any more.@@<br>
 		<<set $Attendant = 0>>
 	<</if>>
 	<<if $Attendant == 0>>
@@ -713,22 +713,22 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Matron">>
 	<<set $Matron = $slaves[$i]>>
 	<<if $Matron.fetish == "mindbroken">>
-		''__@@.pink;$Matron.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Matron any more.@@<br>
+		<span class='slave-name'>$Matron.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Matron any more.@@<br>
 		<<set $Matron = 0>>
 	<<elseif $Matron.preg > 37 && $Matron.broodmother == 2>>
-		''__@@.pink;$Matron.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Matron any longer.@@
+		<span class='slave-name'>$Matron.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Matron any longer.@@
 		<<set $Matron = 0>>
 	<<elseif !canWalk($Matron)>>
-		''__@@.pink;$Matron.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Matron any more.@@<br>
+		<span class='slave-name'>$Matron.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Matron any more.@@<br>
 		<<set $Matron = 0>>
 	<<elseif !canHold($Matron)>>
-		''__@@.pink;$Matron.slaveName@@__'' can no longer hold infants @@.yellow;and cannot serve as your Matron any more.@@<br>
+		<span class='slave-name'>$Matron.slaveName</span> can no longer hold infants @@.yellow;and cannot serve as your Matron any more.@@<br>
 		<<set $Matron = 0>>
 	<<elseif !canHear($Matron)>>
-		''__@@.pink;$Matron.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Matron any more.@@<br>
+		<span class='slave-name'>$Matron.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Matron any more.@@<br>
 		<<set $Matron = 0>>
 	<<elseif !canSee($Matron)>>
-		''__@@.pink;$Matron.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Matron any more.@@<br>
+		<span class='slave-name'>$Matron.slaveName</span> can no longer see @@.yellow;and cannot serve as your Matron any more.@@<br>
 		<<set $Matron = 0>>
 	<</if>>
 	<<if $Matron == 0>>
@@ -737,22 +737,22 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "be the Nurse">>
 	<<set $Nurse = $slaves[$i]>>
 	<<if $Nurse.fetish == "mindbroken">>
-		''__@@.pink;$Nurse.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Nurse any more.@@<br>
+		<span class='slave-name'>$Nurse.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Nurse any more.@@<br>
 		<<set $Nurse = 0>>
 	<<elseif $Nurse.preg > 37 && $Nurse.broodmother == 2>>
-		''__@@.pink;$Nurse.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Nurse any longer.@@
+		<span class='slave-name'>$Nurse.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Nurse any longer.@@
 		<<set $Nurse = 0>>
 	<<elseif !canWalk($Nurse)>>
-		''__@@.pink;$Nurse.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Nurse any more.@@<br>
+		<span class='slave-name'>$Nurse.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Nurse any more.@@<br>
 		<<set $Nurse = 0>>
 	<<elseif !canHold($Nurse)>>
-		''__@@.pink;$Nurse.slaveName@@__'' can no longer hold onto patients @@.yellow;and cannot serve as your Nurse any more.@@<br>
+		<span class='slave-name'>$Nurse.slaveName</span> can no longer hold onto patients @@.yellow;and cannot serve as your Nurse any more.@@<br>
 		<<set $Nurse = 0>>
 	<<elseif !canSee($Nurse)>>
-		''__@@.pink;$Nurse.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Nurse any more.@@<br>
+		<span class='slave-name'>$Nurse.slaveName</span> can no longer see @@.yellow;and cannot serve as your Nurse any more.@@<br>
 		<<set $Nurse = 0>>
 	<<elseif !canHear($Nurse)>>
-		''__@@.pink;$Nurse.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Nurse any more.@@<br>
+		<span class='slave-name'>$Nurse.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Nurse any more.@@<br>
 		<<set $Nurse = 0>>
 	<</if>>
 	<<if $Nurse == 0>>
@@ -761,22 +761,22 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 <<case "guard you">>
 	<<set $Bodyguard = $slaves[$i]>>
 	<<if $Bodyguard.fetish == "mindbroken">>
-		''__@@.pink;$Bodyguard.slaveName@@__'' is mindbroken @@.yellow;and cannot safely serve as your bodyguard any more.@@<br>
+		<span class='slave-name'>$Bodyguard.slaveName</span> is mindbroken @@.yellow;and cannot safely serve as your bodyguard any more.@@<br>
 		<<set $Bodyguard = 0>>
 	<<elseif !canWalk($Bodyguard)>>
-		''__@@.pink;$Bodyguard.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your bodyguard any more.@@<br>
+		<span class='slave-name'>$Bodyguard.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your bodyguard any more.@@<br>
 		<<set $Bodyguard = 0>>
 	<<elseif !canHold($Bodyguard)>>
-		''__@@.pink;$Bodyguard.slaveName@@__'' is no longer able to hold a weapon @@.yellow;and cannot serve as your bodyguard any more.@@<br>
+		<span class='slave-name'>$Bodyguard.slaveName</span> is no longer able to hold a weapon @@.yellow;and cannot serve as your bodyguard any more.@@<br>
 		<<set $Bodyguard = 0>>
 	<<elseif $Bodyguard.preg > 37 && $Bodyguard.broodmother == 2>>
-		''__@@.pink;$Bodyguard.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your bodyguard any longer.@@
+		<span class='slave-name'>$Bodyguard.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your bodyguard any longer.@@
 		<<set $Bodyguard = 0>>
 	<<elseif !canSee($Bodyguard)>>
-		''__@@.pink;$Bodyguard.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Bodyguard any more.@@<br>
+		<span class='slave-name'>$Bodyguard.slaveName</span> can no longer see @@.yellow;and cannot serve as your Bodyguard any more.@@<br>
 		<<set $Bodyguard = 0>>
 	<<elseif !canHear($Bodyguard)>>
-		''__@@.pink;$Bodyguard.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Bodyguard any more.@@<br>
+		<span class='slave-name'>$Bodyguard.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Bodyguard any more.@@<br>
 		<<set $Bodyguard = 0>>
 	<</if>>
 	<<if $Bodyguard == 0>>
@@ -792,16 +792,16 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 	<<if $slaves[$i].ID == $Lurcher.ID>>
 		<<set $Lurcher = $slaves[$i]>>
 		<<if !canWalk($Lurcher)>>
-			''__@@.pink;$Lurcher.slaveName@@__'' is no longer able to run @@.yellow;and cannot course as a lurcher.@@<br>
+			<span class='slave-name'>$Lurcher.slaveName</span> is no longer able to run @@.yellow;and cannot course as a lurcher.@@<br>
 			<<set $Lurcher = 0>>
 		<<elseif !canHold($Lurcher)>>
-			''__@@.pink;$Lurcher.slaveName@@__'' is no longer able to catch the hares @@.yellow;and cannot course as a lurcher.@@<br>
+			<span class='slave-name'>$Lurcher.slaveName</span> is no longer able to catch the hares @@.yellow;and cannot course as a lurcher.@@<br>
 			<<set $Lurcher = 0>>
 		<<elseif !canHear($Lurcher) && !canSee($Lurcher)>>
-			''__@@.pink;$Lurcher.slaveName@@__'' is no longer able to track the hares @@.yellow;and cannot course as a lurcher.@@<br>
+			<span class='slave-name'>$Lurcher.slaveName</span> is no longer able to track the hares @@.yellow;and cannot course as a lurcher.@@<br>
 			<<set $Lurcher = 0>>
 		<<elseif $Lurcher.bellyPreg >= 60000>>
-			''__@@.pink;$Lurcher.slaveName@@__'' is too pregnant to run @@.yellow;and cannot course as a lurcher.@@
+			<span class='slave-name'>$Lurcher.slaveName</span> is too pregnant to run @@.yellow;and cannot course as a lurcher.@@
 			<<set $Lurcher = 0>>
 		<</if>>
 	<</if>>
@@ -809,10 +809,10 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 
 <<if $fighterIDs.includes($slaves[$i])>>
 	<<if !canWalk($slaves[$i])>>
-		''__@@.pink;$slaves[$i].slaveName@@__'' is no longer independently mobile @@.yellow;and cannot fight any more.@@ $He has been removed from $pitName roster<br>.
+		<span class='slave-name'>$slaves[$i].slaveName</span> is no longer independently mobile @@.yellow;and cannot fight any more.@@ $He has been removed from $pitName roster<br>.
 		<<set $fighterIDs.delete($slaves[$i].ID)>>
 	<<elseif !canHold($slaves[$i])>>
-		''__@@.pink;$slaves[$i].slaveName@@__'' is no longer able to strike @@.yellow;and cannot fight any more.@@ $He has been removed from $pitName roster<br>.
+		<span class='slave-name'>$slaves[$i].slaveName</span> is no longer able to strike @@.yellow;and cannot fight any more.@@ $He has been removed from $pitName roster<br>.
 		<<set $fighterIDs.delete($slaves[$i].ID)>>
 	<</if>>
 <</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 6ff2ca23294..c0d465dd481 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -46,7 +46,7 @@
 
 <<include "Place In Line">>
 <center>
-@@.cyan;[←,Q] @@<span id="prevSlave"><strong><<link "Prev" "Previous Slave In Line">><</link>></strong></span>&nbsp;&nbsp;&nbsp;&nbsp;''__@@.pink;$activeSlave.slaveName@@__''&nbsp;&nbsp;&nbsp;&nbsp;<span id="nextSlave"><strong><<link "Next" "Next Slave In Line">><</link>></strong></span>@@.cyan; [E,→]@@
+@@.cyan;[←,Q] @@<span id="prevSlave"><strong><<link "Prev" "Previous Slave In Line">><</link>></strong></span>&nbsp;&nbsp;&nbsp;&nbsp;<span class='slave-name'>$activeSlave.slaveName</span>&nbsp;&nbsp;&nbsp;&nbsp;<span id="nextSlave"><strong><<link "Next" "Next Slave In Line">><</link>></strong></span>@@.cyan; [E,→]@@
 </center>
 <br>
 <<if $seeDetails == 1>>
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index a509280b28a..a5f8b9f6cc0 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -11,7 +11,7 @@
 <<= assignJob($activeSlave, "be a subordinate slave")>>
 <<set _st = $slaveIndices[$activeSlave.subTarget]>>
 <<if def _st>>
-	$activeSlave.slaveName will submit to ''__@@.pink;$slaves[_st].slaveName@@__'' this week.
+	$activeSlave.slaveName will submit to <span class='slave-name'>$slaves[_st].slaveName</span> this week.
 <<else>>
 	$activeSlave.slaveName has not been given to any particular slave, so $he will have to offer $himself to everyone this week.
 	<<set $activeSlave.subTarget = 0>>
-- 
GitLab