diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 5b3a007663f03a0157a0d1133c38b793c4d2bb6f..f627550677c961a48cb4c38715550cf2adb4e02c 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -594,37 +594,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 
 <<if $arcologies[0].FSSupremacist != "unset">>
 	<br>''You are pursuing'' $arcologies[0].FSSupremacistRace superiority. //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSSupremacist = "unset", $arcologies[0].FSSupremacistDecoration = 20, $arcologies[0].FSSupremacistLawME = 0, $arcologies[0].FSSupremacistSMR = 0, $FSCredits += 1>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<if $arcologies[0].FSSupremacistDecoration == 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSSupremacist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSSupremacistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<elseif $arcologies[0].FSSupremacistDecoration == 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSSupremacist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSSupremacistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<elseif $arcologies[0].FSSupremacistDecoration == 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSSupremacist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSSupremacistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<elseif $arcologies[0].FSSupremacistDecoration == 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSSupremacist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSSupremacistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<elseif $arcologies[0].FSSupremacistDecoration == 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</if>>
+	<<FSChangeDecoration "FSSupremacist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "succubus")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -653,37 +623,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 
 <<if $arcologies[0].FSSubjugationist != "unset">>
 	<br>''You are pursuing'' $arcologies[0].FSSubjugationistRace inferiority. //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSSubjugationist = "unset", $arcologies[0].FSSubjugationistDecoration = 20, $arcologies[0].FSSubjugationistLawME = 0, $arcologies[0].FSSubjugationistSMR = 0, $FSCredits += 1>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<if $arcologies[0].FSSubjugationistDecoration == 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSSubjugationist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSSubjugationistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<elseif $arcologies[0].FSSubjugationistDecoration == 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSSubjugationist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSSubjugationistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<elseif $arcologies[0].FSSubjugationistDecoration == 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSSubjugationist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSSubjugationistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<elseif $arcologies[0].FSSubjugationistDecoration == 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSSubjugationist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSSubjugationistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<elseif $arcologies[0].FSSubjugationistDecoration == 100>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<else>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</if>>
+	<<FSChangeDecoration "FSSupremacist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "imp")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -715,38 +655,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSRepopulationFocus != "unset">>
 	<br>''You are pursuing'' the belief that mass breeding will save humanity.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRepopulationFocus = "unset", $arcologies[0].FSRepopulationFocusDecoration = 20, $arcologies[0].FSRepopulationFocusSMR = 0, $arcologies[0].FSRepopulationFocusLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "repopulation focus">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSRepopulationFocusDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSRepopulationFocus >= 10>>
-	  [[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSRepopulationFocusDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-	  You must advance this goal before customization to support it becomes available.
-	<</if>>
-  <<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSRepopulationFocus >= 30>>
-	  [[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSRepopulationFocusDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-	  You must advance this goal before further customization to support it becomes available.
-	<</if>>
-  <<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSRepopulationFocus >= 50>>
-	  [[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSRepopulationFocusDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-	  You must advance this goal before further customization to support it becomes available.
-	<</if>>
-  <<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSRepopulationFocus >= 70>>
-	  [[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSRepopulationFocusDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-	  You must advance this goal before further customization to support it becomes available.
-	<</if>>
-  <<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-  <</switch>>
+	<<FSChangeDecoration "FSRepopulationFocus">>
   <<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
 	  With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -769,37 +678,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<else>>
   <br>''You have established'' Eugenics. <<if $eugenicsFullControl != 1>>The Societal Elite will not permit you to abandon Eugenics.<<else>> //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 20, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>// <</if>><br>&nbsp;&nbsp;&nbsp;&nbsp;
 <</if>>
-  <<switch $arcologies[0].FSRestartDecoration>>
-  <<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSRestart >= 10>>
-	  [[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSRestartDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-	  You must advance this goal before customization to support it becomes available.
-	<</if>>
-  <<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSRestart >= 30>>
-	  [[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSRestartDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-	  You must advance this goal before further customization to support it becomes available.
-	<</if>>
-  <<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSRestart >= 50>>
-	  [[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSRestartDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-	  You must advance this goal before further customization to support it becomes available.
-	<</if>>
-  <<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSRestart >= 70>>
-	  [[Customize the exterior of the arcology to support this goal and fully establish the Societal Elite|Future Society][$arcologies[0].FSRestartDecoration = 100,$upgradeMultiplierArcology = 0.5, $upgradeMultiplierMedicine = 0.5, $cash -= 75000]] //Costs <<print cashFormat(75000)>> and may dilute your control over the arcology//
-	<<else>>
-	  You must advance this goal before further customization to support it becomes available.
-	<</if>>
-  <<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal. The Societal Elite exist as the highest class, allowing you access to all manner of benefits.
+	<<FSChangeDecoration "FSRestartDecoration">>
+	<<if $arcologies[0].FSRestartDecoration == 100>>The Societal Elite exist as the highest class, allowing you access to all manner of benefits.<</if>>
   <</switch>>
   <<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
@@ -821,38 +701,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSGenderRadicalist != "unset">>
 	<br>''You are pursuing'' a radical redefinition of gender that identifies powerful people as male, and everyone else as female.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSGenderRadicalist = "unset", $arcologies[0].FSGenderRadicalistDecoration = 20, $arcologies[0].FSGenderRadicalistLawDicks = 0, $arcologies[0].FSGenderRadicalistLawFuta = 0, $arcologies[0].FSGenderRadicalistLawBeauty = 0, $arcologies[0].FSGenderRadicalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "gender radicalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSGenderRadicalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSGenderRadicalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSGenderRadicalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSGenderRadicalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSGenderRadicalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSGenderRadicalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSGenderRadicalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSGenderRadicalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSGenderRadicalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSGenderRadicalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "shemale") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -872,38 +721,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSGenderFundamentalist != "unset">>
 	<br>''You are pursuing'' gender traditionalism, including a societal preference for feminine slaves and support for slave pregnancy.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSGenderFundamentalist = "unset", $arcologies[0].FSGenderFundamentalistDecoration = 20, $arcologies[0].FSGenderFundamentalistSMR = 0, $arcologies[0].FSGenderFundamentalistLawBimbo = 0, $FSCredits += 1>><<if $assistantFSAppearance == "gender fundamentalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSGenderFundamentalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSGenderFundamentalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSGenderFundamentalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSGenderFundamentalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSGenderFundamentalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSGenderFundamentalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSGenderFundamentalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSGenderFundamentalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSGenderFundamentalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSGenderFundamentalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -922,38 +740,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSPaternalist != "unset">>
 	<br>''You are pursuing'' a vision of slave improvement, including slaves' health, mental well-being, and education.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSPaternalist = "unset", $arcologies[0].FSPaternalistDecoration = 20, $arcologies[0].FSPaternalistLaw = 0, $arcologies[0].FSPaternalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "paternalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSPaternalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSPaternalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSPaternalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSPaternalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSPaternalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSPaternalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSPaternalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSPaternalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSPaternalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSPaternalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -972,38 +759,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSDegradationist != "unset">>
 	<br>''You are pursuing'' slave degradation, a belief that slaves are not human and should not be treated decently.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSDegradationist = "unset", $arcologies[0].FSDegradationistDecoration = 20, $arcologies[0].FSDegradationistLaw = 0, $arcologies[0].FSDegradationistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "degradationist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSDegradationistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSDegradationist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSDegradationistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSDegradationist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSDegradationistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSDegradationist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSDegradationistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSDegradationist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSDegradationistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSDegradationist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "imp")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1022,38 +778,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSBodyPurist != "unset">>
 	<br>''You are pursuing'' societal disapproval of implant surgery.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSBodyPurist = "unset", $arcologies[0].FSBodyPuristDecoration = 20, $arcologies[0].FSBodyPuristLaw = 0, $arcologies[0].FSBodyPuristSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "body purist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSBodyPuristDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSBodyPurist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSBodyPuristDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSBodyPurist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSBodyPuristDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSBodyPurist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSBodyPuristDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSBodyPurist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSBodyPuristDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSBodyPurist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1072,38 +797,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSTransformationFetishist != "unset">>
 	<br>''You are pursuing'' societal fetishization of implant surgery.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSTransformationFetishist = "unset", $arcologies[0].FSTransformationFetishistDecoration = 20, $arcologies[0].FSTransformationFetishistLaw = 0, $arcologies[0].FSTransformationFetishistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "transformation fetishist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSTransformationFetishistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSTransformationFetishist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSTransformationFetishistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSTransformationFetishist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSTransformationFetishistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSTransformationFetishist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSTransformationFetishistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSTransformationFetishist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSTransformationFetishistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSTransformationFetishist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1122,38 +816,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSYouthPreferentialist != "unset">>
 	<br>''You are pursuing'' an accentuated societal preference for younger slaves.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSYouthPreferentialist = "unset", $arcologies[0].FSYouthPreferentialistDecoration = 20, $arcologies[0].FSYouthPreferentialistLaw = 0, $arcologies[0].FSYouthPreferentialistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "youth preferentialist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSYouthPreferentialistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSYouthPreferentialist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSYouthPreferentialistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSYouthPreferentialist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSYouthPreferentialistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSYouthPreferentialist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSYouthPreferentialistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSYouthPreferentialist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSYouthPreferentialistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSYouthPreferentialist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1172,38 +835,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSMaturityPreferentialist != "unset">>
 	<br>''You are pursuing'' a societal preference for older women.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSMaturityPreferentialist = "unset", $arcologies[0].FSMaturityPreferentialistDecoration = 20, $arcologies[0].FSMaturityPreferentialistLaw = 0, $arcologies[0].FSMaturityPreferentialistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "maturity preferentialist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSMaturityPreferentialistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSMaturityPreferentialist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSMaturityPreferentialistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSMaturityPreferentialist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSMaturityPreferentialistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSMaturityPreferentialist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSMaturityPreferentialistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSMaturityPreferentialist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSMaturityPreferentialistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSMaturityPreferentialist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "goddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1222,38 +854,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
 	<br>''You are supporting'' enthusiasm for slaves with girlish figures.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSSlimnessEnthusiast = "unset", $arcologies[0].FSSlimnessEnthusiastDecoration = 20, $arcologies[0].FSSlimnessEnthusiastSMR = 0, $arcologies[0].FSSlimnessEnthusiastLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "slimness enthusiast">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSSlimnessEnthusiastDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSSlimnessEnthusiast >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSSlimnessEnthusiastDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSSlimnessEnthusiast >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSSlimnessEnthusiastDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSSlimnessEnthusiast >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSSlimnessEnthusiastDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSSlimnessEnthusiast >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSSlimnessEnthusiastDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSSlimnessEnthusiast">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "loli") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1272,38 +873,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSAssetExpansionist != "unset">>
 	<br>''You are pursuing'' societal hunger for huge assets.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSAssetExpansionist = "unset", $arcologies[0].FSAssetExpansionistDecoration = 20, $arcologies[0].FSAssetExpansionistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "asset expansionist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSAssetExpansionistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSAssetExpansionist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSAssetExpansionistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSAssetExpansionist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSAssetExpansionistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSAssetExpansionist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSAssetExpansionistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSAssetExpansionist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSAssetExpansionistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSAssetExpansionist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1321,38 +891,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSPastoralist != "unset">>
 	<br>''You are pursuing'' societal normalization of slave milking.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSPastoralist = "unset", $arcologies[0].FSPastoralistDecoration = 20, $arcologies[0].FSPastoralistLaw = 0, $arcologies[0].FSPastoralistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "pastoralist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSPastoralistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSPastoralist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSPastoralistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSPastoralist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSPastoralistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSPastoralist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSPastoralistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSPastoralist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSPastoralistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSPastoralist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1370,38 +909,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSPhysicalIdealist != "unset">>
 	<br>''You are pursuing'' societal reverence for the idealized human form, including height, health and muscle.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSPhysicalIdealist = "unset", $arcologies[0].FSPhysicalIdealistDecoration = 20, $arcologies[0].FSPhysicalIdealistSMR = 0, $arcologies[0].FSPhysicalIdealistLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "physical idealist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSPhysicalIdealistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSPhysicalIdealist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSPhysicalIdealistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSPhysicalIdealist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSPhysicalIdealistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSPhysicalIdealist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSPhysicalIdealistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSPhysicalIdealist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSPhysicalIdealistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSPhysicalIdealist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1420,38 +928,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSHedonisticDecadence != "unset">>
 	<br>''You are pursuing'' societal normalization of overindulgence and immediate gratification. Be it food, drink, sex, drugs or whatever one's desire may be.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSHedonisticDecadence = "unset", $arcologies[0].FSHedonisticDecadenceDecoration = 20, $arcologies[0].FSHedonisticDecadenceLaw = 0, $arcologies[0].FSHedonisticDecadenceLaw2 = 0, $arcologies[0].FSHedonisticDecadenceSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "hedonistic decadence">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSHedonisticDecadenceDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSHedonisticDecadence >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSHedonisticDecadenceDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSHedonisticDecadence >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSHedonisticDecadenceDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSHedonisticDecadence >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSHedonisticDecadenceDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSHedonisticDecadence >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSHedonisticDecadenceDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSHedonisticDecadence">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "imp") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1470,38 +947,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSChattelReligionist != "unset">>
 	<br>''You are pursuing'' a new strain of religion that emphasizes the slaveholding portions of religious history.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSChattelReligionist = "unset", $arcologies[0].FSChattelReligionistDecoration = 20, $arcologies[0].FSChattelReligionistLaw = 0, $arcologies[0].FSChattelReligionistCreed = 0, $arcologies[0].FSChattelReligionistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "chattel religionist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSChattelReligionistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSChattelReligionist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSChattelReligionistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSChattelReligionist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSChattelReligionistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSChattelReligionist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSChattelReligionistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSChattelReligionist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSChattelReligionistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSChattelReligionist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1520,38 +966,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSRomanRevivalist != "unset">>
 	<br>''You are pursuing'' a vision of a new Rome.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRomanRevivalist = "unset", $arcologies[0].FSRomanRevivalistDecoration = 20, $arcologies[0].FSRomanRevivalistLaw = 0, $arcologies[0].FSRomanRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "roman revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSRomanRevivalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSRomanRevivalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSRomanRevivalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSRomanRevivalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSRomanRevivalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSRomanRevivalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSRomanRevivalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSRomanRevivalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSRomanRevivalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSRomanRevivalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1570,38 +985,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSAztecRevivalist != "unset">>
 	<br>''You are pursuing'' a vision of a new Aztec Empire.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSAztecRevivalist = "unset", $arcologies[0].FSAztecRevivalistDecoration = 20, $arcologies[0].FSAztecRevivalistSMR = 0, $arcologies[0].FSAztecRevivalistLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "aztec revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSAztecRevivalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSAztecRevivalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSAztecRevivalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSAztecRevivalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSAztecRevivalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSAztecRevivalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1620,38 +1004,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSEgyptianRevivalist != "unset">>
 	<br>''You are pursuing'' a vision of Pharaoh's Egypt.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSEgyptianRevivalist = "unset", $arcologies[0].FSEgyptianRevivalistDecoration = 20, $arcologies[0].FSEgyptianRevivalistLaw = 0, $arcologies[0].FSEgyptianRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "egyptian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSEgyptianRevivalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSEgyptianRevivalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSEgyptianRevivalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSEgyptianRevivalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSEgyptianRevivalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSEgyptianRevivalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSEgyptianRevivalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSEgyptianRevivalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSEgyptianRevivalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSEgyptianRevivalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1670,38 +1023,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSEdoRevivalist != "unset">>
 	<br>''You are pursuing'' a vision of Edo Japan.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSEdoRevivalist = "unset", $arcologies[0].FSEdoRevivalistDecoration = 20, $arcologies[0].FSEdoRevivalistLaw = 0, $arcologies[0].FSEdoRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "edo revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSEdoRevivalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSEdoRevivalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSEdoRevivalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSEdoRevivalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSEdoRevivalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSEdoRevivalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSEdoRevivalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSEdoRevivalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSEdoRevivalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSEdoRevivalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "loli") || ($assistantAppearance == "kitsune") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1718,38 +1040,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSArabianRevivalist != "unset">>
 	<br>''You are pursuing'' a vision of the Sultanate of old.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSArabianRevivalist = "unset", $arcologies[0].FSArabianRevivalistDecoration = 20, $arcologies[0].FSArabianRevivalistLaw = 0, $arcologies[0].FSArabianRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "arabian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSArabianRevivalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSArabianRevivalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSArabianRevivalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSArabianRevivalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSArabianRevivalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSArabianRevivalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSArabianRevivalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSArabianRevivalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSArabianRevivalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSArabianRevivalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
@@ -1766,38 +1057,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 <<if $arcologies[0].FSChineseRevivalist != "unset">>
 	<br>''You are pursuing'' a vision of ancient China.
 	//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSChineseRevivalist = "unset", $arcologies[0].FSChineseRevivalistDecoration = 20, $arcologies[0].FSChineseRevivalistLaw = 0, $arcologies[0].FSChineseRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "chinese revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $arcologies[0].FSChineseRevivalistDecoration>>
-	<<case 20>>
-	$arcologies[0].name is not customized to support this goal.
-	<<if $arcologies[0].FSChineseRevivalist >= 10>>
-		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSChineseRevivalistDecoration = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
-	<<else>>
-		You must advance this goal before customization to support it becomes available.
-	<</if>>
-	<<case 40>>
-	$arcologies[0].name's media is supporting this goal.
-	<<if $arcologies[0].FSChineseRevivalist >= 30>>
-		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSChineseRevivalistDecoration = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 60>>
-	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
-	<<if $arcologies[0].FSChineseRevivalist >= 50>>
-		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSChineseRevivalistDecoration = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 80>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
-	<<if $arcologies[0].FSChineseRevivalist >= 70>>
-		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSChineseRevivalistDecoration = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
-	<<else>>
-		You must advance this goal before further customization to support it becomes available.
-	<</if>>
-	<<case 100>>
-	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
-	<</switch>>
+	<<FSChangeDecoration "FSChineseRevivalist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index df9ad9fa455b718296fa80fa264f3d707da891d6..7145cc65a8a0066fb24c586d33bbfc84af41c81c 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -9,7 +9,8 @@
 
 You visit the slave markets off the arcology plaza. It's always preferable to examine merchandise in person.
 
-<<if $slaveMarket == "heap">>
+<<switch $slaveMarket>>
+<<case "heap">>
 
 	You're in the corner of the slave market occupied by "The Flesh Heap", a dumping ground, of sorts, for broken slaves. Be it brain death, drug overdose, coma or anything else, this market is willing to buy and sell them. Most of the worthwhile slaves have already been picked clean by pharmaceutical companies for drug testing, and the rest are practically nothing more than vegetables, but a handful remain just conscious enough to be profitable with effort as slaves. One should go in expecting only the worst quality possible, though if anything catches your eye, it will be rather cheap to purchase.
 
@@ -26,7 +27,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
 	<<GenerateMarketSlave "heap">>
 
 
-<<elseif $slaveMarket == "kidnappers">>
+<<case "kidnappers">>
 	You're in the area of the slave market populated by slave kidnappers, though of course they prefer more polite titles. The slaves here are cheap, and they look it. They're almost all recent catches from bad parts of the old world, and most of them have seen considerable abuse between the moment of their capture and entering your arcology.
 	<<if $arcologies[0].FSPaternalistSMR == 1>>
 		Fortunately for them, such behavior is not permitted here. Though they remain frightened and angry, they are safe from rape, for now.
@@ -47,7 +48,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
 	<<GenerateMarketSlave "kidnappers">>
 
 
-<<elseif $slaveMarket == "indentures">>
+<<case "indentures">>
 	You're in the area of the slave market that deals in indentured servants. The people sold here are slaves, but they are temporary slaves, and many of them have clauses in their indentures that prohibit some of the most severe practices. They exhibit a strange variety, with some looking more frightened than the most downtrodden slave and some looking almost cheerful.
 	<<if $arcologies[0].FSPaternalistSMR == 1>>
 		The generous protections for slaves in your arcology lend this last group extra confidence.
@@ -68,7 +69,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
 	<<GenerateMarketSlave "indentures">>
 
 
-<<elseif $slaveMarket == "hunters">>
+<<case "hunters">>
 	You're in the area of the slave market populated by runaway slave catchers, a proud group. The slaves here know their way around Free Cities slavery already, and their eyes are watchful. Most of them probably harbor thoughts of another attempt at escape, though the slavers to their best to disabuse them of these notions.
 	<<if $arcologies[0].FSPaternalistSMR == 1>>
 		Their methods are somewhat limited, as the rules in your arcology preclude the more effective methods of punishment.
@@ -89,7 +90,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
 	<<GenerateMarketSlave "hunters">>
 
 
-<<elseif $slaveMarket == "underage raiders">>
+<<case "underage raiders">>
 	You're in the seediest area of the slave market populated by the cradle robbers, a despised group of slavers known for raiding elementary schools, orphanages and even preschools. They specifically target girls who have yet to experience their first period. The extreme risk of these raids makes the slavers here aggressive and confident,
 	<<if $arcologies[0].FSPaternalistSMR == 1>>
 		though they do obey the rules of your arcology that restrain them from abusing the girls.
@@ -110,7 +111,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
 	<<GenerateMarketSlave "underage raiders">>
 
 
-<<elseif $slaveMarket == "raiders">>
+<<case "raiders">>
 	You're in the area of the slave market populated by girl raiders, that daredevil subset of slave kidnappers that specifically target old world schools, preparatory institutions, religious groups, and other sources of slaves that can soon be sold right after they reach their majorities. The extreme risk of these raids makes the slavers here aggressive and confident,
 	<<if $arcologies[0].FSPaternalistSMR == 1>>
 		though they do obey the rules of your arcology that restrain them from abusing the girls.
@@ -131,12 +132,12 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
 	<<GenerateMarketSlave "raiders">>
 
 
-<<elseif $slaveMarket == "neighbor">>
+<<case "neighbor">>
 	You're in the area of the slave market that specializes in slaves from within the Free City, viewing slaves from ''<<print "$arcologies["+$numArcology+"].name">>''. Some were trained there, specifically for sale, while others are simply being sold.
 	<<GenerateMarketSlave "neighbor">>
 
 
-<<else>>
+<<case "trainers">>
 	You're in the area of the slave market populated by slave trainers, easily the wealthiest vendors. The slaves here have received obedience training and medical care, and many have had some basic sexual skills forced on them.
 	<<if $arcologies[0].FSPaternalistSMR == 1>>
 		Though the rules of your arcology protected them from the worst excesses of the training profession, many of the slaves on sale have the haunted look of people still coming to terms with the idea that they no longer have any bodily autonomy.
@@ -157,7 +158,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
 	<<GenerateMarketSlave "trainers">>
 
 
-<</if>>
+<</switch>>
 
 <br><br>
 
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 1ced7db195f5664e5e4ab71ddf88b963edf8f5fa..04487d3344acf66ead0dbda08f2b125e8361216e 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2196,6 +2196,44 @@ This experience
 
 <</widget>>
 
+/* Called as <<FSChangeDecoration "FSName">>, will generate description of current decoration level and a link to increase it if applicable, quotes are needed to pass FSName as reference - DO NOT INCLUDE IT AS PROPERTY OF $arcologies[0]! */
+<<widget "FSChangeDecoration">>
+<<set _FS = $args[0]>>
+<<set _FSDecoration = _FS + "Decoration">>
+<<switch $arcologies[0][_FSDecoration]>>
+<<case 20>>
+	$arcologies[0].name is not customized to support this goal.
+	<<if $arcologies[0][_FS] >= 10>>
+		[[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0][_FSDecoration] = 40, $cash -= 2500]] //Costs <<print cashFormat(2500)>>//
+	<<else>>
+		You must advance this goal before customization to support it becomes available.
+	<</if>>
+<<case 40>>
+	$arcologies[0].name's media is supporting this goal.
+	<<if $arcologies[0][_FS] >= 30>>
+		[[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0][_FSDecoration] = 60, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
+	<<else>>
+		You must advance this goal before further customization to support it becomes available.
+	<</if>>
+<<case 60>>
+	$arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
+	<<if $arcologies[0][_FS] >= 50>>
+		[[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0][_FSDecoration] = 80, $cash -= 10000]] //Costs <<print cashFormat(10000)>>//
+	<<else>>
+		You must advance this goal before further customization to support it becomes available.
+	<</if>>
+<<case 80>>
+	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
+	<<if $arcologies[0][_FS] >= 70>>
+		[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, $cash -= 20000]] //Costs <<print cashFormat(20000)>>//
+	<<else>>
+		You must advance this goal before further customization to support it becomes available.
+	<</if>>
+<<case 100>>
+	$arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
+<</switch>>
+<</widget>>
+
 <<widget "ValidateFacilityDecoration">>
 /* Used by following widget, called with <<ValidateFacilityDecoration "var">> where var is for example "spaDecoration" -- quotes are needed to pass var as reference - DO NOT INCLUDE $ PREFIX! */
 <<switch State.variables[$args[0]]>> /* get value of var name that was provided */
@@ -2948,31 +2986,33 @@ This experience
 	<<set _suffixes.push("Meat", "Tears", "Thing", "Weeper")>>
 <</if>>
 
-<<if ($args[0].assignment == "guard you")>>
+<<set $args[0].slaveName = _names.random()>>
+<<switch $args[0].assignment>>
+<<case "guard you">>
 	<<set $args[0].slaveName = either("Battle", "Guard")>>
-<<elseif ($args[0].assignment == "recruit girls")>>
+<<case "recruit girls">>
 	<<set $args[0].slaveName = either("Cam", "Recruiter")>>
-<<elseif ($args[0].assignment == "be the Madam")>>
+<<case "be the Madam">>
 	<<set $args[0].slaveName = either("Madam", "Pimp")>>
-<<elseif ($args[0].assignment == "be the DJ")>>
+<<case "be the DJ">>
 	<<set $args[0].slaveName = either("Bass", "Booth")>>
-<<elseif ($args[0].assignment == "be the Milkmaid") && $cumSlaves > 3>>
-	<<set $args[0].slaveName = either("Fucker", "Milker")>>
-<<elseif ($args[0].assignment == "be the Milkmaid")>>
+<<case "be the Milkmaid">>
+	<<if $cumSlaves > 3>>
+		<<set $args[0].slaveName = either("Fucker", "Milker")>>
+	<</if>>
+<<case "be the Milkmaid">>
 	<<set $args[0].slaveName = either("Dairy", "Farm")>>
-<<elseif ($args[0].assignment == "be your Head Girl")>>
+<<case "be your Head Girl">>
 	<<set $args[0].slaveName = either("Chief", "Head")>>
-<<elseif ($args[0].assignment == "be the Schoolteacher")>>
+<<case "be the Schoolteacher">>
 	<<set $args[0].slaveName = either("Classroom", "Teacher")>>
-<<elseif ($args[0].assignment == "be the Attendant")>>
+<<case "be the Attendant">>
 	<<set $args[0].slaveName = either("Bath", "Spa")>>
-<<elseif ($args[0].assignment == "be the Wardeness")>>
+<<case "be the Wardeness">>
 	<<set $args[0].slaveName = either("Jail", "Prison")>>
-<<elseif ($args[0].assignment == "be your concubine")>>
+<<case "be your concubine">>
 	<<set $args[0].slaveName = either("Bed", "Master")>>
-<<else>>
-	<<set $args[0].slaveName = _names.random()>>
-<</if>>
+<</switch>>
 
 <<set _surname = _suffixes.random()>>
 <<if _surname == $args[0].slaveName.toLowerCase()>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 0e604c1e00847990ce866e1b271c2446143c090d..f4683979fea6c842f5ed3e14d162c3ca284179fe 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2608,7 +2608,7 @@
 			They're usually very soft and rather laid back.
 			<<set $activeSlave.weight = random(30,180)>>
 		<</if>>
-		Though they often some with intense fetishes.
+		Though they often come with intense fetishes.
 		<<set $activeSlave.muscles = random(-50,0)>>
 		<<set $activeSlave.trust += random(5,15)>>
 		<<set $activeSlave.energy += random(0,10)>>