diff --git a/devTools/Script to convert SC to JS/SC to JS 1.py b/devTools/Script to convert SC to JS/SC to JS 1.py
index ddece0976db593759b9d43e04e843f87ebe6511e..fc49bcf15ab000638f8a677f1d1200eb4820a429 100644
--- a/devTools/Script to convert SC to JS/SC to JS 1.py	
+++ b/devTools/Script to convert SC to JS/SC to JS 1.py	
@@ -9,14 +9,14 @@ editor.rereplace(r"\$slaves\[\$i\]", r"slave")
 # Update all references
 editor.rereplace(r"\$", r"V\.")
 
-# Clean up print
-editor.rereplace(r"<<print (.*)>>", r"${\1}")
-editor.rereplace(r"<<= (.*?)>>", r"${\1}")
-
 # Line breaks for embedded code, beautify later
 editor.rereplace(r"([a-zA-Z@].*?)<<", r"$1\n<<")
 editor.rereplace(r">>([a-zA-Z,\.@ ].*?)", r">>\n\t$1")
 
+# Clean up print
+editor.rereplace(r"<<print (.*)>>", r"V.\1")
+editor.rereplace(r"<<= (.*?)>>", r"V\.\1")
+
 # Raw text
 editor.rereplace(r"	([a-zA-Z@\.,`'; ].*)", r"	r.push\(`\1`\);")
 
@@ -25,6 +25,7 @@ editor.rereplace(r"<<if (.*?)>>", r"if \1 {")
 editor.rereplace(r"<<elseif (.*?)>>", r"} else if \(\1\) {")
 editor.rereplace(r"<<else>>", r"} else {")
 editor.rereplace(r"<</if>>", r"}")
+
 #fix paren
 editor.rereplace(r"([	\n])if ([^\(].*) {", r"\1if \(\2\) {")
 editor.rereplace(r"([	\n])else if ([^\(].*) {", r"\1 else if \(\2\) {")
@@ -32,12 +33,10 @@ editor.rereplace(r"([	\n])else if ([^\(].*) {", r"\1 else if \(\2\) {")
 # run can happen directly
 editor.rereplace(r"<<run (.*?)>>", r"\1;")
 
-# Set: If it uses "=" let's assume we should let and clean up later
-editor.rereplace(r"<<set (.*? =.*?)>>", r"let $1;")
-editor.rereplace(r"let (slave\.)", r"$1")
-editor.rereplace(r"let (V\.)", r"$1")
+# Clean up unset
+editor.rereplace(r"<<unset (.*)>>", r"delete \1;")
 
-# Set: otherwise we are likely modifying the value
+# Set
 editor.rereplace(r"<<set (.*?)>>", r"$1;")
 
 #Switch
@@ -50,10 +49,14 @@ editor.rereplace(r"<<default>>", r"default:")
 editor.rereplace(r"@@\.(.*?);(.*?)@@", r"<span class=\"\1\">\2</span>")
 editor.rereplace(r"@@\.(.*?);", r"<span class=\"\1\">")
 editor.rereplace(r"@@", r"</span>")
+#remove incompatible comment style
+editor.rereplace(r"/%", r"/*")
+editor.rereplace(r"%/", r"*/")
 
 # JS
 editor.rereplace(r" == ", r" === ")
 editor.rereplace(r" != ", r" !== ")
+editor.rereplace(r"_S\.", r"S.")
 
 #fix pronouns
 editor.rereplace(r"V\.Hers", r"\${Hers}")
@@ -94,9 +97,12 @@ editor.rereplace(r"_Hers2", r"\${_Hers2}")
 editor.rereplace(r"_hers2", r"\${_hers2}")
 
 #look for variables embedded in literals
-editor.rereplace(r"(	r.push.*?[^{])(V\.[^ ,']*)", r"\1${\2}")
-editor.rereplace(r"(	r.push.*?[^{])(slave\.[^ ,']*)", r"\1${\2}")
-
-#remove incompatible comment style
-editor.rereplace(r"/%", r"/*")
-editor.rereplace(r"%/", r"*/")
\ No newline at end of file
+editor.rereplace(r"(	r.push[^;]*?)(V\.[^ ,<'`]*)", r"\1${\2}")
+editor.rereplace(r"(	r.push[^;]*?)(slave\.[^ ,<'`]*)", r"\1${\2}")
+editor.rereplace(r"(	r.push[^;]*?)(S\.[^ ,<'`]*)", r"\1${\2}")
+editor.rereplace(r"(	r.push[^;]*?)( _[^ ,<'`]*)", r"\1${ \2}")
+
+#Cleanup
+editor.rereplace(r"\${He}adGirl", r"V.HeadGirl")
+editor.rereplace(r"\${slave}", r"slave")
+editor.rereplace(r"\${slave\.}", r"slave.")
\ No newline at end of file
diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js
index 624d1b442123b4d56c40ed81f993994f816d38eb..ccd961c4b39fcffa68bf1bd6841c4100b9d11d63 100644
--- a/src/npc/generate/newSlaveIntro.js
+++ b/src/npc/generate/newSlaveIntro.js
@@ -859,7 +859,7 @@ App.UI.newSlaveIntro = function(slave, slave2 = V.eventSlave) {
 					)
 				);
 				if (slave.devotion <= 20) {
-					div.append(`Will not apply many cosmetic and surgical options since ${he} is not obedient`);
+					div.append(` Will not apply many cosmetic and surgical options since ${he} is not obedient`);
 				}
 				el.append(div);
 			}
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index f9b01ce63e6fd5d89bb07ffa6590103f8abb231a..57aca3496cb43739ac05771cfb51a418764b42cb 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -810,7 +810,7 @@ App.Data.FCTV.channels = {
 				get slaves() { return [App.Data.FCTV.actors.premiumVirgin]; },
 				text: function(slave) {
 					const {He, he} = getPronouns(slave);
-					return `<p>Next up, we have a premium virgin named ${slave.slaveName}." A bright pink "VV" symbol flashes on the corner of the screen. "Take a good look, because ${he} is a product of the famous sex slave breeding program at Arcturus Arcology. Like all the slaves they sell, ${he}'s a premium <span class="pink">double virgin.</span> ${He} has excellent breeding potential, and while ${he} isn't that skilled yet, ${he}'s got good intelligence and is already well acclimated to the life of a sex slave."</p>`;
+					return `<p>"Next up, we have a premium virgin named ${slave.slaveName}." A bright pink "VV" symbol flashes on the corner of the screen. "Take a good look, because ${he} is a product of the famous sex slave breeding program at Arcturus Arcology. Like all the slaves they sell, ${he}'s a premium <span class="pink">double virgin.</span> ${He} has excellent breeding potential, and while ${he} isn't that skilled yet, ${he}'s got good intelligence and is already well acclimated to the life of a sex slave."</p>`;
 				}
 			},
 			{// hyperpregnant
@@ -819,7 +819,7 @@ App.Data.FCTV.channels = {
 				text: function(slave) {
 					const r = [];
 					const {his, he, him} = getPronouns(slave);
-					r.push(`<p>Next up, we have ${addA(slave.race)} breeder, young and healthy with an advanced`);
+					r.push(`<p>"Next up, we have ${addA(slave.race)} breeder, young and healthy with an advanced`);
 					if (V.seeHyperPreg === 0) {
 						r.push(`<i><span class="pink">super pregnancy.</span></i>`);
 					} else {
@@ -835,7 +835,7 @@ App.Data.FCTV.channels = {
 				text: function(slave) {
 					const r = [];
 					const {girl, his, He, he, him} = getPronouns(slave);
-					r.push(`<p>Next up, we have a special slave named ${slave.slaveName} who has quite the gift, <span class="pink">superfetation!</span> ${He} can become pregnant while pregnant! Isn't that amazing? ${He} may have a few miles on ${him}, having just completed a double pregnancy, but with a trait like that, ${he}'s more than worth ${his} price if you like your ${girl}s to constantly have a bun in the oven."</p>`);
+					r.push(`<p>"Next up, we have a special slave named ${slave.slaveName} who has quite the gift, <span class="pink">superfetation!</span> ${He} can become pregnant while pregnant! Isn't that amazing? ${He} may have a few miles on ${him}, having just completed a double pregnancy, but with a trait like that, ${he}'s more than worth ${his} price if you like your ${girl}s to constantly have a bun in the oven."</p>`);
 					return r.join(" ");
 				}
 			},
@@ -845,11 +845,11 @@ App.Data.FCTV.channels = {
 				text: function(slave) {
 					const r = [];
 					const {He, he} = getPronouns(slave);
-					r.push(`<p>Next up, we have ${addA(slave.race)} <span class="pink">MILF.</span> ${He}'s no longer young, but still quite attractive. ${He} has been a slave for many years now, and has been trained well. ${He} also has a good array of skills that you can put to use. ${He} has huge tits and a huge ass to play with, but ${he}'d also make good`);
+					r.push(`<p>"Next up, we have ${addA(slave.race)} <span class="pink">MILF.</span> ${He}'s no longer young, but still quite attractive. ${He} has been a slave for many years now, and has been trained well. ${He} also has a good array of skills that you can put to use. ${He} has huge tits and a huge ass to play with, but ${he}'d also make good`);
 					if (V.seePreg === 0) {
-						r.push(`<i>sandwiches</i>.</p>`);
+						r.push(`<i>sandwiches</i>."</p>`);
 					} else {
-						r.push(`stock for a breeding program.</p>`);
+						r.push(`stock for a breeding program."</p>`);
 					}
 					return r.join(" ");
 				}
@@ -860,7 +860,7 @@ App.Data.FCTV.channels = {
 				text: function(slave) {
 					const r = [];
 					const {girl, his, he, him} = getPronouns(slave);
-					r.push(`<p>Next up, we have a bargain discount offer on a young ${slave.race} ${girl}. Unlike our usual stock ${he}'s something of a <span class="red">disobedient</span> slave, but that means savings for you, and all the fun of breaking in a new slave. We have to admit that ${his} previous owner had a hard time training ${him}, but I'm sure you can tell that ${his} body has`);
+					r.push(`<p>"Next up, we have a bargain discount offer on a young ${slave.race} ${girl}. Unlike our usual stock ${he}'s something of a <span class="red">disobedient</span> slave, but that means savings for you, and all the fun of breaking in a new slave. We have to admit that ${his} previous owner had a hard time training ${him}, but I'm sure you can tell that ${his} body has`);
 					if (slave.clit > 4) {
 						r.push(`potential, just look at the <span class="pink">clit</span> on ${him}!"</p>`);
 					} else {
@@ -876,7 +876,7 @@ App.Data.FCTV.channels = {
 				text: function(slave) {
 					const r = [];
 					const {his, He} = getPronouns(slave);
-					r.push(`<p>Next up, we have ${addA(slave.race)} cum cow. Just take a look at that pair of <span class="pink">massive balls.</span> This slave also has a prostate stimulating hormone implant to ramp up ${his} cum production even further. ${He}'s a perfect fit for your dairy, or even your own kitchen creamery!"</p>`);
+					r.push(`<p>"Next up, we have ${addA(slave.race)} cum cow. Just take a look at that pair of <span class="pink">massive balls.</span> This slave also has a prostate stimulating hormone implant to ramp up ${his} cum production even further. ${He}'s a perfect fit for your dairy, or even your own kitchen creamery!"</p>`);
 					r.push(`<p>The woman helping to display the slaves shows her hand to the camera; it's coated in a sticky layer of precum from handling the cum cow's equipment.</p>`);
 					return r.join(" ");
 				}
@@ -886,7 +886,7 @@ App.Data.FCTV.channels = {
 				get slaves() { return [App.Data.FCTV.actors.mpreg]; },
 				text: function(slave) {
 					const {girl, his, he, him} = getPronouns(slave);
-					return `<p>Next up, we have a strong young ${slave.race} ${girl} that retains ${his} cock and balls. ${slave.slaveName} has something that makes ${him} special: thanks to medical science ${he}'s got a <span class="pink">functional ass womb.</span> That's right folks, this slave is fertile and can get knocked up if you inseminate ${his} asshole. That's pretty amazing, to be honest, and exceptionally rare. Don't let this opportunity slip by!"</p>`;
+					return `<p>"Next up, we have a strong young ${slave.race} ${girl} that retains ${his} cock and balls. ${slave.slaveName} has something that makes ${him} special: thanks to medical science ${he}'s got a <span class="pink">functional ass womb.</span> That's right folks, this slave is fertile and can get knocked up if you inseminate ${his} asshole. That's pretty amazing, to be honest, and exceptionally rare. Don't let this opportunity slip by!"</p>`;
 				}
 			},
 		]
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index c3fe0b013050588288e0f5eca678bccbdca452ce..a469c51ab249230dbea6b0487b575479ff0c350a 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3341,7 +3341,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 				<<else>>
 					await the bastard's arrival.
 					<br><br>
-					<<include "P rivalry capture">>
+					<<includeDOM pRivalryCapture()>>
 				<</if>>
 			<</replace>>
 		<</link>>&nbsp;&nbsp;&nbsp;&nbsp;//This option is available due to your @@.springgreen;your hacking mastery,@@ and will immediately end the conflict with a chance of enslaving your rival//
diff --git a/src/uncategorized/pRivalryCapture.js b/src/uncategorized/pRivalryCapture.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b13d38f211624a9879c24ad6569ec2e72d64b38
--- /dev/null
+++ b/src/uncategorized/pRivalryCapture.js
@@ -0,0 +1,529 @@
+globalThis.pRivalryCapture = function() {
+	const el = new DocumentFragment();
+	let rivalType;
+	const slave = createRival();
+	const {his, he, him, He} = getPronouns(slave);
+	let r = [];
+	V.rivalOwner = -1;
+	V.rivalRace = 0;
+	V.rivalGender = 0;
+
+	const artDiv = document.createElement("span");
+	artDiv.id = "art-frame";
+	App.Events.drawEventArt(artDiv, slave);
+	el.append(artDiv);
+
+	r.push(`Your`);
+	if (passage() === "P rivalry actions") {
+		r.push(`target is quickly delivered. Politely dismissing the head of your ${V.mercenariesTitle}, you savor`);
+	} else {
+		r.push(`bounty is quickly claimed, and you are treated to`);
+	}
+	r.push(`the delicious moment of finding your rival on`);
+	if (hasBothLegs(slave)) {
+		r.push(`${his} knees`);
+	} else {
+		r.push(`the ground`);
+	}
+	r.push(`in front of you with a black bag over ${his} head and ${his} hands cuffed behind ${him}. ${He}'s one of your slaves now, fundamentally no different than any other. Looking ${him} over, the causes of ${his} downfall are`);
+	switch (rivalType) {
+		case "expansionist shemale":
+			r.push(`immediately apparent: ${he}'s obviously been indulging in self-transformation to excess.`);
+			break;
+		case "cum addict":
+			r.push(`immediately apparent: there's nothing wrong with having cumflation and ball expansion fetishes, but applying them to oneself can be addictive.`);
+			break;
+		case "hung shota":
+			r.push(`not immediately apparent: ${he}'s young, in good shape, and not lacking down there at all.`);
+			break;
+		case "masculine":
+			r.push(`not immediately apparent: ${he}'s in good shape, if quite masculine.`);
+			break;
+		case "micropenis":
+			r.push(`immediately apparent: ${he}'s got a slavegirl's cock and balls, not an arcology owner's.`);
+			break;
+		case "bull dyke":
+			r.push(`not immediately apparent: though female, ${he}'s obviously no stranger to taking a dominant sexual role, to put it politely.`);
+			break;
+		case "breeder":
+			r.push(`immediately apparent: there's nothing wrong with having a pregnancy fetish, but applying it to oneself is ill-fitting for an arcology owner.`);
+			break;
+		case "oppai loli":
+			r.push(`immediately apparent: ${he}'s young, inexperienced, and extremely top heavy.`);
+			break;
+		case "cow":
+			r.push(`immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive.`);
+			break;
+		case "bimbo":
+			r.push(`immediately apparent: there's nothing wrong with having a bimbo fetish, but applying it to oneself can be addictive.`);
+			break;
+		default:
+			r.push(`immediately apparent: ${he} seems to have recently fallen into serious aphrodisiac addiction.`);
+	}
+	el.append(r.join(" "));
+
+	V.rivalID = slave.ID;
+	// proceed directly to rival initiation event after New Slave Intro
+	newSlave(slave);
+	el.append(App.UI.newSlaveIntro(slave));
+
+	V.nextLink = "P rival initiation";
+	App.Utils.scheduleSidebarRefresh();
+	return el;
+
+	/**
+	 * @returns {App.Entity.SlaveState}
+	 */
+	function createRival() {
+		let slave;
+		const rivalTypeArray = [];
+		/** @type {string} */
+		let race;
+		let minAge;
+		let maxAge;
+		let pedo;
+		if (V.rivalGender === 2) {
+			rivalTypeArray.push("expansionist shemale");
+			rivalTypeArray.push("masculine");
+			rivalTypeArray.push("micropenis");
+			rivalTypeArray.push("cum addict");
+			if (V.pedo_mode === 1) {
+				rivalTypeArray.push("hung shota");
+			}
+		} else {
+			rivalTypeArray.push("bull dyke");
+			rivalTypeArray.push("cow");
+			rivalTypeArray.push("bimbo");
+			rivalTypeArray.push("addict");
+			if (V.seePreg === 1) {
+				rivalTypeArray.push("breeder");
+			}
+			if (V.pedo_mode === 1) {
+				rivalTypeArray.push("oppai loli");
+			}
+		}
+		rivalType = rivalTypeArray.random();
+
+		if (setup.filterRacesLowercase.includes(V.rivalRace)) {
+			race = V.rivalRace;
+		}
+		switch (rivalType) {
+			case "expansionist shemale":
+				slave = GenerateNewSlave("XY", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 100;
+				slave.faceImplant = 15;
+				slave.faceShape = "androgynous";
+				slave.muscles = 20;
+				slave.height = random(185, 215);
+				slave.lips = 35;
+				slave.butt = either(4, 5, 6);
+				slave.boobs = either(800, 1000, 1200);
+				slave.dick = 6;
+				if (slave.foreskin > 0) {
+					slave.foreskin = slave.dick;
+				}
+				slave.balls = 10;
+				slave.anus = 3;
+				slave.vagina = -1;
+				slave.weight = 20;
+				slave.skill.oral = 100;
+				slave.skill.anal = 100;
+				slave.skill.whoring = 15;
+				slave.skill.entertainment = 100;
+				slave.skill.combat = 0;
+				slave.clitPiercing = 2;
+				slave.nipplesPiercing = 1;
+				slave.earPiercing = 1;
+				slave.tonguePiercing = 1;
+				slave.eyebrowPiercing = 1;
+				slave.behavioralFlaw = "odd";
+				slave.behavioralQuirk = "confident";
+				slave.sexualFlaw = "judgemental";
+				slave.sexualQuirk = "romantic";
+				slave.hStyle = "luxurious";
+				slave.hLength = 80;
+				break;
+			case "cum addict":
+				slave = GenerateNewSlave("XY", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.chem = 3000;
+				slave.face = 100;
+				slave.faceShape = "masculine";
+				slave.muscles = 100;
+				slave.height = random(185, 215);
+				slave.lips = 10;
+				slave.butt = 10;
+				slave.boobs = either(100, 200);
+				slave.dick = 6;
+				slave.foreskin = 0;
+				slave.balls = 300;
+				slave.scrotum = 280;
+				slave.anus = 3;
+				slave.vagina = -1;
+				slave.weight = -35;
+				slave.skill.oral = 0;
+				slave.skill.anal = 100;
+				slave.skill.whoring = 15;
+				slave.skill.entertainment = 100;
+				slave.skill.combat = 0;
+				slave.dickPiercing = 2;
+				slave.fetish = "pregnancy";
+				slave.fetishStrength = 100;
+				slave.behavioralFlaw = "odd";
+				slave.behavioralQuirk = "confident";
+				slave.sexualFlaw = "cum addict";
+				slave.sexualQuirk = "size queen";
+				slave.hStyle = "neat";
+				slave.hLength = 20;
+				break;
+			case "hung shota":
+				slave = GenerateNewSlave("XY", {
+					minAge: V.minimumSlaveAge, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 100;
+				slave.faceShape = "androgynous";
+				slave.muscles = 0;
+				slave.lips = 10;
+				slave.butt = 0;
+				slave.boobs = either(100, 200);
+				slave.dick = 6;
+				slave.foreskin = slave.dick;
+				slave.balls = 6;
+				slave.scrotum = 6;
+				slave.anus = 0;
+				slave.vagina = -1;
+				slave.weight = -35;
+				slave.skill.oral = 0;
+				slave.skill.anal = 0;
+				slave.skill.whoring = 0;
+				slave.skill.entertainment = 100;
+				slave.skill.combat = 0;
+				slave.dickPiercing = 2;
+				slave.pubertyXY = 1;
+				slave.fetish = "pregnancy";
+				slave.fetishStrength = 100;
+				slave.behavioralFlaw = "hates men";
+				slave.behavioralQuirk = "adores women";
+				slave.sexualFlaw = "shamefast";
+				slave.sexualQuirk = "perverted";
+				slave.hLength = 20;
+				break;
+			case "masculine":
+				slave = GenerateNewSlave("XY", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 55;
+				slave.faceImplant = 0;
+				slave.faceShape = "masculine";
+				slave.muscles = either(20, 50, 100);
+				slave.height = random(185, 195);
+				slave.butt = either(2, 3);
+				slave.boobs = either(100, 200);
+				slave.dick = 5;
+				if (slave.foreskin > 0) {
+					slave.foreskin = slave.dick;
+				}
+				slave.balls = 5;
+				slave.anus = 0;
+				slave.vagina = -1;
+				slave.weight = 0;
+				slave.skill.vaginal = 0;
+				slave.skill.oral = 15;
+				slave.skill.anal = 0;
+				slave.skill.whoring = 0;
+				slave.skill.entertainment = 15;
+				slave.skill.combat = 1;
+				slave.behavioralFlaw = "hates men";
+				slave.behavioralQuirk = "fitness";
+				slave.sexualFlaw = "hates anal";
+				slave.sexualQuirk = "perverted";
+				slave.hStyle = "neat";
+				slave.hLength = 5;
+				break;
+			case "micropenis":
+				slave = GenerateNewSlave("XY", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 55;
+				slave.faceImplant = 0;
+				slave.faceShape = "masculine";
+				slave.muscles = 0;
+				slave.height = random(145, 160);
+				slave.butt = either(2, 4);
+				slave.boobs = either(100, 400);
+				slave.dick = 1;
+				if (slave.foreskin > 0) {
+					slave.foreskin = slave.dick;
+				}
+				slave.balls = 2;
+				slave.anus = 1;
+				slave.vagina = -1;
+				slave.weight = 100;
+				slave.skill.vaginal = 0;
+				slave.skill.oral = 15;
+				slave.skill.anal = 15;
+				slave.skill.whoring = 0;
+				slave.skill.entertainment = 15;
+				slave.skill.combat = 0;
+				slave.behavioralFlaw = "hates men";
+				slave.behavioralQuirk = "insecure";
+				slave.sexualFlaw = "shamefast";
+				slave.sexualQuirk = "perverted";
+				slave.hStyle = "neat";
+				slave.hLength = 5;
+				break;
+			case "bull dyke":
+				slave = GenerateNewSlave("XX", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 55;
+				slave.faceImplant = 0;
+				slave.faceShape = "androgynous";
+				slave.muscles = 100;
+				slave.height = random(185, 195);
+				slave.lipsImplant = 10;
+				slave.lips = 35;
+				slave.buttImplant = 1;
+				slave.butt += slave.buttImplant;
+				slave.buttImplantType = "normal";
+				slave.boobs -= 100;
+				slave.boobsImplant = either(400, 600, 800);
+				slave.boobs += slave.boobsImplant;
+				slave.boobsImplantType = "normal";
+				slave.clit = 2;
+				slave.anus = 1;
+				slave.vagina = 1;
+				slave.preg = -1;
+				slave.skill.vaginal = 15;
+				slave.skill.oral = 0;
+				slave.skill.anal = 15;
+				slave.skill.whoring = 0;
+				slave.skill.entertainment = 0;
+				slave.skill.combat = 1;
+				slave.clitPiercing = 1;
+				slave.earPiercing = 1;
+				slave.behavioralFlaw = "hates men";
+				slave.behavioralQuirk = "fitness";
+				slave.sexualFlaw = "hates penetration";
+				slave.sexualQuirk = "unflinching";
+				slave.hStyle = "neat";
+				slave.hLength = 5;
+				break;
+			case "breeder":
+				if (V.pedo_mode === 1) {
+					minAge = (V.fertilityAge + 6);
+					pedo = 1;
+					/* Old enough to have been pregnant many times. */
+				} else {
+					minAge = 18;
+					maxAge = 42;
+				}
+				slave = GenerateNewSlave("XX", {
+					minAge: minAge, maxAge: maxAge, ageOverridesPedoMode: pedo, race: race, disableDisability: 1
+				});
+				slave.pubertyXX = 1;
+				slave.face = 100;
+				slave.faceImplant = 0;
+				slave.faceShape = "sensual";
+				slave.muscles = 50;
+				slave.lips = 35;
+				slave.butt = either(6, 7, 8);
+				slave.boobs = 5000;
+				slave.nipples = "huge";
+				slave.lactation = 1;
+				slave.lactationDuration = 2;
+				slave.anus = 1;
+				slave.preg = 25;
+				if (V.seeHyperPreg === 1) {
+					slave.geneticQuirks.uterineHypersensitivity = 2;
+					slave.vagina = 10;
+					slave.pregType = random(20, 35);
+					slave.counter.birthsTotal = random(120, 180);
+					slave.bellySag = 30;
+					slave.bellySagPreg = 30;
+					slave.pregAdaptation = slave.counter.birthsTotal * 2;
+				} else {
+					const UHSchance = Math.random();
+					if (UHSchance > 0.9) {
+						slave.geneticQuirks.uterineHypersensitivity = 2;
+					} else if (UHSchance > 0.6 && slave.geneticQuirks.uterineHypersensitivity !== 2) {
+						slave.geneticQuirks.uterineHypersensitivity = 1;
+					}
+					slave.vagina = 5;
+					slave.pregType = either(3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 8);
+					slave.counter.birthsTotal = random(18, 27);
+					slave.bellySag = 2;
+					slave.bellySagPreg = 2;
+					slave.pregAdaptation = (random(60, 100) + (slave.counter.birthsTotal * slave.geneticQuirks.uterineHypersensitivity));
+				}
+				slave.pregKnown = 1;
+				slave.pregWeek = slave.preg;
+				SetBellySize(slave);
+				slave.skill.vaginal = 100;
+				slave.skill.oral = 15;
+				slave.skill.anal = 15;
+				slave.skill.whoring = 35;
+				slave.skill.entertainment = 15;
+				slave.skill.combat = 0;
+				slave.fetish = "pregnancy";
+				slave.fetishStrength = 1000;
+				slave.behavioralFlaw = "odd";
+				slave.behavioralQuirk = "adores men";
+				slave.sexualFlaw = "breeder";
+				slave.sexualQuirk = "caring";
+				slave.hStyle = "luxurious";
+				slave.hLength = 80;
+				break;
+			case "oppai loli":
+				slave = GenerateNewSlave("XX", {
+					minAge: V.minimumSlaveAge, maxAge: 12, race: race, disableDisability: 1
+				});
+				slave.face = 100;
+				slave.faceImplant = 0;
+				slave.faceShape = "cute";
+				slave.muscles = 20;
+				slave.weight = 60;
+				slave.lips = 10;
+				slave.butt = 1;
+				slave.hips = -1;
+				slave.shoulders = -2;
+				slave.boobs = 7000;
+				slave.nipples = "huge";
+				slave.anus = 0;
+				slave.vagina = 0;
+				slave.preg = 0;
+				slave.skill.vaginal = 0;
+				slave.skill.oral = 0;
+				slave.skill.anal = 0;
+				slave.skill.whoring = 0;
+				slave.skill.entertainment = 15;
+				slave.skill.combat = 0;
+				slave.behavioralFlaw = "odd";
+				slave.behavioralQuirk = "insecure";
+				slave.sexualFlaw = "shamefast";
+				slave.sexualQuirk = "tease";
+				slave.hStyle = "twin tails";
+				slave.hLength = 40;
+				break;
+			case "cow":
+				slave = GenerateNewSlave("XX", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 55;
+				slave.faceImplant = 0;
+				slave.faceShape = "cute";
+				slave.muscles = 50;
+				slave.height = random(185, 195);
+				slave.lips = 35;
+				slave.butt = either(6, 7, 8);
+				slave.boobs = 30000;
+				slave.weight = random(100, 160);
+				slave.nipples = "huge";
+				slave.lactation = 2;
+				slave.lactationDuration = 2;
+				slave.anus = 1;
+				slave.vagina = 2;
+				slave.preg = 0;
+				slave.skill.vaginal = 15;
+				slave.skill.oral = 15;
+				slave.skill.anal = 0;
+				slave.skill.whoring = 0;
+				slave.skill.entertainment = 15;
+				slave.skill.combat = 0;
+				slave.behavioralFlaw = "odd";
+				slave.behavioralQuirk = "insecure";
+				slave.sexualFlaw = "breast growth";
+				slave.sexualQuirk = "perverted";
+				slave.hStyle = "neat";
+				slave.hLength = 5;
+				break;
+			case "bimbo":
+				slave = GenerateNewSlave("XX", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 100;
+				slave.faceImplant = 65;
+				slave.faceShape = "sensual";
+				slave.muscles = 0;
+				slave.height = random(180, 190);
+				slave.lipsImplant = 2;
+				slave.lips = random(25, 55);
+				slave.buttImplant = 2;
+				slave.butt += slave.buttImplant;
+				slave.buttImplantType = "normal";
+				slave.boobsImplant = either(600, 800, 1000);
+				slave.boobs += slave.boobsImplant;
+				slave.boobsImplantType = "normal";
+				slave.anus = 2;
+				slave.vagina = 1;
+				slave.preg = -1;
+				slave.skill.vaginal = 100;
+				slave.skill.oral = 100;
+				slave.skill.anal = 35;
+				slave.skill.whoring = 35;
+				slave.skill.entertainment = 35;
+				slave.skill.combat = 0;
+				slave.clitPiercing = 1;
+				slave.earPiercing = 1;
+				slave.behavioralFlaw = "arrogant";
+				slave.behavioralQuirk = "insecure";
+				slave.sexualFlaw = "crude";
+				slave.sexualQuirk = "caring";
+				slave.hStyle = "tails";
+				slave.hLength = 80;
+				break;
+			default:
+				slave = GenerateNewSlave("XX", {
+					minAge: 18, maxAge: 42, race: race, disableDisability: 1
+				});
+				slave.face = 100;
+				slave.faceImplant = 15;
+				slave.muscles = 0;
+				slave.lips = 35;
+				slave.butt += random(1, 3);
+				slave.boobs += 200 * random(1, 3);
+				slave.anus = 4;
+				slave.vagina = 4;
+				if (V.seePreg === 1) {
+					slave.preg = 2;
+					slave.pregKnown = 1;
+					slave.pregWeek = slave.preg;
+					slave.pregType = setPregType(slave);
+					SetBellySize(slave);
+				}
+				slave.skill.vaginal = 100;
+				slave.skill.oral = 100;
+				slave.skill.anal = 100;
+				slave.skill.whoring = 100;
+				slave.skill.entertainment = 0;
+				slave.skill.combat = 0;
+				slave.clitPiercing = 1;
+				slave.earPiercing = 1;
+				slave.behavioralFlaw = "bitchy";
+				slave.behavioralQuirk = "funny";
+				slave.sexualFlaw = "crude";
+				slave.sexualQuirk = "size queen";
+				slave.hStyle = "neat";
+				slave.hLength = 80;
+				slave.addict = 10;
+		}
+		slave.intelligence = 100;
+		slave.intelligenceImplant = 30;
+		slave.devotion = -20;
+		slave.trust = -10;
+		slave.origin = "${He} was once an arcology owner like yourself.";
+		slave.career = "an arcology owner";
+		slave.prestige = 3;
+		slave.prestigeDesc = "You bankrupted and enslaved ${him} in revenge for ${his} part in the attack on your arcology by the Daughters of Liberty.";
+		setHealth(slave, 100, 0, 0, 0, jsRandom(10, 30));
+		if (slave.physicalAge > 35) {
+			applyAgeImplant(slave);
+		}
+		slave.pubicHStyle = "waxed";
+		slave.underArmHStyle = "waxed";
+		return slave;
+	}
+};
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
deleted file mode 100644
index 9490863e8b9622efb4de03e1bc099b14489b1d90..0000000000000000000000000000000000000000
--- a/src/uncategorized/pRivalryCapture.tw
+++ /dev/null
@@ -1,450 +0,0 @@
-:: P rivalry capture [nobr]
-
-<<set $rivalOwner = -1>>
-<<set _rivalType = []>>
-<<if $rivalGender == 2>>
-	<<set _rivalType.push("expansionist shemale")>>
-	<<set _rivalType.push("masculine")>>
-	<<set _rivalType.push("micropenis")>>
-	<<set _rivalType.push("cum addict")>>
-	<<if $pedo_mode == 1>>
-		<<set _rivalType.push("hung shota")>>
-	<</if>>
-<<else>>
-	<<set _rivalType.push("bull dyke")>>
-	<<set _rivalType.push("cow")>>
-	<<set _rivalType.push("bimbo")>>
-	<<set _rivalType.push("addict")>>
-	<<if $seePreg == 1>>
-		<<set _rivalType.push("breeder")>>
-	<</if>>
-	<<if $pedo_mode == 1>>
-		<<set _rivalType.push("oppai loli")>>
-	<</if>>
-<</if>>
-<<set _rivalType = _rivalType.random()>>
-
-<<if setup.filterRacesLowercase.includes($rivalRace)>>
-	<<set _race = $rivalRace>>
-<</if>>
-<<switch _rivalType>>
-<<case "expansionist shemale">>
-	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 100>>
-	<<set $activeSlave.faceImplant = 15>>
-	<<set $activeSlave.faceShape = "androgynous">>
-	<<set $activeSlave.muscles = 20>>
-	<<set $activeSlave.height = random(185,215)>>
-	<<set $activeSlave.lips = 35>>
-	<<set $activeSlave.butt = either(4, 5, 6)>>
-	<<set $activeSlave.boobs = either(800, 1000, 1200)>>
-	<<set $activeSlave.dick = 6>>
-	<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-	<<set $activeSlave.balls = 10>>
-	<<set $activeSlave.anus = 3>>
-	<<set $activeSlave.vagina = -1>>
-	<<set $activeSlave.weight = 20>>
-	<<set $activeSlave.skill.oral = 100>>
-	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whoring = 15>>
-	<<set $activeSlave.skill.entertainment = 100>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.clitPiercing = 2>>
-	<<set $activeSlave.nipplesPiercing = 1>>
-	<<set $activeSlave.earPiercing = 1>>
-	<<set $activeSlave.tonguePiercing = 1>>
-	<<set $activeSlave.eyebrowPiercing = 1>>
-	<<set $activeSlave.behavioralFlaw = "odd">>
-	<<set $activeSlave.behavioralQuirk = "confident">>
-	<<set $activeSlave.sexualFlaw = "judgemental">>
-	<<set $activeSlave.sexualQuirk = "romantic">>
-	<<set $activeSlave.hStyle = "luxurious">>
-	<<set $activeSlave.hLength = 80>>
-<<case "cum addict">>
-	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.chem = 3000>>
-	<<set $activeSlave.face = 100>>
-	<<set $activeSlave.faceShape = "masculine">>
-	<<set $activeSlave.muscles = 100>>
-	<<set $activeSlave.height = random(185,215)>>
-	<<set $activeSlave.lips = 10>>
-	<<set $activeSlave.butt = 10>>
-	<<set $activeSlave.boobs = either(100, 200)>>
-	<<set $activeSlave.dick = 6>>
-	<<set $activeSlave.foreskin = 0>>
-	<<set $activeSlave.balls = 300>>
-	<<set $activeSlave.scrotum = 280>>
-	<<set $activeSlave.anus = 3>>
-	<<set $activeSlave.vagina = -1>>
-	<<set $activeSlave.weight = -35>>
-	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whoring = 15>>
-	<<set $activeSlave.skill.entertainment = 100>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.dickPiercing = 2>>
-	<<set $activeSlave.fetish = "pregnancy">>
-	<<set $activeSlave.fetishStrength = 100>>
-	<<set $activeSlave.behavioralFlaw = "odd">>
-	<<set $activeSlave.behavioralQuirk = "confident">>
-	<<set $activeSlave.sexualFlaw = "cum addict">>
-	<<set $activeSlave.sexualQuirk = "size queen">>
-	<<set $activeSlave.hStyle = "neat">>
-	<<set $activeSlave.hLength = 20>>
-<<case "hung shota">>
-	<<set $activeSlave = GenerateNewSlave("XY", {minAge: $minimumSlaveAge, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 100>>
-	<<set $activeSlave.faceShape = "androgynous">>
-	<<set $activeSlave.muscles = 0>>
-	<<set $activeSlave.lips = 10>>
-	<<set $activeSlave.butt = 0>>
-	<<set $activeSlave.boobs = either(100, 200)>>
-	<<set $activeSlave.dick = 6>>
-	<<set $activeSlave.foreskin = $activeSlave.dick>>
-	<<set $activeSlave.balls = 6>>
-	<<set $activeSlave.scrotum = 6>>
-	<<set $activeSlave.anus = 0>>
-	<<set $activeSlave.vagina = -1>>
-	<<set $activeSlave.weight = -35>>
-	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whoring = 0>>
-	<<set $activeSlave.skill.entertainment = 100>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.dickPiercing = 2>>
-	<<set $activeSlave.pubertyXY = 1>>
-	<<set $activeSlave.fetish = "pregnancy">>
-	<<set $activeSlave.fetishStrength = 100>>
-	<<set $activeSlave.behavioralFlaw = "hates men">>
-	<<set $activeSlave.behavioralQuirk = "adores women">>
-	<<set $activeSlave.sexualFlaw = "shamefast">>
-	<<set $activeSlave.sexualQuirk = "perverted">>
-	<<set $activeSlave.hLength = 20>>
-<<case "masculine">>
-	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 55>>
-	<<set $activeSlave.faceImplant = 0>>
-	<<set $activeSlave.faceShape = "masculine">>
-	<<set $activeSlave.muscles = either(20, 50, 100)>>
-	<<set $activeSlave.height = random(185,195)>>
-	<<set $activeSlave.butt = either(2, 3)>>
-	<<set $activeSlave.boobs = either(100, 200)>>
-	<<set $activeSlave.dick = 5>>
-	<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-	<<set $activeSlave.balls = 5>>
-	<<set $activeSlave.anus = 0>>
-	<<set $activeSlave.vagina = -1>>
-	<<set $activeSlave.weight = 0>>
-	<<set $activeSlave.skill.vaginal = 0>>
-	<<set $activeSlave.skill.oral = 15>>
-	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whoring = 0>>
-	<<set $activeSlave.skill.entertainment = 15>>
-	<<set $activeSlave.skill.combat = 1>>
-	<<set $activeSlave.behavioralFlaw = "hates men">>
-	<<set $activeSlave.behavioralQuirk = "fitness">>
-	<<set $activeSlave.sexualFlaw = "hates anal">>
-	<<set $activeSlave.sexualQuirk = "perverted">>
-	<<set $activeSlave.hStyle = "neat">>
-	<<set $activeSlave.hLength = 5>>
-<<case "micropenis">>
-	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 55>>
-	<<set $activeSlave.faceImplant = 0>>
-	<<set $activeSlave.faceShape = "masculine">>
-	<<set $activeSlave.muscles = 0>>
-	<<set $activeSlave.height = random(145,160)>>
-	<<set $activeSlave.butt = either(2, 4)>>
-	<<set $activeSlave.boobs = either(100, 400)>>
-	<<set $activeSlave.dick = 1>>
-	<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-	<<set $activeSlave.balls = 2>>
-	<<set $activeSlave.anus = 1>>
-	<<set $activeSlave.vagina = -1>>
-	<<set $activeSlave.weight = 100>>
-	<<set $activeSlave.skill.vaginal = 0>>
-	<<set $activeSlave.skill.oral = 15>>
-	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whoring = 0>>
-	<<set $activeSlave.skill.entertainment = 15>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.behavioralFlaw = "hates men">>
-	<<set $activeSlave.behavioralQuirk = "insecure">>
-	<<set $activeSlave.sexualFlaw = "shamefast">>
-	<<set $activeSlave.sexualQuirk = "perverted">>
-	<<set $activeSlave.hStyle = "neat">>
-	<<set $activeSlave.hLength = 5>>
-<<case "bull dyke">>
-	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 55>>
-	<<set $activeSlave.faceImplant = 0>>
-	<<set $activeSlave.faceShape = "androgynous">>
-	<<set $activeSlave.muscles = 100>>
-	<<set $activeSlave.height = random(185,195)>>
-	<<set $activeSlave.lipsImplant = 10>>
-	<<set $activeSlave.lips = 35>>
-	<<set $activeSlave.buttImplant = 1>>
-	<<set $activeSlave.butt += $activeSlave.buttImplant>>
-	<<set $activeSlave.buttImplantType = "normal">>
-	<<set $activeSlave.boobs -= 100>>
-	<<set $activeSlave.boobsImplant = either(400, 600, 800)>>
-	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
-	<<set $activeSlave.boobsImplantType = "normal">>
-	<<set $activeSlave.clit = 2>>
-	<<set $activeSlave.anus = 1>>
-	<<set $activeSlave.vagina = 1>>
-	<<set $activeSlave.preg = -1>>
-	<<set $activeSlave.skill.vaginal = 15>>
-	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whoring = 0>>
-	<<set $activeSlave.skill.entertainment = 0>>
-	<<set $activeSlave.skill.combat = 1>>
-	<<set $activeSlave.clitPiercing = 1>>
-	<<set $activeSlave.earPiercing = 1>>
-	<<set $activeSlave.behavioralFlaw = "hates men">>
-	<<set $activeSlave.behavioralQuirk = "fitness">>
-	<<set $activeSlave.sexualFlaw = "hates penetration">>
-	<<set $activeSlave.sexualQuirk = "unflinching">>
-	<<set $activeSlave.hStyle = "neat">>
-	<<set $activeSlave.hLength = 5>>
-<<case "breeder">>
-	<<if $pedo_mode == 1>>
-		<<set _minAge = ($fertilityAge + 6)>>
-		<<set _pedo = 1>> /* Old enough to have been pregnant many times. */
-	<<else>>
-		<<set _minAge = 18>>
-		<<set _maxAge = 42>>
-	<</if>>
-	<<set $activeSlave = GenerateNewSlave("XX", {minAge: _minAge, maxAge: _maxAge, ageOverridesPedoMode: _pedo, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.pubertyXX = 1>>
-	<<set $activeSlave.face = 100>>
-	<<set $activeSlave.faceImplant = 0>>
-	<<set $activeSlave.faceShape = "sensual">>
-	<<set $activeSlave.muscles = 50>>
-	<<set $activeSlave.lips = 35>>
-	<<set $activeSlave.butt = either(6, 7, 8)>>
-	<<set $activeSlave.boobs = 5000>>
-	<<set $activeSlave.nipples = "huge">>
-	<<set $activeSlave.lactation = 1>>
-	<<set $activeSlave.lactationDuration = 2>>
-	<<set $activeSlave.anus = 1>>
-	<<set $activeSlave.preg = 25>>
-	<<if $seeHyperPreg == 1>>
-		<<set $activeSlave.geneticQuirks.uterineHypersensitivity = 2>>
-		<<set $activeSlave.vagina = 10>>
-		<<set $activeSlave.pregType = random(20,35)>>
-		<<set $activeSlave.counter.birthsTotal = random(120,180)>>
-		<<set $activeSlave.bellySag = 30, $activeSlave.bellySagPreg = 30>>
-		<<set $activeSlave.pregAdaptation = $activeSlave.counter.birthsTotal*2>>
-	<<else>>
-		<<set _UHSchance = Math.random()>>
-		<<if _UHSchance > 0.9>>
-			<<set $activeSlave.geneticQuirks.uterineHypersensitivity = 2>>
-		<<elseif _UHSchance > 0.6 && $activeSlave.geneticQuirks.uterineHypersensitivity != 2>>
-			<<set $activeSlave.geneticQuirks.uterineHypersensitivity = 1>>
-		<</if>>
-		<<set $activeSlave.vagina = 5>>
-		<<set $activeSlave.pregType = either(3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 8)>>
-		<<set $activeSlave.counter.birthsTotal = random(18,27)>>
-		<<set $activeSlave.bellySag = 2, $activeSlave.bellySagPreg = 2>>
-		<<set $activeSlave.pregAdaptation = (random(60,100) + ($activeSlave.counter.birthsTotal * $activeSlave.geneticQuirks.uterineHypersensitivity))>>
-	<</if>>
-	<<set $activeSlave.pregKnown = 1>>
-	<<set $activeSlave.pregWeek = $activeSlave.preg>>
-	<<run SetBellySize($activeSlave)>>
-	<<set $activeSlave.skill.vaginal = 100>>
-	<<set $activeSlave.skill.oral = 15>>
-	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whoring = 35>>
-	<<set $activeSlave.skill.entertainment = 15>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.fetish = "pregnancy">>
-	<<set $activeSlave.fetishStrength = 1000>>
-	<<set $activeSlave.behavioralFlaw = "odd">>
-	<<set $activeSlave.behavioralQuirk = "adores men">>
-	<<set $activeSlave.sexualFlaw = "breeder">>
-	<<set $activeSlave.sexualQuirk = "caring">>
-	<<set $activeSlave.hStyle = "luxurious">>
-	<<set $activeSlave.hLength = 80>>
-<<case "oppai loli">>
-	<<set $activeSlave = GenerateNewSlave("XX", {minAge: $minimumSlaveAge, maxAge: 12, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 100>>
-	<<set $activeSlave.faceImplant = 0>>
-	<<set $activeSlave.faceShape = "cute">>
-	<<set $activeSlave.muscles = 20>>
-	<<set $activeSlave.weight = 60>>
-	<<set $activeSlave.lips = 10>>
-	<<set $activeSlave.butt = 1>>
-	<<set $activeSlave.hips = -1>>
-	<<set $activeSlave.shoulders = -2>>
-	<<set $activeSlave.boobs = 7000>>
-	<<set $activeSlave.nipples = "huge">>
-	<<set $activeSlave.anus = 0>>
-	<<set $activeSlave.vagina = 0>>
-	<<set $activeSlave.preg = 0>>
-	<<set $activeSlave.skill.vaginal = 0>>
-	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whoring = 0>>
-	<<set $activeSlave.skill.entertainment = 15>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.behavioralFlaw = "odd">>
-	<<set $activeSlave.behavioralQuirk = "insecure">>
-	<<set $activeSlave.sexualFlaw = "shamefast">>
-	<<set $activeSlave.sexualQuirk = "tease">>
-	<<set $activeSlave.hStyle = "twin tails">>
-	<<set $activeSlave.hLength = 40>>
-<<case "cow">>
-	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 55>>
-	<<set $activeSlave.faceImplant = 0>>
-	<<set $activeSlave.faceShape = "cute">>
-	<<set $activeSlave.muscles = 50>>
-	<<set $activeSlave.height = random(185,195)>>
-	<<set $activeSlave.lips = 35>>
-	<<set $activeSlave.butt = either(6, 7, 8)>>
-	<<set $activeSlave.boobs = 30000>>
-	<<set $activeSlave.weight = random(100,160)>>
-	<<set $activeSlave.nipples = "huge">>
-	<<set $activeSlave.lactation = 2>>
-	<<set $activeSlave.lactationDuration = 2>>
-	<<set $activeSlave.anus = 1>>
-	<<set $activeSlave.vagina = 2>>
-	<<set $activeSlave.preg = 0>>
-	<<set $activeSlave.skill.vaginal = 15>>
-	<<set $activeSlave.skill.oral = 15>>
-	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whoring = 0>>
-	<<set $activeSlave.skill.entertainment = 15>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.behavioralFlaw = "odd">>
-	<<set $activeSlave.behavioralQuirk = "insecure">>
-	<<set $activeSlave.sexualFlaw = "breast growth">>
-	<<set $activeSlave.sexualQuirk = "perverted">>
-	<<set $activeSlave.hStyle = "neat">>
-	<<set $activeSlave.hLength = 5>>
-<<case "bimbo">>
-	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 100>>
-	<<set $activeSlave.faceImplant = 65>>
-	<<set $activeSlave.faceShape = "sensual">>
-	<<set $activeSlave.muscles = 0>>
-	<<set $activeSlave.height = random(180,190)>>
-	<<set $activeSlave.lipsImplant = 2>>
-	<<set $activeSlave.lips = random(25,55)>>
-	<<set $activeSlave.buttImplant = 2>>
-	<<set $activeSlave.butt += $activeSlave.buttImplant>>
-	<<set $activeSlave.buttImplantType = "normal">>
-	<<set $activeSlave.boobsImplant = either(600, 800, 1000)>>
-	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
-	<<set $activeSlave.boobsImplantType = "normal">>
-	<<set $activeSlave.anus = 2>>
-	<<set $activeSlave.vagina = 1>>
-	<<set $activeSlave.preg = -1>>
-	<<set $activeSlave.skill.vaginal = 100>>
-	<<set $activeSlave.skill.oral = 100>>
-	<<set $activeSlave.skill.anal = 35>>
-	<<set $activeSlave.skill.whoring = 35>>
-	<<set $activeSlave.skill.entertainment = 35>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.clitPiercing = 1>>
-	<<set $activeSlave.earPiercing = 1>>
-	<<set $activeSlave.behavioralFlaw = "arrogant">>
-	<<set $activeSlave.behavioralQuirk = "insecure">>
-	<<set $activeSlave.sexualFlaw = "crude">>
-	<<set $activeSlave.sexualQuirk = "caring">>
-	<<set $activeSlave.hStyle = "tails">>
-	<<set $activeSlave.hLength = 80>>
-<<default>>
-	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
-	<<set $activeSlave.face = 100>>
-	<<set $activeSlave.faceImplant = 15>>
-	<<set $activeSlave.muscles = 0>>
-	<<set $activeSlave.lips = 35>>
-	<<set $activeSlave.butt += random(1,3)>>
-	<<set $activeSlave.boobs += 200*random(1,3)>>
-	<<set $activeSlave.anus = 4>>
-	<<set $activeSlave.vagina = 4>>
-	<<if $seePreg == 1>>
-		<<set $activeSlave.preg = 2>>
-		<<set $activeSlave.pregKnown = 1>>
-		<<set $activeSlave.pregWeek = $activeSlave.preg>>
-		<<set $activeSlave.pregType = setPregType($activeSlave)>>
-		<<run SetBellySize($activeSlave)>>
-	<</if>>
-	<<set $activeSlave.skill.vaginal = 100>>
-	<<set $activeSlave.skill.oral = 100>>
-	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whoring = 100>>
-	<<set $activeSlave.skill.entertainment = 0>>
-	<<set $activeSlave.skill.combat = 0>>
-	<<set $activeSlave.clitPiercing = 1>>
-	<<set $activeSlave.earPiercing = 1>>
-	<<set $activeSlave.behavioralFlaw = "bitchy">>
-	<<set $activeSlave.behavioralQuirk = "funny">>
-	<<set $activeSlave.sexualFlaw = "crude">>
-	<<set $activeSlave.sexualQuirk = "size queen">>
-	<<set $activeSlave.hStyle = "neat">>
-	<<set $activeSlave.hLength = 80>>
-	<<set $activeSlave.addict = 10>>
-<</switch>>
-<<set $activeSlave.intelligence = 100>>
-<<set $activeSlave.intelligenceImplant = 30>>
-<<set $activeSlave.devotion = -20>>
-<<set $activeSlave.trust = -10>>
-<<set $activeSlave.origin = "$He was once an arcology owner like yourself.">>
-<<set $activeSlave.career = "an arcology owner">>
-<<set $activeSlave.prestige = 3>>
-<<set $activeSlave.prestigeDesc = "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty.">>
-<<run setHealth($activeSlave, 100, 0, 0, 0, jsRandom(10, 30))>>
-<<if $activeSlave.physicalAge > 35>><<run applyAgeImplant($activeSlave)>><</if>>
-<<set $activeSlave.pubicHStyle = "waxed">>
-<<set $activeSlave.underArmHStyle = "waxed">>
-
-<<setLocalPronouns $activeSlave>>
-
-<<if $seeImages == 1>>
-	<<if $imageChoice == 1>>
-		<div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
-	<<else>>
-		<div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
-	<</if>>
-<</if>>
-
-Your
-<<if passage() == "P rivalry actions">>
-	target is quickly delivered. Politely dismissing the head of your $mercenariesTitle, you savor
-<<else>>
-	bounty is quickly claimed, and you are treated to
-<</if>>
-the delicious moment of finding your rival on <<if hasBothLegs($activeSlave)>>$his knees<<else>>the ground<</if>> in front of you with a black bag over $his head and $his hands cuffed behind $him. $He's one of your slaves now, fundamentally no different than any other. Looking $him over, the causes of $his downfall are
-<<switch _rivalType>>
-<<case "expansionist shemale">>
-	immediately apparent: $he's obviously been indulging in self-transformation to excess.
-<<case "cum addict">>
-	immediately apparent: there's nothing wrong with having cumflation and ball expansion fetishes, but applying them to oneself can be addictive.
-<<case "hung shota">>
-	not immediately apparent: $he's young, in good shape, and not lacking down there at all.
-<<case "masculine">>
-	not immediately apparent: $he's in good shape, if quite masculine.
-<<case "micropenis">>
-	immediately apparent: $he's got a slavegirl's cock and balls, not an arcology owner's.
-<<case "bull dyke">>
-	not immediately apparent: though female, $he's obviously no stranger to taking a dominant sexual role, to put it politely.
-<<case "breeder">>
-	immediately apparent: there's nothing wrong with having a pregnancy fetish, but applying it to oneself is ill-fitting for an arcology owner.
-<<case "oppai loli">>
-	immediately apparent: $he's young, inexperienced, and extremely top heavy.
-<<case "cow">>
-	immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive.
-<<case "bimbo">>
-	immediately apparent: there's nothing wrong with having a bimbo fetish, but applying it to oneself can be addictive.
-<<default>>
-	immediately apparent: $he seems to have recently fallen into serious aphrodisiac addiction.
-<</switch>>
-
-<<set $nextLink = "AS Dump", $returnTo = "P rival initiation", $rivalID = $activeSlave.ID>> /* proceed directly to rival initiation event after New Slave Intro */
-<<set $rivalRace = 0>>
-<<set $rivalGender = 0>>
-<<include "New Slave Intro">>
diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw
index 81801ded0d298128110e4a0b8bac40a06314a6f4..8b60f4351fb20985551df283f16795f52be1399c 100644
--- a/src/uncategorized/pRivalryVictory.tw
+++ b/src/uncategorized/pRivalryVictory.tw
@@ -144,7 +144,7 @@ For the first time, you receive a direct call from your rival. You pictured the
 		<<run cashX(random(-10000,-25000), "war")>>
 	<</if>>
 	<<run cashX(-50000, "war")>>
-	<<include "P rivalry capture">>
+	<<includeDOM pRivalryCapture()>>
 	<</replace>>
 <</link>>
 </span>