From fcbfe574c04d56fc14a8f8d1ac91f52cc9356d84 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Mon, 25 Mar 2019 15:13:31 +0100
Subject: [PATCH] Consolidate slave porn performance parameters in an object

Various porn.+ properties get moved into a .porn object inside the
SlaveState class.
---
 slave variables documentation - Pregmod.txt |   84 +-
 src/endWeek/saPorn.js                       |  140 +-
 src/js/SlaveState.js                        |  169 +-
 src/js/datatypeCleanupJS.js                 |  192 +-
 src/pregmod/saPorn.tw                       | 2142 +++++++++----------
 src/pregmod/widgets/bodyswapWidgets.tw      |   40 +-
 src/uncategorized/nextWeek.tw               |   70 +-
 src/uncategorized/reRelativeRecruiter.tw    |  148 +-
 src/uncategorized/saLongTermEffects.tw      |    2 +-
 src/uncategorized/saServeThePublic.tw       |    2 +-
 src/uncategorized/saWhore.tw                |    2 +-
 src/uncategorized/sellSlave.tw              |    6 +-
 src/uncategorized/slaveInteract.tw          |   84 +-
 src/uncategorized/slaveSold.tw              |    2 +-
 src/uncategorized/slaveStats.tw             |   76 +-
 15 files changed, 1587 insertions(+), 1572 deletions(-)

diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 628e86e4771..366d8c51ed5 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -293,7 +293,11 @@ pornPrestigeDesc:
 description to go with above pornPrestige
 accepts string
 
-pornFameType:
+porn:
+
+porn performance of the slave. Has the following properties:
+
+porn.fameType:
 
 what porn she is known for
 "none"
@@ -333,7 +337,7 @@ what porn she is known for
 "unspeakable"
 "huge insertion"
 
-pornFocus:
+porn.focus:
 
 what aspect of her the upgraded studio is focusing on for porn
 "none"
@@ -373,177 +377,177 @@ what aspect of her the upgraded studio is focusing on for porn
 "unflinching"
 "size queen"
 
-pornTypeGeneral:
+porn.fame.general:
 
 generic porn fame
 accepts int
 
-pornTypeFuckdoll:
+porn.fame.fuckdoll:
 
 fuckdoll porn fame
 accepts int
 
-pornTypeRape:
+porn.fame.rape:
 
 rape porn fame
 accepts int
 
-pornTypePreggo:
+porn.fame.preggo:
 
 preggo porn fame
 accepts int
 
-pornTypeBBW:
+porn.fame.BBW:
 
 BBW porn fame
 accepts int
 
-pornTypeGainer:
+porn.fame.gainer:
 
 weight gain porn fame
 accepts int
 
-pornTypeStud:
+porn.fame.stud:
 
 well hung porn fame
 accepts int
 
-pornTypeLoli:
+porn.fame.loli:
 
 underage porn fame
 accepts int
 
-pornTypeDeepThroat:
+porn.fame.deepThroat:
 
 gagfuck queen porn fame
 accepts int
 
-pornTypeStruggleFuck:
+porn.fame.struggleFuck:
 
 strugglefuck queen porn fame
 accepts int
 
-pornTypePainal:
+porn.fame.painal:
 
 painal queen porn fame
 accepts int
 
-pornTypeTease:
+porn.fame.tease:
 
 tease porn fame
 accepts int
 
-pornTypeRomantic:
+porn.fame.romantic:
 
 romantic porn fame
 accepts int
 
-pornTypePervert:
+porn.fame.pervert:
 
 pervert porn fame
 accepts int
 
-pornTypeCaring:
+porn.fame.caring:
 
 caring porn fame
 accepts int
 
-pornTypeUnflinching:
+porn.fame.unflinching:
 
 unflinching porn fame
 accepts int
 
-pornTypeSizeQueen:
+porn.fame.sizeQueen:
 
 size queen porn fame
 accepts int
 
-pornTypeNeglectful:
+porn.fame.neglectful:
 
 neglectful porn fame
 accepts int
 
-pornTypeCumAddict:
+porn.fame.cumAddict:
 
 cum addict porn fame
 accepts int
 
-pornTypeAnalAddict:
+porn.fame.analAddict:
 
 anal addict porn fame
 accepts int
 
-pornTypeAttentionWhore:
+porn.fame.attentionWhore:
 
 attention whore porn fame
 accepts int
 
-pornTypeBreastGrowth:
+porn.fame.breastGrowth:
 
 breast growth porn fame
 accepts int
 
-pornTypeAbusive:
+porn.fame.abusive:
 
 abusive porn fame
 accepts int
 
-pornTypeMalicious:
+porn.fame.malicious:
 
 malicious porn fame
 accepts int
 
-pornTypeSelfHating:
+porn.fame.selfHating:
 
 self hating porn fame
 accepts int
 
-pornTypeBreeder:
+porn.fame.breeder:
 
 breeder porn fame
 accepts int
 
-pornTypeSub:
+porn.fame.sub:
 
 submissive porn fame
 accepts int
 
-pornTypeCumSlut:
+porn.fame.cumSlut:
 
 cumslut porn fame
 accepts int
 
-pornTypeAnal:
+porn.fame.anal:
 
 buttslut porn fame
 accepts int
 
-pornTypeHumiliation:
+porn.fame.humiliation:
 
 humiliation porn fame
 accepts int
 
-pornTypeBoobs:
+porn.fame.boobs:
 
 boob porn fame
 accepts int
 
-pornTypeDom:
+porn.fame.dom:
 
 dom porn fame
 accepts int
 
-pornTypeSadist:
+porn.fame.sadist:
 
 sadist porn fame
 accepts int
 
-pornTypeMasochist:
+porn.fame.masochist:
 
 masochist porn fame
 accepts int
 
-pornTypePregnancy:
+porn.fame.pregnancy:
 
 pregnancy porn fame
 accepts int
@@ -3617,9 +3621,7 @@ Not currently used, will work similarly to the cash variables above
 
 How to set up your own hero slave.
 
--The default slave template used:
-
-<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", origRace: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", pupil: "circular", sclerae: "white", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", underArmHColor: "brown", eyebrowHColor: "brown", origSkin: "light", skin: "light", hLength: 60, eyebrowFullness: "natural", hStyle: "short", pubicHStyle: "neat", underArmHStyle: "neat", eyebrowHStyle: "natural", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, areolaeShape: "circle", boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, superfetation: 0, ovaImplant: 0, wombImplant: "none", broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, reservedChildrenNursery: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, prematureBirth: 0, premature: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillMT: 0, skillST: 0, skillMM: 0, skillFA: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, geneMods: {NCS: 0, rapidCellGrowth: 0}, NCSyouthening: 0, override_Race: 0, override_Skin: 0, override_Eye_Color: 0, override_H_Color: 0, override_Pubic_H_Color: 0, override_Arm_H_Color: 0, override_Brow_H_Color: 0, albinismOverride: 0, missingEyes: 0, missingArms: 0, missingLegs: 0, slaveCost: 0, lifetimeCashExpenses: 0, lifetimeCashIncome: 0, lastWeeksCashIncome: 0, lifetimeRepExpenses: 0, lifetimeRepIncome: 0, lastWeeksRepIncome: 0, chastityVagina = 0, chastityPenis = 0, chastityAnus = 0, smells: 0, tastes: 0}>>
+-The default slave template used is defined in src/js/SlaveState.js
 
 Making your slave; add their name to the following, then go down the documentation adding in your changes.
 -each variable must be separated from the last by a comma followed by a space
@@ -3627,7 +3629,7 @@ Making your slave; add their name to the following, then go down the documentati
 -if your slave's variable matches the default, you do not have to list it
 -strings MUST be in " or your slave will not compile properly
 
-<<set _HS = {}>>
+<<set _HS =  App.Entity.SlaveState.makeSkeleton()>>
 <<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _HS.ID = _i++>>
 <<set $heroSlaves.push(_HS)>>
 
diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js
index 2804472deb4..fea7013dedb 100644
--- a/src/endWeek/saPorn.js
+++ b/src/endWeek/saPorn.js
@@ -3,110 +3,110 @@
 window.getHighestPorn = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	let max = {value: 0, type: "none"};
 
-	if (slave.pornTypeGeneral > max.value) {
-		max = {value: slave.pornTypeGeneral, type: "generic"};
+	if (slave.porn.fame.general > max.value) {
+		max = {value: slave.porn.fame.general, type: "generic"};
 	}
-	if (slave.pornTypeFuckdoll > max.value) {
-		max = {value: slave.pornTypeFuckdoll, type: "fuckdoll"};
+	if (slave.porn.fame.fuckdoll > max.value) {
+		max = {value: slave.porn.fame.fuckdoll, type: "fuckdoll"};
 	}
-	if (slave.pornTypeRape > max.value) {
-		max = {value: slave.pornTypeRape, type: "rape"};
+	if (slave.porn.fame.rape > max.value) {
+		max = {value: slave.porn.fame.rape, type: "rape"};
 	}
-	if (slave.pornTypePreggo > max.value) {
-		max = {value: slave.pornTypePreggo, type: "preggo"};
+	if (slave.porn.fame.preggo > max.value) {
+		max = {value: slave.porn.fame.preggo, type: "preggo"};
 	}
-	if (slave.pornTypeBBW > max.value) {
-		max = {value: slave.pornTypeBBW, type: "BBW"};
+	if (slave.porn.fame.BBW > max.value) {
+		max = {value: slave.porn.fame.BBW, type: "BBW"};
 	}
-	if (slave.pornTypeGainer > max.value) {
-		max = {value: slave.pornTypeGainer, type: "weight gain"};
+	if (slave.porn.fame.gainer > max.value) {
+		max = {value: slave.porn.fame.gainer, type: "weight gain"};
 	}
-	if (slave.pornTypeStud > max.value) {
-		max = {value: slave.pornTypeStud, type: "big dick"};
+	if (slave.porn.fame.stud > max.value) {
+		max = {value: slave.porn.fame.stud, type: "big dick"};
 	}
-	if (slave.pornTypeLoli > max.value) {
-		max = {value: slave.pornTypeLoli, type: "underage"};
+	if (slave.porn.fame.loli > max.value) {
+		max = {value: slave.porn.fame.loli, type: "underage"};
 	}
-	if (slave.pornTypeDeepThroat > max.value) {
-		max = {value: slave.pornTypeDeepThroat, type: "deepthroat"};
+	if (slave.porn.fame.deepThroat > max.value) {
+		max = {value: slave.porn.fame.deepThroat, type: "deepthroat"};
 	}
-	if (slave.pornTypeStruggleFuck > max.value) {
-		max = {value: slave.pornTypeStruggleFuck, type: "unwilling"};
+	if (slave.porn.fame.struggleFuck > max.value) {
+		max = {value: slave.porn.fame.struggleFuck, type: "unwilling"};
 	}
-	if (slave.pornTypePainal > max.value) {
-		max = {value: slave.pornTypePainal, type: "hardcore anal"};
+	if (slave.porn.fame.painal > max.value) {
+		max = {value: slave.porn.fame.painal, type: "hardcore anal"};
 	}
-	if (slave.pornTypeTease > max.value) {
-		max = {value: slave.pornTypeTease, type: "softcore"};
+	if (slave.porn.fame.tease > max.value) {
+		max = {value: slave.porn.fame.tease, type: "softcore"};
 	}
-	if (slave.pornTypeRomantic > max.value) {
-		max = {value: slave.pornTypeRomantic, type: "romantic"};
+	if (slave.porn.fame.romantic > max.value) {
+		max = {value: slave.porn.fame.romantic, type: "romantic"};
 	}
-	if (slave.pornTypePervert > max.value) {
-		max = {value: slave.pornTypePervert, type: "really perverted"};
+	if (slave.porn.fame.pervert > max.value) {
+		max = {value: slave.porn.fame.pervert, type: "really perverted"};
 	}
-	if (slave.pornTypeCaring > max.value) {
-		max = {value: slave.pornTypeCaring, type: "voyeur"};
+	if (slave.porn.fame.caring > max.value) {
+		max = {value: slave.porn.fame.caring, type: "voyeur"};
 	}
-	if (slave.pornTypeUnflinching > max.value) {
-		max = {value: slave.pornTypeUnflinching, type: "unspeakable"};
+	if (slave.porn.fame.unflinching > max.value) {
+		max = {value: slave.porn.fame.unflinching, type: "unspeakable"};
 	}
-	if (slave.pornTypeSizeQueen > max.value) {
-		max = {value: slave.pornTypeSizeQueen, type: "huge insertion"};
+	if (slave.porn.fame.sizeQueen > max.value) {
+		max = {value: slave.porn.fame.sizeQueen, type: "huge insertion"};
 	}
-	if (slave.pornTypeNeglectful > max.value) {
-		max = {value: slave.pornTypeNeglectful, type: "orgasm denial"};
+	if (slave.porn.fame.neglectful > max.value) {
+		max = {value: slave.porn.fame.neglectful, type: "orgasm denial"};
 	}
-	if (slave.pornTypeCumAddict > max.value) {
-		max = {value: slave.pornTypeCumAddict, type: "cum addiction"};
+	if (slave.porn.fame.cumAddict > max.value) {
+		max = {value: slave.porn.fame.cumAddict, type: "cum addiction"};
 	}
-	if (slave.pornTypeAnalAddict > max.value) {
-		max = {value: slave.pornTypeAnalAddict, type: "anal addiction"};
+	if (slave.porn.fame.analAddict > max.value) {
+		max = {value: slave.porn.fame.analAddict, type: "anal addiction"};
 	}
-	if (slave.pornTypeAttentionWhore > max.value) {
-		max = {value: slave.pornTypeAttentionWhore, type: "exhibition"};
+	if (slave.porn.fame.attentionWhore > max.value) {
+		max = {value: slave.porn.fame.attentionWhore, type: "exhibition"};
 	}
-	if (slave.pornTypeBreastGrowth > max.value) {
-		max = {value: slave.pornTypeBreastGrowth, type: "breast expansion"};
+	if (slave.porn.fame.breastGrowth > max.value) {
+		max = {value: slave.porn.fame.breastGrowth, type: "breast expansion"};
 	}
-	if (slave.pornTypeAbusive > max.value) {
-		max = {value: slave.pornTypeAbusive, type: "abuse"};
+	if (slave.porn.fame.abusive > max.value) {
+		max = {value: slave.porn.fame.abusive, type: "abuse"};
 	}
-	if (slave.pornTypeMalicious > max.value) {
-		max = {value: slave.pornTypeMalicious, type: "sexual torture"};
+	if (slave.porn.fame.malicious > max.value) {
+		max = {value: slave.porn.fame.malicious, type: "sexual torture"};
 	}
-	if (slave.pornTypeSelfHating > max.value) {
-		max = {value: slave.pornTypeSelfHating, type: "self hating"};
+	if (slave.porn.fame.selfHating > max.value) {
+		max = {value: slave.porn.fame.selfHating, type: "self hating"};
 	}
-	if (slave.pornTypeBreeder > max.value) {
-		max = {value: slave.pornTypeBreeder, type: "breeder"};
+	if (slave.porn.fame.breeder > max.value) {
+		max = {value: slave.porn.fame.breeder, type: "breeder"};
 	}
-	if (slave.pornTypeSub > max.value) {
-		max = {value: slave.pornTypeSub, type: "submissive"};
+	if (slave.porn.fame.sub > max.value) {
+		max = {value: slave.porn.fame.sub, type: "submissive"};
 	}
-	if (slave.pornTypeCumSlut > max.value) {
-		max = {value: slave.pornTypeCumSlut, type: "cum"};
+	if (slave.porn.fame.cumSlut > max.value) {
+		max = {value: slave.porn.fame.cumSlut, type: "cum"};
 	}
-	if (slave.pornTypeAnal > max.value) {
-		max = {value: slave.pornTypeAnal, type: "buttslut"};
+	if (slave.porn.fame.anal > max.value) {
+		max = {value: slave.porn.fame.anal, type: "buttslut"};
 	}
-	if (slave.pornTypeHumiliation > max.value) {
-		max = {value: slave.pornTypeHumiliation, type: "humiliating"};
+	if (slave.porn.fame.humiliation > max.value) {
+		max = {value: slave.porn.fame.humiliation, type: "humiliating"};
 	}
-	if (slave.pornTypeBoobs > max.value) {
-		max = {value: slave.pornTypeBoobs, type: "breast"};
+	if (slave.porn.fame.boobs > max.value) {
+		max = {value: slave.porn.fame.boobs, type: "breast"};
 	}
-	if (slave.pornTypeDom > max.value) {
-		max = {value: slave.pornTypeDom, type: "dominant"};
+	if (slave.porn.fame.dom > max.value) {
+		max = {value: slave.porn.fame.dom, type: "dominant"};
 	}
-	if (slave.pornTypeSadist > max.value) {
-		max = {value: slave.pornTypeSadist, type: "sadistic"};
+	if (slave.porn.fame.sadist > max.value) {
+		max = {value: slave.porn.fame.sadist, type: "sadistic"};
 	}
-	if (slave.pornTypeMasochist > max.value) {
-		max = {value: slave.pornTypeMasochist, type: "masochistic"};
+	if (slave.porn.fame.masochist > max.value) {
+		max = {value: slave.porn.fame.masochist, type: "masochistic"};
 	}
-	if (slave.pornTypePregnancy > max.value) {
-		max = {value: slave.pornTypePregnancy, type: "pregnancy fetish"};
+	if (slave.porn.fame.pregnancy > max.value) {
+		max = {value: slave.porn.fame.pregnancy, type: "pregnancy fetish"};
 	}
 
 	return max;
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index cb19ef1633b..eb71a972093 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -3,12 +3,100 @@
  * Encapsulates the full description of a slave state. Serializable by the SugarCube state
  * management.
  */
+
+/**
+ * Encapsulates porn performance of a slave. Used inside of the
+ * App.Entity.SlaveState class.
+ * @ref App.Entity.SlaveState
+ */
+App.Entity.SlavePornPerformanceState = class SlavePornPerformanceState {
+	constructor() {
+		/** what porn she is known for */
+		this.fameType = "none";
+		/** what aspect of her the upgraded studio is focusing on for porn */
+		this.focus = "none";
+		this.fame = {
+			/** generic porn fame */
+			general: 0,
+			/** fuckdoll porn fame */
+			fuckdoll: 0,
+			/** rape porn fame */
+			rape: 0,
+			/** preggo porn fame */
+			preggo: 0,
+			/** BBW porn fame */
+			BBW: 0,
+			/** weight gain porn fame */
+			gainer: 0,
+			/** well hung porn fame */
+			stud: 0,
+			/** underage porn fame */
+			loli: 0,
+			/** gagfuck queen porn fame */
+			deepThroat: 0,
+			/** strugglefuck queen porn fame */
+			struggleFuck: 0,
+			/** painal queen porn fame */
+			painal: 0,
+			/** tease porn fame */
+			tease: 0,
+			/** romantic porn fame */
+			romantic: 0,
+			/** pervert porn fame */
+			pervert: 0,
+			/** caring porn fame */
+			caring: 0,
+			/** unflinching porn fame */
+			unflinching: 0,
+			/** size queen porn fame */
+			sizeQueen: 0,
+			/** neglectful porn fame */
+			neglectful: 0,
+			/** cum addict porn fame */
+			cumAddict: 0,
+			/** anal addict porn fame */
+			analAddict: 0,
+			/** attention whore porn fame */
+			attentionWhore: 0,
+			/** breast growth porn fame */
+			breastGrowth: 0,
+			/** abusive porn fame */
+			abusive: 0,
+			/** malicious porn fame */
+			malicious: 0,
+			/** self hating porn fame */
+			selfHating: 0,
+			/** breeder porn fame */
+			breeder: 0,
+			/** submissive porn fame */
+			sub: 0,
+			/** cumslut porn fame */
+			cumSlut: 0,
+			/** buttslut porn fame */
+			anal: 0,
+			/** humiliation porn fame */
+			humiliation: 0,
+			/** boob porn fame */
+			boobs: 0,
+			/** dom porn fame */
+			dom: 0,
+			/** sadist porn fame */
+			sadist: 0,
+			/** masochist porn fame */
+			masochist: 0,
+			/** pregnancy porn fame*/
+			pregnancy: 0
+		};
+	}
+};
+
 App.Entity.SlaveState = class SlaveState {
 
 	constructor() {
 		/** Slave's current name */
 		this.slaveName = "blank";
-		/** Slave's current surname */
+		/** Slave's current surname
+		 * @type {string|number} */
 		this.slaveSurname = 0;
 		/** slave's original name */
 		this.birthName = "blank";
@@ -55,80 +143,8 @@ App.Entity.SlaveState = class SlaveState {
 		/** description to go with @see pornPrestige
 		 * @type {string|number} */
 		this.pornPrestigeDesc = 0;
-		/** what porn she is known for */
-		this.pornFameType = "none";
-		/** what aspect of her the upgraded studio is focusing on for porn */
-		this.pornFocus = "none";
-		/** generic porn fame */
-		this.pornTypeGeneral = 0;
-		/** fuckdoll porn fame */
-		this.pornTypeFuckdoll = 0;
-		/** rape porn fame */
-		this.pornTypeRape = 0;
-		/** preggo porn fame */
-		this.pornTypePreggo = 0;
-		/** BBW porn fame */
-		this.pornTypeBBW = 0;
-		/** weight gain porn fame */
-		this.pornTypeGainer = 0;
-		/** well hung porn fame */
-		this.pornTypeStud = 0;
-		/** underage porn fame */
-		this.pornTypeLoli = 0;
-		/** gagfuck queen porn fame */
-		this.pornTypeDeepThroat = 0;
-		/** strugglefuck queen porn fame */
-		this.pornTypeStruggleFuck = 0;
-		/** painal queen porn fame */
-		this.pornTypePainal = 0;
-		/** tease porn fame */
-		this.pornTypeTease = 0;
-		/** romantic porn fame */
-		this.pornTypeRomantic = 0;
-		/** pervert porn fame */
-		this.pornTypePervert = 0;
-		/** caring porn fame */
-		this.pornTypeCaring = 0;
-		/** unflinching porn fame */
-		this.pornTypeUnflinching = 0;
-		/** size queen porn fame */
-		this.pornTypeSizeQueen = 0;
-		/** neglectful porn fame */
-		this.pornTypeNeglectful = 0;
-		/** cum addict porn fame */
-		this.pornTypeCumAddict = 0;
-		/** anal addict porn fame */
-		this.pornTypeAnalAddict = 0;
-		/** attention whore porn fame */
-		this.pornTypeAttentionWhore = 0;
-		/** breast growth porn fame */
-		this.pornTypeBreastGrowth = 0;
-		/** abusive porn fame */
-		this.pornTypeAbusive = 0;
-		/** malicious porn fame */
-		this.pornTypeMalicious = 0;
-		/** self hating porn fame */
-		this.pornTypeSelfHating = 0;
-		/** breeder porn fame */
-		this.pornTypeBreeder = 0;
-		/** submissive porn fame */
-		this.pornTypeSub = 0;
-		/** cumslut porn fame */
-		this.pornTypeCumSlut = 0;
-		/** buttslut porn fame */
-		this.pornTypeAnal = 0;
-		/** humiliation porn fame */
-		this.pornTypeHumiliation = 0;
-		/** boob porn fame */
-		this.pornTypeBoobs = 0;
-		/** dom porn fame */
-		this.pornTypeDom = 0;
-		/** sadist porn fame */
-		this.pornTypeSadist = 0;
-		/** masochist porn fame */
-		this.pornTypeMasochist = 0;
-		/** pregnancy porn fame*/
-		this.pornTypePregnancy = 0;
+		/** porn fame */
+		this.porn = new App.Entity.SlavePornPerformanceState();
 		/** reason for prestige
 		 * @type {string|number} */
 		this.prestigeDesc = 0;
@@ -2275,6 +2291,9 @@ App.Entity.SlaveState = class SlaveState {
 	 */
 	static makeSkeleton() {
 		return {
+			porn: {
+				fame: {	}
+			}
 		};
 	}
 };
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 1d0e4c00bca..ccd173225e9 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -12,6 +12,34 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
 
 	/** @param {App.Entity.SlaveState} slave */
 	function SlaveDataSchemeCleanup(slave) { // eslint-disable-line no-unused-vars
+		migratePorn(slave);
+	}
+
+	/** @param {App.Entity.SlaveState} slave */
+	function migratePorn(slave) {
+		if (!slave.hasOwnProperty("porn")) {
+			slave.porn = new App.Entity.SlavePornPerformanceState();
+			const pornType = "pornType";
+			const pornTypeLength = pornType.length;
+			for (let prop in slave) {
+				if (prop.startsWith("pornType")) {
+					let fameName = prop.substr(pornTypeLength);
+					// lowercase firs charachter
+					fameName = fameName.charAt(0).toLowerCase() + fameName.substr(1);
+					slave.porn.fame[fameName] = slave[prop];
+					delete slave[prop];
+				}
+			}
+			if (slave.hasOwnProperty("pornFameType")) {
+				slave.porn.fameType = slave["pornFameType"];
+				delete slave["pornFameType"];
+			}
+
+			if (slave.hasOwnProperty("pornFocus")) {
+				slave.porn.focus = slave["pornFocus"];
+				delete slave["pornFocus"];
+			}
+		}
 
 	}
 })();
@@ -475,47 +503,47 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
 		if (typeof slave.pornPrestigeDesc !== "string") {
 			slave.pornPrestigeDesc = 0;
 		}
-		if (typeof slave.pornFameType !== "string") {
-			slave.pornFameType = "none";
-		}
-		if (typeof slave.pornFocus !== "string") {
-			slave.pornFocus = "none";
-		}
-		slave.pornTypeGeneral = Math.max(+slave.pornTypeGeneral, 0) || 0;
-		slave.pornTypeFuckdoll = Math.max(+slave.pornTypeFuckdoll, 0) || 0;
-		slave.pornTypeRape = Math.max(+slave.pornTypeRape, 0) || 0;
-		slave.pornTypePreggo = Math.max(+slave.pornTypePreggo, 0) || 0;
-		slave.pornTypeBBW = Math.max(+slave.pornTypeBBW, 0) || 0;
-		slave.pornTypeGainer = Math.max(+slave.pornTypeGainer, 0) || 0;
-		slave.pornTypeStud = Math.max(+slave.pornTypeStud, 0) || 0;
-		slave.pornTypeLoli = Math.max(+slave.pornTypeLoli, 0) || 0;
-		slave.pornTypeDeepThroat = Math.max(+slave.pornTypeDeepThroat, 0) || 0;
-		slave.pornTypeStruggleFuck = Math.max(+slave.pornTypeStruggleFuck, 0) || 0;
-		slave.pornTypePainal = Math.max(+slave.pornTypePainal, 0) || 0;
-		slave.pornTypeTease = Math.max(+slave.pornTypeTease, 0) || 0;
-		slave.pornTypeRomantic = Math.max(+slave.pornTypeRomantic, 0) || 0;
-		slave.pornTypePervert = Math.max(+slave.pornTypePervert, 0) || 0;
-		slave.pornTypeCaring = Math.max(+slave.pornTypeCaring, 0) || 0;
-		slave.pornTypeUnflinching = Math.max(+slave.pornTypeUnflinching, 0) || 0;
-		slave.pornTypeSizeQueen = Math.max(+slave.pornTypeSizeQueen, 0) || 0;
-		slave.pornTypeNeglectful = Math.max(+slave.pornTypeNeglectful, 0) || 0;
-		slave.pornTypeCumAddict = Math.max(+slave.pornTypeCumAddict, 0) || 0;
-		slave.pornTypeAnalAddict = Math.max(+slave.pornTypeAnalAddict, 0) || 0;
-		slave.pornTypeAttentionWhore = Math.max(+slave.pornTypeAttentionWhore, 0) || 0;
-		slave.pornTypeBreastGrowth = Math.max(+slave.pornTypeBreastGrowth, 0) || 0;
-		slave.pornTypeAbusive = Math.max(+slave.pornTypeAbusive, 0) || 0;
-		slave.pornTypeMalicious = Math.max(+slave.pornTypeMalicious, 0) || 0;
-		slave.pornTypeSelfHating = Math.max(+slave.pornTypeSelfHating, 0) || 0;
-		slave.pornTypeBreeder = Math.max(+slave.pornTypeBreeder, 0) || 0;
-		slave.pornTypeSub = Math.max(+slave.pornTypeSub, 0) || 0;
-		slave.pornTypeCumSlut = Math.max(+slave.pornTypeCumSlut, 0) || 0;
-		slave.pornTypeAnal = Math.max(+slave.pornTypeAnal, 0) || 0;
-		slave.pornTypeHumiliation = Math.max(+slave.pornTypeHumiliation, 0) || 0;
-		slave.pornTypeBoobs = Math.max(+slave.pornTypeBoobs, 0) || 0;
-		slave.pornTypeDom = Math.max(+slave.pornTypeDom, 0) || 0;
-		slave.pornTypeSadist = Math.max(+slave.pornTypeSadist, 0) || 0;
-		slave.pornTypeMasochist = Math.max(+slave.pornTypeMasochist, 0) || 0;
-		slave.pornTypePregnancy = Math.max(+slave.pornTypePregnancy, 0) || 0;
+		if (typeof slave.porn.fameType !== "string") {
+			slave.porn.fameType = "none";
+		}
+		if (typeof slave.porn.focus !== "string") {
+			slave.porn.focus = "none";
+		}
+		slave.porn.fame.general = Math.max(+slave.porn.fame.general, 0) || 0;
+		slave.porn.fame.fuckdoll = Math.max(+slave.porn.fame.fuckdoll, 0) || 0;
+		slave.porn.fame.rape = Math.max(+slave.porn.fame.rape, 0) || 0;
+		slave.porn.fame.preggo = Math.max(+slave.porn.fame.preggo, 0) || 0;
+		slave.porn.fame.BBW = Math.max(+slave.porn.fame.BBW, 0) || 0;
+		slave.porn.fame.gainer = Math.max(+slave.porn.fame.gainer, 0) || 0;
+		slave.porn.fame.stud = Math.max(+slave.porn.fame.stud, 0) || 0;
+		slave.porn.fame.loli = Math.max(+slave.porn.fame.loli, 0) || 0;
+		slave.porn.fame.deepThroat = Math.max(+slave.porn.fame.deepThroat, 0) || 0;
+		slave.porn.fame.struggleFuck = Math.max(+slave.porn.fame.struggleFuck, 0) || 0;
+		slave.porn.fame.painal = Math.max(+slave.porn.fame.painal, 0) || 0;
+		slave.porn.fame.tease = Math.max(+slave.porn.fame.tease, 0) || 0;
+		slave.porn.fame.romantic = Math.max(+slave.porn.fame.romantic, 0) || 0;
+		slave.porn.fame.pervert = Math.max(+slave.porn.fame.pervert, 0) || 0;
+		slave.porn.fame.caring = Math.max(+slave.porn.fame.caring, 0) || 0;
+		slave.porn.fame.unflinching = Math.max(+slave.porn.fame.unflinching, 0) || 0;
+		slave.porn.fame.sizeQueen = Math.max(+slave.porn.fame.sizeQueen, 0) || 0;
+		slave.porn.fame.neglectful = Math.max(+slave.porn.fame.neglectful, 0) || 0;
+		slave.porn.fame.cumAddict = Math.max(+slave.porn.fame.cumAddict, 0) || 0;
+		slave.porn.fame.analAddict = Math.max(+slave.porn.fame.analAddict, 0) || 0;
+		slave.porn.fame.attentionWhore = Math.max(+slave.porn.fame.attentionWhore, 0) || 0;
+		slave.porn.fame.breastGrowth = Math.max(+slave.porn.fame.breastGrowth, 0) || 0;
+		slave.porn.fame.abusive = Math.max(+slave.porn.fame.abusive, 0) || 0;
+		slave.porn.fame.malicious = Math.max(+slave.porn.fame.malicious, 0) || 0;
+		slave.porn.fame.selfHating = Math.max(+slave.porn.fame.selfHating, 0) || 0;
+		slave.porn.fame.breeder = Math.max(+slave.porn.fame.breeder, 0) || 0;
+		slave.porn.fame.sub = Math.max(+slave.porn.fame.sub, 0) || 0;
+		slave.porn.fame.cumSlut = Math.max(+slave.porn.fame.cumSlut, 0) || 0;
+		slave.porn.fame.anal = Math.max(+slave.porn.fame.anal, 0) || 0;
+		slave.porn.fame.humiliation = Math.max(+slave.porn.fame.humiliation, 0) || 0;
+		slave.porn.fame.boobs = Math.max(+slave.porn.fame.boobs, 0) || 0;
+		slave.porn.fame.dom = Math.max(+slave.porn.fame.dom, 0) || 0;
+		slave.porn.fame.sadist = Math.max(+slave.porn.fame.sadist, 0) || 0;
+		slave.porn.fame.masochist = Math.max(+slave.porn.fame.masochist, 0) || 0;
+		slave.porn.fame.pregnancy = Math.max(+slave.porn.fame.pregnancy, 0) || 0;
 	}
 
 	/** @param {App.Entity.SlaveState} slave */
@@ -1051,47 +1079,47 @@ window.childPornDatatypeCleanup = function childPornDatatypeCleanup(child) {
 	if (typeof child.pornPrestigeDesc !== "string") {
 		child.pornPrestigeDesc = 0;
 	}
-	if (typeof child.pornFameType !== "string") {
-		child.pornFameType = "none";
-	}
-	if (typeof child.pornFocus !== "string") {
-		child.pornFocus = "none";
-	}
-	child.pornTypeGeneral = Math.max(+child.pornTypeGeneral, 0) || 0;
-	child.pornTypeFuckdoll = Math.max(+child.pornTypeFuckdoll, 0) || 0;
-	child.pornTypeRape = Math.max(+child.pornTypeRape, 0) || 0;
-	child.pornTypePreggo = Math.max(+child.pornTypePreggo, 0) || 0;
-	child.pornTypeBBW = Math.max(+child.pornTypeBBW, 0) || 0;
-	child.pornTypeGainer = Math.max(+child.pornTypeGainer, 0) || 0;
-	child.pornTypeStud = Math.max(+child.pornTypeStud, 0) || 0;
-	child.pornTypeLoli = Math.max(+child.pornTypeLoli, 0) || 0;
-	child.pornTypeDeepThroat = Math.max(+child.pornTypeDeepThroat, 0) || 0;
-	child.pornTypeStruggleFuck = Math.max(+child.pornTypeStruggleFuck, 0) || 0;
-	child.pornTypePainal = Math.max(+child.pornTypePainal, 0) || 0;
-	child.pornTypeTease = Math.max(+child.pornTypeTease, 0) || 0;
-	child.pornTypeRomantic = Math.max(+child.pornTypeRomantic, 0) || 0;
-	child.pornTypePervert = Math.max(+child.pornTypePervert, 0) || 0;
-	child.pornTypeCaring = Math.max(+child.pornTypeCaring, 0) || 0;
-	child.pornTypeUnflinching = Math.max(+child.pornTypeUnflinching, 0) || 0;
-	child.pornTypeSizeQueen = Math.max(+child.pornTypeSizeQueen, 0) || 0;
-	child.pornTypeNeglectful = Math.max(+child.pornTypeNeglectful, 0) || 0;
-	child.pornTypeCumAddict = Math.max(+child.pornTypeCumAddict, 0) || 0;
-	child.pornTypeAnalAddict = Math.max(+child.pornTypeAnalAddict, 0) || 0;
-	child.pornTypeAttentionWhore = Math.max(+child.pornTypeAttentionWhore, 0) || 0;
-	child.pornTypeBreastGrowth = Math.max(+child.pornTypeBreastGrowth, 0) || 0;
-	child.pornTypeAbusive = Math.max(+child.pornTypeAbusive, 0) || 0;
-	child.pornTypeMalicious = Math.max(+child.pornTypeMalicious, 0) || 0;
-	child.pornTypeSelfHating = Math.max(+child.pornTypeSelfHating, 0) || 0;
-	child.pornTypeBreeder = Math.max(+child.pornTypeBreeder, 0) || 0;
-	child.pornTypeSub = Math.max(+child.pornTypeSub, 0) || 0;
-	child.pornTypeCumSlut = Math.max(+child.pornTypeCumSlut, 0) || 0;
-	child.pornTypeAnal = Math.max(+child.pornTypeAnal, 0) || 0;
-	child.pornTypeHumiliation = Math.max(+child.pornTypeHumiliation, 0) || 0;
-	child.pornTypeBoobs = Math.max(+child.pornTypeBoobs, 0) || 0;
-	child.pornTypeDom = Math.max(+child.pornTypeDom, 0) || 0;
-	child.pornTypeSadist = Math.max(+child.pornTypeSadist, 0) || 0;
-	child.pornTypeMasochist = Math.max(+child.pornTypeMasochist, 0) || 0;
-	child.pornTypePregnancy = Math.max(+child.pornTypePregnancy, 0) || 0;
+	if (typeof child.porn.fameType !== "string") {
+		child.porn.fameType = "none";
+	}
+	if (typeof child.porn.focus !== "string") {
+		child.porn.focus = "none";
+	}
+	child.porn.fame.general = Math.max(+child.porn.fame.general, 0) || 0;
+	child.porn.fame.fuckdoll = Math.max(+child.porn.fame.fuckdoll, 0) || 0;
+	child.porn.fame.rape = Math.max(+child.porn.fame.rape, 0) || 0;
+	child.porn.fame.preggo = Math.max(+child.porn.fame.preggo, 0) || 0;
+	child.porn.fame.BBW = Math.max(+child.porn.fame.BBW, 0) || 0;
+	child.porn.fame.gainer = Math.max(+child.porn.fame.gainer, 0) || 0;
+	child.porn.fame.stud = Math.max(+child.porn.fame.stud, 0) || 0;
+	child.porn.fame.loli = Math.max(+child.porn.fame.loli, 0) || 0;
+	child.porn.fame.deepThroat = Math.max(+child.porn.fame.deepThroat, 0) || 0;
+	child.porn.fame.struggleFuck = Math.max(+child.porn.fame.struggleFuck, 0) || 0;
+	child.porn.fame.painal = Math.max(+child.porn.fame.painal, 0) || 0;
+	child.porn.fame.tease = Math.max(+child.porn.fame.tease, 0) || 0;
+	child.porn.fame.romantic = Math.max(+child.porn.fame.romantic, 0) || 0;
+	child.porn.fame.pervert = Math.max(+child.porn.fame.pervert, 0) || 0;
+	child.porn.fame.caring = Math.max(+child.porn.fame.caring, 0) || 0;
+	child.porn.fame.unflinching = Math.max(+child.porn.fame.unflinching, 0) || 0;
+	child.porn.fame.sizeQueen = Math.max(+child.porn.fame.sizeQueen, 0) || 0;
+	child.porn.fame.neglectful = Math.max(+child.porn.fame.neglectful, 0) || 0;
+	child.porn.fame.cumAddict = Math.max(+child.porn.fame.cumAddict, 0) || 0;
+	child.porn.fame.analAddict = Math.max(+child.porn.fame.analAddict, 0) || 0;
+	child.porn.fame.attentionWhore = Math.max(+child.porn.fame.attentionWhore, 0) || 0;
+	child.porn.fame.breastGrowth = Math.max(+child.porn.fame.breastGrowth, 0) || 0;
+	child.porn.fame.abusive = Math.max(+child.porn.fame.abusive, 0) || 0;
+	child.porn.fame.malicious = Math.max(+child.porn.fame.malicious, 0) || 0;
+	child.porn.fame.selfHating = Math.max(+child.porn.fame.selfHating, 0) || 0;
+	child.porn.fame.breeder = Math.max(+child.porn.fame.breeder, 0) || 0;
+	child.porn.fame.sub = Math.max(+child.porn.fame.sub, 0) || 0;
+	child.porn.fame.cumSlut = Math.max(+child.porn.fame.cumSlut, 0) || 0;
+	child.porn.fame.anal = Math.max(+child.porn.fame.anal, 0) || 0;
+	child.porn.fame.humiliation = Math.max(+child.porn.fame.humiliation, 0) || 0;
+	child.porn.fame.boobs = Math.max(+child.porn.fame.boobs, 0) || 0;
+	child.porn.fame.dom = Math.max(+child.porn.fame.dom, 0) || 0;
+	child.porn.fame.sadist = Math.max(+child.porn.fame.sadist, 0) || 0;
+	child.porn.fame.masochist = Math.max(+child.porn.fame.masochist, 0) || 0;
+	child.porn.fame.pregnancy = Math.max(+child.porn.fame.pregnancy, 0) || 0;
 };
 
 window.childRelationDatatypeCleanup = function childRelationDatatypeCleanup(child) {
diff --git a/src/pregmod/saPorn.tw b/src/pregmod/saPorn.tw
index de8f3f29c53..3291423c4af 100644
--- a/src/pregmod/saPorn.tw
+++ b/src/pregmod/saPorn.tw
@@ -44,12 +44,12 @@
 	<<if $cheatMode == 1>>Decay: _decayRate Viewership: _viewership Last week's fame: _oldFame<</if>>
 
 	<<if $slaves[$i].pornPrestige > 1>>
-		$He is widely regarded in $slaves[$i].pornFameType porn, but with so many watchers, turn over is high.
+		$He is widely regarded in $slaves[$i].porn.fameType porn, but with so many watchers, turn over is high.
 	<<elseif $slaves[$i].pornPrestige > 0>>
-		<<if $slaves[$i].pornFameType == "generic">>
+		<<if $slaves[$i].porn.fameType == "generic">>
 			$He has claimed a niche in slave porn, so there is a constant cycle of new arrivals and bored ex-watchers.
 		<<else>>
-			$He has claimed a niche for $himself in $slaves[$i].pornFameType porn, so there is a constant cycle of new arrivals and bored ex-watchers.
+			$He has claimed a niche for $himself in $slaves[$i].porn.fameType porn, so there is a constant cycle of new arrivals and bored ex-watchers.
 		<</if>>
 	<<else>>
 		$He is borderline unknown, so $he tends to hold onto what little watchers $he has.
@@ -100,932 +100,932 @@
 
 	/*Paraphilias have the highest take of viewers*/
 	<<if $slaves[$i].sexualFlaw == "neglectful">>
-		<<if $slaves[$i].pornFocus == "neglectful" || $slaves[$i].pornFameType == "orgasm denial">> /*perhaps split these? */
+		<<if $slaves[$i].porn.focus == "neglectful" || $slaves[$i].porn.fameType == "orgasm denial">> /*perhaps split these? */
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeNeglectful>>
-		<<set $slaves[$i].pornTypeNeglectful += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarNeglectfuls-1))>>
-		<<set $slaves[$i].pornTypeNeglectful = Math.clamp($slaves[$i].pornTypeNeglectful, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.neglectful>>
+		<<set $slaves[$i].porn.fame.neglectful += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarNeglectfuls-1))>>
+		<<set $slaves[$i].porn.fame.neglectful = Math.clamp($slaves[$i].porn.fame.neglectful, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "neglectful" || $slaves[$i].pornFameType == "orgasm denial">>
+		<<if $slaves[$i].porn.focus == "neglectful" || $slaves[$i].porn.fameType == "orgasm denial">>
 			$His lack of interest in getting off $himself, even when at the verge of climax, makes $him a hit with viewers that enjoy orgasm denial.
-			<<if $slaves[$i].pornTypeNeglectful > _oldPorn>>
+			<<if $slaves[$i].porn.fame.neglectful > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeNeglectful < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.neglectful < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].pornTypeNeglectful).<</if>>
-	<<elseif $slaves[$i].pornTypeNeglectful > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeNeglectful>><</if>>
-		<<set $slaves[$i].pornTypeNeglectful = Math.clamp($slaves[$i].pornTypeNeglectful-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].pornTypeNeglectful).<</if>>
+		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].porn.fame.neglectful).<</if>>
+	<<elseif $slaves[$i].porn.fame.neglectful > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.neglectful>><</if>>
+		<<set $slaves[$i].porn.fame.neglectful = Math.clamp($slaves[$i].porn.fame.neglectful-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].porn.fame.neglectful).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "cum addict">>
-		<<if $slaves[$i].pornFocus == "cum addict" || $slaves[$i].pornFameType == "cum addiction">>
+		<<if $slaves[$i].porn.focus == "cum addict" || $slaves[$i].porn.fameType == "cum addiction">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeCumAddict>>
-		<<set $slaves[$i].pornTypeCumAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarCumAddicts-1))>>
-		<<set $slaves[$i].pornTypeCumAddict = Math.clamp($slaves[$i].pornTypeCumAddict, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.cumAddict>>
+		<<set $slaves[$i].porn.fame.cumAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarCumAddicts-1))>>
+		<<set $slaves[$i].porn.fame.cumAddict = Math.clamp($slaves[$i].porn.fame.cumAddict, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "cum addict" || $slaves[$i].pornFameType == "bukkake">>
+		<<if $slaves[$i].porn.focus == "cum addict" || $slaves[$i].porn.fameType == "bukkake">>
 			$His complete obsession with cum makes $him a hit with viewers that enjoy bukkake and cum drinking.
-			<<if $slaves[$i].pornTypeCumAddict > _oldPorn>>
+			<<if $slaves[$i].porn.fame.cumAddict > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeCumAddict < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].pornTypeCumAddict).<</if>>
-	<<elseif $slaves[$i].pornTypeCumAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumAddict>><</if>>
-		<<set $slaves[$i].pornTypeCumAddict = Math.clamp($slaves[$i].pornTypeCumAddict-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].pornTypeCumAddict).<</if>>
+		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].porn.fame.cumAddict).<</if>>
+	<<elseif $slaves[$i].porn.fame.cumAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumAddict>><</if>>
+		<<set $slaves[$i].porn.fame.cumAddict = Math.clamp($slaves[$i].porn.fame.cumAddict-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].porn.fame.cumAddict).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "anal addict" && canDoAnal($slaves[$i])>>
-		<<if $slaves[$i].pornFocus == "anal addict" || $slaves[$i].pornFameType == "anal addiction">>
+		<<if $slaves[$i].porn.focus == "anal addict" || $slaves[$i].porn.fameType == "anal addiction">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAnalAddict>>
-		<<set $slaves[$i].pornTypeAnalAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAnalAddicts-1))>>
-		<<set $slaves[$i].pornTypeAnalAddict = Math.clamp($slaves[$i].pornTypeAnalAddict, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.analAddict>>
+		<<set $slaves[$i].porn.fame.analAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAnalAddicts-1))>>
+		<<set $slaves[$i].porn.fame.analAddict = Math.clamp($slaves[$i].porn.fame.analAddict, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].sexualFlaw == "anal addict" || $slaves[$i].pornFameType == "anal addiction">>
+		<<if $slaves[$i].sexualFlaw == "anal addict" || $slaves[$i].porn.fameType == "anal addiction">>
 			$His complete obsession with taking things up $his ass makes $him a hit with viewers that enjoy hardcore anal.
-			<<if $slaves[$i].pornTypeAnalAddict > _oldPorn>>
+			<<if $slaves[$i].porn.fame.analAddict > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAnalAddict < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.analAddict < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].pornTypeAnalAddict).<</if>>
-	<<elseif $slaves[$i].pornTypeAnalAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnalAddict>><</if>>
-		<<set $slaves[$i].pornTypeAnalAddict = Math.clamp($slaves[$i].pornTypeAnalAddict-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].pornTypeAnalAddict).<</if>>
+		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].porn.fame.analAddict).<</if>>
+	<<elseif $slaves[$i].porn.fame.analAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.analAddict>><</if>>
+		<<set $slaves[$i].porn.fame.analAddict = Math.clamp($slaves[$i].porn.fame.analAddict-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].porn.fame.analAddict).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "attention whore">>
-		<<if $slaves[$i].pornFocus == "attention whore" || $slaves[$i].pornFameType == "exhibition">>
+		<<if $slaves[$i].porn.focus == "attention whore" || $slaves[$i].porn.fameType == "exhibition">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAttentionWhore>>
-		<<set $slaves[$i].pornTypeAttentionWhore += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAttentionWhores-1))>>
-		<<set $slaves[$i].pornTypeAttentionWhore = Math.clamp($slaves[$i].pornTypeAttentionWhore, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.attentionWhore>>
+		<<set $slaves[$i].porn.fame.attentionWhore += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAttentionWhores-1))>>
+		<<set $slaves[$i].porn.fame.attentionWhore = Math.clamp($slaves[$i].porn.fame.attentionWhore, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "attention whore" || $slaves[$i].pornFameType == "exhibition">>
+		<<if $slaves[$i].porn.focus == "attention whore" || $slaves[$i].porn.fameType == "exhibition">>
 			$His complete obsession with being the center of attention makes $him a hit with viewers that savor $his frequent exhibitionism.
-			<<if $slaves[$i].pornTypeAttentionWhore > _oldPorn>>
+			<<if $slaves[$i].porn.fame.attentionWhore > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAttentionWhore < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].pornTypeAttentionWhore).<</if>>
-	<<elseif $slaves[$i].pornTypeAttentionWhore > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAttentionWhore>><</if>>
-		<<set $slaves[$i].pornTypeAttentionWhore = Math.clamp($slaves[$i].pornTypeAttentionWhore-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].pornTypeAttentionWhore).<</if>>
+		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].porn.fame.attentionWhore).<</if>>
+	<<elseif $slaves[$i].porn.fame.attentionWhore > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.attentionWhore>><</if>>
+		<<set $slaves[$i].porn.fame.attentionWhore = Math.clamp($slaves[$i].porn.fame.attentionWhore-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].porn.fame.attentionWhore).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "breast growth">>
-		<<if $slaves[$i].pornFocus == "breast growth" || $slaves[$i].pornFameType == "breast expansion">>
+		<<if $slaves[$i].porn.focus == "breast growth" || $slaves[$i].porn.fameType == "breast expansion">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBreastGrowth>>
-		<<set $slaves[$i].pornTypeBreastGrowth += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreastGrowths-1))>>
-		<<set $slaves[$i].pornTypeBreastGrowth = Math.clamp($slaves[$i].pornTypeBreastGrowth, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.breastGrowth>>
+		<<set $slaves[$i].porn.fame.breastGrowth += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreastGrowths-1))>>
+		<<set $slaves[$i].porn.fame.breastGrowth = Math.clamp($slaves[$i].porn.fame.breastGrowth, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "breast growth" || $slaves[$i].pornFameType == "breast expansion">>
+		<<if $slaves[$i].porn.focus == "breast growth" || $slaves[$i].porn.fameType == "breast expansion">>
 			$His complete obsession with the ever increasing size of $his tits makes $him a hit with viewers that enjoy enormous knockers and breast expansion.
-			<<if $slaves[$i].pornTypeBreastGrowth > _oldPorn>>
+			<<if $slaves[$i].porn.fame.breastGrowth > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBreastGrowth < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].pornTypeBreastGrowth).<</if>>
-	<<elseif $slaves[$i].pornTypeBreastGrowth > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreastGrowth>><</if>>
-		<<set $slaves[$i].pornTypeBreastGrowth = Math.clamp($slaves[$i].pornTypeBreastGrowth-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].pornTypeBreastGrowth).<</if>>
+		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].porn.fame.breastGrowth).<</if>>
+	<<elseif $slaves[$i].porn.fame.breastGrowth > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breastGrowth>><</if>>
+		<<set $slaves[$i].porn.fame.breastGrowth = Math.clamp($slaves[$i].porn.fame.breastGrowth-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].porn.fame.breastGrowth).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "abusive">>
-		<<if $slaves[$i].pornFocus == "abusive" || $slaves[$i].pornFameType == "abuse">>
+		<<if $slaves[$i].porn.focus == "abusive" || $slaves[$i].porn.fameType == "abuse">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAbusive>>
-		<<set $slaves[$i].pornTypeAbusive += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAbusives-1))>>
-		<<set $slaves[$i].pornTypeAbusive = Math.clamp($slaves[$i].pornTypeAbusive, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.abusive>>
+		<<set $slaves[$i].porn.fame.abusive += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAbusives-1))>>
+		<<set $slaves[$i].porn.fame.abusive = Math.clamp($slaves[$i].porn.fame.abusive, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "abusive" || $slaves[$i].pornFameType == "abuse">>
+		<<if $slaves[$i].porn.focus == "abusive" || $slaves[$i].porn.fameType == "abuse">>
 			$His wanton enjoyment of pleasure through force amuses viewers that enjoy rape and abuse.
-			<<if $slaves[$i].pornTypeAbusive > _oldPorn>>
+			<<if $slaves[$i].porn.fame.abusive > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAbusive < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.abusive < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].pornTypeAbusive).<</if>>
-	<<elseif $slaves[$i].pornTypeAbusive > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAbusive>><</if>>
-		<<set $slaves[$i].pornTypeAbusive = Math.clamp($slaves[$i].pornTypeAbusive-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].pornTypeAbusive).<</if>>
+		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].porn.fame.abusive).<</if>>
+	<<elseif $slaves[$i].porn.fame.abusive > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.abusive>><</if>>
+		<<set $slaves[$i].porn.fame.abusive = Math.clamp($slaves[$i].porn.fame.abusive-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].porn.fame.abusive).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "malicious">>
-		<<if $slaves[$i].pornFocus == "malicious" || $slaves[$i].pornFameType == "sexual torture">>
+		<<if $slaves[$i].porn.focus == "malicious" || $slaves[$i].porn.fameType == "sexual torture">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeMalicious>>
-		<<set $slaves[$i].pornTypeMalicious += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarMalicious-1))>>
-		<<set $slaves[$i].pornTypeMalicious = Math.clamp($slaves[$i].pornTypeMalicious, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.malicious>>
+		<<set $slaves[$i].porn.fame.malicious += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarMalicious-1))>>
+		<<set $slaves[$i].porn.fame.malicious = Math.clamp($slaves[$i].porn.fame.malicious, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "malicious" || $slaves[$i].pornFameType == "sexual torture">>
+		<<if $slaves[$i].porn.focus == "malicious" || $slaves[$i].porn.fameType == "sexual torture">>
 			$His sexual appetite of others' suffering makes $him a hit with viewers that enjoy sadism and violence.
-			<<if $slaves[$i].pornTypeMalicious > _oldPorn>>
+			<<if $slaves[$i].porn.fame.malicious > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeMalicious < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.malicious < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].pornTypeMalicious).<</if>>
-	<<elseif $slaves[$i].pornTypeMalicious > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMalicious>><</if>>
-		<<set $slaves[$i].pornTypeMalicious = Math.clamp($slaves[$i].pornTypeMalicious-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].pornTypeMalicious).<</if>>
+		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].porn.fame.malicious).<</if>>
+	<<elseif $slaves[$i].porn.fame.malicious > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.malicious>><</if>>
+		<<set $slaves[$i].porn.fame.malicious = Math.clamp($slaves[$i].porn.fame.malicious-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].porn.fame.malicious).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "self hating">>
-		<<if $slaves[$i].pornFocus == "self hating" || $slaves[$i].pornFameType == "self hating">>
+		<<if $slaves[$i].porn.focus == "self hating" || $slaves[$i].porn.fameType == "self hating">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSelfHating>>
-		<<set $slaves[$i].pornTypeSelfHating += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarSelfHatings-1))>>
-		<<set $slaves[$i].pornTypeSelfHating = Math.clamp($slaves[$i].pornTypeSelfHating, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.selfHating>>
+		<<set $slaves[$i].porn.fame.selfHating += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarSelfHatings-1))>>
+		<<set $slaves[$i].porn.fame.selfHating = Math.clamp($slaves[$i].porn.fame.selfHating, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "self hating" || $slaves[$i].pornFameType == "self hating">>
+		<<if $slaves[$i].porn.focus == "self hating" || $slaves[$i].porn.fameType == "self hating">>
 			$His complete disregard for $his own wellbeing makes $him a hit with viewers that enjoy watching $him suffer.
-			<<if $slaves[$i].pornTypeSelfHating > _oldPorn>>
+			<<if $slaves[$i].porn.fame.selfHating > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSelfHating < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.selfHating < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].pornTypeSelfHating).<</if>>
-	<<elseif $slaves[$i].pornTypeSelfHating > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSelfHating>><</if>>
-		<<set $slaves[$i].pornTypeSelfHating = Math.clamp($slaves[$i].pornTypeSelfHating-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].pornTypeSelfHating).<</if>>
+		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].porn.fame.selfHating).<</if>>
+	<<elseif $slaves[$i].porn.fame.selfHating > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.selfHating>><</if>>
+		<<set $slaves[$i].porn.fame.selfHating = Math.clamp($slaves[$i].porn.fame.selfHating-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].porn.fame.selfHating).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "breeder">>
-		<<if $slaves[$i].pornFocus == "breeder" || $slaves[$i].pornFameType == "breeder">>
+		<<if $slaves[$i].porn.focus == "breeder" || $slaves[$i].porn.fameType == "breeder">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBreeder>>
-		<<set $slaves[$i].pornTypeBreeder += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreeders-1))>>
-		<<set $slaves[$i].pornTypeBreeder = Math.clamp($slaves[$i].pornTypeBreeder, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.breeder>>
+		<<set $slaves[$i].porn.fame.breeder += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreeders-1))>>
+		<<set $slaves[$i].porn.fame.breeder = Math.clamp($slaves[$i].porn.fame.breeder, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "breeder" || $slaves[$i].pornFameType == "breeder">>
+		<<if $slaves[$i].porn.focus == "breeder" || $slaves[$i].porn.fameType == "breeder">>
 			$His complete obsession with getting and staying pregnant makes $him a hit with viewers with all manner of pregnancy fetish, but particularly resonates with those as focused on it as $he is.
-			<<if $slaves[$i].pornTypeBreeder > _oldPorn>>
+			<<if $slaves[$i].porn.fame.breeder > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBreeder < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.breeder < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].pornTypeBreeder).<</if>>
-	<<elseif $slaves[$i].pornTypeBreeder > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreeder>><</if>>
-		<<set $slaves[$i].pornTypeBreeder = Math.clamp($slaves[$i].pornTypeBreeder-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].pornTypeBreeder).<</if>>
+		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].porn.fame.breeder).<</if>>
+	<<elseif $slaves[$i].porn.fame.breeder > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breeder>><</if>>
+		<<set $slaves[$i].porn.fame.breeder = Math.clamp($slaves[$i].porn.fame.breeder-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].porn.fame.breeder).<</if>>
 	<</if>>
 
 	/*fetish*/
 	<<if $slaves[$i].fetish == "submissive">>
-		<<if $slaves[$i].pornFocus == "submissive" || $slaves[$i].pornFameType == "submissive">>
+		<<if $slaves[$i].porn.focus == "submissive" || $slaves[$i].porn.fameType == "submissive">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSub>>
-		<<set $slaves[$i].pornTypeSub += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSubs-1))>>
-		<<set $slaves[$i].pornTypeSub = Math.clamp($slaves[$i].pornTypeSub, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.sub>>
+		<<set $slaves[$i].porn.fame.sub += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSubs-1))>>
+		<<set $slaves[$i].porn.fame.sub = Math.clamp($slaves[$i].porn.fame.sub, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "submissive" || $slaves[$i].pornFameType == "submissive">>
+		<<if $slaves[$i].porn.focus == "submissive" || $slaves[$i].porn.fameType == "submissive">>
 			With $his submissive streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeSub > _oldPorn>>
+			<<if $slaves[$i].porn.fame.sub > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSub < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.sub < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].pornTypeSub).<</if>>
-	<<elseif $slaves[$i].pornTypeSub > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSub>><</if>>
-		<<set $slaves[$i].pornTypeSub = Math.clamp($slaves[$i].pornTypeSub-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].pornTypeSub).<</if>>
+		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].porn.fame.sub).<</if>>
+	<<elseif $slaves[$i].porn.fame.sub > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sub>><</if>>
+		<<set $slaves[$i].porn.fame.sub = Math.clamp($slaves[$i].porn.fame.sub-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].porn.fame.sub).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "cumslut">>
-		<<if $slaves[$i].pornFocus == "cumslut" || $slaves[$i].pornFameType == "cum">>
+		<<if $slaves[$i].porn.focus == "cumslut" || $slaves[$i].porn.fameType == "cum">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeCumSlut>>
-		<<set $slaves[$i].pornTypeCumSlut += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarCumSluts-1))>>
-		<<set $slaves[$i].pornTypeCumSlut = Math.clamp($slaves[$i].pornTypeCumSlut, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.cumSlut>>
+		<<set $slaves[$i].porn.fame.cumSlut += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarCumSluts-1))>>
+		<<set $slaves[$i].porn.fame.cumSlut = Math.clamp($slaves[$i].porn.fame.cumSlut, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "cumslut" || $slaves[$i].pornFameType == "cum">>
+		<<if $slaves[$i].porn.focus == "cumslut" || $slaves[$i].porn.fameType == "cum">>
 			With $his taste for cum, $he has a clear advantage when it comes to ejaculate-based smut.
-			<<if $slaves[$i].pornTypeCumSlut > _oldPorn>>
+			<<if $slaves[$i].porn.fame.cumSlut > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeCumSlut < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].pornTypeCumSlut).<</if>>
-	<<elseif $slaves[$i].pornTypeCumSlut > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumSlut>><</if>>
-		<<set $slaves[$i].pornTypeCumSlut = Math.clamp($slaves[$i].pornTypeCumSlut-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].pornTypeCumSlut).<</if>>
+		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].porn.fame.cumSlut).<</if>>
+	<<elseif $slaves[$i].porn.fame.cumSlut > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumSlut>><</if>>
+		<<set $slaves[$i].porn.fame.cumSlut = Math.clamp($slaves[$i].porn.fame.cumSlut-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].porn.fame.cumSlut).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "buttslut">>
-		<<if $slaves[$i].pornFocus == "buttslut" || $slaves[$i].pornFameType == "buttslut">>
+		<<if $slaves[$i].porn.focus == "buttslut" || $slaves[$i].porn.fameType == "buttslut">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAnal>>
-		<<set $slaves[$i].pornTypeAnal += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarAnals-1))>>
-		<<set $slaves[$i].pornTypeAnal = Math.clamp($slaves[$i].pornTypeAnal, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.anal>>
+		<<set $slaves[$i].porn.fame.anal += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarAnals-1))>>
+		<<set $slaves[$i].porn.fame.anal = Math.clamp($slaves[$i].porn.fame.anal, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "buttslut" || $slaves[$i].pornFameType == "buttslut">>
+		<<if $slaves[$i].porn.focus == "buttslut" || $slaves[$i].porn.fameType == "buttslut">>
 			With $his fetish for asses, $he finds in the company of viewers that love rear ends.
-			<<if $slaves[$i].pornTypeAnal > _oldPorn>>
+			<<if $slaves[$i].porn.fame.anal > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAnal < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.anal < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Buttslut: (_oldPorn) to ($slaves[$i].pornTypeAnal).<</if>>
-	<<elseif $slaves[$i].pornTypeAnal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnal>><</if>>
-		<<set $slaves[$i].pornTypeAnal = Math.clamp($slaves[$i].pornTypeAnal-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].pornTypeAnal).<</if>>
+		<<if $cheatMode == 1>>Buttslut: (_oldPorn) to ($slaves[$i].porn.fame.anal).<</if>>
+	<<elseif $slaves[$i].porn.fame.anal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.anal>><</if>>
+		<<set $slaves[$i].porn.fame.anal = Math.clamp($slaves[$i].porn.fame.anal-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].porn.fame.anal).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "humiliation">>
-		<<if $slaves[$i].pornFocus == "humiliation" || $slaves[$i].pornFameType == "humiliating">>
+		<<if $slaves[$i].porn.focus == "humiliation" || $slaves[$i].porn.fameType == "humiliating">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeHumiliation>>
-		<<set $slaves[$i].pornTypeHumiliation += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarHumiliations-1))>>
-		<<set $slaves[$i].pornTypeHumiliation = Math.clamp($slaves[$i].pornTypeHumiliation, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.humiliation>>
+		<<set $slaves[$i].porn.fame.humiliation += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarHumiliations-1))>>
+		<<set $slaves[$i].porn.fame.humiliation = Math.clamp($slaves[$i].porn.fame.humiliation, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "humiliation" || $slaves[$i].pornFameType == "humiliating">>
+		<<if $slaves[$i].porn.focus == "humiliation" || $slaves[$i].porn.fameType == "humiliating">>
 			With $his fetish for humiliation, $he has a clear advantage when it comes to demeaning smut.
-			<<if $slaves[$i].pornTypeHumiliation > _oldPorn>>
+			<<if $slaves[$i].porn.fame.humiliation > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeHumiliation < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.humiliation < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].pornTypeHumiliation).<</if>>
-	<<elseif $slaves[$i].pornTypeHumiliation > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeHumiliation>><</if>>
-		<<set $slaves[$i].pornTypeHumiliation = Math.clamp($slaves[$i].pornTypeHumiliation-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].pornTypeHumiliation).<</if>>
+		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].porn.fame.humiliation).<</if>>
+	<<elseif $slaves[$i].porn.fame.humiliation > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.humiliation>><</if>>
+		<<set $slaves[$i].porn.fame.humiliation = Math.clamp($slaves[$i].porn.fame.humiliation-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].porn.fame.humiliation).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "boobs">>
-		<<if $slaves[$i].pornFocus == "boobs" || $slaves[$i].pornFameType == "breast">>
+		<<if $slaves[$i].porn.focus == "boobs" || $slaves[$i].porn.fameType == "breast">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBoobs>>
-		<<set $slaves[$i].pornTypeBoobs += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarBoobs-1))>>
-		<<set $slaves[$i].pornTypeBoobs = Math.clamp($slaves[$i].pornTypeBoobs, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.boobs>>
+		<<set $slaves[$i].porn.fame.boobs += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarBoobs-1))>>
+		<<set $slaves[$i].porn.fame.boobs = Math.clamp($slaves[$i].porn.fame.boobs, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "boobs" || $slaves[$i].pornFameType == "breast">>
+		<<if $slaves[$i].porn.focus == "boobs" || $slaves[$i].porn.fameType == "breast">>
 			With $his fetish for tits, $he has a clear advantage when it comes to breast focused smut.
-			<<if $slaves[$i].pornTypeBoobs > _oldPorn>>
+			<<if $slaves[$i].porn.fame.boobs > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBoobs < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.boobs < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].pornTypeBoobs).<</if>>
-	<<elseif $slaves[$i].pornTypeBoobs > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBoobs>><</if>>
-		<<set $slaves[$i].pornTypeBoobs = Math.clamp($slaves[$i].pornTypeBoobs-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].pornTypeBoobs).<</if>>
+		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].porn.fame.boobs).<</if>>
+	<<elseif $slaves[$i].porn.fame.boobs > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.boobs>><</if>>
+		<<set $slaves[$i].porn.fame.boobs = Math.clamp($slaves[$i].porn.fame.boobs-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].porn.fame.boobs).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "dom">>
-		<<if $slaves[$i].pornFocus == "dom" || $slaves[$i].pornFameType == "dominant">>
+		<<if $slaves[$i].porn.focus == "dom" || $slaves[$i].porn.fameType == "dominant">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeDom>>
-		<<set $slaves[$i].pornTypeDom += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarDoms-1))>>
-		<<set $slaves[$i].pornTypeDom = Math.clamp($slaves[$i].pornTypeDom, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.dom>>
+		<<set $slaves[$i].porn.fame.dom += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarDoms-1))>>
+		<<set $slaves[$i].porn.fame.dom = Math.clamp($slaves[$i].porn.fame.dom, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "dom" || $slaves[$i].pornFameType == "dominant">>
+		<<if $slaves[$i].porn.focus == "dom" || $slaves[$i].porn.fameType == "dominant">>
 			With $his dominant streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeDom > _oldPorn>>
+			<<if $slaves[$i].porn.fame.dom > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeDom < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.dom < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].pornTypeDom).<</if>>
-	<<elseif $slaves[$i].pornTypeDom > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDom>><</if>>
-		<<set $slaves[$i].pornTypeDom = Math.clamp($slaves[$i].pornTypeDom-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].pornTypeDom).<</if>>
+		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].porn.fame.dom).<</if>>
+	<<elseif $slaves[$i].porn.fame.dom > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.dom>><</if>>
+		<<set $slaves[$i].porn.fame.dom = Math.clamp($slaves[$i].porn.fame.dom-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].porn.fame.dom).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "sadist">>
-		<<if $slaves[$i].pornFocus == "sadist" || $slaves[$i].pornFameType == "sadistic">>
+		<<if $slaves[$i].porn.focus == "sadist" || $slaves[$i].porn.fameType == "sadistic">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSadist>>
-		<<set $slaves[$i].pornTypeSadist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSadists-1))>>
-		<<set $slaves[$i].pornTypeSadist = Math.clamp($slaves[$i].pornTypeSadist, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.sadist>>
+		<<set $slaves[$i].porn.fame.sadist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSadists-1))>>
+		<<set $slaves[$i].porn.fame.sadist = Math.clamp($slaves[$i].porn.fame.sadist, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "sadist" || $slaves[$i].pornFameType == "sadistic">>
+		<<if $slaves[$i].porn.focus == "sadist" || $slaves[$i].porn.fameType == "sadistic">>
 			With $his sadistic streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeSadist > _oldPorn>>
+			<<if $slaves[$i].porn.fame.sadist > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSadist < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.sadist < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].pornTypeSadist).<</if>>
-	<<elseif $slaves[$i].pornTypeSadist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSadist>><</if>>
-		<<set $slaves[$i].pornTypeSadist = Math.clamp($slaves[$i].pornTypeSadist-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].pornTypeSadist).<</if>>
+		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].porn.fame.sadist).<</if>>
+	<<elseif $slaves[$i].porn.fame.sadist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sadist>><</if>>
+		<<set $slaves[$i].porn.fame.sadist = Math.clamp($slaves[$i].porn.fame.sadist-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].porn.fame.sadist).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "masochist">>
-		<<if $slaves[$i].pornFocus == "masochist" || $slaves[$i].pornFameType == "masochistic">>
+		<<if $slaves[$i].porn.focus == "masochist" || $slaves[$i].porn.fameType == "masochistic">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeMasochist>>
-		<<set $slaves[$i].pornTypeMasochist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarMasochists-1))>>
-		<<set $slaves[$i].pornTypeMasochist = Math.clamp($slaves[$i].pornTypeMasochist, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.masochist>>
+		<<set $slaves[$i].porn.fame.masochist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarMasochists-1))>>
+		<<set $slaves[$i].porn.fame.masochist = Math.clamp($slaves[$i].porn.fame.masochist, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "masochist" || $slaves[$i].pornFameType == "masochistic">>
+		<<if $slaves[$i].porn.focus == "masochist" || $slaves[$i].porn.fameType == "masochistic">>
 			With $his masochistic streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeMasochist > _oldPorn>>
+			<<if $slaves[$i].porn.fame.masochist > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeMasochist < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.masochist < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].pornTypeMasochist).<</if>>
-	<<elseif $slaves[$i].pornTypeMasochist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMasochist>><</if>>
-		<<set $slaves[$i].pornTypeMasochist = Math.clamp($slaves[$i].pornTypeMasochist-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].pornTypeMasochist).<</if>>
+		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].porn.fame.masochist).<</if>>
+	<<elseif $slaves[$i].porn.fame.masochist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.masochist>><</if>>
+		<<set $slaves[$i].porn.fame.masochist = Math.clamp($slaves[$i].porn.fame.masochist-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].porn.fame.masochist).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "pregnancy">>
-		<<if $slaves[$i].pornFocus == "pregnancy" || $slaves[$i].pornFameType == "pregnancy fetish">>
+		<<if $slaves[$i].porn.focus == "pregnancy" || $slaves[$i].porn.fameType == "pregnancy fetish">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePregnancy>>
-		<<set $slaves[$i].pornTypePregnancy += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarPregnancySluts-1))>>
-		<<set $slaves[$i].pornTypePregnancy = Math.clamp($slaves[$i].pornTypePregnancy, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.pregnancy>>
+		<<set $slaves[$i].porn.fame.pregnancy += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarPregnancySluts-1))>>
+		<<set $slaves[$i].porn.fame.pregnancy = Math.clamp($slaves[$i].porn.fame.pregnancy, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "pregnancy" || $slaves[$i].pornFameType == "pregnancy fetish">>
+		<<if $slaves[$i].porn.focus == "pregnancy" || $slaves[$i].porn.fameType == "pregnancy fetish">>
 			With $his fetish for all things pregnancy, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypePregnancy > _oldPorn>>
+			<<if $slaves[$i].porn.fame.pregnancy > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePregnancy < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].pornTypePregnancy).<</if>>
-	<<elseif $slaves[$i].pornTypePregnancy > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePregnancy>><</if>>
-		<<set $slaves[$i].pornTypePregnancy = Math.clamp($slaves[$i].pornTypePregnancy-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].pornTypePregnancy).<</if>>
+		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].porn.fame.pregnancy).<</if>>
+	<<elseif $slaves[$i].porn.fame.pregnancy > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pregnancy>><</if>>
+		<<set $slaves[$i].porn.fame.pregnancy = Math.clamp($slaves[$i].porn.fame.pregnancy-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].porn.fame.pregnancy).<</if>>
 	<</if>>
 
 	/*General*/
 
 	<<if $slaves[$i].fuckdoll > 0>>
-		<<if $slaves[$i].pornFocus == "fuckdoll" || $slaves[$i].pornFameType == "fuckdoll">>
+		<<if $slaves[$i].porn.focus == "fuckdoll" || $slaves[$i].porn.fameType == "fuckdoll">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeFuckdoll>>
-		<<set $slaves[$i].pornTypeFuckdoll += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarFuckdolls-1))>>
-		<<set $slaves[$i].pornTypeFuckdoll = Math.clamp($slaves[$i].pornTypeFuckdoll, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.fuckdoll>>
+		<<set $slaves[$i].porn.fame.fuckdoll += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarFuckdolls-1))>>
+		<<set $slaves[$i].porn.fame.fuckdoll = Math.clamp($slaves[$i].porn.fame.fuckdoll, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "fuckdoll" || $slaves[$i].pornFameType == "fuckdoll">>
+		<<if $slaves[$i].porn.focus == "fuckdoll" || $slaves[$i].porn.fameType == "fuckdoll">>
 			$His latex encased body attracts a variety of viewers with tastes ranging from bondage to dolls.
-			<<if $slaves[$i].pornTypeFuckdoll > _oldPorn>>
+			<<if $slaves[$i].porn.fame.fuckdoll > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeFuckdoll < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].pornTypeFuckdoll).<</if>>
-	<<elseif $slaves[$i].pornTypeFuckdoll > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeFuckdoll>><</if>>
-		<<set $slaves[$i].pornTypeFuckdoll = Math.clamp($slaves[$i].pornTypeFuckdoll-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].pornTypeFuckdoll).<</if>>
+		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].porn.fame.fuckdoll).<</if>>
+	<<elseif $slaves[$i].porn.fame.fuckdoll > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.fuckdoll>><</if>>
+		<<set $slaves[$i].porn.fame.fuckdoll = Math.clamp($slaves[$i].porn.fame.fuckdoll-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].porn.fame.fuckdoll).<</if>>
 	<</if>>
 	<<if ($slaves[$i].devotion < -20) && ($slaves[$i].analCount + $slaves[$i].vaginalCount > 0)>>
-		<<if $slaves[$i].pornFocus == "rape" || $slaves[$i].pornFameType == "rape">>
+		<<if $slaves[$i].porn.focus == "rape" || $slaves[$i].porn.fameType == "rape">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeRape>>
-		<<set $slaves[$i].pornTypeRape += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRapees-1))>>
-		<<set $slaves[$i].pornTypeRape = Math.clamp($slaves[$i].pornTypeRape, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.rape>>
+		<<set $slaves[$i].porn.fame.rape += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRapees-1))>>
+		<<set $slaves[$i].porn.fame.rape = Math.clamp($slaves[$i].porn.fame.rape, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "rape" || $slaves[$i].pornFameType == "rape">>
+		<<if $slaves[$i].porn.focus == "rape" || $slaves[$i].porn.fameType == "rape">>
 			$He is too unbroken for consensual sex, but $his viewers wouldn't want it any other way.
-			<<if $slaves[$i].pornTypeRape > _oldPorn>>
+			<<if $slaves[$i].porn.fame.rape > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeRape < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.rape < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].pornTypeRape).<</if>>
-	<<elseif $slaves[$i].pornTypeRape > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRape>><</if>>
-		<<set $slaves[$i].pornTypeRape = Math.clamp($slaves[$i].pornTypeRape-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].pornTypeRape).<</if>>
+		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].porn.fame.rape).<</if>>
+	<<elseif $slaves[$i].porn.fame.rape > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.rape>><</if>>
+		<<set $slaves[$i].porn.fame.rape = Math.clamp($slaves[$i].porn.fame.rape-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].porn.fame.rape).<</if>>
 	<</if>>
 	<<if $slaves[$i].bellyPreg > 500>>
-		<<if $slaves[$i].pornFocus == "preggo" || $slaves[$i].pornFameType == "preggo">>
+		<<if $slaves[$i].porn.focus == "preggo" || $slaves[$i].porn.fameType == "preggo">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePreggo>>
-		<<set $slaves[$i].pornTypePreggo += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPreggos-1))>>
-		<<set $slaves[$i].pornTypePreggo = Math.clamp($slaves[$i].pornTypePreggo, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.preggo>>
+		<<set $slaves[$i].porn.fame.preggo += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPreggos-1))>>
+		<<set $slaves[$i].porn.fame.preggo = Math.clamp($slaves[$i].porn.fame.preggo, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "preggo" || $slaves[$i].pornFameType == "preggo">>
+		<<if $slaves[$i].porn.focus == "preggo" || $slaves[$i].porn.fameType == "preggo">>
 			$His gravid swell may be a turn off to some, but the maiesiophiliacs love it.
-			<<if $slaves[$i].pornTypePreggo > _oldPorn>>
+			<<if $slaves[$i].porn.fame.preggo > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePreggo < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.preggo < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].pornTypePreggo).<</if>>
-	<<elseif $slaves[$i].pornTypePreggo > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePreggo>><</if>>
-		<<set $slaves[$i].pornTypePreggo = Math.clamp($slaves[$i].pornTypePreggo-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].pornTypePreggo).<</if>>
+		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].porn.fame.preggo).<</if>>
+	<<elseif $slaves[$i].porn.fame.preggo > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.preggo>><</if>>
+		<<set $slaves[$i].porn.fame.preggo = Math.clamp($slaves[$i].porn.fame.preggo-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].porn.fame.preggo).<</if>>
 	<</if>>
 	<<if $slaves[$i].weight > 95>>
-		<<if $slaves[$i].pornFocus == "BBW" || $slaves[$i].pornFameType == "BBW">>
+		<<if $slaves[$i].porn.focus == "BBW" || $slaves[$i].porn.fameType == "BBW">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBBW>>
-		<<set $slaves[$i].pornTypeBBW += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarBBWs-1))>>
-		<<set $slaves[$i].pornTypeBBW = Math.clamp($slaves[$i].pornTypeBBW, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.BBW>>
+		<<set $slaves[$i].porn.fame.BBW += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarBBWs-1))>>
+		<<set $slaves[$i].porn.fame.BBW = Math.clamp($slaves[$i].porn.fame.BBW, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "BBW" || $slaves[$i].pornFameType == "BBW">>
+		<<if $slaves[$i].porn.focus == "BBW" || $slaves[$i].porn.fameType == "BBW">>
 			$His weight gives $him a heavy allure to the chubby chasers and BBW lovers out there.
-			<<if $slaves[$i].pornTypeBBW > _oldPorn>>
+			<<if $slaves[$i].porn.fame.BBW > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBBW < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.BBW < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].pornTypeBBW).<</if>>
-	<<elseif $slaves[$i].pornTypeBBW > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBBW>><</if>>
-		<<set $slaves[$i].pornTypeBBW = Math.clamp($slaves[$i].pornTypeBBW-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].pornTypeBBW).<</if>>
+		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].porn.fame.BBW).<</if>>
+	<<elseif $slaves[$i].porn.fame.BBW > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.BBW>><</if>>
+		<<set $slaves[$i].porn.fame.BBW = Math.clamp($slaves[$i].porn.fame.BBW-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].porn.fame.BBW).<</if>>
 	<</if>>
 	<<if $slaves[$i].visualAge <= 12>>
-		<<if $slaves[$i].pornFocus == "loli" || $slaves[$i].pornFameType == "underage">>
+		<<if $slaves[$i].porn.focus == "loli" || $slaves[$i].porn.fameType == "underage">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeLoli>>
-		<<set $slaves[$i].pornTypeLoli += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarLolis-1))>>
-		<<set $slaves[$i].pornTypeLoli = Math.clamp($slaves[$i].pornTypeLoli, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.loli>>
+		<<set $slaves[$i].porn.fame.loli += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarLolis-1))>>
+		<<set $slaves[$i].porn.fame.loli = Math.clamp($slaves[$i].porn.fame.loli, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "loli" || $slaves[$i].pornFameType == "underage">>
+		<<if $slaves[$i].porn.focus == "loli" || $slaves[$i].porn.fameType == "underage">>
 			$His young age gives $him a dangerous edge and a number of careful viewers.
-			<<if $slaves[$i].pornTypeLoli > _oldPorn>>
+			<<if $slaves[$i].porn.fame.loli > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeLoli < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.loli < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].pornTypeLoli).<</if>>
-	<<elseif $slaves[$i].pornTypeLoli > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeLoli>><</if>>
-		<<set $slaves[$i].pornTypeLoli = Math.clamp($slaves[$i].pornTypeLoli-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].pornTypeLoli).<</if>>
+		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].porn.fame.loli).<</if>>
+	<<elseif $slaves[$i].porn.fame.loli > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.loli>><</if>>
+		<<set $slaves[$i].porn.fame.loli = Math.clamp($slaves[$i].porn.fame.loli-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].porn.fame.loli).<</if>>
 	<</if>>
 	<<if ($slaves[$i].weight > 30 && $slaves[$i].diet == "fattening") || ($slaves[$i].inflation > 0 && $slaves[$i].inflationType == "food")>>
-		<<if $slaves[$i].pornFocus == "gainer" || $slaves[$i].pornFameType == "weight gain">>
+		<<if $slaves[$i].porn.focus == "gainer" || $slaves[$i].porn.fameType == "weight gain">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeGainer>>
-		<<set $slaves[$i].pornTypeGainer += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarGainers-1))>>
-		<<set $slaves[$i].pornTypeGainer = Math.clamp($slaves[$i].pornTypeGainer, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.gainer>>
+		<<set $slaves[$i].porn.fame.gainer += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarGainers-1))>>
+		<<set $slaves[$i].porn.fame.gainer = Math.clamp($slaves[$i].porn.fame.gainer, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "gainer" || $slaves[$i].pornFameType == "weight gain">>
+		<<if $slaves[$i].porn.focus == "gainer" || $slaves[$i].porn.fameType == "weight gain">>
 			$His expanding waistline attracts those who enjoy seeing a $girl pack on the pounds while stuffing $his face.
-			<<if $slaves[$i].pornTypeGainer > _oldPorn>>
+			<<if $slaves[$i].porn.fame.gainer > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeGainer < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.gainer < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].pornTypeGainer).<</if>>
-	<<elseif $slaves[$i].pornTypeGainer > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGainer>><</if>>
-		<<set $slaves[$i].pornTypeGainer = Math.clamp($slaves[$i].pornTypeGainer-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].pornTypeGainer).<</if>>
+		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].porn.fame.gainer).<</if>>
+	<<elseif $slaves[$i].porn.fame.gainer > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.gainer>><</if>>
+		<<set $slaves[$i].porn.fame.gainer = Math.clamp($slaves[$i].porn.fame.gainer-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].porn.fame.gainer).<</if>>
 	<</if>>
 	<<if canPenetrate($slaves[$i]) && $slaves[$i].dick > 3>>
-		<<if $slaves[$i].pornFocus == "stud" || $slaves[$i].pornFameType == "big dick">>
+		<<if $slaves[$i].porn.focus == "stud" || $slaves[$i].porn.fameType == "big dick">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeStud>>
-		<<set $slaves[$i].pornTypeStud += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStuds-1))>>
-		<<set $slaves[$i].pornTypeStud = Math.clamp($slaves[$i].pornTypeStud, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.stud>>
+		<<set $slaves[$i].porn.fame.stud += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStuds-1))>>
+		<<set $slaves[$i].porn.fame.stud = Math.clamp($slaves[$i].porn.fame.stud, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "stud" || $slaves[$i].pornFameType == "big dick">>
+		<<if $slaves[$i].porn.focus == "stud" || $slaves[$i].porn.fameType == "big dick">>
 			$His powerful erection excites those who see it, especially when it is put to good use.
-			<<if $slaves[$i].pornTypeStud > _oldPorn>>
+			<<if $slaves[$i].porn.fame.stud > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeStud < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.stud < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].pornTypeStud).<</if>>
-	<<elseif $slaves[$i].pornTypeStud > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStud>><</if>>
-		<<set $slaves[$i].pornTypeStud = Math.clamp($slaves[$i].pornTypeStud-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].pornTypeStud).<</if>>
+		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].porn.fame.stud).<</if>>
+	<<elseif $slaves[$i].porn.fame.stud > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.stud>><</if>>
+		<<set $slaves[$i].porn.fame.stud = Math.clamp($slaves[$i].porn.fame.stud-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].porn.fame.stud).<</if>>
 	<</if>>
-	<<if $slaves[$i].pornFocus == "porn" || $slaves[$i].pornFameType === "generic">>
+	<<if $slaves[$i].porn.focus == "porn" || $slaves[$i].porn.fameType === "generic">>
 		<<set _adjustedViewership = _viewership*5>>
 	<<else>>
 		<<set _adjustedViewership = _viewership>>
 	<</if>>
-	<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGeneral>><</if>>
-	<<set $slaves[$i].pornTypeGeneral += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStars-1))>>
-	<<set $slaves[$i].pornTypeGeneral = Math.clamp($slaves[$i].pornTypeGeneral, 0, 150000)>>
-	<<if $cheatMode == 1>>General: (_oldPorn) to ($slaves[$i].pornTypeGeneral).<</if>>
+	<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.general>><</if>>
+	<<set $slaves[$i].porn.fame.general += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStars-1))>>
+	<<set $slaves[$i].porn.fame.general = Math.clamp($slaves[$i].porn.fame.general, 0, 150000)>>
+	<<if $cheatMode == 1>>General: (_oldPorn) to ($slaves[$i].porn.fame.general).<</if>>
 
 	/*Quirks are low and unlikely, requiring focus to push into the limelight*/
 	<<if $slaves[$i].sexualQuirk == "gagfuck queen">>
-		<<if $slaves[$i].pornFocus == "gagfuck queen" || $slaves[$i].pornFameType == "deepthroat">>
+		<<if $slaves[$i].porn.focus == "gagfuck queen" || $slaves[$i].porn.fameType == "deepthroat">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeDeepThroat>>
-		<<set $slaves[$i].pornTypeDeepThroat += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarDeepThroats-1))>>
-		<<set $slaves[$i].pornTypeDeepThroat = Math.clamp($slaves[$i].pornTypeDeepThroat, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.deepThroat>>
+		<<set $slaves[$i].porn.fame.deepThroat += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarDeepThroats-1))>>
+		<<set $slaves[$i].porn.fame.deepThroat = Math.clamp($slaves[$i].porn.fame.deepThroat, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "gagfuck queen" || $slaves[$i].pornFameType == "deepthroat">>
+		<<if $slaves[$i].porn.focus == "gagfuck queen" || $slaves[$i].porn.fameType == "deepthroat">>
 			$He impresses with just how much dick can slip down $his throat.
-			<<if $slaves[$i].pornTypeDeepThroat > _oldPorn>>
+			<<if $slaves[$i].porn.fame.deepThroat > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeDeepThroat < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].pornTypeDeepThroat).<</if>>
-	<<elseif $slaves[$i].pornTypeDeepThroat > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDeepThroat>><</if>>
-		<<set $slaves[$i].pornTypeDeepThroat = Math.clamp($slaves[$i].pornTypeDeepThroat-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].pornTypeDeepThroat).<</if>>
+		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.deepThroat).<</if>>
+	<<elseif $slaves[$i].porn.fame.deepThroat > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.deepThroat>><</if>>
+		<<set $slaves[$i].porn.fame.deepThroat = Math.clamp($slaves[$i].porn.fame.deepThroat-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.deepThroat).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "strugglefuck queen" && (canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i]))>>
-		<<if $slaves[$i].pornFocus == "strugglefuck queen" || $slaves[$i].pornFameType == "unwilling">>
+		<<if $slaves[$i].porn.focus == "strugglefuck queen" || $slaves[$i].porn.fameType == "unwilling">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeStruggleFuck>>
-		<<set $slaves[$i].pornTypeStruggleFuck += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStruggleFucks-1))>>
-		<<set $slaves[$i].pornTypeStruggleFuck = Math.clamp($slaves[$i].pornTypeStruggleFuck, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.struggleFuck>>
+		<<set $slaves[$i].porn.fame.struggleFuck += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStruggleFucks-1))>>
+		<<set $slaves[$i].porn.fame.struggleFuck = Math.clamp($slaves[$i].porn.fame.struggleFuck, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "strugglefuck queen" || $slaves[$i].pornFameType == "unwilling">>
+		<<if $slaves[$i].porn.focus == "strugglefuck queen" || $slaves[$i].porn.fameType == "unwilling">>
 			$He impresses with $his ability to put up just the right amount of fight during sex.
-			<<if $slaves[$i].pornTypeStruggleFuck > _oldPorn>>
+			<<if $slaves[$i].porn.fame.struggleFuck > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeStruggleFuck < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypeStruggleFuck).<</if>>
-	<<elseif $slaves[$i].pornTypeStruggleFuck > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStruggleFuck>><</if>>
-		<<set $slaves[$i].pornTypeStruggleFuck = Math.clamp($slaves[$i].pornTypeStruggleFuck-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypeStruggleFuck).<</if>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.struggleFuck).<</if>>
+	<<elseif $slaves[$i].porn.fame.struggleFuck > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.struggleFuck>><</if>>
+		<<set $slaves[$i].porn.fame.struggleFuck = Math.clamp($slaves[$i].porn.fame.struggleFuck-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.struggleFuck).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "painal queen" && canDoAnal($slaves[$i])>>
-		<<if $slaves[$i].pornFocus == "painal queen" || $slaves[$i].pornFameType == "hardcore anal">>
+		<<if $slaves[$i].porn.focus == "painal queen" || $slaves[$i].porn.fameType == "hardcore anal">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePainal>>
-		<<set $slaves[$i].pornTypePainal += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPainals-1))>>
-		<<set $slaves[$i].pornTypePainal = Math.clamp($slaves[$i].pornTypePainal, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.painal>>
+		<<set $slaves[$i].porn.fame.painal += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPainals-1))>>
+		<<set $slaves[$i].porn.fame.painal = Math.clamp($slaves[$i].porn.fame.painal, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "painal queen" || $slaves[$i].pornFameType == "hardcore anal">>
+		<<if $slaves[$i].porn.focus == "painal queen" || $slaves[$i].porn.fameType == "hardcore anal">>
 			$He impresses with $his ability to push $his anus to its limit.
-			<<if $slaves[$i].pornTypePainal > _oldPorn>>
+			<<if $slaves[$i].porn.fame.painal > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePainal < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.painal < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Painal Queen: (_oldPorn) to ($slaves[$i].pornTypePainal).<</if>>
-	<<elseif $slaves[$i].pornTypePainal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePainal>><</if>>
-		<<set $slaves[$i].pornTypePainal = Math.clamp($slaves[$i].pornTypePainal-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypePainal).<</if>>
+		<<if $cheatMode == 1>>Painal Queen: (_oldPorn) to ($slaves[$i].porn.fame.painal).<</if>>
+	<<elseif $slaves[$i].porn.fame.painal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.painal>><</if>>
+		<<set $slaves[$i].porn.fame.painal = Math.clamp($slaves[$i].porn.fame.painal-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.painal).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "tease">>
-		<<if $slaves[$i].pornFocus == "tease" || $slaves[$i].pornFameType == "softcore">>
+		<<if $slaves[$i].porn.focus == "tease" || $slaves[$i].porn.fameType == "softcore">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeTease>>
-		<<set $slaves[$i].pornTypeTease += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarTeases-1))>>
-		<<set $slaves[$i].pornTypeTease = Math.clamp($slaves[$i].pornTypeTease, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.tease>>
+		<<set $slaves[$i].porn.fame.tease += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarTeases-1))>>
+		<<set $slaves[$i].porn.fame.tease = Math.clamp($slaves[$i].porn.fame.tease, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "tease" || $slaves[$i].pornFameType == "softcore">>
+		<<if $slaves[$i].porn.focus == "tease" || $slaves[$i].porn.fameType == "softcore">>
 			$He tantalizes viewers with $his suggestive moves.
-			<<if $slaves[$i].pornTypeTease > _oldPorn>>
+			<<if $slaves[$i].porn.fame.tease > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeTease < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.tease < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].pornTypeTease).<</if>>
-	<<elseif $slaves[$i].pornTypeTease > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeTease>><</if>>
-		<<set $slaves[$i].pornTypeTease = Math.clamp($slaves[$i].pornTypeTease-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].pornTypeTease).<</if>>
+		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].porn.fame.tease).<</if>>
+	<<elseif $slaves[$i].porn.fame.tease > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.tease>><</if>>
+		<<set $slaves[$i].porn.fame.tease = Math.clamp($slaves[$i].porn.fame.tease-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].porn.fame.tease).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "romantic">>
-		<<if $slaves[$i].pornFocus == "romantic" || $slaves[$i].pornFameType == "romantic">>
+		<<if $slaves[$i].porn.focus == "romantic" || $slaves[$i].porn.fameType == "romantic">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeRomantic>>
-		<<set $slaves[$i].pornTypeRomantic += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRomantics-1))>>
-		<<set $slaves[$i].pornTypeRomantic = Math.clamp($slaves[$i].pornTypeRomantic, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.romantic>>
+		<<set $slaves[$i].porn.fame.romantic += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRomantics-1))>>
+		<<set $slaves[$i].porn.fame.romantic = Math.clamp($slaves[$i].porn.fame.romantic, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "romantic" || $slaves[$i].pornFameType == "romantic">>
+		<<if $slaves[$i].porn.focus == "romantic" || $slaves[$i].porn.fameType == "romantic">>
 			$He draws viewers in with $his genuine pleasure.
-			<<if $slaves[$i].pornTypeRomantic > _oldPorn>>
+			<<if $slaves[$i].porn.fame.romantic > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeRomantic < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.romantic < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].pornTypeRomantic).<</if>>
-	<<elseif $slaves[$i].pornTypeRomantic > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRomantic>><</if>>
-		<<set $slaves[$i].pornTypeRomantic = Math.clamp($slaves[$i].pornTypeRomantic-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].pornTypeRomantic).<</if>>
+		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].porn.fame.romantic).<</if>>
+	<<elseif $slaves[$i].porn.fame.romantic > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.romantic>><</if>>
+		<<set $slaves[$i].porn.fame.romantic = Math.clamp($slaves[$i].porn.fame.romantic-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].porn.fame.romantic).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "perverted">>
-		<<if $slaves[$i].pornFocus == "perverted" || $slaves[$i].pornFameType == "really perverted">>
+		<<if $slaves[$i].porn.focus == "perverted" || $slaves[$i].porn.fameType == "really perverted">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePervert>>
-		<<set $slaves[$i].pornTypePervert += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPerverts-1))>>
-		<<set $slaves[$i].pornTypePervert = Math.clamp($slaves[$i].pornTypePervert, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.pervert>>
+		<<set $slaves[$i].porn.fame.pervert += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPerverts-1))>>
+		<<set $slaves[$i].porn.fame.pervert = Math.clamp($slaves[$i].porn.fame.pervert, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "perverted" || $slaves[$i].pornFameType == "really perverted">>
+		<<if $slaves[$i].porn.focus == "perverted" || $slaves[$i].porn.fameType == "really perverted">>
 			$His perverted tastes shock and allure viewers in ways they didn't even realize.
-			<<if $slaves[$i].pornTypePervert > _oldPorn>>
+			<<if $slaves[$i].porn.fame.pervert > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePervert < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.pervert < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].pornTypePervert).<</if>>
-	<<elseif $slaves[$i].pornTypePervert > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePervert>><</if>>
-		<<set $slaves[$i].pornTypePervert = Math.clamp($slaves[$i].pornTypePervert-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].pornTypePervert).<</if>>
+		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].porn.fame.pervert).<</if>>
+	<<elseif $slaves[$i].porn.fame.pervert > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pervert>><</if>>
+		<<set $slaves[$i].porn.fame.pervert = Math.clamp($slaves[$i].porn.fame.pervert-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].porn.fame.pervert).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "caring">>
-		<<if $slaves[$i].pornFocus == "caring" || $slaves[$i].pornFameType == "voyeur">>
+		<<if $slaves[$i].porn.focus == "caring" || $slaves[$i].porn.fameType == "voyeur">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeCaring>>
-		<<set $slaves[$i].pornTypeCaring += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarCarings-1))>>
-		<<set $slaves[$i].pornTypeCaring = Math.clamp($slaves[$i].pornTypeCaring, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.caring>>
+		<<set $slaves[$i].porn.fame.caring += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarCarings-1))>>
+		<<set $slaves[$i].porn.fame.caring = Math.clamp($slaves[$i].porn.fame.caring, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "caring" || $slaves[$i].pornFameType == "voyeur">>
+		<<if $slaves[$i].porn.focus == "caring" || $slaves[$i].porn.fameType == "voyeur">>
 			$His sincere devotion to $his partner's pleasure draws in viewers with an interest in watching couples fuck.
-			<<if $slaves[$i].pornTypeCaring > _oldPorn>>
+			<<if $slaves[$i].porn.fame.caring > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeCaring < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.caring < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].pornTypeCaring).<</if>>
-	<<elseif $slaves[$i].pornTypeCaring > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCaring>><</if>>
-		<<set $slaves[$i].pornTypeCaring = Math.clamp($slaves[$i].pornTypeCaring-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].pornTypeCaring).<</if>>
+		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].porn.fame.caring).<</if>>
+	<<elseif $slaves[$i].porn.fame.caring > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.caring>><</if>>
+		<<set $slaves[$i].porn.fame.caring = Math.clamp($slaves[$i].porn.fame.caring-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].porn.fame.caring).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "unflinching">>
-		<<if $slaves[$i].pornFocus == "unflinching" || $slaves[$i].pornFameType == "unspeakable">>
+		<<if $slaves[$i].porn.focus == "unflinching" || $slaves[$i].porn.fameType == "unspeakable">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeUnflinching>>
-		<<set $slaves[$i].pornTypeUnflinching += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarUnflinchings-1))>>
-		<<set $slaves[$i].pornTypeUnflinching = Math.clamp($slaves[$i].pornTypeUnflinching, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.unflinching>>
+		<<set $slaves[$i].porn.fame.unflinching += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarUnflinchings-1))>>
+		<<set $slaves[$i].porn.fame.unflinching = Math.clamp($slaves[$i].porn.fame.unflinching, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "unflinching" || $slaves[$i].pornFameType == "unspeakable">>
+		<<if $slaves[$i].porn.focus == "unflinching" || $slaves[$i].porn.fameType == "unspeakable">>
 			$His willingness to do anything catches the attention of those who enjoy acts that should never be mentioned to others.
-			<<if $slaves[$i].pornTypeUnflinching > _oldPorn>>
+			<<if $slaves[$i].porn.fame.unflinching > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeUnflinching < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.unflinching < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].pornTypeUnflinching).<</if>>
-	<<elseif $slaves[$i].pornTypeUnflinching > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeUnflinching>><</if>>
-		<<set $slaves[$i].pornTypeUnflinching = Math.clamp($slaves[$i].pornTypeUnflinching-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].pornTypeUnflinching).<</if>>
+		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].porn.fame.unflinching).<</if>>
+	<<elseif $slaves[$i].porn.fame.unflinching > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.unflinching>><</if>>
+		<<set $slaves[$i].porn.fame.unflinching = Math.clamp($slaves[$i].porn.fame.unflinching-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].porn.fame.unflinching).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "size queen">>
-		<<if $slaves[$i].pornFocus == "size queen" || $slaves[$i].pornFameType == "huge insertion">>
+		<<if $slaves[$i].porn.focus == "size queen" || $slaves[$i].porn.fameType == "huge insertion">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSizeQueen>>
-		<<set $slaves[$i].pornTypeSizeQueen += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarSizeQueens-1))>>
-		<<set $slaves[$i].pornTypeSizeQueen = Math.clamp($slaves[$i].pornTypeSizeQueen, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.sizeQueen>>
+		<<set $slaves[$i].porn.fame.sizeQueen += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarSizeQueens-1))>>
+		<<set $slaves[$i].porn.fame.sizeQueen = Math.clamp($slaves[$i].porn.fame.sizeQueen, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "size queen" || $slaves[$i].pornFameType == "huge insertion">>
+		<<if $slaves[$i].porn.focus == "size queen" || $slaves[$i].porn.fameType == "huge insertion">>
 			$His intent on taking the largest things possible into $his holes draws in viewers with an interest for huge insertions.
-			<<if $slaves[$i].pornTypeSizeQueen > _oldPorn>>
+			<<if $slaves[$i].porn.fame.sizeQueen > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSizeQueen < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].pornTypeSizeQueen).<</if>>
-	<<elseif $slaves[$i].pornTypeSizeQueen > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSizeQueen>><</if>>
-		<<set $slaves[$i].pornTypeSizeQueen = Math.clamp($slaves[$i].pornTypeSizeQueen-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].pornTypeSizeQueen).<</if>>
+		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
+	<<elseif $slaves[$i].porn.fame.sizeQueen > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sizeQueen>><</if>>
+		<<set $slaves[$i].porn.fame.sizeQueen = Math.clamp($slaves[$i].porn.fame.sizeQueen-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
 	<</if>>
 
-	<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGeneral + $slaves[$i].pornTypeFuckdoll + $slaves[$i].pornTypeRape + $slaves[$i].pornTypePreggo + $slaves[$i].pornTypeBBW + $slaves[$i].pornTypeGainer + $slaves[$i].pornTypeStud + $slaves[$i].pornTypeLoli + $slaves[$i].pornTypeDeepThroat + $slaves[$i].pornTypeStruggleFuck + $slaves[$i].pornTypePainal + $slaves[$i].pornTypeTease + $slaves[$i].pornTypeRomantic + $slaves[$i].pornTypePervert + $slaves[$i].pornTypeCaring + $slaves[$i].pornTypeUnflinching + $slaves[$i].pornTypeSizeQueen + $slaves[$i].pornTypeNeglectful + $slaves[$i].pornTypeCumAddict + $slaves[$i].pornTypeAnalAddict + $slaves[$i].pornTypeAttentionWhore + $slaves[$i].pornTypeBreastGrowth + $slaves[$i].pornTypeAbusive + $slaves[$i].pornTypeMalicious + $slaves[$i].pornTypeSelfHating + $slaves[$i].pornTypeBreeder + $slaves[$i].pornTypeSub + $slaves[$i].pornTypeCumSlut + $slaves[$i].pornTypeAnal + $slaves[$i].pornTypeHumiliation + $slaves[$i].pornTypeBoobs + $slaves[$i].pornTypeDom + $slaves[$i].pornTypeSadist + $slaves[$i].pornTypeMasochist + $slaves[$i].pornTypePregnancy>>
+	<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
 	<<set $slaves[$i].pornFame = Math.trunc($slaves[$i].pornFame)>>
 
 	<<if _oldFame > $slaves[$i].pornFame>>
@@ -1054,49 +1054,49 @@
 
 	<<if $slaves[$i].pornPrestige == 0 && $slaves[$i].pornFame >= 10000>>
 		<<set _pornFameGrabBag = []>>
-		<<if $slaves[$i].pornTypeGeneral >= 10000>><<set _pornFameGrabBag.push("generic")>><</if>>
-		<<if $slaves[$i].pornTypeFuckdoll >= 10000>><<set _pornFameGrabBag.push("fuckdoll")>><</if>>
-		<<if $slaves[$i].pornTypeRape >= 10000>><<set _pornFameGrabBag.push("rape")>><</if>>
-		<<if $slaves[$i].pornTypePreggo >= 10000>><<set _pornFameGrabBag.push("preggo")>><</if>>
-		<<if $slaves[$i].pornTypeBBW >= 10000>><<set _pornFameGrabBag.push("BBW")>><</if>>
-		<<if $slaves[$i].pornTypeGainer >= 10000>><<set _pornFameGrabBag.push("weight gain")>><</if>>
-		<<if $slaves[$i].pornTypeStud >= 10000>><<set _pornFameGrabBag.push("big dick")>><</if>>
-		<<if $slaves[$i].pornTypeLoli >= 10000>><<set _pornFameGrabBag.push("underage")>><</if>>
-		<<if $slaves[$i].pornTypeDeepThroat >= 10000>><<set _pornFameGrabBag.push("deepthroat")>><</if>>
-		<<if $slaves[$i].pornTypeStruggleFuck >= 10000>><<set _pornFameGrabBag.push("unwilling")>><</if>>
-		<<if $slaves[$i].pornTypePainal >= 10000>><<set _pornFameGrabBag.push("hardcore anal")>><</if>>
-		<<if $slaves[$i].pornTypeTease >= 10000>><<set _pornFameGrabBag.push("softcore")>><</if>>
-		<<if $slaves[$i].pornTypeRomantic >= 10000>><<set _pornFameGrabBag.push("romantic")>><</if>>
-		<<if $slaves[$i].pornTypePervert >= 10000>><<set _pornFameGrabBag.push("really perverted")>><</if>>
-		<<if $slaves[$i].pornTypeCaring >= 10000>><<set _pornFameGrabBag.push("voyeur")>><</if>>
-		<<if $slaves[$i].pornTypeUnflinching >= 10000>><<set _pornFameGrabBag.push("unspeakable")>><</if>>
-		<<if $slaves[$i].pornTypeSizeQueen >= 10000>><<set _pornFameGrabBag.push("huge insertion")>><</if>>
-		<<if $slaves[$i].pornTypeNeglectful >= 10000>><<set _pornFameGrabBag.push("orgasm denial")>><</if>>
-		<<if $slaves[$i].pornTypeCumAddict >= 10000>><<set _pornFameGrabBag.push("cum addiction")>><</if>>
-		<<if $slaves[$i].pornTypeAnalAddict >= 10000>><<set _pornFameGrabBag.push("anal addiction")>><</if>>
-		<<if $slaves[$i].pornTypeAttentionWhore >= 10000>><<set _pornFameGrabBag.push("exhibition")>><</if>>
-		<<if $slaves[$i].pornTypeBreastGrowth >= 10000>><<set _pornFameGrabBag.push("breast expansion")>><</if>>
-		<<if $slaves[$i].pornTypeAbusive >= 10000>><<set _pornFameGrabBag.push("abuse")>><</if>>
-		<<if $slaves[$i].pornTypeMalicious >= 10000>><<set _pornFameGrabBag.push("sexual torture")>><</if>>
-		<<if $slaves[$i].pornTypeSelfHating >= 10000>><<set _pornFameGrabBag.push("self hating")>><</if>>
-		<<if $slaves[$i].pornTypeBreeder >= 10000>><<set _pornFameGrabBag.push("breeder")>><</if>>
-		<<if $slaves[$i].pornTypeSub >= 10000>><<set _pornFameGrabBag.push("submissive")>><</if>>
-		<<if $slaves[$i].pornTypeCumSlut >= 10000>><<set _pornFameGrabBag.push("cum")>><</if>>
-		<<if $slaves[$i].pornTypeAnal >= 10000>><<set _pornFameGrabBag.push("buttslut")>><</if>>
-		<<if $slaves[$i].pornTypeHumiliation >= 10000>><<set _pornFameGrabBag.push("humiliating")>><</if>>
-		<<if $slaves[$i].pornTypeBoobs >= 10000>><<set _pornFameGrabBag.push("breast")>><</if>>
-		<<if $slaves[$i].pornTypeDom >= 10000>><<set _pornFameGrabBag.push("dominant")>><</if>>
-		<<if $slaves[$i].pornTypeSadist >= 10000>><<set _pornFameGrabBag.push("sadistic")>><</if>>
-		<<if $slaves[$i].pornTypeMasochist >= 10000>><<set _pornFameGrabBag.push("masochistic")>><</if>>
-		<<if $slaves[$i].pornTypePregnancy >= 10000>><<set _pornFameGrabBag.push("pregnancy fetish")>><</if>>
+		<<if $slaves[$i].porn.fame.general >= 10000>><<set _pornFameGrabBag.push("generic")>><</if>>
+		<<if $slaves[$i].porn.fame.fuckdoll >= 10000>><<set _pornFameGrabBag.push("fuckdoll")>><</if>>
+		<<if $slaves[$i].porn.fame.rape >= 10000>><<set _pornFameGrabBag.push("rape")>><</if>>
+		<<if $slaves[$i].porn.fame.preggo >= 10000>><<set _pornFameGrabBag.push("preggo")>><</if>>
+		<<if $slaves[$i].porn.fame.BBW >= 10000>><<set _pornFameGrabBag.push("BBW")>><</if>>
+		<<if $slaves[$i].porn.fame.gainer >= 10000>><<set _pornFameGrabBag.push("weight gain")>><</if>>
+		<<if $slaves[$i].porn.fame.stud >= 10000>><<set _pornFameGrabBag.push("big dick")>><</if>>
+		<<if $slaves[$i].porn.fame.loli >= 10000>><<set _pornFameGrabBag.push("underage")>><</if>>
+		<<if $slaves[$i].porn.fame.deepThroat >= 10000>><<set _pornFameGrabBag.push("deepthroat")>><</if>>
+		<<if $slaves[$i].porn.fame.struggleFuck >= 10000>><<set _pornFameGrabBag.push("unwilling")>><</if>>
+		<<if $slaves[$i].porn.fame.painal >= 10000>><<set _pornFameGrabBag.push("hardcore anal")>><</if>>
+		<<if $slaves[$i].porn.fame.tease >= 10000>><<set _pornFameGrabBag.push("softcore")>><</if>>
+		<<if $slaves[$i].porn.fame.romantic >= 10000>><<set _pornFameGrabBag.push("romantic")>><</if>>
+		<<if $slaves[$i].porn.fame.pervert >= 10000>><<set _pornFameGrabBag.push("really perverted")>><</if>>
+		<<if $slaves[$i].porn.fame.caring >= 10000>><<set _pornFameGrabBag.push("voyeur")>><</if>>
+		<<if $slaves[$i].porn.fame.unflinching >= 10000>><<set _pornFameGrabBag.push("unspeakable")>><</if>>
+		<<if $slaves[$i].porn.fame.sizeQueen >= 10000>><<set _pornFameGrabBag.push("huge insertion")>><</if>>
+		<<if $slaves[$i].porn.fame.neglectful >= 10000>><<set _pornFameGrabBag.push("orgasm denial")>><</if>>
+		<<if $slaves[$i].porn.fame.cumAddict >= 10000>><<set _pornFameGrabBag.push("cum addiction")>><</if>>
+		<<if $slaves[$i].porn.fame.analAddict >= 10000>><<set _pornFameGrabBag.push("anal addiction")>><</if>>
+		<<if $slaves[$i].porn.fame.attentionWhore >= 10000>><<set _pornFameGrabBag.push("exhibition")>><</if>>
+		<<if $slaves[$i].porn.fame.breastGrowth >= 10000>><<set _pornFameGrabBag.push("breast expansion")>><</if>>
+		<<if $slaves[$i].porn.fame.abusive >= 10000>><<set _pornFameGrabBag.push("abuse")>><</if>>
+		<<if $slaves[$i].porn.fame.malicious >= 10000>><<set _pornFameGrabBag.push("sexual torture")>><</if>>
+		<<if $slaves[$i].porn.fame.selfHating >= 10000>><<set _pornFameGrabBag.push("self hating")>><</if>>
+		<<if $slaves[$i].porn.fame.breeder >= 10000>><<set _pornFameGrabBag.push("breeder")>><</if>>
+		<<if $slaves[$i].porn.fame.sub >= 10000>><<set _pornFameGrabBag.push("submissive")>><</if>>
+		<<if $slaves[$i].porn.fame.cumSlut >= 10000>><<set _pornFameGrabBag.push("cum")>><</if>>
+		<<if $slaves[$i].porn.fame.anal >= 10000>><<set _pornFameGrabBag.push("buttslut")>><</if>>
+		<<if $slaves[$i].porn.fame.humiliation >= 10000>><<set _pornFameGrabBag.push("humiliating")>><</if>>
+		<<if $slaves[$i].porn.fame.boobs >= 10000>><<set _pornFameGrabBag.push("breast")>><</if>>
+		<<if $slaves[$i].porn.fame.dom >= 10000>><<set _pornFameGrabBag.push("dominant")>><</if>>
+		<<if $slaves[$i].porn.fame.sadist >= 10000>><<set _pornFameGrabBag.push("sadistic")>><</if>>
+		<<if $slaves[$i].porn.fame.masochist >= 10000>><<set _pornFameGrabBag.push("masochistic")>><</if>>
+		<<if $slaves[$i].porn.fame.pregnancy >= 10000>><<set _pornFameGrabBag.push("pregnancy fetish")>><</if>>
 
 		<<if _pornFameGrabBag.length > 0>>
-			<<set $slaves[$i].pornFameType = _pornFameGrabBag.random()>>
+			<<set $slaves[$i].porn.fameType = _pornFameGrabBag.random()>>
 			<<set $slaves[$i].pornPrestige = 1>>
 
-			@@.green;$He has gained a following in $slaves[$i].pornFameType pornography!@@ Thousands have enjoyed
+			@@.green;$He has gained a following in $slaves[$i].porn.fameType pornography!@@ Thousands have enjoyed
 
-			<<switch $slaves[$i].pornFameType>>
+			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
 				the sight of $him being used,
@@ -1218,370 +1218,370 @@
 	<<elseif $slaves[$i].pornPrestige == 1>>
 		<<set _failedStar = 0, _fameSwap = 0, _swapPoint = 1.2>>
 
-		<<switch $slaves[$i].pornFameType>>
+		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
-			<<if $slaves[$i].pornTypeGeneral >= 50000>>
+			<<if $slaves[$i].porn.fame.general >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her being used.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeGeneral*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.general*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeGeneral < 5000>>
+			<<elseif $slaves[$i].porn.fame.general < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $slaves[$i].pornTypeFuckdoll >= 50000>>
+			<<if $slaves[$i].porn.fame.fuckdoll >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "It is well known from its career in slave pornography. Its many fans relish the sight of it being used.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeFuckdoll*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.fuckdoll*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeFuckdoll < 5000>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "rape">>
-			<<if $slaves[$i].pornTypeRape >= 50000>>
+			<<if $slaves[$i].porn.fame.rape >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her being raped.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him being raped, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeRape*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being raped, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.rape*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeRape < 5000>>
+			<<elseif $slaves[$i].porn.fame.rape < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "preggo">>
-			<<if $slaves[$i].pornTypePreggo >= 50000>>
+			<<if $slaves[$i].porn.fame.preggo >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her swollen with child.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him swollen with child, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePreggo*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him swollen with child, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.preggo*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePreggo < 5000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "BBW">>
-			<<if $slaves[$i].pornTypeBBW >= 50000>>
+			<<if $slaves[$i].porn.fame.BBW >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her thick, soft body.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his thick and soft body, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBBW*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his thick and soft body, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.BBW*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBBW < 5000>>
+			<<elseif $slaves[$i].porn.fame.BBW < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "underage">>
-			<<if $slaves[$i].pornTypeLoli >= 50000>>
+			<<if $slaves[$i].porn.fame.loli >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her immature body.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his immature body, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeLoli*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his immature body, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.loli*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeLoli < 5000>>
+			<<elseif $slaves[$i].porn.fame.loli < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $slaves[$i].pornTypeGainer >= 50000>>
+			<<if $slaves[$i].porn.fame.gainer >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish how curvy she's gotten.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish how curvy <<print $he>>'s gotten, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeGainer*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish how curvy <<print $he>>'s gotten, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.gainer*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeGainer < 5000>>
+			<<elseif $slaves[$i].porn.fame.gainer < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "big dick">>
-			<<if $slaves[$i].pornTypeStud >= 50000>>
+			<<if $slaves[$i].porn.fame.stud >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her heavy dick.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his heavy dick, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeStud*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his heavy dick, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.stud*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeStud < 5000>>
+			<<elseif $slaves[$i].porn.fame.stud < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $slaves[$i].pornTypeDeepThroat >= 50000>>
+			<<if $slaves[$i].porn.fame.deepThroat >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sounds she makes when being throatfucked.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sounds $he makes when being throatfucked, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeDeepThroat*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sounds $he makes when being throatfucked, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.deepThroat*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeDeepThroat < 5000>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $slaves[$i].pornTypeStruggleFuck >= 50000>>
+			<<if $slaves[$i].porn.fame.struggleFuck >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish how perfectly she struggles during sex.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish how perfectly $he struggles during sex, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeStruggleFuck*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish how perfectly $he struggles during sex, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.struggleFuck*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeStruggleFuck < 5000>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $slaves[$i].pornTypePainal >= 50000>>
+			<<if $slaves[$i].porn.fame.painal >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish watching her asshole pushed to its limit.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish watching $his asshole pushed to its limit, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePainal*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish watching $his asshole pushed to its limit, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.painal*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePainal < 5000>>
+			<<elseif $slaves[$i].porn.fame.painal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "softcore">>
-			<<if $slaves[$i].pornTypeTease >= 50000>>
+			<<if $slaves[$i].porn.fame.tease >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her lewd striptease.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his lewd striptease, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeTease*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his lewd striptease, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.tease*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeTease < 5000>>
+			<<elseif $slaves[$i].porn.fame.tease < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "romantic">>
-			<<if $slaves[$i].pornTypeRomantic >= 50000>>
+			<<if $slaves[$i].porn.fame.romantic >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the deep bond she shares with her partners.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the deep bond $he shares with $his partners, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeRomantic*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the deep bond $he shares with $his partners, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.romantic*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeRomantic < 5000>>
+			<<elseif $slaves[$i].porn.fame.romantic < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $slaves[$i].pornTypePervert >= 50000>>
+			<<if $slaves[$i].porn.fame.pervert >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the depths of her perversions.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the depths of $his perversions, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePervert*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the depths of $his perversions, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.pervert*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePervert < 5000>>
+			<<elseif $slaves[$i].porn.fame.pervert < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $slaves[$i].pornTypeCaring >= 50000>>
+			<<if $slaves[$i].porn.fame.caring >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her devotion to her partners' pleasure.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his devotion to $his partners' pleasure, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeCaring*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his devotion to $his partners' pleasure, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.caring*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeCaring < 5000>>
+			<<elseif $slaves[$i].porn.fame.caring < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $slaves[$i].pornTypeUnflinching >= 50000>>
+			<<if $slaves[$i].porn.fame.unflinching >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her willingness to do anything and everything.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his willingness to do anything and everything, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeUnflinching*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his willingness to do anything and everything, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.unflinching*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeUnflinching < 5000>>
+			<<elseif $slaves[$i].porn.fame.unflinching < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $slaves[$i].pornTypeSizeQueen >= 50000>>
+			<<if $slaves[$i].porn.fame.sizeQueen >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her holes filled to their limits.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his holes filled to their limits, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSizeQueen*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his holes filled to their limits, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.sizeQueen*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSizeQueen < 5000>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $slaves[$i].pornTypeNeglectful >= 50000>>
+			<<if $slaves[$i].porn.fame.neglectful >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her denying herself pleasure.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him denying $himself pleasure, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeNeglectful*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him denying $himself pleasure, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.neglectful*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeNeglectful < 5000>>
+			<<elseif $slaves[$i].porn.fame.neglectful < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $slaves[$i].pornTypeCumAddict >= 50000>>
+			<<if $slaves[$i].porn.fame.cumAddict >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for cum.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him doing anything for cum, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeCumAddict*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for cum, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.cumAddict*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeCumAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $slaves[$i].pornTypeAnalAddict >= 50000>>
+			<<if $slaves[$i].porn.fame.analAddict >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for a dick up her ass.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him doing anything for a dick up $his ass, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAnalAddict*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for a dick up $his ass, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.analAddict*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAnalAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.analAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $slaves[$i].pornTypeAttentionWhore >= 50000>>
+			<<if $slaves[$i].porn.fame.attentionWhore >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for attention.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him doing anything for attention, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAttentionWhore*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for attention, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.attentionWhore*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAttentionWhore < 5000>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $slaves[$i].pornTypeBreastGrowth >= 50000>>
+			<<if $slaves[$i].porn.fame.breastGrowth >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her expanding bust.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his expanding bust, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBreastGrowth*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his expanding bust, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.breastGrowth*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBreastGrowth < 5000>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "abuse">>
-			<<if $slaves[$i].pornTypeAbusive >= 50000>>
+			<<if $slaves[$i].porn.fame.abusive >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her abusing others.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him abusing others, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAbusive*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him abusing others, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.abusive*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAbusive < 5000>>
+			<<elseif $slaves[$i].porn.fame.abusive < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $slaves[$i].pornTypeMalicious >= 50000>>
+			<<if $slaves[$i].porn.fame.malicious >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her getting off from the suffering she caused.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him getting off from the suffering $he caused, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeMalicious*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him getting off from the suffering $he caused, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.malicious*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeMalicious < 5000>>
+			<<elseif $slaves[$i].porn.fame.malicious < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "self hating">>
-			<<if $slaves[$i].pornTypeSelfHating >= 50000>>
+			<<if $slaves[$i].porn.fame.selfHating >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her suffering.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his suffering, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSelfHating*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his suffering, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.selfHating*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSelfHating < 5000>>
+			<<elseif $slaves[$i].porn.fame.selfHating < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breeder">>
-			<<if $slaves[$i].pornTypeBreeder >= 50000>>
+			<<if $slaves[$i].porn.fame.breeder >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her obsession with having children.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his obsession with having children, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBreeder*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his obsession with having children, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.breeder*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBreeder < 5000>>
+			<<elseif $slaves[$i].porn.fame.breeder < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "submissive">>
-			<<if $slaves[$i].pornTypeSub >= 50000>>
+			<<if $slaves[$i].porn.fame.sub >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her submissiveness.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his submissiveness, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSub*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his submissiveness, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.sub*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSub < 5000>>
+			<<elseif $slaves[$i].porn.fame.sub < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum">>
-			<<if $slaves[$i].pornTypeCumSlut >= 50000>>
+			<<if $slaves[$i].porn.fame.cumSlut >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her desire for cum.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his desire for cum, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeCumSlut*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his desire for cum, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.cumSlut*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeCumSlut < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $slaves[$i].pornTypeAnal >= 50000>>
+			<<if $slaves[$i].porn.fame.anal >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her rear.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his rear, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAnal*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his rear, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.anal*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAnal < 5000>>
+			<<elseif $slaves[$i].porn.fame.anal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $slaves[$i].pornTypeHumiliation >= 50000>>
+			<<if $slaves[$i].porn.fame.humiliation >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her frequent humiliation.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his frequent humiliation, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeHumiliation*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his frequent humiliation, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.humiliation*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeHumiliation < 5000>>
+			<<elseif $slaves[$i].porn.fame.humiliation < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast">>
-			<<if $slaves[$i].pornTypeBoobs >= 50000>>
+			<<if $slaves[$i].porn.fame.boobs >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her breasts.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his breasts, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBoobs*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his breasts, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.boobs*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBoobs < 5000>>
+			<<elseif $slaves[$i].porn.fame.boobs < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "dominant">>
-			<<if $slaves[$i].pornTypeDom >= 50000>>
+			<<if $slaves[$i].porn.fame.dom >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her dominance.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his dominance, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeDom*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his dominance, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.dom*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeDom < 5000>>
+			<<elseif $slaves[$i].porn.fame.dom < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $slaves[$i].pornTypeSadist >= 50000>>
+			<<if $slaves[$i].porn.fame.sadist >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her sadism.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his sadism, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSadist*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his sadism, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.sadist*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSadist < 5000>>
+			<<elseif $slaves[$i].porn.fame.sadist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $slaves[$i].pornTypeMasochist >= 50000>>
+			<<if $slaves[$i].porn.fame.masochist >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her masochism.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his masochism, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeMasochist*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his masochism, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.masochist*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeMasochist < 5000>>
+			<<elseif $slaves[$i].porn.fame.masochist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $slaves[$i].pornTypePregnancy >= 50000>>
+			<<if $slaves[$i].porn.fame.pregnancy >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her fondness for pregnancy.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his fondness for pregnancy, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePregnancy*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his fondness for pregnancy, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.pregnancy*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePregnancy < 5000>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].pornFameType = "none">>
+			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
 			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0>>
-			@@.red;$His popularity in $slaves[$i].pornFameType pornography has faded.@@ $He is once again relatively unknown.
-			<<set $slaves[$i].pornFameType = "none">>
+			@@.red;$His popularity in $slaves[$i].porn.fameType pornography has faded.@@ $He is once again relatively unknown.
+			<<set $slaves[$i].porn.fameType = "none">>
 		<</if>>
 		<<if _fameSwap == 1>>
-			$His fame in $slaves[$i].pornFameType pornography has been overwhelmed by $his surging popularity in other aspects. @@.yellow;$He is now better known for $his _topFame.type porn.@@
-			<<set $slaves[$i].pornFameType = _topFame.type>>
+			$His fame in $slaves[$i].porn.fameType pornography has been overwhelmed by $his surging popularity in other aspects. @@.yellow;$He is now better known for $his _topFame.type porn.@@
+			<<set $slaves[$i].porn.fameType = _topFame.type>>
 			<<switch _topFame.type>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
@@ -1667,391 +1667,391 @@
 	<<elseif $slaves[$i].pornPrestige == 2>>
 		<<set _failedStar = 0>>
 
-		<<switch $slaves[$i].pornFameType>>
+		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
-			<<if $slaves[$i].pornTypeGeneral >= 150000 && $pornStarID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeGeneral = 250000, $pornStarID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGeneral>>
+			<<if $slaves[$i].porn.fame.general >= 150000 && $pornStarID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.general = 250000, $pornStarID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her mid-coitus.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him mid-coitus, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him mid-coitus, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her mid-coitus">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeGeneral < 40000>>
+			<<elseif $slaves[$i].porn.fame.general < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $slaves[$i].pornTypeFuckdoll >= 150000 && $pornStarFuckdollID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeFuckdoll = 250000, $pornStarFuckdollID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeFuckdoll>>
+			<<if $slaves[$i].porn.fame.fuckdoll >= 150000 && $pornStarFuckdollID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.fuckdoll = 250000, $pornStarFuckdollID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.fuckdoll>>
 				<<set $slaves[$i].pornPrestigeDesc = "It is world famous for its career in slave pornography. Millions are intimately familiar with the sight of it being used.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him being used, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him being used, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing it offering itself">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeFuckdoll < 40000>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "rape">>
-			<<if $slaves[$i].pornTypeRape >= 150000 && $pornStarRapeID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeRape = 250000, $pornStarRapeID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeRape>>
+			<<if $slaves[$i].porn.fame.rape >= 150000 && $pornStarRapeID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.rape = 250000, $pornStarRapeID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.rape>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her being raped.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him being raped, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him being raped, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her rape">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeRape < 40000>>
+			<<elseif $slaves[$i].porn.fame.rape < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "preggo">>
-			<<if $slaves[$i].pornTypePreggo >= 150000 && $pornStarPreggoID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePreggo = 250000, $pornStarPreggoID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePreggo>>
+			<<if $slaves[$i].porn.fame.preggo >= 150000 && $pornStarPreggoID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.preggo = 250000, $pornStarPreggoID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.preggo>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her swollen with child.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him swollen with child, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him swollen with child, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her cradling her middle">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePreggo < 40000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "BBW">>
-			<<if $slaves[$i].pornTypeBBW >= 150000 && $pornStarBBWID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBBW = 250000, $pornStarBBWID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBBW>>
+			<<if $slaves[$i].porn.fame.BBW >= 150000 && $pornStarBBWID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.BBW = 250000, $pornStarBBWID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.BBW>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her thick, soft body.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his thick and soft body, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his thick and soft body, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her giving a bellyjob">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePreggo < 40000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "underage">>
-			<<if $slaves[$i].pornTypeLoli >= 150000 && $pornStarLoliID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeLoli = 250000, $pornStarLoliID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeLoli>>
+			<<if $slaves[$i].porn.fame.loli >= 150000 && $pornStarLoliID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.loli = 250000, $pornStarLoliID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.loli>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her immature body.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his immature body, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his immature body, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her 'innocence'">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeLoli < 40000>>
+			<<elseif $slaves[$i].porn.fame.loli < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $slaves[$i].pornTypeGainer >= 150000 && $pornStarGainerID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeGainer = 250000, $pornStarGainerID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGainer>>
+			<<if $slaves[$i].porn.fame.gainer >= 150000 && $pornStarGainerID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.gainer = 250000, $pornStarGainerID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.gainer>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with how with how much weight she has gained.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with how much weight<<print $he>>'s put on, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with how much weight<<print $he>>'s put on, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her trying on her old clothes">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeGainer < 40000>>
+			<<elseif $slaves[$i].porn.fame.gainer < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "big dick">>
-			<<if $slaves[$i].pornTypeStud >= 150000 && $pornStarStudID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeStud = 250000, $pornStarStudID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeStud>>
+			<<if $slaves[$i].porn.fame.stud >= 150000 && $pornStarStudID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.stud = 250000, $pornStarStudID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.stud>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her erect dick.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $his erect dick, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his erect dick, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her money shot">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeStud < 40000>>
+			<<elseif $slaves[$i].porn.fame.stud < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $slaves[$i].pornTypeDeepThroat >= 150000 && $pornStarDeepThroatID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeDeepThroat = 250000, $pornStarDeepThroatID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeDeepThroat>>
+			<<if $slaves[$i].porn.fame.deepThroat >= 150000 && $pornStarDeepThroatID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.deepThroat = 250000, $pornStarDeepThroatID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.deepThroat>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sounds she makes when being throatfucked.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sounds $he makes when being throatfucked, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sounds $he makes when being throatfucked, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her getting facefucked">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeDeepThroat < 40000>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $slaves[$i].pornTypeStruggleFuck >= 150000 && $pornStarStruggleFuckID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeStruggleFuck = 250000, $pornStarStruggleFuckID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeStruggleFuck>>
+			<<if $slaves[$i].porn.fame.struggleFuck >= 150000 && $pornStarStruggleFuckID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.struggleFuck = 250000, $pornStarStruggleFuckID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.struggleFuck>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with how perfectly she struggles during sex.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with how perfectly $he struggles during sex, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with how perfectly $he struggles during sex, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her struggling">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeStruggleFuck < 40000>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $slaves[$i].pornTypePainal >= 150000 && $pornStarPainalID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePainal = 250000, $pornStarPainalID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePainal>>
+			<<if $slaves[$i].porn.fame.painal >= 150000 && $pornStarPainalID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.painal = 250000, $pornStarPainalID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.painal>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with seeing her asshole pushed to its limit.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with seeing $his asshole pushed to its limit, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with seeing $his asshole pushed to its limit, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her taking an enormous dick up her ass">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePainal < 40000>>
+			<<elseif $slaves[$i].porn.fame.painal < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "softcore">>
-			<<if $slaves[$i].pornTypeTease >= 150000 && $pornStarTeaseID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeTease = 250000, $pornStarTeaseID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeTease>>
+			<<if $slaves[$i].porn.fame.tease >= 150000 && $pornStarTeaseID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.tease = 250000, $pornStarTeaseID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.tease>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her lewd striptease.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his lewd striptease, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his lewd striptease, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her stripping">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeTease < 40000>>
+			<<elseif $slaves[$i].porn.fame.tease < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "romantic">>
-			<<if $slaves[$i].pornTypeRomantic >= 150000 && $pornStarRomanticID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeRomantic = 250000, $pornStarRomanticID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeRomantic>>
+			<<if $slaves[$i].porn.fame.romantic >= 150000 && $pornStarRomanticID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.romantic = 250000, $pornStarRomanticID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.romantic>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the deep bond she shares with her partners.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the deep bond $he shares with her partners, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the deep bond $he shares with her partners, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her sharing an orgasm with her partner">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeRomantic < 40000>>
+			<<elseif $slaves[$i].porn.fame.romantic < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $slaves[$i].pornTypePervert >= 150000 && $pornStarPervertID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePervert = 250000, $pornStarPervertID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePervert>>
+			<<if $slaves[$i].porn.fame.pervert >= 150000 && $pornStarPervertID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.pervert = 250000, $pornStarPervertID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.pervert>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the depths of her perversions.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the depths of $his perversions, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the depths of $his perversions, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her doing something perverted">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePervert < 40000>>
+			<<elseif $slaves[$i].porn.fame.pervert < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $slaves[$i].pornTypeCaring >= 150000 && $pornStarCaringID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeCaring = 250000, $pornStarCaringID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeCaring>>
+			<<if $slaves[$i].porn.fame.caring >= 150000 && $pornStarCaringID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.caring = 250000, $pornStarCaringID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.caring>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her devotion to her partners' pleasure.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his devotion to $his partners' pleasure, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his devotion to $his partners' pleasure, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her bringing her partner to orgasm">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeCaring < 40000>>
+			<<elseif $slaves[$i].porn.fame.caring < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $slaves[$i].pornTypeUnflinching >= 150000 && $pornStarUnflinchingID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeUnflinching = 250000, $pornStarUnflinchingID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeUnflinching>>
+			<<if $slaves[$i].porn.fame.unflinching >= 150000 && $pornStarUnflinchingID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.unflinching = 250000, $pornStarUnflinchingID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.unflinching>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her willingness to do things not repeated in polite company.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his willingness to do things not repeated in polite company, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his willingness to do things not repeated in polite company, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her doing something unmentionable">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeUnflinching < 40000>>
+			<<elseif $slaves[$i].porn.fame.unflinching < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $slaves[$i].pornTypeSizeQueen >= 150000 && $pornStarSizeQueenID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSizeQueen = 250000, $pornStarSizeQueenID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSizeQueen>>
+			<<if $slaves[$i].porn.fame.sizeQueen >= 150000 && $pornStarSizeQueenID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sizeQueen = 250000, $pornStarSizeQueenID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sizeQueen>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her holes filled to their limits.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $his holes filled to their limits, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his holes filled to their limits, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her belly bulging from within">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSizeQueen < 40000>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $slaves[$i].pornTypeNeglectful >= 150000 && $pornStarNeglectfulID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeNeglectful = 250000, $pornStarNeglectfulID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeNeglectful>>
+			<<if $slaves[$i].porn.fame.neglectful >= 150000 && $pornStarNeglectfulID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.neglectful = 250000, $pornStarNeglectfulID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.neglectful>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her denying herself pleasure.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him denying $himself pleasure, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him denying $himself pleasure, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her pleasing a line of partners without cumming once">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeNeglectful < 40000>>
+			<<elseif $slaves[$i].porn.fame.neglectful < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $slaves[$i].pornTypeCumAddict >= 150000 && $pornStarCumAddictID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeCumAddict = 250000, $pornStarCumAddictID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeCumAddict>>
+			<<if $slaves[$i].porn.fame.cumAddict >= 150000 && $pornStarCumAddictID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.cumAddict = 250000, $pornStarCumAddictID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.cumAddict>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for cum.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for cum, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for cum, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her bathing in a tub of cum">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeCumAddict < 40000>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $slaves[$i].pornTypeAnalAddict >= 150000 && $pornStarAnalAddictID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAnalAddict = 250000, $pornStarAnalAddictID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAnalAddict>>
+			<<if $slaves[$i].porn.fame.analAddict >= 150000 && $pornStarAnalAddictID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.analAddict = 250000, $pornStarAnalAddictID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.analAddict>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her well-versed anus.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for a dick up $his ass, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for a dick up $his ass, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her taking a series of huge cocks up her ass">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAnalAddict < 40000>>
+			<<elseif $slaves[$i].porn.fame.analAddict < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $slaves[$i].pornTypeAttentionWhore >= 150000 && $pornStarAttentionWhoreID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAttentionWhore = 250000, $pornStarAttentionWhoreID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAttentionWhore>>
+			<<if $slaves[$i].porn.fame.attentionWhore >= 150000 && $pornStarAttentionWhoreID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.attentionWhore = 250000, $pornStarAttentionWhoreID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.attentionWhore>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for attention.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him going to any length for attention, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him going to any length for attention, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her flashing strangers">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAttentionWhore < 40000>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $slaves[$i].pornTypeBreastGrowth >= 150000 && $pornStarBreastGrowthID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBreastGrowth = 250000, $pornStarBreastGrowthID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBreastGrowth>>
+			<<if $slaves[$i].porn.fame.breastGrowth >= 150000 && $pornStarBreastGrowthID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.breastGrowth = 250000, $pornStarBreastGrowthID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.breastGrowth>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the history of her growing bust.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with history of $his growing bust, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with history of $his growing bust, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her having her tits measured">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeBreastGrowth < 40000>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "abuse">>
-			<<if $slaves[$i].pornTypeAbusive >= 150000 && $pornStarAbusiveID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAbusive = 250000, $pornStarAbusiveID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAbusive>>
+			<<if $slaves[$i].porn.fame.abusive >= 150000 && $pornStarAbusiveID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.abusive = 250000, $pornStarAbusiveID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.abusive>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her abusive tendencies.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his abusive tendencies, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his abusive tendencies, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " taking what she wants by force">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAbusive < 40000>>
+			<<elseif $slaves[$i].porn.fame.abusive < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $slaves[$i].pornTypeMalicious >= 150000 && $pornStarMaliciousID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeMalicious = 250000, $pornStarMaliciousID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeMalicious>>
+			<<if $slaves[$i].porn.fame.malicious >= 150000 && $pornStarMaliciousID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.malicious = 250000, $pornStarMaliciousID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.malicious>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her hunger for making others suffer.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him torturing others, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him torturing others, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her tormenting her prey">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeMalicious < 40000>>
+			<<elseif $slaves[$i].porn.fame.malicious < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "self hating">>
-			<<if $slaves[$i].pornTypeSelfHating >= 150000 && $pornStarSelfHatingID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSelfHating = 250000, $pornStarSelfHatingID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSelfHating>>
+			<<if $slaves[$i].porn.fame.selfHating >= 150000 && $pornStarSelfHatingID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.selfHating = 250000, $pornStarSelfHatingID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.selfHating>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her suffering.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him suffering, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him suffering, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her orgasming from pain">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSelfHating < 40000>>
+			<<elseif $slaves[$i].porn.fame.selfHating < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breeder">>
-			<<if $slaves[$i].pornTypeBreeder >= 150000 && $pornStarBreederID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBreeder = 250000, $pornStarBreederID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBreeder>>
+			<<if $slaves[$i].porn.fame.breeder >= 150000 && $pornStarBreederID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.breeder = 250000, $pornStarBreederID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.breeder>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her obsession with being pregnant.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his obsession with having children, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his obsession with having children, so it is now extremely prestigious to own $him.
 				<<if $slaves[$i].births > 0>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her having an orgasmic birth">>
 				<<else>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her being bred">>
 				<</if>>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeBreeder < 40000>>
+			<<elseif $slaves[$i].porn.fame.breeder < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "submissive">>
-			<<if $slaves[$i].pornTypeSub >= 150000 && $pornStarSubID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSub = 250000, $pornStarSubID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSub>>
+			<<if $slaves[$i].porn.fame.sub >= 150000 && $pornStarSubID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sub = 250000, $pornStarSubID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sub>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her submissiveness.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his submissiveness, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his submissiveness, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her submission">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSub < 40000>>
+			<<elseif $slaves[$i].porn.fame.sub < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum">>
-			<<if $slaves[$i].pornTypeCumSlut >= 150000 && $pornStarCumSlutID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeCumSlut = 250000, $pornStarCumSlutID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeCumSlut>>
+			<<if $slaves[$i].porn.fame.cumSlut >= 150000 && $pornStarCumSlutID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.cumSlut = 250000, $pornStarCumSlutID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.cumSlut>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her taste for cum.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his taste for cum, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his taste for cum, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her drinking a glass of cum">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeCumSlut < 40000>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $slaves[$i].pornTypeAnal >= 150000 && $pornStarAnalID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAnal = 250000, $pornStarAnalID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAnal>>
+			<<if $slaves[$i].porn.fame.anal >= 150000 && $pornStarAnalID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.anal = 250000, $pornStarAnalID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.anal>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her rear.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $his rear, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his rear, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her shaking her booty">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAnal < 40000>>
+			<<elseif $slaves[$i].porn.fame.anal < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $slaves[$i].pornTypeHumiliation >= 150000 && $pornStarHumiliationID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeHumiliation = 250000, $pornStarHumiliationID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeHumiliation>>
+			<<if $slaves[$i].porn.fame.humiliation >= 150000 && $pornStarHumiliationID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.humiliation = 250000, $pornStarHumiliationID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.humiliation>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her frequent humiliation.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his frequent humiliation, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his frequent humiliation, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her humiliated in public">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeHumiliation < 40000>>
+			<<elseif $slaves[$i].porn.fame.humiliation < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast">>
-			<<if $slaves[$i].pornTypeBoobs >= 150000 && $pornStarBoobsID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBoobs = 250000, $pornStarBoobsID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBoobs>>
+			<<if $slaves[$i].porn.fame.boobs >= 150000 && $pornStarBoobsID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.boobs = 250000, $pornStarBoobsID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.boobs>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her breasts.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his breasts, so it is now extremely prestigious to own $him, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his breasts, so it is now extremely prestigious to own $him, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her bare chest">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeBoobs < 40000>>
+			<<elseif $slaves[$i].porn.fame.boobs < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "dominant">>
-			<<if $slaves[$i].pornTypeDom >= 150000 && $pornStarDomID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeDom = 250000, $pornStarDomID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeDom>>
+			<<if $slaves[$i].porn.fame.dom >= 150000 && $pornStarDomID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.dom = 250000, $pornStarDomID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.dom>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her dominant streak.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his dominant streak, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his dominant streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her seated upon her obedient toy">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeDom < 40000>>
+			<<elseif $slaves[$i].porn.fame.dom < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $slaves[$i].pornTypeSadist >= 150000 && $pornStarSadistID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSadist = 250000, $pornStarSadistID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSadist>>
+			<<if $slaves[$i].porn.fame.sadist >= 150000 && $pornStarSadistID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sadist = 250000, $pornStarSadistID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sadist>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her sadistic streak.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his sadistic streak, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his sadistic streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her whipping her lover">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSadist < 40000>>
+			<<elseif $slaves[$i].porn.fame.sadist < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $slaves[$i].pornTypeMasochist >= 150000 && $pornStarMasochistID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeMasochist = 250000, $pornStarMasochistID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeMasochist>>
+			<<if $slaves[$i].porn.fame.masochist >= 150000 && $pornStarMasochistID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.masochist = 250000, $pornStarMasochistID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.masochist>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her masochistic streak.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his masochistic streak, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his masochistic streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her being whipped">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeMasochist < 40000>>
+			<<elseif $slaves[$i].porn.fame.masochist < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $slaves[$i].pornTypePregnancy >= 150000 && $pornStarPregnancyID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePregnancy = 250000, $pornStarPregnancyID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePregnancy>>
+			<<if $slaves[$i].porn.fame.pregnancy >= 150000 && $pornStarPregnancyID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.pregnancy = 250000, $pornStarPregnancyID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.pregnancy>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her pregnancy kink.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his pregnancy kink, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his pregnancy kink, so it is now extremely prestigious to own $him.
 				<<if $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her getting knocked up">>
 				<<elseif $slaves[$i].dick > 0>>
@@ -2060,18 +2060,18 @@
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her pretending to be pregnant">>
 				<</if>>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePregnancy < 40000>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].pornFameType = "none">>
+			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
 			<<set $slaves[$i].pornPrestige = 1>>
-			@@.red;$His popularity in $slaves[$i].pornFameType pornography has dropped considerably,@@ though $he still retains a core fanbase.
-			<<switch $slaves[$i].pornFameType>>
+			@@.red;$His popularity in $slaves[$i].porn.fameType pornography has dropped considerably,@@ though $he still retains a core fanbase.
+			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
 			<<case "fuckdoll">>
@@ -2161,415 +2161,415 @@
 		<<set _decayRate = 30>>
 	<</if>>
 
-	<<if $slaves[$i].pornTypeNeglectful > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeNeglectful>><</if>>
-		<<set $slaves[$i].pornTypeNeglectful = Math.clamp($slaves[$i].pornTypeNeglectful-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].pornTypeNeglectful).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeCumAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumAddict>><</if>>
-		<<set $slaves[$i].pornTypeCumAddict = Math.clamp($slaves[$i].pornTypeCumAddict-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].pornTypeCumAddict).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAnalAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnalAddict>><</if>>
-		<<set $slaves[$i].pornTypeAnalAddict = Math.clamp($slaves[$i].pornTypeAnalAddict-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].pornTypeAnalAddict).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAttentionWhore > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAttentionWhore>><</if>>
-		<<set $slaves[$i].pornTypeAttentionWhore = Math.clamp($slaves[$i].pornTypeAttentionWhore-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].pornTypeAttentionWhore).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBreastGrowth > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreastGrowth>><</if>>
-		<<set $slaves[$i].pornTypeBreastGrowth = Math.clamp($slaves[$i].pornTypeBreastGrowth-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].pornTypeBreastGrowth).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAbusive > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAbusive>><</if>>
-		<<set $slaves[$i].pornTypeAbusive = Math.clamp($slaves[$i].pornTypeAbusive-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].pornTypeAbusive).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeMalicious > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMalicious>><</if>>
-		<<set $slaves[$i].pornTypeMalicious = Math.clamp($slaves[$i].pornTypeMalicious-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].pornTypeMalicious).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeSelfHating > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSelfHating>><</if>>
-		<<set $slaves[$i].pornTypeSelfHating = Math.clamp($slaves[$i].pornTypeSelfHating-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].pornTypeSelfHating).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBreeder > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreeder>><</if>>
-		<<set $slaves[$i].pornTypeBreeder = Math.clamp($slaves[$i].pornTypeBreeder-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].pornTypeBreeder).<</if>>
-	<</if>>
-
-	<<if $slaves[$i].pornTypeSub > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSub>><</if>>
-		<<set $slaves[$i].pornTypeSub = Math.clamp($slaves[$i].pornTypeSub-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].pornTypeSub).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeCumSlut > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumSlut>><</if>>
-		<<set $slaves[$i].pornTypeCumSlut = Math.clamp($slaves[$i].pornTypeCumSlut-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].pornTypeCumSlut).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAnal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnal>><</if>>
-		<<set $slaves[$i].pornTypeAnal = Math.clamp($slaves[$i].pornTypeAnal-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].pornTypeAnal).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeHumiliation > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeHumiliation>><</if>>
-		<<set $slaves[$i].pornTypeHumiliation = Math.clamp($slaves[$i].pornTypeHumiliation-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].pornTypeHumiliation).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBoobs > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBoobs>><</if>>
-		<<set $slaves[$i].pornTypeBoobs = Math.clamp($slaves[$i].pornTypeBoobs-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].pornTypeBoobs).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeDom > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDom>><</if>>
-		<<set $slaves[$i].pornTypeDom = Math.clamp($slaves[$i].pornTypeDom-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].pornTypeDom).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeSadist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSadist>><</if>>
-		<<set $slaves[$i].pornTypeSadist = Math.clamp($slaves[$i].pornTypeSadist-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].pornTypeSadist).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeMasochist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMasochist>><</if>>
-		<<set $slaves[$i].pornTypeMasochist = Math.clamp($slaves[$i].pornTypeMasochist-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].pornTypeMasochist).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePregnancy > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePregnancy>><</if>>
-		<<set $slaves[$i].pornTypePregnancy = Math.clamp($slaves[$i].pornTypePregnancy-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].pornTypePregnancy).<</if>>
-	<</if>>
-
-	<<if $slaves[$i].pornTypeFuckdoll > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeFuckdoll>><</if>>
-		<<set $slaves[$i].pornTypeFuckdoll = Math.clamp($slaves[$i].pornTypeFuckdoll-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].pornTypeFuckdoll).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeRape > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRape>><</if>>
-		<<set $slaves[$i].pornTypeRape = Math.clamp($slaves[$i].pornTypeRape-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].pornTypeRape).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePreggo > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePreggo>><</if>>
-		<<set $slaves[$i].pornTypePreggo = Math.clamp($slaves[$i].pornTypePreggo-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].pornTypePreggo).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBBW > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBBW>><</if>>
-		<<set $slaves[$i].pornTypeBBW = Math.clamp($slaves[$i].pornTypeBBW-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].pornTypeBBW).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeLoli > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeLoli>><</if>>
-		<<set $slaves[$i].pornTypeLoli = Math.clamp($slaves[$i].pornTypeLoli-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].pornTypeLoli).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeGainer > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGainer>><</if>>
-		<<set $slaves[$i].pornTypeGainer = Math.clamp($slaves[$i].pornTypeGainer-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].pornTypeGainer).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeStud > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStud>><</if>>
-		<<set $slaves[$i].pornTypeStud = Math.clamp($slaves[$i].pornTypeStud-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].pornTypeStud).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeGeneral > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGeneral>><</if>>
-		<<set $slaves[$i].pornTypeGeneral = Math.clamp($slaves[$i].pornTypeGeneral-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].pornTypeGeneral).<</if>>
-	<</if>>
-
-	<<if $slaves[$i].pornTypeDeepThroat > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDeepThroat>><</if>>
-		<<set $slaves[$i].pornTypeDeepThroat = Math.clamp($slaves[$i].pornTypeDeepThroat-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].pornTypeDeepThroat).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeStruggleFuck > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStruggleFuck>><</if>>
-		<<set $slaves[$i].pornTypeStruggleFuck = Math.clamp($slaves[$i].pornTypeStruggleFuck-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypeStruggleFuck).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePainal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePainal>><</if>>
-		<<set $slaves[$i].pornTypePainal = Math.clamp($slaves[$i].pornTypePainal-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypePainal).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeTease > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeTease>><</if>>
-		<<set $slaves[$i].pornTypeTease = Math.clamp($slaves[$i].pornTypeTease-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].pornTypeTease).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeRomantic > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRomantic>><</if>>
-		<<set $slaves[$i].pornTypeRomantic = Math.clamp($slaves[$i].pornTypeRomantic-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].pornTypeRomantic).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePervert > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePervert>><</if>>
-		<<set $slaves[$i].pornTypePervert = Math.clamp($slaves[$i].pornTypePervert-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].pornTypePervert).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeCaring > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCaring>><</if>>
-		<<set $slaves[$i].pornTypeCaring = Math.clamp($slaves[$i].pornTypeCaring-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].pornTypeCaring).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeUnflinching > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeUnflinching>><</if>>
-		<<set $slaves[$i].pornTypeUnflinching = Math.clamp($slaves[$i].pornTypeUnflinching-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].pornTypeUnflinching).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeSizeQueen > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSizeQueen>><</if>>
-		<<set $slaves[$i].pornTypeSizeQueen = Math.clamp($slaves[$i].pornTypeSizeQueen-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].pornTypeSizeQueen).<</if>>
-	<</if>>
-
-	<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGeneral + $slaves[$i].pornTypeFuckdoll + $slaves[$i].pornTypeRape + $slaves[$i].pornTypePreggo + $slaves[$i].pornTypeBBW + $slaves[$i].pornTypeGainer + $slaves[$i].pornTypeStud + $slaves[$i].pornTypeLoli + $slaves[$i].pornTypeDeepThroat + $slaves[$i].pornTypeStruggleFuck + $slaves[$i].pornTypePainal + $slaves[$i].pornTypeTease + $slaves[$i].pornTypeRomantic + $slaves[$i].pornTypePervert + $slaves[$i].pornTypeCaring + $slaves[$i].pornTypeUnflinching + $slaves[$i].pornTypeSizeQueen + $slaves[$i].pornTypeNeglectful + $slaves[$i].pornTypeCumAddict + $slaves[$i].pornTypeAnalAddict + $slaves[$i].pornTypeAttentionWhore + $slaves[$i].pornTypeBreastGrowth + $slaves[$i].pornTypeAbusive + $slaves[$i].pornTypeMalicious + $slaves[$i].pornTypeSelfHating + $slaves[$i].pornTypeBreeder + $slaves[$i].pornTypeSub + $slaves[$i].pornTypeCumSlut + $slaves[$i].pornTypeAnal + $slaves[$i].pornTypeHumiliation + $slaves[$i].pornTypeBoobs + $slaves[$i].pornTypeDom + $slaves[$i].pornTypeSadist + $slaves[$i].pornTypeMasochist + $slaves[$i].pornTypePregnancy>>
+	<<if $slaves[$i].porn.fame.neglectful > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.neglectful>><</if>>
+		<<set $slaves[$i].porn.fame.neglectful = Math.clamp($slaves[$i].porn.fame.neglectful-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].porn.fame.neglectful).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.cumAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumAddict>><</if>>
+		<<set $slaves[$i].porn.fame.cumAddict = Math.clamp($slaves[$i].porn.fame.cumAddict-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].porn.fame.cumAddict).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.analAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.analAddict>><</if>>
+		<<set $slaves[$i].porn.fame.analAddict = Math.clamp($slaves[$i].porn.fame.analAddict-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].porn.fame.analAddict).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.attentionWhore > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.attentionWhore>><</if>>
+		<<set $slaves[$i].porn.fame.attentionWhore = Math.clamp($slaves[$i].porn.fame.attentionWhore-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].porn.fame.attentionWhore).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.breastGrowth > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breastGrowth>><</if>>
+		<<set $slaves[$i].porn.fame.breastGrowth = Math.clamp($slaves[$i].porn.fame.breastGrowth-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].porn.fame.breastGrowth).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.abusive > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.abusive>><</if>>
+		<<set $slaves[$i].porn.fame.abusive = Math.clamp($slaves[$i].porn.fame.abusive-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].porn.fame.abusive).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.malicious > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.malicious>><</if>>
+		<<set $slaves[$i].porn.fame.malicious = Math.clamp($slaves[$i].porn.fame.malicious-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].porn.fame.malicious).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.selfHating > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.selfHating>><</if>>
+		<<set $slaves[$i].porn.fame.selfHating = Math.clamp($slaves[$i].porn.fame.selfHating-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].porn.fame.selfHating).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.breeder > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breeder>><</if>>
+		<<set $slaves[$i].porn.fame.breeder = Math.clamp($slaves[$i].porn.fame.breeder-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].porn.fame.breeder).<</if>>
+	<</if>>
+
+	<<if $slaves[$i].porn.fame.sub > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sub>><</if>>
+		<<set $slaves[$i].porn.fame.sub = Math.clamp($slaves[$i].porn.fame.sub-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].porn.fame.sub).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.cumSlut > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumSlut>><</if>>
+		<<set $slaves[$i].porn.fame.cumSlut = Math.clamp($slaves[$i].porn.fame.cumSlut-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].porn.fame.cumSlut).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.anal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.anal>><</if>>
+		<<set $slaves[$i].porn.fame.anal = Math.clamp($slaves[$i].porn.fame.anal-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].porn.fame.anal).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.humiliation > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.humiliation>><</if>>
+		<<set $slaves[$i].porn.fame.humiliation = Math.clamp($slaves[$i].porn.fame.humiliation-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].porn.fame.humiliation).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.boobs > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.boobs>><</if>>
+		<<set $slaves[$i].porn.fame.boobs = Math.clamp($slaves[$i].porn.fame.boobs-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].porn.fame.boobs).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.dom > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.dom>><</if>>
+		<<set $slaves[$i].porn.fame.dom = Math.clamp($slaves[$i].porn.fame.dom-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].porn.fame.dom).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.sadist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sadist>><</if>>
+		<<set $slaves[$i].porn.fame.sadist = Math.clamp($slaves[$i].porn.fame.sadist-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].porn.fame.sadist).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.masochist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.masochist>><</if>>
+		<<set $slaves[$i].porn.fame.masochist = Math.clamp($slaves[$i].porn.fame.masochist-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].porn.fame.masochist).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.pregnancy > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pregnancy>><</if>>
+		<<set $slaves[$i].porn.fame.pregnancy = Math.clamp($slaves[$i].porn.fame.pregnancy-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].porn.fame.pregnancy).<</if>>
+	<</if>>
+
+	<<if $slaves[$i].porn.fame.fuckdoll > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.fuckdoll>><</if>>
+		<<set $slaves[$i].porn.fame.fuckdoll = Math.clamp($slaves[$i].porn.fame.fuckdoll-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].porn.fame.fuckdoll).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.rape > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.rape>><</if>>
+		<<set $slaves[$i].porn.fame.rape = Math.clamp($slaves[$i].porn.fame.rape-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].porn.fame.rape).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.preggo > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.preggo>><</if>>
+		<<set $slaves[$i].porn.fame.preggo = Math.clamp($slaves[$i].porn.fame.preggo-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].porn.fame.preggo).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.BBW > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.BBW>><</if>>
+		<<set $slaves[$i].porn.fame.BBW = Math.clamp($slaves[$i].porn.fame.BBW-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].porn.fame.BBW).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.loli > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.loli>><</if>>
+		<<set $slaves[$i].porn.fame.loli = Math.clamp($slaves[$i].porn.fame.loli-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].porn.fame.loli).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.gainer > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.gainer>><</if>>
+		<<set $slaves[$i].porn.fame.gainer = Math.clamp($slaves[$i].porn.fame.gainer-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].porn.fame.gainer).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.stud > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.stud>><</if>>
+		<<set $slaves[$i].porn.fame.stud = Math.clamp($slaves[$i].porn.fame.stud-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].porn.fame.stud).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.general > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.general>><</if>>
+		<<set $slaves[$i].porn.fame.general = Math.clamp($slaves[$i].porn.fame.general-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].porn.fame.general).<</if>>
+	<</if>>
+
+	<<if $slaves[$i].porn.fame.deepThroat > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.deepThroat>><</if>>
+		<<set $slaves[$i].porn.fame.deepThroat = Math.clamp($slaves[$i].porn.fame.deepThroat-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.deepThroat).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.struggleFuck > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.struggleFuck>><</if>>
+		<<set $slaves[$i].porn.fame.struggleFuck = Math.clamp($slaves[$i].porn.fame.struggleFuck-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.struggleFuck).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.painal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.painal>><</if>>
+		<<set $slaves[$i].porn.fame.painal = Math.clamp($slaves[$i].porn.fame.painal-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.painal).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.tease > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.tease>><</if>>
+		<<set $slaves[$i].porn.fame.tease = Math.clamp($slaves[$i].porn.fame.tease-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].porn.fame.tease).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.romantic > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.romantic>><</if>>
+		<<set $slaves[$i].porn.fame.romantic = Math.clamp($slaves[$i].porn.fame.romantic-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].porn.fame.romantic).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.pervert > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pervert>><</if>>
+		<<set $slaves[$i].porn.fame.pervert = Math.clamp($slaves[$i].porn.fame.pervert-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].porn.fame.pervert).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.caring > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.caring>><</if>>
+		<<set $slaves[$i].porn.fame.caring = Math.clamp($slaves[$i].porn.fame.caring-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].porn.fame.caring).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.unflinching > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.unflinching>><</if>>
+		<<set $slaves[$i].porn.fame.unflinching = Math.clamp($slaves[$i].porn.fame.unflinching-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].porn.fame.unflinching).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.sizeQueen > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sizeQueen>><</if>>
+		<<set $slaves[$i].porn.fame.sizeQueen = Math.clamp($slaves[$i].porn.fame.sizeQueen-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
+	<</if>>
+
+	<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
 	<<set $slaves[$i].pornFame = Math.trunc($slaves[$i].pornFame)>>
 
 	<<if $slaves[$i].pornPrestige > 0>>
 		<<set _failedStar = 0>>
 
-		<<switch $slaves[$i].pornFameType>>
+		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
-			<<if $slaves[$i].pornTypeGeneral < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.general < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeGeneral < 5000>>
+			<<elseif $slaves[$i].porn.fame.general < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $slaves[$i].pornTypeFuckdoll < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.fuckdoll < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeFuckdoll < 5000>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "rape">>
-			<<if $slaves[$i].pornTypeRape < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.rape < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeRape < 5000>>
+			<<elseif $slaves[$i].porn.fame.rape < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "preggo">>
-			<<if $slaves[$i].pornTypePreggo < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePreggo < 5000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "BBW">>
-			<<if $slaves[$i].pornTypePreggo < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePreggo < 5000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "underage">>
-			<<if $slaves[$i].pornTypeLoli < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.loli < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeLoli < 5000>>
+			<<elseif $slaves[$i].porn.fame.loli < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $slaves[$i].pornTypeGainer < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.gainer < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeGainer < 5000>>
+			<<elseif $slaves[$i].porn.fame.gainer < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "big dick">>
-			<<if $slaves[$i].pornTypeStud < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.stud < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeStud < 5000>>
+			<<elseif $slaves[$i].porn.fame.stud < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $slaves[$i].pornTypeDeepThroat < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.deepThroat < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeDeepThroat < 5000>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $slaves[$i].pornTypeStruggleFuck < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.struggleFuck < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeStruggleFuck < 5000>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $slaves[$i].pornTypePainal < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.painal < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePainal < 5000>>
+			<<elseif $slaves[$i].porn.fame.painal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "softcore">>
-			<<if $slaves[$i].pornTypeTease < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.tease < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeTease < 5000>>
+			<<elseif $slaves[$i].porn.fame.tease < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "romantic">>
-			<<if $slaves[$i].pornTypeRomantic < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.romantic < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeRomantic < 5000>>
+			<<elseif $slaves[$i].porn.fame.romantic < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $slaves[$i].pornTypePervert < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.pervert < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePervert < 5000>>
+			<<elseif $slaves[$i].porn.fame.pervert < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $slaves[$i].pornTypeCaring < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.caring < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeCaring < 5000>>
+			<<elseif $slaves[$i].porn.fame.caring < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $slaves[$i].pornTypeUnflinching < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.unflinching < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeUnflinching < 5000>>
+			<<elseif $slaves[$i].porn.fame.unflinching < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $slaves[$i].pornTypeSizeQueen < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sizeQueen < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSizeQueen < 5000>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $slaves[$i].pornTypeNeglectful < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.neglectful < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeNeglectful < 5000>>
+			<<elseif $slaves[$i].porn.fame.neglectful < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $slaves[$i].pornTypeCumAddict < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.cumAddict < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeCumAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $slaves[$i].pornTypeAnalAddict < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.analAddict < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAnalAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.analAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $slaves[$i].pornTypeAttentionWhore < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.attentionWhore < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAttentionWhore < 5000>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $slaves[$i].pornTypeBreastGrowth < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.breastGrowth < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeBreastGrowth < 5000>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "abuse">>
-			<<if $slaves[$i].pornTypeAbusive < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.abusive < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAbusive < 5000>>
+			<<elseif $slaves[$i].porn.fame.abusive < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $slaves[$i].pornTypeMalicious < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.malicious < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeMalicious < 5000>>
+			<<elseif $slaves[$i].porn.fame.malicious < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "self hating">>
-			<<if $slaves[$i].pornTypeSelfHating < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.selfHating < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSelfHating < 5000>>
+			<<elseif $slaves[$i].porn.fame.selfHating < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breeder">>
-			<<if $slaves[$i].pornTypeBreeder < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.breeder < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeBreeder < 5000>>
+			<<elseif $slaves[$i].porn.fame.breeder < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "submissive">>
-			<<if $slaves[$i].pornTypeSub < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sub < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSub < 5000>>
+			<<elseif $slaves[$i].porn.fame.sub < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum">>
-			<<if $slaves[$i].pornTypeCumSlut < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.cumSlut < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeCumSlut < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $slaves[$i].pornTypeAnal < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.anal < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAnal < 5000>>
+			<<elseif $slaves[$i].porn.fame.anal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $slaves[$i].pornTypeHumiliation < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.humiliation < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeHumiliation < 5000>>
+			<<elseif $slaves[$i].porn.fame.humiliation < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast">>
-			<<if $slaves[$i].pornTypeBoobs < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.boobs < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeBoobs < 5000>>
+			<<elseif $slaves[$i].porn.fame.boobs < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "dominant">>
-			<<if $slaves[$i].pornTypeDom < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.dom < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeDom < 5000>>
+			<<elseif $slaves[$i].porn.fame.dom < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $slaves[$i].pornTypeSadist < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sadist < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSadist < 5000>>
+			<<elseif $slaves[$i].porn.fame.sadist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $slaves[$i].pornTypeMasochist < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.masochist < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeMasochist < 5000>>
+			<<elseif $slaves[$i].porn.fame.masochist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $slaves[$i].pornTypePregnancy < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.pregnancy < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePregnancy < 5000>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].pornFameType = "none">>
+			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
 			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0>>
-			With no new $slaves[$i].pornFameType content coming out, @@.red;$his popularity has faded away.@@
-			<<set $slaves[$i].pornFameType = "none">>
+			With no new $slaves[$i].porn.fameType content coming out, @@.red;$his popularity has faded away.@@
+			<<set $slaves[$i].porn.fameType = "none">>
 		<<elseif _failedStar == 2>>
 			<<set $slaves[$i].pornPrestige = 1>>
-			With the lack of any new content, @@.red;$his popularity in $slaves[$i].pornFameType pornography has dropped considerably,@@ though some viewers still cling to the hope that <<print $he>>'ll come back.
-			<<switch $slaves[$i].pornFameType>>
+			With the lack of any new content, @@.red;$his popularity in $slaves[$i].porn.fameType pornography has dropped considerably,@@ though some viewers still cling to the hope that <<print $he>>'ll come back.
+			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
 			<<case "fuckdoll">>
@@ -2644,4 +2644,4 @@
 		<</if>>
 	<</if>>
 
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index d396524a58a..76f8142e4ef 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -11,43 +11,9 @@
 <<set $args[0].pornFame = $args[1].pornFame>>
 <<set $args[0].pornPrestige = $args[1].pornPrestige>>
 <<set $args[0].pornPrestigeDesc = $args[1].pornPrestigeDesc>>
-<<set $args[0].pornFameType = $args[1].pornFameType>>
-<<set $args[0].pornFocus = "none">>
-<<set $args[0].pornTypeGeneral = $args[1].pornTypeGeneral>>
-<<set $args[0].pornTypeFuckdoll = $args[1].pornTypeFuckdoll>>
-<<set $args[0].pornTypeRape = $args[1].pornTypeRape>>
-<<set $args[0].pornTypePreggo = $args[1].pornTypePreggo>>
-<<set $args[0].pornTypeBBW = $args[1].pornTypeBBW>>
-<<set $args[0].pornTypeGainer = $args[1].pornTypeGainer>>
-<<set $args[0].pornTypeStud = $args[1].pornTypeStud>>
-<<set $args[0].pornTypeLoli = $args[1].pornTypeLoli>>
-<<set $args[0].pornTypeDeepThroat = $args[1].pornTypeDeepThroat>>
-<<set $args[0].pornTypeStruggleFuck = $args[1].pornTypeStruggleFuck>>
-<<set $args[0].pornTypePainal = $args[1].pornTypePainal>>
-<<set $args[0].pornTypeTease = $args[1].pornTypeTease>>
-<<set $args[0].pornTypeRomantic = $args[1].pornTypeRomantic>>
-<<set $args[0].pornTypePervert = $args[1].pornTypePervert>>
-<<set $args[0].pornTypeCaring = $args[1].pornTypeCaring>>
-<<set $args[0].pornTypeUnflinching = $args[1].pornTypeUnflinching>>
-<<set $args[0].pornTypeSizeQueen = $args[1].pornTypeSizeQueen>>
-<<set $args[0].pornTypeNeglectful = $args[1].pornTypeNeglectful>>
-<<set $args[0].pornTypeCumAddict = $args[1].pornTypeCumAddict>>
-<<set $args[0].pornTypeAnalAddict = $args[1].pornTypeAnalAddict>>
-<<set $args[0].pornTypeAttentionWhore = $args[1].pornTypeAttentionWhore>>
-<<set $args[0].pornTypeBreastGrowth = $args[1].pornTypeBreastGrowth>>
-<<set $args[0].pornTypeAbusive = $args[1].pornTypeAbusive>>
-<<set $args[0].pornTypeMalicious = $args[1].pornTypeMalicious>>
-<<set $args[0].pornTypeSelfHating = $args[1].pornTypeSelfHating>>
-<<set $args[0].pornTypeBreeder = $args[1].pornTypeBreeder>>
-<<set $args[0].pornTypeSub = $args[1].pornTypeSub>>
-<<set $args[0].pornTypeCumSlut = $args[1].pornTypeCumSlut>>
-<<set $args[0].pornTypeAnal = $args[1].pornTypeAnal>>
-<<set $args[0].pornTypeHumiliation = $args[1].pornTypeHumiliation>>
-<<set $args[0].pornTypeBoobs = $args[1].pornTypeBoobs>>
-<<set $args[0].pornTypeDom = $args[1].pornTypeDom>>
-<<set $args[0].pornTypeSadist = $args[1].pornTypeSadist>>
-<<set $args[0].pornTypeMasochist = $args[1].pornTypeMasochist>>
-<<set $args[0].pornTypePregnancy = $args[1].pornTypePregnancy>>
+<<set $args[0].porn.fameType = $args[1].porn.fameType>>
+<<set $args[0].porn.focus = "none">>
+<<set $args[0].porn = $args[1].porn>>
 <<set $args[0].prestigeDesc = $args[1].prestigeDesc>>
 <<set $args[0].physicalAge = $args[1].physicalAge>>
 <<set $args[0].visualAge = $args[1].visualAge>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index d03f730accd..8e9ce1b7e55 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -193,41 +193,41 @@
 		<<set $averageTrust += $slaves[_i].trust*0.5, $averageDevotion += $slaves[_i].devotion*0.5, _slavesContributing += 0.5>>
 	<</if>>
 	<<if $studio == 1>>
-		<<if $slaves[_i].pornTypeGeneral > 0>><<set $pornStars++>><</if>>
-		<<if $slaves[_i].pornTypeFuckdoll > 0>><<set $pornStarFuckdolls++>><</if>>
-		<<if $slaves[_i].pornTypeRape > 0>><<set $pornStarRapees++>><</if>>
-		<<if $slaves[_i].pornTypePreggo > 0>><<set $pornStarPreggos++>><</if>>
-		<<if $slaves[_i].pornTypeBBW > 0>><<set $pornStarBBWs++>><</if>>
-		<<if $slaves[_i].pornTypeGainer > 0>><<set $pornStarGainers++>><</if>>
-		<<if $slaves[_i].pornTypeStud > 0>><<set $pornStarStuds++>><</if>>
-		<<if $slaves[_i].pornTypeLoli > 0>><<set $pornStarLolis++>><</if>>
-		<<if $slaves[_i].pornTypeDeepThroat > 0>><<set $pornStarDeepThroats++>><</if>>
-		<<if $slaves[_i].pornTypeStruggleFuck > 0>><<set $pornStarStruggleFucks++>><</if>>
-		<<if $slaves[_i].pornTypePainal > 0>><<set $pornStarPainals++>><</if>>
-		<<if $slaves[_i].pornTypeTease > 0>><<set $pornStarTeases++>><</if>>
-		<<if $slaves[_i].pornTypeRomantic > 0>><<set $pornStarRomantics++>><</if>>
-		<<if $slaves[_i].pornTypePervert > 0>><<set $pornStarPerverts++>><</if>>
-		<<if $slaves[_i].pornTypeCaring > 0>><<set $pornStarCarings++>><</if>>
-		<<if $slaves[_i].pornTypeUnflinching > 0>><<set $pornStarUnflinchings++>><</if>>
-		<<if $slaves[_i].pornTypeSizeQueen > 0>><<set $pornStarSizeQueens++>><</if>>
-		<<if $slaves[_i].pornTypeNeglectful > 0>><<set $pornStarNeglectfuls++>><</if>>
-		<<if $slaves[_i].pornTypeCumAddict > 0>><<set $pornStarCumAddicts++>><</if>>
-		<<if $slaves[_i].pornTypeAnalAddict > 0>><<set $pornStarAnalAddicts++>><</if>>
-		<<if $slaves[_i].pornTypeAttentionWhore > 0>><<set $pornStarAttentionWhores++>><</if>>
-		<<if $slaves[_i].pornTypeBreastGrowth > 0>><<set $pornStarBreastGrowths++>><</if>>
-		<<if $slaves[_i].pornTypeAbusive > 0>><<set $pornStarAbusives++>><</if>>
-		<<if $slaves[_i].pornTypeMalicious > 0>><<set $pornStarMalicious++>><</if>>
-		<<if $slaves[_i].pornTypeSelfHating > 0>><<set $pornStarSelfHatings++>><</if>>
-		<<if $slaves[_i].pornTypeBreeder > 0>><<set $pornStarBreeders++>><</if>>
-		<<if $slaves[_i].pornTypeSub > 0>><<set $pornStarSubs++>><</if>>
-		<<if $slaves[_i].pornTypeCumSlut > 0>><<set $pornStarCumSluts++>><</if>>
-		<<if $slaves[_i].pornTypeAnal > 0>><<set $pornStarAnals++>><</if>>
-		<<if $slaves[_i].pornTypeHumiliation > 0>><<set $pornStarHumiliations++>><</if>>
-		<<if $slaves[_i].pornTypeBoobs > 0>><<set $pornStarBoobs++>><</if>>
-		<<if $slaves[_i].pornTypeDom > 0>><<set $pornStarDoms++>><</if>>
-		<<if $slaves[_i].pornTypeSadist > 0>><<set $pornStarSadists++>><</if>>
-		<<if $slaves[_i].pornTypeMasochist > 0>><<set $pornStarMasochists++>><</if>>
-		<<if $slaves[_i].pornTypePregnancy > 0>><<set $pornStarPregnancySluts++>><</if>>
+		<<if $slaves[_i].porn.fame.general > 0>><<set $pornStars++>><</if>>
+		<<if $slaves[_i].porn.fame.fuckdoll > 0>><<set $pornStarFuckdolls++>><</if>>
+		<<if $slaves[_i].porn.fame.rape > 0>><<set $pornStarRapees++>><</if>>
+		<<if $slaves[_i].porn.fame.preggo > 0>><<set $pornStarPreggos++>><</if>>
+		<<if $slaves[_i].porn.fame.BBW > 0>><<set $pornStarBBWs++>><</if>>
+		<<if $slaves[_i].porn.fame.gainer > 0>><<set $pornStarGainers++>><</if>>
+		<<if $slaves[_i].porn.fame.stud > 0>><<set $pornStarStuds++>><</if>>
+		<<if $slaves[_i].porn.fame.loli > 0>><<set $pornStarLolis++>><</if>>
+		<<if $slaves[_i].porn.fame.deepThroat > 0>><<set $pornStarDeepThroats++>><</if>>
+		<<if $slaves[_i].porn.fame.struggleFuck > 0>><<set $pornStarStruggleFucks++>><</if>>
+		<<if $slaves[_i].porn.fame.painal > 0>><<set $pornStarPainals++>><</if>>
+		<<if $slaves[_i].porn.fame.tease > 0>><<set $pornStarTeases++>><</if>>
+		<<if $slaves[_i].porn.fame.romantic > 0>><<set $pornStarRomantics++>><</if>>
+		<<if $slaves[_i].porn.fame.pervert > 0>><<set $pornStarPerverts++>><</if>>
+		<<if $slaves[_i].porn.fame.caring > 0>><<set $pornStarCarings++>><</if>>
+		<<if $slaves[_i].porn.fame.unflinching > 0>><<set $pornStarUnflinchings++>><</if>>
+		<<if $slaves[_i].porn.fame.sizeQueen > 0>><<set $pornStarSizeQueens++>><</if>>
+		<<if $slaves[_i].porn.fame.neglectful > 0>><<set $pornStarNeglectfuls++>><</if>>
+		<<if $slaves[_i].porn.fame.cumAddict > 0>><<set $pornStarCumAddicts++>><</if>>
+		<<if $slaves[_i].porn.fame.analAddict > 0>><<set $pornStarAnalAddicts++>><</if>>
+		<<if $slaves[_i].porn.fame.attentionWhore > 0>><<set $pornStarAttentionWhores++>><</if>>
+		<<if $slaves[_i].porn.fame.breastGrowth > 0>><<set $pornStarBreastGrowths++>><</if>>
+		<<if $slaves[_i].porn.fame.abusive > 0>><<set $pornStarAbusives++>><</if>>
+		<<if $slaves[_i].porn.fame.malicious > 0>><<set $pornStarMalicious++>><</if>>
+		<<if $slaves[_i].porn.fame.selfHating > 0>><<set $pornStarSelfHatings++>><</if>>
+		<<if $slaves[_i].porn.fame.breeder > 0>><<set $pornStarBreeders++>><</if>>
+		<<if $slaves[_i].porn.fame.sub > 0>><<set $pornStarSubs++>><</if>>
+		<<if $slaves[_i].porn.fame.cumSlut > 0>><<set $pornStarCumSluts++>><</if>>
+		<<if $slaves[_i].porn.fame.anal > 0>><<set $pornStarAnals++>><</if>>
+		<<if $slaves[_i].porn.fame.humiliation > 0>><<set $pornStarHumiliations++>><</if>>
+		<<if $slaves[_i].porn.fame.boobs > 0>><<set $pornStarBoobs++>><</if>>
+		<<if $slaves[_i].porn.fame.dom > 0>><<set $pornStarDoms++>><</if>>
+		<<if $slaves[_i].porn.fame.sadist > 0>><<set $pornStarSadists++>><</if>>
+		<<if $slaves[_i].porn.fame.masochist > 0>><<set $pornStarMasochists++>><</if>>
+		<<if $slaves[_i].porn.fame.pregnancy > 0>><<set $pornStarPregnancySluts++>><</if>>
 	<</if>>
 	<<if $slaves[_i].choosesOwnAssignment > 0>>
 		<<= assignJob($slaves[_i], "choose her own job")>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 1e1e7e9ca24..45fb2275f97 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -397,43 +397,43 @@
 <<set $activeSlave.pornFeed = 0>>
 <<set $activeSlave.pornPrestige = 0>>
 <<set $activeSlave.pornPrestigeDesc = 0>>
-<<set $activeSlave.pornFameType = "none">>
-<<set $activeSlave.pornFocus = "none">>
-<<set $activeSlave.pornTypeGeneral = 0>>
-<<set $activeSlave.pornTypeFuckdoll = 0>>
-<<set $activeSlave.pornTypeRape = 0>>
-<<set $activeSlave.pornTypePreggo = 0>>
-<<set $activeSlave.pornTypeBBW = 0>>
-<<set $activeSlave.pornTypeGainer = 0>>
-<<set $activeSlave.pornTypeStud = 0>>
-<<set $activeSlave.pornTypeLoli = 0>>
-<<set $activeSlave.pornTypeDeepThroat = 0>>
-<<set $activeSlave.pornTypeStruggleFuck = 0>>
-<<set $activeSlave.pornTypePainal = 0>>
-<<set $activeSlave.pornTypeTease = 0>>
-<<set $activeSlave.pornTypeRomantic = 0>>
-<<set $activeSlave.pornTypePervert = 0>>
-<<set $activeSlave.pornTypeCaring = 0>>
-<<set $activeSlave.pornTypeUnflinching = 0>>
-<<set $activeSlave.pornTypeSizeQueen = 0>>
-<<set $activeSlave.pornTypeNeglectful = 0>>
-<<set $activeSlave.pornTypeCumAddict = 0>>
-<<set $activeSlave.pornTypeAnalAddict = 0>>
-<<set $activeSlave.pornTypeAttentionWhore = 0>>
-<<set $activeSlave.pornTypeBreastGrowth = 0>>
-<<set $activeSlave.pornTypeAbusive = 0>>
-<<set $activeSlave.pornTypeMalicious = 0>>
-<<set $activeSlave.pornTypeSelfHating = 0>>
-<<set $activeSlave.pornTypeBreeder = 0>>
-<<set $activeSlave.pornTypeSub = 0>>
-<<set $activeSlave.pornTypeCumSlut = 0>>
-<<set $activeSlave.pornTypeAnal = 0>>
-<<set $activeSlave.pornTypeHumiliation = 0>>
-<<set $activeSlave.pornTypeBoobs = 0>>
-<<set $activeSlave.pornTypeDom = 0>>
-<<set $activeSlave.pornTypeSadist = 0>>
-<<set $activeSlave.pornTypeMasochist = 0>>
-<<set $activeSlave.pornTypePregnancy = 0>>
+<<set $activeSlave.porn.fameType = "none">>
+<<set $activeSlave.porn.focus = "none">>
+<<set $activeSlave.porn.fame.general = 0>>
+<<set $activeSlave.porn.fame.fuckdoll = 0>>
+<<set $activeSlave.porn.fame.rape = 0>>
+<<set $activeSlave.porn.fame.preggo = 0>>
+<<set $activeSlave.porn.fame.BBW = 0>>
+<<set $activeSlave.porn.fame.gainer = 0>>
+<<set $activeSlave.porn.fame.stud = 0>>
+<<set $activeSlave.porn.fame.loli = 0>>
+<<set $activeSlave.porn.fame.deepThroat = 0>>
+<<set $activeSlave.porn.fame.struggleFuck = 0>>
+<<set $activeSlave.porn.fame.painal = 0>>
+<<set $activeSlave.porn.fame.tease = 0>>
+<<set $activeSlave.porn.fame.romantic = 0>>
+<<set $activeSlave.porn.fame.pervert = 0>>
+<<set $activeSlave.porn.fame.caring = 0>>
+<<set $activeSlave.porn.fame.unflinching = 0>>
+<<set $activeSlave.porn.fame.sizeQueen = 0>>
+<<set $activeSlave.porn.fame.neglectful = 0>>
+<<set $activeSlave.porn.fame.cumAddict = 0>>
+<<set $activeSlave.porn.fame.analAddict = 0>>
+<<set $activeSlave.porn.fame.attentionWhore = 0>>
+<<set $activeSlave.porn.fame.breastGrowth = 0>>
+<<set $activeSlave.porn.fame.abusive = 0>>
+<<set $activeSlave.porn.fame.malicious = 0>>
+<<set $activeSlave.porn.fame.selfHating = 0>>
+<<set $activeSlave.porn.fame.breeder = 0>>
+<<set $activeSlave.porn.fame.sub = 0>>
+<<set $activeSlave.porn.fame.cumSlut = 0>>
+<<set $activeSlave.porn.fame.anal = 0>>
+<<set $activeSlave.porn.fame.humiliation = 0>>
+<<set $activeSlave.porn.fame.boobs = 0>>
+<<set $activeSlave.porn.fame.dom = 0>>
+<<set $activeSlave.porn.fame.sadist = 0>>
+<<set $activeSlave.porn.fame.masochist = 0>>
+<<set $activeSlave.porn.fame.pregnancy = 0>>
 <<set $activeSlave.prestigeDesc = "">>
 <<set $activeSlave.rivalry = 0>>
 <<set $activeSlave.rivalryTarget = 0>>
@@ -1032,43 +1032,43 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
 <<set $activeSlave.pornFeed = 0>>
 <<set $activeSlave.pornPrestige = 0>>
 <<set $activeSlave.pornPrestigeDesc = 0>>
-<<set $activeSlave.pornFameType = "none">>
-<<set $activeSlave.pornFocus = "none">>
-<<set $activeSlave.pornTypeGeneral = 0>>
-<<set $activeSlave.pornTypeFuckdoll = 0>>
-<<set $activeSlave.pornTypeRape = 0>>
-<<set $activeSlave.pornTypePreggo = 0>>
-<<set $activeSlave.pornTypeBBW = 0>>
-<<set $activeSlave.pornTypeGainer = 0>>
-<<set $activeSlave.pornTypeStud = 0>>
-<<set $activeSlave.pornTypeLoli = 0>>
-<<set $activeSlave.pornTypeDeepThroat = 0>>
-<<set $activeSlave.pornTypeStruggleFuck = 0>>
-<<set $activeSlave.pornTypePainal = 0>>
-<<set $activeSlave.pornTypeTease = 0>>
-<<set $activeSlave.pornTypeRomantic = 0>>
-<<set $activeSlave.pornTypePervert = 0>>
-<<set $activeSlave.pornTypeCaring = 0>>
-<<set $activeSlave.pornTypeUnflinching = 0>>
-<<set $activeSlave.pornTypeSizeQueen = 0>>
-<<set $activeSlave.pornTypeNeglectful = 0>>
-<<set $activeSlave.pornTypeCumAddict = 0>>
-<<set $activeSlave.pornTypeAnalAddict = 0>>
-<<set $activeSlave.pornTypeAttentionWhore = 0>>
-<<set $activeSlave.pornTypeBreastGrowth = 0>>
-<<set $activeSlave.pornTypeAbusive = 0>>
-<<set $activeSlave.pornTypeMalicious = 0>>
-<<set $activeSlave.pornTypeSelfHating = 0>>
-<<set $activeSlave.pornTypeBreeder = 0>>
-<<set $activeSlave.pornTypeSub = 0>>
-<<set $activeSlave.pornTypeCumSlut = 0>>
-<<set $activeSlave.pornTypeAnal = 0>>
-<<set $activeSlave.pornTypeHumiliation = 0>>
-<<set $activeSlave.pornTypeBoobs = 0>>
-<<set $activeSlave.pornTypeDom = 0>>
-<<set $activeSlave.pornTypeSadist = 0>>
-<<set $activeSlave.pornTypeMasochist = 0>>
-<<set $activeSlave.pornTypePregnancy = 0>>
+<<set $activeSlave.porn.fameType = "none">>
+<<set $activeSlave.porn.focus = "none">>
+<<set $activeSlave.porn.fame.general = 0>>
+<<set $activeSlave.porn.fame.fuckdoll = 0>>
+<<set $activeSlave.porn.fame.rape = 0>>
+<<set $activeSlave.porn.fame.preggo = 0>>
+<<set $activeSlave.porn.fame.BBW = 0>>
+<<set $activeSlave.porn.fame.gainer = 0>>
+<<set $activeSlave.porn.fame.stud = 0>>
+<<set $activeSlave.porn.fame.loli = 0>>
+<<set $activeSlave.porn.fame.deepThroat = 0>>
+<<set $activeSlave.porn.fame.struggleFuck = 0>>
+<<set $activeSlave.porn.fame.painal = 0>>
+<<set $activeSlave.porn.fame.tease = 0>>
+<<set $activeSlave.porn.fame.romantic = 0>>
+<<set $activeSlave.porn.fame.pervert = 0>>
+<<set $activeSlave.porn.fame.caring = 0>>
+<<set $activeSlave.porn.fame.unflinching = 0>>
+<<set $activeSlave.porn.fame.sizeQueen = 0>>
+<<set $activeSlave.porn.fame.neglectful = 0>>
+<<set $activeSlave.porn.fame.cumAddict = 0>>
+<<set $activeSlave.porn.fame.analAddict = 0>>
+<<set $activeSlave.porn.fame.attentionWhore = 0>>
+<<set $activeSlave.porn.fame.breastGrowth = 0>>
+<<set $activeSlave.porn.fame.abusive = 0>>
+<<set $activeSlave.porn.fame.malicious = 0>>
+<<set $activeSlave.porn.fame.selfHating = 0>>
+<<set $activeSlave.porn.fame.breeder = 0>>
+<<set $activeSlave.porn.fame.sub = 0>>
+<<set $activeSlave.porn.fame.cumSlut = 0>>
+<<set $activeSlave.porn.fame.anal = 0>>
+<<set $activeSlave.porn.fame.humiliation = 0>>
+<<set $activeSlave.porn.fame.boobs = 0>>
+<<set $activeSlave.porn.fame.dom = 0>>
+<<set $activeSlave.porn.fame.sadist = 0>>
+<<set $activeSlave.porn.fame.masochist = 0>>
+<<set $activeSlave.porn.fame.pregnancy = 0>>
 <<set $activeSlave.prestigeDesc = "">>
 <<if ndef $activeSlave.geneMods>>
 	<<set $activeSlave.geneMods = {NCS: 0, rapidCellGrowth: 0}>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index e609ec05ba5..ed7a9028b53 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -8151,7 +8151,7 @@
 
 /* saPorn */
 <<if $slaves[$i].pornPrestige == 3>>
-	$He is the whore people envision when they think of $slaves[$i].pornFameType porn. $His omnipresence on the internet @@.green;boosts $his owner's reputation.@@
+	$He is the whore people envision when they think of $slaves[$i].porn.fameType porn. $His omnipresence on the internet @@.green;boosts $his owner's reputation.@@
 	<<run repX((750*$slaves[$i].pornPrestige), "porn", $slaves[$i])>>
 	<<set _donations = Math.floor($slaves[$i].pornFame/(random(13,20)))+(random(-5000,5000))>>
 	<<if _donations > 0>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index de9dab8a420..202103e8326 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -823,7 +823,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
 <</if>>
 
 <<if $slaves[$i].pornPrestige > 2>>
-	Patrons line up for the chance to spend time with the face of $slaves[$i].pornFameType porn.
+	Patrons line up for the chance to spend time with the face of $slaves[$i].porn.fameType porn.
 <<elseif $slaves[$i].pornPrestige > 1>>
 	$He has a sizable fanbase, one that is eager to spend time with $him.
 <<elseif $slaves[$i].pornPrestige > 0>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 19ad644826b..26f1ac82478 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -839,7 +839,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 <</if>>
 
 <<if $slaves[$i].pornPrestige > 2>>
-	Customers line up for the chance to buy time with the face of $slaves[$i].pornFameType porn.
+	Customers line up for the chance to buy time with the face of $slaves[$i].porn.fameType porn.
 <<elseif $slaves[$i].pornPrestige > 1>>
 	$He has a sizable fanbase, one that is eager to buy time with $him.
 <<elseif $slaves[$i].pornPrestige > 0>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 652f08c8c7c..ae50d1cf02a 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -501,11 +501,11 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
 <</if>>
 
 <<if $activeSlave.pornPrestige == 3>>
-	$He's pretty popular in $activeSlave.pornFameType smut, isn't $he? Buyers will be lining up for $him.
+	$He's pretty popular in $activeSlave.porn.fameType smut, isn't $he? Buyers will be lining up for $him.
 <<elseif $activeSlave.pornPrestige == 2>>
-	$He's gained quite the following in $activeSlave.pornFameType smut. In fact, I've even seen some of $his smut; buyers will flock to $him.
+	$He's gained quite the following in $activeSlave.porn.fameType smut. In fact, I've even seen some of $his smut; buyers will flock to $him.
 <<elseif $activeSlave.pornPrestige == 1>>
-	$He's got a small fanbase in $activeSlave.pornFameType smut. Who knows? Maybe one of them will want $him all to themselves?
+	$He's got a small fanbase in $activeSlave.porn.fameType smut. Who knows? Maybe one of them will want $him all to themselves?
 <</if>>
 
 <<if $activeSlave.devotion > 95>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 3f1f8cf9edf..cef0d6cf710 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1717,18 +1717,18 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule
 
 	<br><br>__Media__:<br>
 	<<if $activeSlave.pornPrestige == 3>>
-		//$He is so prestigious in the realm of $activeSlave.pornFameType porn that $his fame is self-sustaining.//
+		//$He is so prestigious in the realm of $activeSlave.porn.fameType porn that $his fame is self-sustaining.//
 	<<elseif $activeSlave.pornFeed == 0>>
 		The media hub is not releasing highlights of $his sex life. [[Release|Slave Interact][$activeSlave.pornFeed = 1]]
 	<<else>>
 		The media hub is releasing highlights of $his sex life <<if $activeSlave.pornFameSpending < 500>>to those who can find it<<elseif $activeSlave.pornFameSpending < 2500>>on several websites<<elseif $activeSlave.pornFameSpending > 5000>>through your old distributor<<else>>on many websites<</if>>.
 		<<if $activeSlave.pornFameSpending == 0>>
-			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFocus = "none"]] |
+			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.porn.focus = "none"]] |
 			[[Publicize|Slave Interact][$activeSlave.pornFameSpending += 1000]]
 			//Will cost <<print cashFormat(1000)>> weekly.//
 		<<else>>
 			<<textbox "_newPornSpending" $activeSlave.pornFameSpending>> weekly is spent to publicize them. [[Save changes|Slave Interact][$activeSlave.pornFameSpending = Number(_newPornSpending) || 0]] |
-			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFameSpending = 0, $activeSlave.pornFocus = "none", $PCSlutContacts = 1]] |
+			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFameSpending = 0, $activeSlave.porn.focus = "none", $PCSlutContacts = 1]] |
 			<<if $activeSlave.pornFameSpending < 5000>>
 				[[Increase|Slave Interact][$activeSlave.pornFameSpending += 1000]] |
 			<</if>>
@@ -1756,100 +1756,100 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule
 				$He lacks the fame in porn needed to discern what $his feed is getting tagged as.
 			<<else>>
 				<<if $activeSlave.pornPrestige > 0>>
-					$He is known for $activeSlave.pornFameType porn<<if $activeSlave.pornPrestige > 1>> and viewers have grown to expect it from $him<</if>>.
+					$He is known for $activeSlave.porn.fameType porn<<if $activeSlave.pornPrestige > 1>> and viewers have grown to expect it from $him<</if>>.
 				<</if>>
-				<<if $activeSlave.pornFocus == "none">>
+				<<if $activeSlave.porn.focus == "none">>
 					You are allowing $his viewers to guide the direction of $his content.
 				<<else>>
-					You are focusing attention on the $activeSlave.pornFocus aspect of $his content.
+					You are focusing attention on the $activeSlave.porn.focus aspect of $his content.
 				<</if>>
 				<<switch $activeSlave.sexualFlaw>>
 				<<case "neglectful">>
-					[[Neglectful|Slave Interact][$activeSlave.pornFocus = "neglectful"]] |
+					[[Neglectful|Slave Interact][$activeSlave.porn.focus = "neglectful"]] |
 				<<case "cum addict">>
-					[[Cum addiction|Slave Interact][$activeSlave.pornFocus = "cum addict"]] |
+					[[Cum addiction|Slave Interact][$activeSlave.porn.focus = "cum addict"]] |
 				<<case "anal addict">>
-					[[Anal addiction|Slave Interact][$activeSlave.pornFocus = "anal addict"]] |
+					[[Anal addiction|Slave Interact][$activeSlave.porn.focus = "anal addict"]] |
 				<<case "attention whore">>
-					[[Attention whore|Slave Interact][$activeSlave.pornFocus = "attention whore"]] |
+					[[Attention whore|Slave Interact][$activeSlave.porn.focus = "attention whore"]] |
 				<<case "breast growth">>
-					[[Breast growth|Slave Interact][$activeSlave.pornFocus = "breast growth"]] |
+					[[Breast growth|Slave Interact][$activeSlave.porn.focus = "breast growth"]] |
 				<<case "abusive">>
-					[[Abusive|Slave Interact][$activeSlave.pornFocus = "abusive"]] |
+					[[Abusive|Slave Interact][$activeSlave.porn.focus = "abusive"]] |
 				<<case "malicious">>
-					[[Malicious|Slave Interact][$activeSlave.pornFocus = "malicious"]] |
+					[[Malicious|Slave Interact][$activeSlave.porn.focus = "malicious"]] |
 				<<case "self hating">>
-					[[Self hating|Slave Interact][$activeSlave.pornFocus = "self hating"]] |
+					[[Self hating|Slave Interact][$activeSlave.porn.focus = "self hating"]] |
 				<<case "breeder">>
-					[[Breeder|Slave Interact][$activeSlave.pornFocus = "breeder"]] |
+					[[Breeder|Slave Interact][$activeSlave.porn.focus = "breeder"]] |
 				<</switch>>
 
 				<<switch $activeSlave.fetish>>
 				<<case "submissive">>
-					[[Submissive|Slave Interact][$activeSlave.pornFocus = "submissive"]] |
+					[[Submissive|Slave Interact][$activeSlave.porn.focus = "submissive"]] |
 				<<case "cumslut">>
-					[[Cumslut|Slave Interact][$activeSlave.pornFocus = "cumslut"]] |
+					[[Cumslut|Slave Interact][$activeSlave.porn.focus = "cumslut"]] |
 				<<case "buttslut">>
-					[[Buttslut|Slave Interact][$activeSlave.pornFocus = "buttslut"]] |
+					[[Buttslut|Slave Interact][$activeSlave.porn.focus = "buttslut"]] |
 				<<case "humiliation">>
-					[[Humiliation|Slave Interact][$activeSlave.pornFocus = "humiliation"]] |
+					[[Humiliation|Slave Interact][$activeSlave.porn.focus = "humiliation"]] |
 				<<case "boobs">>
-					[[Boobs|Slave Interact][$activeSlave.pornFocus = "boobs"]] |
+					[[Boobs|Slave Interact][$activeSlave.porn.focus = "boobs"]] |
 				<<case "dom">>
-					[[Dominant|Slave Interact][$activeSlave.pornFocus = "dom"]] |
+					[[Dominant|Slave Interact][$activeSlave.porn.focus = "dom"]] |
 				<<case "sadist">>
-					[[Sadist|Slave Interact][$activeSlave.pornFocus = "sadist"]] |
+					[[Sadist|Slave Interact][$activeSlave.porn.focus = "sadist"]] |
 				<<case "masochist">>
-					[[Masochist|Slave Interact][$activeSlave.pornFocus = "masochist"]] |
+					[[Masochist|Slave Interact][$activeSlave.porn.focus = "masochist"]] |
 				<<case "pregnancy">>
-					[[Pregnancy|Slave Interact][$activeSlave.pornFocus = "pregnancy"]] |
+					[[Pregnancy|Slave Interact][$activeSlave.porn.focus = "pregnancy"]] |
 				<</switch>>
 
 				<<switch $activeSlave.sexualQuirk>>
 				<<case "gagfuck queen">>
-					[[Gagfuck queen|Slave Interact][$activeSlave.pornFocus = "gagfuck queen"]] |
+					[[Gagfuck queen|Slave Interact][$activeSlave.porn.focus = "gagfuck queen"]] |
 				<<case "strugglefuck queen">>
-					[[Strugglefuck queen|Slave Interact][$activeSlave.pornFocus = "strugglefuck queen"]] |
+					[[Strugglefuck queen|Slave Interact][$activeSlave.porn.focus = "strugglefuck queen"]] |
 				<<case "painal queen">>
-					[[Painal queen|Slave Interact][$activeSlave.pornFocus = "painal queen"]] |
+					[[Painal queen|Slave Interact][$activeSlave.porn.focus = "painal queen"]] |
 				<<case "tease">>
-					[[Tease|Slave Interact][$activeSlave.pornFocus = "tease"]] |
+					[[Tease|Slave Interact][$activeSlave.porn.focus = "tease"]] |
 				<<case "romantic">>
-					[[Romantic|Slave Interact][$activeSlave.pornFocus = "romantic"]] |
+					[[Romantic|Slave Interact][$activeSlave.porn.focus = "romantic"]] |
 				<<case "perverted">>
-					[[Perverted|Slave Interact][$activeSlave.pornFocus = "perverted"]] |
+					[[Perverted|Slave Interact][$activeSlave.porn.focus = "perverted"]] |
 				<<case "caring">>
-					[[Caring|Slave Interact][$activeSlave.pornFocus = "caring"]] |
+					[[Caring|Slave Interact][$activeSlave.porn.focus = "caring"]] |
 				<<case "unflinching">>
-					[[Unspeakable|Slave Interact][$activeSlave.pornFocus = "unspeakable"]] |
+					[[Unspeakable|Slave Interact][$activeSlave.porn.focus = "unspeakable"]] |
 				<<case "size queen">>
-					[[Size queen|Slave Interact][$activeSlave.pornFocus = "size queen"]] |
+					[[Size queen|Slave Interact][$activeSlave.porn.focus = "size queen"]] |
 				<</switch>>
 
 				<<if $activeSlave.fuckdoll > 0>>
-					[[Fuckdoll|Slave Interact][$activeSlave.pornFocus = "fuckdoll"]] |
+					[[Fuckdoll|Slave Interact][$activeSlave.porn.focus = "fuckdoll"]] |
 				<</if>>
 				<<if ($activeSlave.devotion < -20) && ($activeSlave.analCount + $activeSlave.vaginalCount > 0)>>
-					[[Rape|Slave Interact][$activeSlave.pornFocus = "rape"]] |
+					[[Rape|Slave Interact][$activeSlave.porn.focus = "rape"]] |
 				<</if>>
 				<<if $activeSlave.bellyPreg > 500>>
-					[[Preggo|Slave Interact][$activeSlave.pornFocus = "preggo"]] |
+					[[Preggo|Slave Interact][$activeSlave.porn.focus = "preggo"]] |
 				<</if>>
 				<<if $activeSlave.weight > 95>>
-					[[BBW|Slave Interact][$activeSlave.pornFocus = "BBW"]] |
+					[[BBW|Slave Interact][$activeSlave.porn.focus = "BBW"]] |
 				<</if>>
 				<<if $activeSlave.visualAge <= 12>>
-					[[Underage|Slave Interact][$activeSlave.pornFocus = "underage"]] |
+					[[Underage|Slave Interact][$activeSlave.porn.focus = "underage"]] |
 				<</if>>
 				<<if ($activeSlave.weight > 30 && $activeSlave.diet == "fattening") || ($activeSlave.inflation > 0 && $activeSlave.inflationType == "food")>>
-					[[Weight gain|Slave Interact][$activeSlave.pornFocus = "weight gain"]] |
+					[[Weight gain|Slave Interact][$activeSlave.porn.focus = "weight gain"]] |
 				<</if>>
 				<<if canPenetrate($activeSlave) && $activeSlave.dick > 3>>
-					[[Big dick|Slave Interact][$activeSlave.pornFocus = "well hung"]] |
+					[[Big dick|Slave Interact][$activeSlave.porn.focus = "well hung"]] |
 				<</if>>
 
-				[[Smut is smut|Slave Interact][$activeSlave.pornFocus = "porn"]] |
-				[[No focus|Slave Interact][$activeSlave.pornFocus = "none"]]
+				[[Smut is smut|Slave Interact][$activeSlave.porn.focus = "porn"]] |
+				[[No focus|Slave Interact][$activeSlave.porn.focus = "none"]]
 			<</if>>
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 296de31fc13..cccfa4e3eef 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -1045,7 +1045,7 @@
 	<</for>>
 
 <<case "porn studio">>
-	$activeSlave.slaveName becomes a frequent sight in $activeSlave.pornFameType smut and attracts huge crowds with each public appearance. Your other aspiring porn stars @@.mediumaquamarine;try harder than ever@@ in the hopes of following in $his prestigious footsteps.
+	$activeSlave.slaveName becomes a frequent sight in $activeSlave.porn.fameType smut and attracts huge crowds with each public appearance. Your other aspiring porn stars @@.mediumaquamarine;try harder than ever@@ in the hopes of following in $his prestigious footsteps.
 	<<run clearSummaryCache()>>
 	<<for _ss = 0; _ss < $slaves.length; _ss++>>
 		<<if $slaves[_ss].pornPrestige > 0 && $slaves[_ss].pornPrestige < 3>>
diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw
index 70ea971fc5a..db0f71f63d8 100644
--- a/src/uncategorized/slaveStats.tw
+++ b/src/uncategorized/slaveStats.tw
@@ -26,43 +26,43 @@ slaveName: $activeSlave.slaveName	   /* TODO: figure out why this is being inden
 <br>pornFameSpending: $activeSlave.pornFameSpending
 <br>pornPrestige: $activeSlave.pornPrestige
 <br>pornPrestigeDesc: $activeSlave.pornPrestigeDesc
-<br>pornFameType: $activeSlave.pornFameType
-<br>pornFocus: $activeSlave.pornFocus
-<br>pornTypeGeneral: $activeSlave.pornTypeGeneral
-<br>pornTypeFuckdoll: $activeSlave.pornTypeFuckdoll
-<br>pornTypeRape: $activeSlave.pornTypeRape
-<br>pornTypePreggo: $activeSlave.pornTypePreggo
-<br>pornTypeBBW: $activeSlave.pornTypeBBW
-<br>pornTypeGainer: $activeSlave.pornTypeGainer
-<br>pornTypeStud: $activeSlave.pornTypeStud
-<br>pornTypeLoli: $activeSlave.pornTypeLoli
-<br>pornTypeDeepThroat: $activeSlave.pornTypeDeepThroat
-<br>pornTypeStruggleFuck: $activeSlave.pornTypeStruggleFuck
-<br>pornTypePainal: $activeSlave.pornTypePainal
-<br>pornTypeTease: $activeSlave.pornTypeTease
-<br>pornTypeRomantic: $activeSlave.pornTypeRomantic
-<br>pornTypePervert: $activeSlave.pornTypePervert
-<br>pornTypeCaring: $activeSlave.pornTypeCaring
-<br>pornTypeUnflinching: $activeSlave.pornTypeUnflinching
-<br>pornTypeSizeQueen: $activeSlave.pornTypeSizeQueen
-<br>pornTypeNeglectful: $activeSlave.pornTypeNeglectful
-<br>pornTypeCumAddict: $activeSlave.pornTypeCumAddict
-<br>pornTypeAnalAddict: $activeSlave.pornTypeAnalAddict
-<br>pornTypeAttentionWhore: $activeSlave.pornTypeAttentionWhore
-<br>pornTypeBreastGrowth: $activeSlave.pornTypeBreastGrowth
-<br>pornTypeAbusive: $activeSlave.pornTypeAbusive
-<br>pornTypeMalicious: $activeSlave.pornTypeMalicious
-<br>pornTypeSelfHating: $activeSlave.pornTypeSelfHating
-<br>pornTypeBreeder: $activeSlave.pornTypeBreeder
-<br>pornTypeSub: $activeSlave.pornTypeSub
-<br>pornTypeCumSlut: $activeSlave.pornTypeCumSlut
-<br>pornTypeAnal: $activeSlave.pornTypeAnal
-<br>pornTypeHumiliation: $activeSlave.pornTypeHumiliation
-<br>pornTypeBoobs: $activeSlave.pornTypeBoobs
-<br>pornTypeDom: $activeSlave.pornTypeDom
-<br>pornTypeSadist: $activeSlave.pornTypeSadist
-<br>pornTypeMasochist: $activeSlave.pornTypeMasochist
-<br>pornTypePregnancy: $activeSlave.pornTypePregnancy
+<br>pornFameType: $activeSlave.porn.fameType
+<br>pornFocus: $activeSlave.porn.focus
+<br>pornTypeGeneral: $activeSlave.porn.fame.general
+<br>pornTypeFuckdoll: $activeSlave.porn.fame.fuckdoll
+<br>pornTypeRape: $activeSlave.porn.fame.rape
+<br>pornTypePreggo: $activeSlave.porn.fame.preggo
+<br>pornTypeBBW: $activeSlave.porn.fame.BBW
+<br>pornTypeGainer: $activeSlave.porn.fame.gainer
+<br>pornTypeStud: $activeSlave.porn.fame.stud
+<br>pornTypeLoli: $activeSlave.porn.fame.loli
+<br>pornTypeDeepThroat: $activeSlave.porn.fame.deepThroat
+<br>pornTypeStruggleFuck: $activeSlave.porn.fame.struggleFuck
+<br>pornTypePainal: $activeSlave.porn.fame.painal
+<br>pornTypeTease: $activeSlave.porn.fame.tease
+<br>pornTypeRomantic: $activeSlave.porn.fame.romantic
+<br>pornTypePervert: $activeSlave.porn.fame.pervert
+<br>pornTypeCaring: $activeSlave.porn.fame.caring
+<br>pornTypeUnflinching: $activeSlave.porn.fame.unflinching
+<br>pornTypeSizeQueen: $activeSlave.porn.fame.sizeQueen
+<br>pornTypeNeglectful: $activeSlave.porn.fame.neglectful
+<br>pornTypeCumAddict: $activeSlave.porn.fame.cumAddict
+<br>pornTypeAnalAddict: $activeSlave.porn.fame.analAddict
+<br>pornTypeAttentionWhore: $activeSlave.porn.fame.attentionWhore
+<br>pornTypeBreastGrowth: $activeSlave.porn.fame.breastGrowth
+<br>pornTypeAbusive: $activeSlave.porn.fame.abusive
+<br>pornTypeMalicious: $activeSlave.porn.fame.malicious
+<br>pornTypeSelfHating: $activeSlave.porn.fame.selfHating
+<br>pornTypeBreeder: $activeSlave.porn.fame.breeder
+<br>pornTypeSub: $activeSlave.porn.fame.sub
+<br>pornTypeCumSlut: $activeSlave.porn.fame.cumSlut
+<br>pornTypeAnal: $activeSlave.porn.fame.anal
+<br>pornTypeHumiliation: $activeSlave.porn.fame.humiliation
+<br>pornTypeBoobs: $activeSlave.porn.fame.boobs
+<br>pornTypeDom: $activeSlave.porn.fame.dom
+<br>pornTypeSadist: $activeSlave.porn.fame.sadist
+<br>pornTypeMasochist: $activeSlave.porn.fame.masochist
+<br>pornTypePregnancy: $activeSlave.porn.fame.pregnancy
 <br>prestigeDesc: $activeSlave.prestigeDesc
 <br>recruiter: $activeSlave.recruiter
 <br>relation: $activeSlave.relation
@@ -388,4 +388,4 @@ slaveName: $activeSlave.slaveName	   /* TODO: figure out why this is being inden
 <br>lastWeeksRepExpenses: $activeSlave.lastWeeksRepExpenses
 <br>lastWeeksRepIncome: $activeSlave.lastWeeksRepIncome
 <br>Deadliness <<print Deadliness($activeSlave)>>
-<br><br>
\ No newline at end of file
+<br><br>
-- 
GitLab