From 7b2d919ca4feea4879af663c8919842953e0bfce Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 4 Sep 2020 22:25:47 -0400
Subject: [PATCH] remove include new slave

---
 src/Mods/SpecialForce/TrickShotNight.tw            |  2 +-
 src/pregmod/FCTV/seFCTVremote.tw                   |  4 ++--
 .../JobFulfillmentCenterDelivery.tw                |  2 +-
 src/pregmod/pRaped.tw                              |  6 +++---
 src/pregmod/reTheSirenStrikesBack.tw               |  8 ++++----
 src/uncategorized/REFS.tw                          |  8 ++++----
 src/uncategorized/REroyalblood.tw                  | 12 ++++++------
 src/uncategorized/bulkSlaveIntro.tw                |  2 +-
 src/uncategorized/genericPlotEvents.tw             |  2 +-
 src/uncategorized/jeSlaveDispute.tw                | 14 +++++++-------
 src/uncategorized/pHostageAcquisition.tw           |  2 +-
 src/uncategorized/pSlaveMedic.tw                   |  2 +-
 src/uncategorized/pSnatchAndGrabResult.tw          |  2 +-
 src/uncategorized/reAWOL.tw                        |  4 ++--
 src/uncategorized/reBoomerang.tw                   |  2 +-
 src/uncategorized/reFSAcquisition.tw               |  2 +-
 src/uncategorized/reMalefactor.tw                  | 10 +++++-----
 src/uncategorized/reMilfTourist.tw                 |  2 +-
 src/uncategorized/rePokerNight.tw                  |  2 +-
 src/uncategorized/reRecruit.tw                     |  2 +-
 src/uncategorized/reShelterInspection.tw           |  2 +-
 src/uncategorized/seCustomSlaveDelivery.tw         |  2 +-
 src/uncategorized/seRecruiterSuccess.tw            |  2 +-
 23 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/Mods/SpecialForce/TrickShotNight.tw b/src/Mods/SpecialForce/TrickShotNight.tw
index ad6d9ca743c..8b46e074d64 100644
--- a/src/Mods/SpecialForce/TrickShotNight.tw
+++ b/src/Mods/SpecialForce/TrickShotNight.tw
@@ -139,7 +139,7 @@ Despite your direct elevator, interaction with the majority of your security for
 										<</replace>>
 										For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin $his new life as your sexual servant. $He's not young, but $he's tough and not distrusting of you due to $his service in $SF.Lower.
 										<br>
-										<<include "New Slave Intro">>
+										<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 									<</if>>
 									<<= IncreasePCSkills('warfare', 1)>>
 								<</replace>>
diff --git a/src/pregmod/FCTV/seFCTVremote.tw b/src/pregmod/FCTV/seFCTVremote.tw
index 42cec0b9444..80a01dd058f 100644
--- a/src/pregmod/FCTV/seFCTVremote.tw
+++ b/src/pregmod/FCTV/seFCTVremote.tw
@@ -242,7 +242,7 @@
 							<<replace "#result">>
 								<<set $analTotal++>>
 								_slave.slaveName knows $he has nowhere to turn. Sobbing, $he complies with the process.
-								<p> <<include "New Slave Intro">> </p>
+								<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 							<</replace>>
 						<</link>>
 					</div>
@@ -296,7 +296,7 @@
 								<</if>>
 								<<run repX(500, "event", _slave)>>
 								<<set $arcologies[0].prosperity += 2>>
-								<p> <<include "New Slave Intro">> </p>
+								<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 							<</replace>>
 						<</link>>
 					</div>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index 6b72e8962f6..3473318cfa5 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
@@ -21,7 +21,7 @@ A slave dealer has submitted a slave to satisfy your ''$JFC.role'' order.
 		<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
 		<<replace "#result">>
 			$He has been very well trained by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now eagerly awaiting your instructions.
-			<<include "New Slave Intro">>
+			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<<set $JFC.role = "">>
 			<<run delete $JFC.reorder>>
 		<</replace>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 861b3e0ab0f..0435d462a3f 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -245,7 +245,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
 			<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
 			<<replace "#result">>
 				You complete the legalities and biometric scanning quickly and without fuss. The idiot will regret crossing you when $he wakes in the penthouse for basic slave induction.
-				<<include "New Slave Intro">>
+				<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<</replace>>
 		<</link>>
 		<br><<link "Sentence $him to a day in the stocks, then enslave $him">>
@@ -269,7 +269,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
 				You declare $his holes fair game for the entire arcology. $He spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to $his ordeal, bruises all over $his body, cum leaking from $his @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
 				<<run repX(500, "event")>>
 				<<set $arcologies[0].prosperity += 2>>
-				<<include "New Slave Intro">>
+				<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<</replace>>
 		<</link>>
 		<<if $arcade > 0>>
@@ -326,7 +326,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
 					<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
 					<<replace "#result">>
 						You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction.
-						<<include "New Slave Intro">>
+						<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 					<</replace>>
 				<</link>>
 			<</if>>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index 45c94ea84ff..d24052023a2 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -79,7 +79,7 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
 		<<replace "#result">>
 		You decide to spare the coward from _his2 former subordinate's wrath and simply enslave _him2.
 		<br>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>>
 	<<if !isAmputee(_ssb)>>
@@ -117,7 +117,7 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
 				<</if>>
 			<</if>>
 			<br>
-			<<include "New Slave Intro">>
+			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<</replace>>
 		<</link>>
 	<</if>>
@@ -142,7 +142,7 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
 		<<replace "#result">>
 		You spare the coward the pain and humiliation _he2 deserves and simply enslave _him2.
 		<br>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>>
 	<br><<link "Enslave _him2 and punish _him2 for their actions">>
@@ -162,7 +162,7 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
 		<<replace "#result">>
 		You decide the coward needs more punishment. You order a whip brought to you and give _him2 several lashes directly across _his2 exposed genitalia. _He2 cries out with each lash as _his2 nethers accumulate angry red welts, some even bleeding slightly. After the yelps stop, you feel enough punishment has been given for now and have the producer turned slave hauled to _his2 feet for a proper inspection.
 		<br>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>>
 	</span>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index d3b1dc3f8da..72ed485916f 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -313,7 +313,7 @@
 				<<replace "#result">>
 					Confronting the citizen is simplicity in itself; he would not dare defy you under threat of arrest by your security drones and is unlikely to garner any sympathy from the public for his degradationist behaviors. As such, you are able to take civil ownership over the poor slave $girl and take $him into your care with only minimal compensation to the citizen. As you stride away from $his former owner with the $girl in your arms, $he leans over to plant a chaste kiss of thanks on your cheek.
 					<<run cashX(-2000, "slaveTransfer", $activeSlave)>>
-					<<include "New Slave Intro">>
+					<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 				<</replace>>
 			<</link>> // Taking custody of the $girl will cost <<print cashFormat(2000)>>. //
 		<</if>>
@@ -350,7 +350,7 @@
 				<<replace "#result">>
 					Confronting the citizen is simplicity in itself; he would not dare defy you directly under threat of arrest by your security drones and is unlikely to garner any sympathy from the public for his disturbing actions. As such, you are able to take civil ownership over the slave $girl and claim $him for yourself with only token compensation to the citizen. As you stride away from $his former owner with the $girl in your arms, $he clings to you with obvious naïveté for how you will treat $him. It's time $he learnt how slaves are treated in $arcologies[0].name.
 					<<run cashX(-2000, "slaveTransfer", $activeSlave)>>
-					<<include "New Slave Intro">>
+					<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 				<</replace>>
 			<</link>> // Taking custody of the $girl will cost <<print cashFormat(2000)>>. //
 		<</if>>
@@ -526,7 +526,7 @@
 								After $he regains $his bearings from your sexual encounter, the $girl slips on $his simple clothes and attempts to slink away from your private suite unobtrusively. $He makes it out the door before being confronted by a glowing array of wallscreen monitors, each displaying a visual representation of your purchase of $his father's considerable debt and subsequent enslavement of $him on the basis of that debt. Tears begin to stream down $his cheeks as $he sinks to <<if hasBothLegs($activeSlave)>>$his knees<<else>>the floor<</if>>, $his hopes of a long life without enslavement now dashed.
 								<br><br>
 								<<run cashX(-10000, "event", $activeSlave)>>
-								<<include "New Slave Intro">>
+								<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 							<</replace>>
 						<</link>> // Purchasing $his outstanding debts will cost <<print cashFormat(10000)>>. //
 					</span>
@@ -578,7 +578,7 @@
 								After $he regains $his bearings from your sexual encounter, the older $woman slips on $his simple clothes and attempts to slink away from your private suite unobtrusively. $He makes it out the door before being confronted by a glowing array of wallscreen monitors, each displaying a visual representation of your purchase of $his considerable debt and subsequent enslavement of $him on the basis of that debt. Tears begin to stream down $his weathered cheeks as $he sinks to <<if hasBothLegs($activeSlave)>>$his knees<<else>>the floor<</if>>, $his hopes of making it through the breadth of $his long life without enslavement now dashed.
 								<br><br>
 								<<run cashX(-10000, "event", $activeSlave)>>
-								<<include "New Slave Intro">>
+								<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 							<</replace>>
 						<</link>> // Purchasing $his outstanding debts will cost <<print cashFormat(10000)>>. //
 					</span>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 4328209a088..49464db70e2 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -273,7 +273,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 		<<run cashX(-50000, "slaveTransfer", _princess)>>
 		<<run repX(-2000, "event", _princess)>>
 		<<set $activeSlave = _princess>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>> // You will need to utilize a portion of your reputation and <<print cashFormat(50000)>> to enslave $him.//
 <<else>>
@@ -290,7 +290,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 		<<set $arcologies[0].prosperity -= 15>>
 		<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
 		<<set $activeSlave = _princess>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<<run repX(-18000, "event", $activeSlave)>>
 	<</replace>>
 <</link>> //You will be despised for this action, and trade will be greatly damaged.//
@@ -306,7 +306,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 				<<set _prince.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was sold to you in exchange for aid.">>
 				<<run cashX(-35000, "slaveTransfer", _prince)>>
 				<<set $activeSlave = _prince>>
-				<<include "New Slave Intro">>
+				<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<</replace>>
 		<</link>> // Purchasing the goods and hiring the VTOLs will cost about <<print cashFormat(35000)>>.//
 	<<else>>
@@ -326,7 +326,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 				<<run repX(-18000, "event", $activeSlave)>>
 				<<set _prince.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
 				<<set $activeSlave = _prince>>
-				<<include "New Slave Intro">>
+				<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<</replace>>
 		<</link>> //You will be despised for this action, and trade will be greatly damaged.//
 	<</if>>
@@ -506,7 +506,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 		<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was sold to you in exchange for credits.">>
 		<<run cashX(-15000, "slaveTransfer", _queen)>>
 		<<set $activeSlave = _queen>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>> // It will cost about <<print cashFormat(15000)>> to enslave _him3.//
 <<else>>
@@ -538,7 +538,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 		<<set _queen.ovaryAge = _queen.actualAge>>
 		<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was acquired by "+$SF.Lower+".">>
 		<<set $activeSlave = _queen>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<<run repX(-12000, "event", _queen)>>
 	<</replace>>
 <</link>> //You will be despised for this action, and trade will be greatly damaged.//
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 5651355cbe8..802c19c7a97 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -92,7 +92,7 @@
 	<br>
 
 	/* Use existing New Slave Intro */
-	<<include "New Slave Intro">> /* calls removeGingering() if needed */
+	<<includeDOM App.UI.newSlaveIntro($activeSlave)>> /* calls removeGingering() if needed */
 
 	/* Override nextButton setting from New Slave Intro */
 	<<set $nextButton = "Continue">>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 24cbaf6bb6e..36fe509557e 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -1056,7 +1056,7 @@ A screen opposite your desk springs to life, <<if $assistant.personality == 0>>s
 		<<else>>
 			$He smiles with gratitude as the biometric scanners scrupulously record $his every particular as belonging not to a person but to a piece of human property. $He's seen what Free Cities life is, and $he seems to have come to the conclusion that being a slave in the penthouse is better than being a free whore on the lower levels.
 		<</if>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>>
 	<<else>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index e6ab45e4754..8625f7185d0 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -245,7 +245,7 @@
 		<br><br>
 		<<set $arcologies[0].prosperity += 5>>
 		<<run repX(2500, "event")>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
 <<case "breeding deal">>
@@ -281,7 +281,7 @@
 		<br><br>
 		<<set $arcologies[0].prosperity += 3>>
 		<<run repX(300, "event")>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
 <<case "slave training">>
@@ -313,7 +313,7 @@
 		<br><br>
 		<<set $arcologies[0].prosperity += 5>>
 		<<run repX(2500, "event")>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
 <<case "majority deal">>
@@ -345,7 +345,7 @@
 		<br><br>
 		<<set $arcologies[0].prosperity += 3>>
 		<<run repX(1500, "event")>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
 <<case "indenture deal">>
@@ -383,7 +383,7 @@
 			<br><br>
 			<<set $arcologies[0].prosperity += 3>>
 			<<run repX(1500, "event")>>
-			<<include "New Slave Intro">>
+			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the servant as such//
 	<br><<link "Buy out the contract and enslave $him">>
@@ -397,7 +397,7 @@
 			<br><br>
 			<<set $arcologies[0].prosperity += 5>>
 			<<run repX(-100, "event")>>
-			<<include "New Slave Intro">>
+			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the servant as a slave//
 <<default>>
@@ -427,7 +427,7 @@
 		<<replace "#result">>
 		You offer to simply buy out the contract, taking the slave for yourself. This lets the buyer out of buying $him, and the slaveowner gets his money; but it soon becomes apparent that what both of them were really looking for is an opportunity to put one over on the other. Neither is pleased to be denied a petty victory, but they both have the sense to keep their mouths shut. The poor slave, meanwhile, appears in the penthouse entryway, @@.hotpink;hopeful@@ that $he's been lucky enough to end up in a less abusive situation.
 		<br><br>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
 <</switch>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 9fa03447470..ad7df99a5f8 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -598,4 +598,4 @@ Your hired mercenaries are en route now with your precious cargo.
 <</if>>
 
 <br><br>
-<<include "New Slave Intro">>
+<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index 457232b761e..0db3c2a3ec0 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -123,7 +123,7 @@
 	<<replace "#result">>
 	<<run cashX(-25000, "slaveTransfer", $activeSlave)>>
 		"Huh," says the mercenary. "$He's popular, but for that we could probably buy two of $him. Might be fun to train a couple of new nurses. Let me ask the boys and girls." He speaks into his helmet for a few minutes, and then turns back to you. "Sold. Enjoy, $he's a good fuck."
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>>
 </span>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index b05d0ffc006..6571b1af54c 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -143,4 +143,4 @@ When you state that, apparently, you are, $he climbs out of the case, prostrates
 <br><br>
 <<includeDOM App.Desc.longSlave(V.activeSlave)>>
 
-<br><<include "New Slave Intro">>
+<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 651c3acc5f6..d54a7a02ba8 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -161,7 +161,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
 									<<replace "#alive-result">>
 										Despite the trouble $he has caused you, you manage to complete the legalities and biometric scanning quickly and without incident. Of course, this is in large part due to the fact that the would-be mutineer is of course restrained. Based on the accounts of $his captors and the numerous injuries evident amongst them, $he is likely to be violent when $he is finally released.
 										<br>
-										<<include "New Slave Intro">>
+										<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 									<</replace>>
 								<</link>>
 
@@ -242,7 +242,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
 								<<replace "#alive-result">>
 									Despite the trouble $he has caused you, you manage to complete the legalities and biometric scanning quickly and without incident. Of course, this is in large part due to the fact that the would-be mutineer is of course restrained. Based on the accounts of $his captors and the numerous injuries evident amongst them, $he is likely to be violent when $he is finally released.
 									<br>
-									<<include "New Slave Intro">>
+									<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 									<<run cashX(-5000, "event", $activeSlave)>>
 								<</replace>>
 							<</link>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index d1f28f5cab1..8f3f17ebd58 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -457,7 +457,7 @@ It isn't obvious how $he managed to escape, though no doubt you could review the
 	<<set $boomerangStats = 0>>
 	<<replace "#result">>
 		The penthouse opens, and $activeSlave.slaveName stumbles inside, sobbing $his thanks. $He's immediately conducted to the autosurgery for some quick cosmetic surgery, while you and $assistant.name do the necessary work to falsify the arcology records and conceal $his origins. Even so, it would probably be wise to keep $him off public assignments for a while. In no time at all, $he's standing in front of your desk like any other new slave. $He waits obediently, knowing that it's in $his best interests not to mention anything out of the ordinary.
-	<<include "New Slave Intro">>
+	<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>.//
 <br><<link "Sell $him immediately">>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index f7c3e442a11..68591503db1 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1669,7 +1669,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
 	<<case "Chinese Revivalist">>
 		$He arrives in a simple, sturdy suit, which $he obviously wore in the correct anticipation of immediately removing and never seeing again. $He cooperates with the enslavement process as best $he can, $his glance confident and watchful. $He's obviously calculating how to get ahead within this new place, and $he pays particularly close attention as the ebb and flow of business through your office brings your various slaves into $his view for the first time.
 	<</switch>>
-	<<include "New Slave Intro">>
+	<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>//
 <br><<link "Sell $him immediately">>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index fcf9ddf6c52..f95774dad92 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -411,7 +411,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
 				<<case "liberator">>
 					You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, $he could awake at any time. Based on the drone logs, $he is likely to be violent when $he does.
 				<</switch>>
-				<<include "New Slave Intro">>
+				<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<</replace>>
 		<</link>>
 		<br><<link "Sentence $him to a day in the stocks, then enslave $him">>
@@ -457,7 +457,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
 				<</switch>>
 				<<run repX(500, "event", $activeSlave)>>
 				<<set $arcologies[0].prosperity += 2>>
-				<<include "New Slave Intro">>
+				<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<</replace>>
 		<</link>>
 		<<if $arcade > 0>>
@@ -548,7 +548,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
 						An example must be made. The citizens of your arcology must be assured that the racially inferior will not try to rise above their station, no matter their deceptions. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. $He begs and pleads until $he sees $his doom in the form of the surgical machinery, at which point $he switches to fighting vainly to escape. Of course, @@.red;$his health is affected@@ and the horrible experience has left $him @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness.@@
 					<</switch>>
 					<<run repX(500, "event", $activeSlave)>>
-					<<include "New Slave Intro">>
+					<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 				<</replace>>
 			<</link>>
 			<<if $malefactor == "rapist" && $activeSlave.balls > 0>>
@@ -562,7 +562,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
 						Video feeds from your remote surgery are made public as the protesting criminal is strapped down and gelded. $He is so utterly broken by this turn of events that you complete the legalities and biometric scanning without fuss. The condemned sobs weakly throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ which increases your arcology's prosperity by @@.green;giving it a reputation for swift and terrible justice.@@
 						<<run repX(500, "event", $activeSlave)>>
 						<<set $arcologies[0].prosperity += 10>>
-						<<include "New Slave Intro">>
+						<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 					<</replace>>
 				<</link>>
 			<</if>>
@@ -582,7 +582,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
 						@@.red;feels you let this criminal off too easy.@@
 						<<run repX(forceNeg(100), "event", $activeSlave)>>
 					<</if>>
-					<<include "New Slave Intro">>
+					<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 				<</replace>>
 			<</link>>
 		<</if>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 14ca8e626cc..310a8b1e787 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -167,7 +167,7 @@
 		When your new slave comes to, _his2 weight is hanging from _his2 wrists, bound over _his2 head. _He2's not exactly thin, making the position uncomfortable for _his2 arms, so _he2 groggily stands, finding _himself2 in a pool of light in the middle of a cell. _He2's nursing a tremendous hangover, and though _he2 does not realize it, _he2's drugged. You're present, though not visible, witnessing _his2 first conscious moment of slavery from your desk. Realization is slow. _He2's no innocent, so _he2 recognizes the sensations of waking up the morning after a night of drinking interspersed with vigorous vaginal, oral, and anal intercourse, but _he2 does not remember the specifics. After a few minutes, _he2 understands that no one is coming, and speaks up hesitantly: "I<<s>> anyone there?" Getting no immediate answer, _he2 slumps against _his2 wrist restraints again, and begins to cry to _himself2. "W-why would a-anyone do thi<<s>>."
 		<br>
 		<<run cashX(-20000, "event", $activeSlave)>>
-		<<include "New Slave Intro">>
+		<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</replace>>
 	<</link>> //This will require an unprofitable <<print cashFormat(20000)>>, since _he2 is wealthy and obfuscating _his2 fate will require considerable spending//
 <<else>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index e727fda708c..2a623902464 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -125,7 +125,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
 										<</replace>>
 										For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin $his new life as your sexual servant. $He's not young, but $he's tough and not distrusting of you due to $his service in the $mercenariesTitle.
 										<br>
-										<<include "New Slave Intro">>
+										<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 									<</if>>
 								<</replace>>
 							<</link>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 75438776fa7..e8f89cb554a 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2715,7 +2715,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
 		<<case "desperate birth" "blessed vessel">>
 			<<run newSlave($activeSlave)>>
 		<<default>>
-			<<include "New Slave Intro">>
+			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 		<</switch>>
 		<</replace>>
 	<</link>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 0f7ca419cc2..570ef646b7d 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -112,7 +112,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 	$assistant.name ushers _him2 into your penthouse and keeps _him2 busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have _him2 brought into your office, and you are pleased to see _him2. _He2's not young and _he2's not pretty, but _his2 suit cannot disguise _his2 big bottom, and _he2's using the tablet _he2 has clasped protectively against _his2 chest to conceal a huge pair of mature breasts. _He2 knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of month<<s>>," _he2 says with venom, "when you've filled me full of hormone<<s>> and drug<<s>> and training, and I'm begging you to <<if $PC.dick != 0>><<s>>tick your tiny little dick up<<else>>fi<<s>>t<</if>> my a<<ss>>hole, remember thi<<s>>. It'll be conditioning and <<s>>elf-pre<<s>>ervation and <<S>>tockholm <<S>>yndrome talking, not me. I think you're a <<if $PC.title == 1>><<s>>ad ba<<s>>tard<<else>>vile cunt<</if>>, and I alway<<s>> will."
 	<<set $shelterAbuse += 10>>
 	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
-	<<include "New Slave Intro">>
+	<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>//
 <<if _S.Bodyguard || $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index b78b56d769b..18dd7919c27 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -232,7 +232,7 @@ $His price is <<print cashFormat(_slaveCost)>>.
 		<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
 		<<replace "#result">>
 			$He has been reasonably broken by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now awaiting your instructions.
-			<<include "New Slave Intro">>
+			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 			<<if def $customSlaveOrderedReorder>><<run delete $customSlaveOrderedReorder>><</if>>
 		<</replace>>
 	<</link>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 57535f22625..8852bfc7e93 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -208,7 +208,7 @@ Your recruiter _S.Recruiter.slaveName has succeeded; _he2's convinced a desperat
 <<link "Enslave $him">>
 	<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $slaves[$i])>>
 	<<replace "#result">>
-	<<include "New Slave Intro">>
+	<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>//
 <br><<link "Sell $him immediately">>
-- 
GitLab