diff --git a/game/03-JavaScript/base.js b/game/03-JavaScript/base.js
index ed3df62e13bf61deff8641cd9e916b3e6a12fa01..de9edb54d8fb21dab07646c2a6db1a49fe3453f1 100644
--- a/game/03-JavaScript/base.js
+++ b/game/03-JavaScript/base.js
@@ -309,7 +309,7 @@ function outfitChecks() {
 	T.underNaked = V.worn.under_lower.name === "naked" && V.worn.under_upper.name === "naked";
 	T.middleNaked = V.worn.lower.name === "naked" && V.worn.upper.name === "naked";
 	T.overNaked = V.worn.over_lower.name === "naked" && V.worn.over_upper.name === "naked";
-	T.topless = V.worn.over_upper.name === "naked" && V.worn.upper.name === "naked" && V.worn.under_upper.name === "naked" && (V.worn.lower.name !== "plaid school pinafore" && V.worn.lower.name !== "school pinafore");
+	T.topless = V.worn.over_upper.name === "naked" && V.worn.upper.name === "naked" && V.worn.under_upper.name === "naked" && (V.worn.lower.name !== "plaid school pinafore" && V.worn.lower.name !== "school pinafore" && V.worn.lower.name !== "shortalls");
 	T.bottomless = V.worn.over_lower.name === "naked" && V.worn.lower.name === "naked" && V.worn.under_lower.name === "naked";
 	T.fullyNaked = T.topless && T.bottomless;
 }
diff --git a/game/04-Variables/canvasmodel-main.js b/game/04-Variables/canvasmodel-main.js
index 75767b737bf47912c7f01d47c697867c56af92ed..fd1ae281625235b56eec1408d443fe1e11b80e4d 100644
--- a/game/04-Variables/canvasmodel-main.js
+++ b/game/04-Variables/canvasmodel-main.js
@@ -3103,7 +3103,7 @@ Renderer.CanvasModels["main"] = {
 				options.worn_neck_setup.altposition !== undefined;
 				let path = 'img/clothes/neck/' +
 					options.worn_neck_setup.variable + '/' +
-					options.worn_neck_integrity + (options.worn_neck_setup.name === "necktie" && options.worn_upper_setup.has_collar === 1 ? '_nocollar' : options.worn_neck_setup.name === "sailor ribbon" && options.worn_upper_setup.name === "serafuku" ? '_serafuku' :'') +  (isAltPosition ? '_alt' : '') + '.png';
+					options.worn_neck_integrity + (options.worn_neck_setup.has_collar === 1 && options.worn_upper_setup.has_collar === 1 ? '_nocollar' : options.worn_neck_setup.name === "sailor ribbon" && options.worn_upper_setup.name === "serafuku" ? '_serafuku' :'') +  (isAltPosition ? '_alt' : '') + '.png';
 				return gray_suffix(path, options.filters['worn_neck']);
 			},
 			zfn(options) {
diff --git a/game/04-Variables/hair-defs.js b/game/04-Variables/hair-defs.js
index e22a98bec8f673198ade40d8cf2c024f1722cdd9..7f946a4109653183e7b62a430179ab340295d0e2 100644
--- a/game/04-Variables/hair-defs.js
+++ b/game/04-Variables/hair-defs.js
@@ -29,7 +29,7 @@ setup.hair = {
 		},
 		{
 			name: "double tail",
-			list: ["pigtails", "twintails", "curly pigtails", "sailor buns", "loop braid", "thick twintails", "drill ringlets", "low tails", "thick pigtails"],
+			list: ["pigtails", "twintails", "curly pigtails", "sailor buns", "loop braid", "thick twintails", "drill ringlets", "low tails", "thick pigtails", "scorpion tails"],
 			devolve: ["twintails"],
 		},
 		{
diff --git a/game/04-Variables/hair-styles.twee b/game/04-Variables/hair-styles.twee
index c589fb3fd0ce22daad9641d37a5584a7f3e21b69..91a8d0b4b9dcd2caa8c0d65ca0d84361917fc7a8 100644
--- a/game/04-Variables/hair-styles.twee
+++ b/game/04-Variables/hair-styles.twee
@@ -201,6 +201,12 @@
 		variable: "sailor buns",
 		type: ["buns", "loose"],
 		shop: ["mirrorhair"],
+	},
+		{name: "scorpion tails",
+		name_cap: "Scorpion Tails",
+		variable: "scorpion tails",
+		type: ["pigtails"],
+		shop: ["mirrorhair"],
 	},
 		{name: "shaved",
 		name_cap: "Shaved",
@@ -228,13 +234,13 @@
 	},
 		{name: "sidetail left",
 		name_cap: "Sidetail Left",
-		variable: "side tail left",
+		variable: "sidetail left",
 		type: ["ponytail"],
 		shop: ["mirrorhair"],
 	},
 		{name: "sidetail right",
 		name_cap: "Sidetail Right",
-		variable: "side tail right",
+		variable: "sidetail right",
 		type: ["ponytail"],
 		shop: ["mirrorhair"],
 	},
@@ -270,7 +276,7 @@
 	},
 		{name: "thick sidetail",
 		name_cap: "Thick Sidetail",
-		variable: "side thicktail",
+		variable: "thick sidetail",
 		type: ["ponytail"],
 		shop: ["mirrorhair"],
 	},
@@ -312,7 +318,7 @@
 	},
 		{name: "blunt locks",
 		name_cap: "Blunt Locks",
-		variable: "blunt sidelocks",
+		variable: "blunt locks",
 		type: ["loose", "sleek"],
 		shop: ["mirrorhair"],
 	},
@@ -522,7 +528,7 @@
 	},
 		{name: "tied back",
 		name_cap: "Tied Back",
-		variable: "french bob",
+		variable: "tied back",
 		type: ["short", "sleek"],
 		shop: ["mirrorhair"],
 	},
diff --git a/game/04-Variables/variables-versionUpdate.twee b/game/04-Variables/variables-versionUpdate.twee
index 08ad9c3e6990000903a88bf487c41a5e928a8393..b335ea14abbdc90ac04c7e8ac81e38ee57c102a3 100644
--- a/game/04-Variables/variables-versionUpdate.twee
+++ b/game/04-Variables/variables-versionUpdate.twee
@@ -4662,4 +4662,16 @@
 		<<run delete $pillory_tenant.endday>>
 	<</if>>
 
+	<<if $fringetype is "french bob">>
+		<<set $fringetype to "tied back">>
+	<</if>>
+	<<if $hairtype is "side thicktail">>
+		<<set $hairtype to "thick sidetail">>
+	<</if>>
+	<<if $hairtype is "side tail left">>
+		<<set $hairtype to "sidetail left">>
+	<</if>>
+	<<if $hairtype is "side tail right">>
+		<<set $hairtype to "sidetail right">>
+	<</if>>
 <</widget>>
diff --git a/game/base-clothing/clothing-legs.js b/game/base-clothing/clothing-legs.js
index 7aea306dd158379c7a62794349c244c97f38817d..737b5d7a5a0cf1c02c8507f88b803bda94a62c1c 100644
--- a/game/base-clothing/clothing-legs.js
+++ b/game/base-clothing/clothing-legs.js
@@ -874,6 +874,36 @@ function initLegs() {
 			iconFile: "mismatched.png",
 			accIcon: "mismatched_acc.png",
 		},
+		{
+			index: 27,
+			name: "loose socks",
+			name_cap: "Loose socks",
+			variable: "loosesocks",
+			integrity: 100,
+			integrity_max: 100,
+			fabric_strength: 20,
+			reveal: 500,
+			word: "n",
+			state: "ankles",
+			state_base: "ankles",
+			plural: 1,
+			colour: 0,
+			colour_options: [],
+			type: ["school"],
+			gender: "f",
+			femininity: 100,
+			warmth: 15,
+			cost: 500,
+			description: "Popular with schoolgirls in a foreign land.",
+			shop: ["clothing", "school", "adult"],
+			accessory: 0,
+			accessory_colour: 0,
+			accessory_colour_options: [],
+			cursed: 0,
+			location: 0,
+			iconFile: "loose_socks.png",
+			accIcon: 0,
+		},
 	];
 
 	/*
diff --git a/game/base-clothing/clothing-lower.js b/game/base-clothing/clothing-lower.js
index 8e55d4295e4d4b88d52e1f75eed25451de92c7b7..ad3f59599d73a4dd6707c6a3fa297d63235a89d1 100644
--- a/game/base-clothing/clothing-lower.js
+++ b/game/base-clothing/clothing-lower.js
@@ -5688,6 +5688,98 @@ function initLower() {
 			accIcon: "open_shoulder_lolita_dress_acc.png",
 			outfitSecondary: ["upper", "open shoulder lolita dress"],
 		},
+		{
+			index: 121,
+			name: "gym shorts",
+			name_cap: "Gym shorts",
+			variable: "gymshorts",
+			integrity: 140,
+			integrity_max: 140,
+			fabric_strength: 20,
+			reveal: 400,
+			rearresize: 0,
+			word: "n",
+			one_piece: 0,
+			skirt: 0,
+			skirt_down: 0,
+			short: 1,
+			state: "waist",
+			state_base: "waist",
+			plural: 1,
+			colour: 0,
+			colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow", "custom"],
+			colour_sidebar: 1,
+			exposed: 0,
+			exposed_base: 0,
+			vagina_exposed: 0,
+			vagina_exposed_base: 0,
+			anus_exposed: 0,
+			anus_exposed_base: 0,
+			type: ["normal", "athletic", "school"],
+			set: "lower",
+			gender: "m",
+			femininity: -200,
+			warmth: 15,
+			cost: 2200,
+			description: "Old-fashioned PE shorts.",
+			shop: ["clothing", "school"],
+			accessory: 0,
+			accessory_colour: 0,
+			accessory_colour_options: [],
+			high_img: 0,
+			back_img: 0,
+			cursed: 0,
+			location: 0,
+			iconFile: "gym_shorts.png",
+			accIcon: 0,
+		},
+		{
+			index: 122,
+			name: "shortalls",
+			name_cap: "Shortalls",
+			variable: "shortalls",
+			integrity: 160,
+			integrity_max: 160,
+			fabric_strength: 20,
+			reveal: 300,
+			rearresize: 0,
+			word: "n",
+			one_piece: 0,
+			skirt: 0,
+			skirt_down: 0,
+			short: 1,
+			state: "waist",
+			state_base: "waist",
+			plural: 1,
+			colour: 0,
+			colour_options: ["blue steel", "light blue", "tan", "sand","black", "white", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "yellow", "custom"],
+			colour_sidebar: 1,
+			exposed: 0,
+			exposed_base: 0,
+			vagina_exposed: 0,
+			vagina_exposed_base: 0,
+			anus_exposed: 0,
+			anus_exposed_base: 0,
+			type: ["normal"],
+			set: "lower",
+			gender: "n",
+			femininity: 200,
+			warmth: 20,
+			cost: 2500,
+			description: "Shirt sold separately.",
+			shop: ["clothing"],
+			accessory: 1,
+			accessory_colour: 0,
+			accessory_colour_options: ["silver", "gold", "black"],
+			accessory_colour_sidebar: 1,
+			high_img: 1,
+			back_img: 0,
+			cursed: 0,
+			location: 0,
+			iconFile: "shortalls.png",
+			accIcon: "shortalls_acc.png",
+			pregType: "cover",
+		},
 	];
 
 	/*
diff --git a/game/base-clothing/clothing-neck.js b/game/base-clothing/clothing-neck.js
index 2a499c44550d2878c10b404adeb66cea07e9604e..46d5ba5fb103200e0c511a7031b3fe488abdac35 100644
--- a/game/base-clothing/clothing-neck.js
+++ b/game/base-clothing/clothing-neck.js
@@ -419,6 +419,7 @@ function initNeck() {
 			description: "Classic accessory for office workers.",
 			shop: ["clothing", "adult"],
 			collared: 0,
+			has_collar: 1,
 			accessory: 1,
 			accessory_colour: 0,
 			accessory_colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow", "custom"],
@@ -984,6 +985,70 @@ function initNeck() {
 			iconFile: "lace_choker.png",
 			accIcon: 0,
 		},
+		{
+			index: 32,
+			name: "bowtie",
+			name_cap: "Bowtie",
+			variable: "bowtie",
+			integrity: 100,
+			integrity_max: 100,
+			fabric_strength: 20,
+			reveal: 100,
+			word: "a",
+			plural: 0,
+			colour: 0,
+			colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow", "custom"],
+			colour_sidebar: 1,
+			type: ["formal"],
+			gender: "m",
+			femininity: -100,
+			warmth: 0,
+			cost: 3000,
+			description: "Classic accessory for office workers.",
+			shop: ["clothing", "adult"],
+			collared: 0,
+			has_collar: 1,
+			accessory: 0,
+			accessory_colour: 0,
+			accessory_colour_options: [],
+			accessory_colour_sidebar: 0,
+			cursed: 0,
+			location: 0,
+			iconFile: "bowtie.png",
+			accIcon: 0,
+		},
+		{
+			index: 33,
+			name: "ribbon tie",
+			name_cap: "Ribbon tie",
+			variable: "ribbontie",
+			integrity: 100,
+			integrity_max: 100,
+			fabric_strength: 20,
+			reveal: 100,
+			word: "a",
+			plural: 0,
+			colour: 0,
+			colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow", "custom"],
+			colour_sidebar: 1,
+			type: ["formal"],
+			gender: "f",
+			femininity: 100,
+			warmth: 0,
+			cost: 3000,
+			description: "Classic accessory for office workers.",
+			shop: ["clothing", "adult"],
+			collared: 0,
+			has_collar: 1,
+			accessory: 0,
+			accessory_colour: 0,
+			accessory_colour_options: [],
+			accessory_colour_sidebar: 0,
+			cursed: 0,
+			location: 0,
+			iconFile: "ribbon_tie.png",
+			accIcon: 0,
+		},
 	];
 
 	/*
diff --git a/game/base-clothing/clothing-upper.js b/game/base-clothing/clothing-upper.js
index 70293fc474b143ab5baeece8e26b9b6bb29b3c66..e3313add19d709b9560e2b5942d8be60091a4dbf 100644
--- a/game/base-clothing/clothing-upper.js
+++ b/game/base-clothing/clothing-upper.js
@@ -2783,7 +2783,8 @@ function initUpper() {
 			accessory_colour_options: [],
 			accessory_colour_combat: "white",
 			sleeve_img: 0,
-			breast_img: 0,
+			breast_img: 1,
+			breast_acc_img: 1,
 			cursed: 0,
 			location: 0,
 			iconFile: "cheerleading_top.png",
@@ -5275,6 +5276,7 @@ function initUpper() {
 			breast_img: 1,
 			back_img: 1,
 			back_img_colour: "secondary",
+			has_collar: 1,
 			cursed: 0,
 			location: 0,
 			iconFile: "cardigan.png",
@@ -5321,6 +5323,7 @@ function initUpper() {
 			accessory_colour_sidebar: 0,
 			sleeve_img: 1,
 			breast_img: 1,
+			has_collar: 1,
 			cursed: 0,
 			location: 0,
 			iconFile: "school_blouse.png",
@@ -5980,6 +5983,53 @@ function initUpper() {
 			notuck: 0,
 			pregType: "min",
 		},
+		{
+			index: 128,
+			name: "school sweater vest",
+			name_cap: "School sweater vest",
+			variable: "schoolvest",
+			integrity: 200,
+			integrity_max: 200,
+			fabric_strength: 20,
+			reveal: 200,
+			bustresize: 0,
+			word: "a",
+			one_piece: 0,
+			strap: 0,
+			open: 0,
+			state: "waist",
+			state_base: "waist",
+			state_top: "chest",
+			state_top_base: "chest",
+			plural: 0,
+			colour: 0,
+			colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow", "custom"],
+			colour_sidebar: 1,
+			exposed: 0,
+			exposed_base: 0,
+			type: ["normal", "school"],
+			set: "upper",
+			gender: "n",
+			warmth: 60,
+			cost: 6000,
+			description: "The proper sweater vest for school.",
+			shop: ["clothing", "school"],
+			accessory: 1,
+			accessory_colour: 0,
+			accessory_colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow", "custom"],
+			accessory_colour_sidebar: 1,
+			accessory_integrity_img: 1,
+			sleeve_img: 1,
+			sleeve_colour: "secondary",
+			breast_img: 1,
+			has_collar: 1,
+			cursed: 0,
+			location: 0,
+			iconFile: "school_vest.png",
+			accIcon: "school_vest_acc.png",
+			notuck: 0,
+			pregType: 0,
+		},
 	];
 
 	/*
diff --git a/game/base-system/images.twee b/game/base-system/images.twee
index 2865b8b8f4613047a659de9ad2461c5d6e15d19a..fbd23f69304d69ff44b8edbdb2232d40f8049a2b 100644
--- a/game/base-system/images.twee
+++ b/game/base-system/images.twee
@@ -1478,6 +1478,7 @@
 		<<case "angry">><<icon "socialise_angry.png">>
 		<<case "party">><<icon "solocup.png">>
 		<<case "volleyball">><<icon "volleyball.png">>
+		<<case "cinema">><<icon "ticket.png">>
 		<<default>><<icon "socialise.png">>
 	<</switch>>
 <</widget>>
diff --git a/game/base-system/named-npcs.twee b/game/base-system/named-npcs.twee
index 93ae6e8e9c09e08e741e7b28c6a2ecb74ed641c6..55dd346f21c4767acb5d96584e68aee38d4e9b34 100644
--- a/game/base-system/named-npcs.twee
+++ b/game/base-system/named-npcs.twee
@@ -1339,7 +1339,7 @@ Zohar
 					<<if $NPCName[_i].dom gte 20>>
 						<span class="lewd">owns you.</span>
 					<<elseif $NPCName[_i].dom lte 8>>
-						thinks you're <span class="green"><<nnpc_his "Whitney">> <<girl>>friend.</span>
+						thinks you're <span class="green"><<nnpc_his "Whitney">> <<girlfriend>>.</span>
 					<<else>>
 						<span class="lewd">thinks you're <<nnpc_his "Whitney">> pet.</span>
 					<</if>>
diff --git a/game/base-system/text.twee b/game/base-system/text.twee
index 668120b0b7f25e5362a4ebff3d5946a27393ed4f..8c3130ad58fada8de95acf977628b8a8b51a965d 100644
--- a/game/base-system/text.twee
+++ b/game/base-system/text.twee
@@ -6255,7 +6255,7 @@
 	<<if _args[0] is "desc">>
 		<<set _text_output to $description + " ">>
 		<<set _text_output += ($pronoun is "m" ? "monk" : "nun")>>
-	<<else>>		
+	<<else>>
 		<<set _text_output to ($pronoun is "m" ? "monk" : "nun")>>
 	<</if>>
 <</silently>><<print _text_output>><</widget>>
@@ -7906,7 +7906,7 @@ Argument 2, where appropriate, determines whether it's the player undressing the
 <</silently>><<print _text_output>><</widget>>
 
 <<widget "gfabric">>
-	<<if $statdisable is "f">>
+	<<if $statdisable is "f">> |
 		<span class="green">+ Fabric</span>
 	<</if>>
 <</widget>>
diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee
index f80809ea62968fb30a624445250b6886217d8d13..c16bed4d87a80cf57d5548b9ff4306b6b3f9aeac 100644
--- a/game/base-system/widgets.twee
+++ b/game/base-system/widgets.twee
@@ -2159,14 +2159,14 @@
 	<<set $exposed to 0>>
 	<<if $worn.upper.exposed gte 1 and $worn.over_upper.exposed gte 1>>
 		<<if $player.gender_appearance is "m">>
-		<<elseif $libertine gte 1 or $possessed or ["plaid school pinafore","school pinafore"].includes($worn.lower.name)>>
+		<<elseif $libertine gte 1 or $possessed or ["plaid school pinafore","school pinafore","shortalls"].includes($worn.lower.name)>>
 		<<else>>
 			<<set $exposed to 1>>
 		<</if>>
 	<</if>>
 	<<if $worn.upper.exposed gte 2 and $worn.over_upper.exposed gte 2 and $player.gender_appearance isnot "m">>
 		<<if $possessed>>
-		<<elseif ["plaid school pinafore","school pinafore"].includes($worn.lower.name)>>
+		<<elseif ["plaid school pinafore","school pinafore","shortalls"].includes($worn.lower.name)>>
 		<<elseif $libertine is 1>>
 			<<set $topless to 1>>
 		<<else>>
diff --git a/game/overworld-town/loc-adultshop/events.twee b/game/overworld-town/loc-adultshop/events.twee
index d9a57cfa3c250d4946fb00e90931587bfbd9ac24..8df2fa9832401eb127c272c96594b2ef194f346e 100644
--- a/game/overworld-town/loc-adultshop/events.twee
+++ b/game/overworld-town/loc-adultshop/events.twee
@@ -2850,7 +2850,7 @@ The <<person1>><<person>> laughs nervously. "B-bad <<girl>>. Leave the nice <<pe
 
 	A struggle ensues. Sydney manages to wrestle your leash out of the <<persons>> grasp. <<person2>><<He>> rushes you into a back room, leaving the <<person1>><<person>> to explain <<himself>> to the bemused crowd of customers.
 <<else>>
-	Sydney screams. "H-help! Somebody! <<person1>><<Hes>> trying to kidnap my <<girl>>friend!"
+	Sydney screams. "H-help! Somebody! <<person1>><<Hes>> trying to kidnap my <<girlfriend>>!"
 	<br><br>
 
 	Heads turn up and down the aisles. The <<person>> curses under <<his>> breath before bolting out the door, leaving you behind. Sydney grabs your arm and rushes you into a back room.
diff --git a/game/overworld-town/special-robin/walk.twee b/game/overworld-town/special-robin/walk.twee
index ed94e86816bc1ebeb0698125015d93d65890b521..4004e9150ddec8fd3d62cb024cad53569e835d27 100644
--- a/game/overworld-town/special-robin/walk.twee
+++ b/game/overworld-town/special-robin/walk.twee
@@ -21,15 +21,15 @@
 	<br>
 <</if>>
 <<if C.npc.Robin.love gte 20 and $money gte 1500 and !$daily.robin.cinema>>
-	<<ind>><<link [[Cinema (£15 2:00)|Robin Walk Cinema]]>><<if Time.hour lt 12 and (Time.schoolDay or Time.isWeekEnd())>><<pass 15>><</if>><</link>>
+	<<socialiseicon "cinema">><<link [[Cinema (£15 2:00)|Robin Walk Cinema]]>><<if Time.hour lt 12 and (Time.schoolDay or Time.isWeekEnd())>><<pass 15>><</if>><</link>>
 	<br>
 <</if>>
 <<if $halloween_robin is 1 and $halloween_robin_costume is "ghost" and !(Time.monthDay is 31 and Time.hour gte 16)>>
 	<!-- SANITY: Intentional mismatch between stated time and actual time. Extra time is passed later on in the event -->
 	<<if !$robin_forest_visited>>
-		<<ind>><<link [[Go shopping for Halloween costumes (0:30)|Robin Forest Shop]]>><<pass 10>><</link>>
+		<<foodicon "halloween">><<link [[Go shopping for Halloween costumes (0:30)|Robin Forest Shop]]>><<pass 10>><</link>>
 	<<else>>
-		<<ind>><<link [[Go shopping for Halloween costumes (0:20)|Robin Forest Shop]]>><<pass 10>><</link>>
+		<<foodicon "halloween">><<link [[Go shopping for Halloween costumes (0:20)|Robin Forest Shop]]>><<pass 10>><</link>>
 	<</if>>
 	<br>
 <</if>>
diff --git a/game/overworld-town/special-whitney/street.twee b/game/overworld-town/special-whitney/street.twee
index 0f51bac556995d08b18e43d8ce609babcc588995..6a25af643f10a36aeb2961e8ba0f143af92d9bef 100644
--- a/game/overworld-town/special-whitney/street.twee
+++ b/game/overworld-town/special-whitney/street.twee
@@ -443,7 +443,7 @@
 						You could hazard a guess as to its contents.
 					<</if>>
 					<br><br>
-					
+
 					<<if playerIsPregnant() and playerAwareTheyArePregnant()>>
 						<span class="blue">You can't bring yourself to drink while you know you're with child.</span>
 					<<else>>
@@ -2707,7 +2707,7 @@ A <<generate2>><<person2>><<person>> drives by, honking <<his>> horn as <<he>> l
 		You grab Whitney by the shoulder and spin <<him>> around. At first <<his>> eyes are wide with shock. <<He>> grins when <<he>> sees you.
 		<br><br>
 
-		"What're you playing with that loser for?" you say. "Your <<girl>>friend's right here."
+		"What're you playing with that loser for?" you say. "Your <<girlfriend>>'s right here."
 	<<else>>
 		You tap Whitney on the shoulder. <<He>> turns around with a glare. <<His>> eyebrows raise when <<he>> sees you.
 		<br><br>
diff --git a/img/clothes/legs/loosesocks/full.png b/img/clothes/legs/loosesocks/full.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea05f9bb903efdd46da6cf0121f76a865a62c462
Binary files /dev/null and b/img/clothes/legs/loosesocks/full.png differ
diff --git a/img/clothes/lower/cheerleader/frayed.png b/img/clothes/lower/cheerleader/frayed.png
deleted file mode 100644
index 79747733c295e51071feb398aeec5796001f6c2c..0000000000000000000000000000000000000000
Binary files a/img/clothes/lower/cheerleader/frayed.png and /dev/null differ
diff --git a/img/clothes/lower/cheerleader/frayed_acc.png b/img/clothes/lower/cheerleader/frayed_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..14cb8b1e653cd6c7a8c6fd2cb164277040cbd17f
Binary files /dev/null and b/img/clothes/lower/cheerleader/frayed_acc.png differ
diff --git a/img/clothes/lower/cheerleader/full.png b/img/clothes/lower/cheerleader/full.png
deleted file mode 100644
index 4cf6dfd198efefa114d7ca2f00c85976e0936e54..0000000000000000000000000000000000000000
Binary files a/img/clothes/lower/cheerleader/full.png and /dev/null differ
diff --git a/img/clothes/lower/cheerleader/full_acc.png b/img/clothes/lower/cheerleader/full_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4759b3d0eb9d2b34f6fe623c6bfc6e007f8e790
Binary files /dev/null and b/img/clothes/lower/cheerleader/full_acc.png differ
diff --git a/img/clothes/lower/cheerleader/tattered.png b/img/clothes/lower/cheerleader/tattered.png
deleted file mode 100644
index 01e0a70141986c3ddf26a12e94cbecbeeaec3e76..0000000000000000000000000000000000000000
Binary files a/img/clothes/lower/cheerleader/tattered.png and /dev/null differ
diff --git a/img/clothes/lower/cheerleader/tattered_acc.png b/img/clothes/lower/cheerleader/tattered_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..455dbd8bac154e597075de92b166d048d84ad19c
Binary files /dev/null and b/img/clothes/lower/cheerleader/tattered_acc.png differ
diff --git a/img/clothes/lower/cheerleader/torn.png b/img/clothes/lower/cheerleader/torn.png
deleted file mode 100644
index da14e792c2d1e0dcd2ccf9aed9aba373b74c76b9..0000000000000000000000000000000000000000
Binary files a/img/clothes/lower/cheerleader/torn.png and /dev/null differ
diff --git a/img/clothes/lower/cheerleader/torn_acc.png b/img/clothes/lower/cheerleader/torn_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..d10eb9f84ef27122250c86e763f0b11296baa8a0
Binary files /dev/null and b/img/clothes/lower/cheerleader/torn_acc.png differ
diff --git a/img/clothes/lower/gymshorts/frayed_gray.png b/img/clothes/lower/gymshorts/frayed_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..f39325c0651b112ec10ac74973bb5acd1223859a
Binary files /dev/null and b/img/clothes/lower/gymshorts/frayed_gray.png differ
diff --git a/img/clothes/lower/gymshorts/full_gray.png b/img/clothes/lower/gymshorts/full_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3161dba312c93d5435ca2251e9a2c385420f140
Binary files /dev/null and b/img/clothes/lower/gymshorts/full_gray.png differ
diff --git a/img/clothes/lower/gymshorts/tattered_gray.png b/img/clothes/lower/gymshorts/tattered_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e606cf2b0f2f3f80098809537470f3270d9d2fc
Binary files /dev/null and b/img/clothes/lower/gymshorts/tattered_gray.png differ
diff --git a/img/clothes/lower/gymshorts/torn_gray.png b/img/clothes/lower/gymshorts/torn_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b729c1ba5d9c1ef4ac2c7f26c9158d3455669ae
Binary files /dev/null and b/img/clothes/lower/gymshorts/torn_gray.png differ
diff --git a/img/clothes/lower/shortalls/acc_gray.png b/img/clothes/lower/shortalls/acc_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..17c72a07675ff708b06e735e236d66544d9133f7
Binary files /dev/null and b/img/clothes/lower/shortalls/acc_gray.png differ
diff --git a/img/clothes/lower/shortalls/frayed_gray.png b/img/clothes/lower/shortalls/frayed_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..eec46985a4e4a29cf79ff350544939f6fc190e79
Binary files /dev/null and b/img/clothes/lower/shortalls/frayed_gray.png differ
diff --git a/img/clothes/lower/shortalls/full_gray.png b/img/clothes/lower/shortalls/full_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..b898fce7fb988773a886c7501c60f511bc8ca063
Binary files /dev/null and b/img/clothes/lower/shortalls/full_gray.png differ
diff --git a/img/clothes/lower/shortalls/tattered_gray.png b/img/clothes/lower/shortalls/tattered_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a27920a00eb3cab28af12cb4d6b4aa14a7ef0c7
Binary files /dev/null and b/img/clothes/lower/shortalls/tattered_gray.png differ
diff --git a/img/clothes/lower/shortalls/torn_gray.png b/img/clothes/lower/shortalls/torn_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7945549f8cdeeb4d641567e91a6b2027ad147b0
Binary files /dev/null and b/img/clothes/lower/shortalls/torn_gray.png differ
diff --git a/img/clothes/neck/bowtie/full_gray.png b/img/clothes/neck/bowtie/full_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ad795bc826494540fcfd7e48f93897b5fe8cdd
Binary files /dev/null and b/img/clothes/neck/bowtie/full_gray.png differ
diff --git a/img/clothes/neck/bowtie/full_nocollar_gray.png b/img/clothes/neck/bowtie/full_nocollar_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4aa4393768b67ad79d31c823ebcaec755431565
Binary files /dev/null and b/img/clothes/neck/bowtie/full_nocollar_gray.png differ
diff --git a/img/clothes/neck/ribbontie/full_gray.png b/img/clothes/neck/ribbontie/full_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..627374c34c9fa2ec5dda1ed16bddee3215b7f77f
Binary files /dev/null and b/img/clothes/neck/ribbontie/full_gray.png differ
diff --git a/img/clothes/neck/ribbontie/full_nocollar_gray.png b/img/clothes/neck/ribbontie/full_nocollar_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ee27ebc6546bf077fa027430abb49db3a2450b8
Binary files /dev/null and b/img/clothes/neck/ribbontie/full_nocollar_gray.png differ
diff --git a/img/clothes/upper/cheerleader/0_acc.png b/img/clothes/upper/cheerleader/0_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9747e9ebc21c534e5d738a4b10b65ac860b5b4f
Binary files /dev/null and b/img/clothes/upper/cheerleader/0_acc.png differ
diff --git a/img/clothes/upper/cheerleader/0_gray.png b/img/clothes/upper/cheerleader/0_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9d17d1d2f06b8ef481b22c0ed7f5a3ffbf048d3
Binary files /dev/null and b/img/clothes/upper/cheerleader/0_gray.png differ
diff --git a/img/clothes/upper/cheerleader/1_acc.png b/img/clothes/upper/cheerleader/1_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5981c8753c06a62ca6353097497232784a01660
Binary files /dev/null and b/img/clothes/upper/cheerleader/1_acc.png differ
diff --git a/img/clothes/upper/cheerleader/1_gray.png b/img/clothes/upper/cheerleader/1_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b98e4b26e25f5f8aa0172e3d1a78246fa2a0e61
Binary files /dev/null and b/img/clothes/upper/cheerleader/1_gray.png differ
diff --git a/img/clothes/upper/cheerleader/2_acc.png b/img/clothes/upper/cheerleader/2_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c93c085d34d1ffa105b13404061fdcb1db44a07
Binary files /dev/null and b/img/clothes/upper/cheerleader/2_acc.png differ
diff --git a/img/clothes/upper/cheerleader/2_gray.png b/img/clothes/upper/cheerleader/2_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd066116aa2136dcdcf4fdc5809bc804a8db3d1d
Binary files /dev/null and b/img/clothes/upper/cheerleader/2_gray.png differ
diff --git a/img/clothes/upper/cheerleader/3_acc.png b/img/clothes/upper/cheerleader/3_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..01625f857912d91376f63ca62ee679c4ab602c0d
Binary files /dev/null and b/img/clothes/upper/cheerleader/3_acc.png differ
diff --git a/img/clothes/upper/cheerleader/3_gray.png b/img/clothes/upper/cheerleader/3_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..a96258972572c772d746681fa42998454e46abeb
Binary files /dev/null and b/img/clothes/upper/cheerleader/3_gray.png differ
diff --git a/img/clothes/upper/cheerleader/4_acc.png b/img/clothes/upper/cheerleader/4_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..25903ed48f77317efddb272b74631bd25bd0776e
Binary files /dev/null and b/img/clothes/upper/cheerleader/4_acc.png differ
diff --git a/img/clothes/upper/cheerleader/4_gray.png b/img/clothes/upper/cheerleader/4_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..975c4e901e8ad306ada39f3a0cb7fd67aef3bd68
Binary files /dev/null and b/img/clothes/upper/cheerleader/4_gray.png differ
diff --git a/img/clothes/upper/cheerleader/5_acc.png b/img/clothes/upper/cheerleader/5_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a37c3351f4be0da5b61be927fc2134600c5e7838
Binary files /dev/null and b/img/clothes/upper/cheerleader/5_acc.png differ
diff --git a/img/clothes/upper/cheerleader/5_gray.png b/img/clothes/upper/cheerleader/5_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dac0d91dbbfc02a62fd5389cae1cb5509971636
Binary files /dev/null and b/img/clothes/upper/cheerleader/5_gray.png differ
diff --git a/img/clothes/upper/cheerleader/frayed.png b/img/clothes/upper/cheerleader/frayed.png
deleted file mode 100644
index abda1545927bfbfba4fc4d3d2295c3897124d4eb..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/frayed.png and /dev/null differ
diff --git a/img/clothes/upper/cheerleader/full.png b/img/clothes/upper/cheerleader/full.png
deleted file mode 100644
index abda1545927bfbfba4fc4d3d2295c3897124d4eb..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/full.png and /dev/null differ
diff --git a/img/clothes/upper/cheerleader/left.png b/img/clothes/upper/cheerleader/left.png
deleted file mode 100644
index ef2f1193f39f8d45a3944c1458104197706f9469..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/left.png and /dev/null differ
diff --git a/img/clothes/upper/cheerleader/left_cover.png b/img/clothes/upper/cheerleader/left_cover.png
deleted file mode 100644
index 3b3cd6a2ea3e581d21979ee23764f0ce46db9f84..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/left_cover.png and /dev/null differ
diff --git a/img/clothes/upper/cheerleader/right.png b/img/clothes/upper/cheerleader/right.png
deleted file mode 100644
index 6ff4eb639dd54f79394a5428482b25a7f87d1da8..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/right.png and /dev/null differ
diff --git a/img/clothes/upper/cheerleader/right_cover.png b/img/clothes/upper/cheerleader/right_cover.png
deleted file mode 100644
index c68f7f4b2ed96cc0cf723bd6cd2ea1a018fe86cc..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/right_cover.png and /dev/null differ
diff --git a/img/clothes/upper/cheerleader/tattered.png b/img/clothes/upper/cheerleader/tattered.png
deleted file mode 100644
index abda1545927bfbfba4fc4d3d2295c3897124d4eb..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/tattered.png and /dev/null differ
diff --git a/img/clothes/upper/cheerleader/torn.png b/img/clothes/upper/cheerleader/torn.png
deleted file mode 100644
index abda1545927bfbfba4fc4d3d2295c3897124d4eb..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/cheerleader/torn.png and /dev/null differ
diff --git a/img/clothes/upper/schoolvest/0_gray.png b/img/clothes/upper/schoolvest/0_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8bab0d406587db87840aee93215e2f1a55aa4b2
Binary files /dev/null and b/img/clothes/upper/schoolvest/0_gray.png differ
diff --git a/img/clothes/upper/schoolvest/1_gray.png b/img/clothes/upper/schoolvest/1_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..5255647c5310b7008f51063cd805d07443022c6a
Binary files /dev/null and b/img/clothes/upper/schoolvest/1_gray.png differ
diff --git a/img/clothes/upper/schoolvest/2_gray.png b/img/clothes/upper/schoolvest/2_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..91a4e7b2cf94d1958de5f397ba7ed93224711eba
Binary files /dev/null and b/img/clothes/upper/schoolvest/2_gray.png differ
diff --git a/img/clothes/upper/schoolvest/3_gray.png b/img/clothes/upper/schoolvest/3_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b23b6afae723a53dce0566537669f381063ae75
Binary files /dev/null and b/img/clothes/upper/schoolvest/3_gray.png differ
diff --git a/img/clothes/upper/schoolvest/4_gray.png b/img/clothes/upper/schoolvest/4_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8c35de6b2f859b86dbade7a5f656767c708773e
Binary files /dev/null and b/img/clothes/upper/schoolvest/4_gray.png differ
diff --git a/img/clothes/upper/schoolvest/5_gray.png b/img/clothes/upper/schoolvest/5_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..efd7bf454a6d02aac6594b2f68390694515d242f
Binary files /dev/null and b/img/clothes/upper/schoolvest/5_gray.png differ
diff --git a/img/clothes/upper/schoolvest/acc_frayed_gray.png b/img/clothes/upper/schoolvest/acc_frayed_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c858d48569ca39222b8296bf549b1b1bfc7527c
Binary files /dev/null and b/img/clothes/upper/schoolvest/acc_frayed_gray.png differ
diff --git a/img/clothes/upper/schoolvest/acc_full_gray.png b/img/clothes/upper/schoolvest/acc_full_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..33e6a5012afebad91c27a6b624d3a7a04f0cb5e1
Binary files /dev/null and b/img/clothes/upper/schoolvest/acc_full_gray.png differ
diff --git a/img/clothes/upper/schoolvest/acc_tattered_gray.png b/img/clothes/upper/schoolvest/acc_tattered_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..280004298994cca447747d3b94bc99d481e6c485
Binary files /dev/null and b/img/clothes/upper/schoolvest/acc_tattered_gray.png differ
diff --git a/img/clothes/upper/schoolvest/acc_torn_gray.png b/img/clothes/upper/schoolvest/acc_torn_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4a6ea8a3399cf972a4cf5c037251c1425cde79b
Binary files /dev/null and b/img/clothes/upper/schoolvest/acc_torn_gray.png differ
diff --git a/img/clothes/upper/schoolvest/frayed_gray.png b/img/clothes/upper/schoolvest/frayed_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea29d986d1391143daacdd3c0de009ada0883f32
Binary files /dev/null and b/img/clothes/upper/schoolvest/frayed_gray.png differ
diff --git a/img/clothes/upper/schoolvest/full_gray.png b/img/clothes/upper/schoolvest/full_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..1041f51a25377144d94fa7eb3897c37490015f77
Binary files /dev/null and b/img/clothes/upper/schoolvest/full_gray.png differ
diff --git a/img/clothes/upper/schoolvest/left_cover_gray.png b/img/clothes/upper/schoolvest/left_cover_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..45e70b22fc5d115b0a3f1c23bc906c88737e23a1
Binary files /dev/null and b/img/clothes/upper/schoolvest/left_cover_gray.png differ
diff --git a/img/clothes/upper/schoolvest/left_gray.png b/img/clothes/upper/schoolvest/left_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..65179eba4aa3c97e87950af3e0e5fd1b52450726
Binary files /dev/null and b/img/clothes/upper/schoolvest/left_gray.png differ
diff --git a/img/clothes/upper/schoolvest/right_cover_gray.png b/img/clothes/upper/schoolvest/right_cover_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..538a41cefedb56611d86aaa72b3fa13f8acab56d
Binary files /dev/null and b/img/clothes/upper/schoolvest/right_cover_gray.png differ
diff --git a/img/clothes/upper/schoolvest/right_gray.png b/img/clothes/upper/schoolvest/right_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..f066ca7f627fc7728efaa45810bd6a667d4f4564
Binary files /dev/null and b/img/clothes/upper/schoolvest/right_gray.png differ
diff --git a/img/clothes/upper/schoolvest/tattered_gray.png b/img/clothes/upper/schoolvest/tattered_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..07e129835650154e2288293fde8f9b31e7e0342e
Binary files /dev/null and b/img/clothes/upper/schoolvest/tattered_gray.png differ
diff --git a/img/clothes/upper/schoolvest/torn_gray.png b/img/clothes/upper/schoolvest/torn_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..b37a6877da4ab20f6c8c6a855ea0650f3c645482
Binary files /dev/null and b/img/clothes/upper/schoolvest/torn_gray.png differ
diff --git a/img/clothes/upper/turtleneckjumper/0.png b/img/clothes/upper/turtleneckjumper/0.png
deleted file mode 100644
index 5903f168d5e2dd0b3fd1b06b3c32bc2cb31d21c1..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/0.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/1.png b/img/clothes/upper/turtleneckjumper/1.png
deleted file mode 100644
index 236800a2b7c0cf6bb8ac02f0dc169f8d8695d99c..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/1.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/2.png b/img/clothes/upper/turtleneckjumper/2.png
deleted file mode 100644
index 0fdda1820897c8c7725bd3d1b2ef851bc3be55d8..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/2.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/3.png b/img/clothes/upper/turtleneckjumper/3.png
deleted file mode 100644
index d85ec014fba9063bc0d7d876eee86ba067bb71fd..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/3.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/4.png b/img/clothes/upper/turtleneckjumper/4.png
deleted file mode 100644
index e51c533b7bf5bf8356e4d2d4f5547484a1f837d6..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/4.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/5.png b/img/clothes/upper/turtleneckjumper/5.png
deleted file mode 100644
index b1cb6907d01436e03cffd760b4ce37e55a56c7c6..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/5.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/frayed.png b/img/clothes/upper/turtleneckjumper/frayed.png
deleted file mode 100644
index e02365cd9fff04b13fef153bda21cd474033566b..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/frayed.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/full.png b/img/clothes/upper/turtleneckjumper/full.png
deleted file mode 100644
index e02365cd9fff04b13fef153bda21cd474033566b..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/full.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/left.png b/img/clothes/upper/turtleneckjumper/left.png
deleted file mode 100644
index e28c7b1c9073d16f1289d2da10dd89139772e1f4..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/left.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/left_cover.png b/img/clothes/upper/turtleneckjumper/left_cover.png
deleted file mode 100644
index e862caa59db44bccf0bc7955884223c6168f35cb..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/left_cover.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/right.png b/img/clothes/upper/turtleneckjumper/right.png
deleted file mode 100644
index f045f19639a5339527ad3b3198a76e3f43b4e7cb..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/right.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/right_cover.png b/img/clothes/upper/turtleneckjumper/right_cover.png
deleted file mode 100644
index 218f94ffec8b0be0ea018e603908d1ae0576157e..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/right_cover.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/tattered.png b/img/clothes/upper/turtleneckjumper/tattered.png
deleted file mode 100644
index e02365cd9fff04b13fef153bda21cd474033566b..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/tattered.png and /dev/null differ
diff --git a/img/clothes/upper/turtleneckjumper/torn.png b/img/clothes/upper/turtleneckjumper/torn.png
deleted file mode 100644
index e02365cd9fff04b13fef153bda21cd474033566b..0000000000000000000000000000000000000000
Binary files a/img/clothes/upper/turtleneckjumper/torn.png and /dev/null differ
diff --git a/img/hair/fringe/blunt sidelocks/chest.png b/img/hair/fringe/blunt locks/chest.png
similarity index 100%
rename from img/hair/fringe/blunt sidelocks/chest.png
rename to img/hair/fringe/blunt locks/chest.png
diff --git a/img/hair/fringe/blunt sidelocks/feet.png b/img/hair/fringe/blunt locks/feet.png
similarity index 100%
rename from img/hair/fringe/blunt sidelocks/feet.png
rename to img/hair/fringe/blunt locks/feet.png
diff --git a/img/hair/fringe/blunt sidelocks/navel.png b/img/hair/fringe/blunt locks/navel.png
similarity index 100%
rename from img/hair/fringe/blunt sidelocks/navel.png
rename to img/hair/fringe/blunt locks/navel.png
diff --git a/img/hair/fringe/blunt sidelocks/short.png b/img/hair/fringe/blunt locks/short.png
similarity index 100%
rename from img/hair/fringe/blunt sidelocks/short.png
rename to img/hair/fringe/blunt locks/short.png
diff --git a/img/hair/fringe/blunt sidelocks/shoulder.png b/img/hair/fringe/blunt locks/shoulder.png
similarity index 100%
rename from img/hair/fringe/blunt sidelocks/shoulder.png
rename to img/hair/fringe/blunt locks/shoulder.png
diff --git a/img/hair/fringe/blunt sidelocks/thighs.png b/img/hair/fringe/blunt locks/thighs.png
similarity index 100%
rename from img/hair/fringe/blunt sidelocks/thighs.png
rename to img/hair/fringe/blunt locks/thighs.png
diff --git a/img/hair/fringe/french bob/chest.png b/img/hair/fringe/tied back/chest.png
similarity index 100%
rename from img/hair/fringe/french bob/chest.png
rename to img/hair/fringe/tied back/chest.png
diff --git a/img/hair/fringe/french bob/feet.png b/img/hair/fringe/tied back/feet.png
similarity index 100%
rename from img/hair/fringe/french bob/feet.png
rename to img/hair/fringe/tied back/feet.png
diff --git a/img/hair/fringe/french bob/navel.png b/img/hair/fringe/tied back/navel.png
similarity index 100%
rename from img/hair/fringe/french bob/navel.png
rename to img/hair/fringe/tied back/navel.png
diff --git a/img/hair/fringe/french bob/short.png b/img/hair/fringe/tied back/short.png
similarity index 100%
rename from img/hair/fringe/french bob/short.png
rename to img/hair/fringe/tied back/short.png
diff --git a/img/hair/fringe/french bob/shoulder.png b/img/hair/fringe/tied back/shoulder.png
similarity index 100%
rename from img/hair/fringe/french bob/shoulder.png
rename to img/hair/fringe/tied back/shoulder.png
diff --git a/img/hair/fringe/french bob/thighs.png b/img/hair/fringe/tied back/thighs.png
similarity index 100%
rename from img/hair/fringe/french bob/thighs.png
rename to img/hair/fringe/tied back/thighs.png
diff --git a/img/hair/sides/scorpion tails/chest.png b/img/hair/sides/scorpion tails/chest.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1a3ae1e1c28877c06cab430649b06b2f2946310
Binary files /dev/null and b/img/hair/sides/scorpion tails/chest.png differ
diff --git a/img/hair/sides/scorpion tails/feet.png b/img/hair/sides/scorpion tails/feet.png
new file mode 100644
index 0000000000000000000000000000000000000000..70dbded1c609854c8368b610eca1de7a85bdf41e
Binary files /dev/null and b/img/hair/sides/scorpion tails/feet.png differ
diff --git a/img/hair/sides/scorpion tails/navel.png b/img/hair/sides/scorpion tails/navel.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ed437317739136fa3fcbb1224a458565883400d
Binary files /dev/null and b/img/hair/sides/scorpion tails/navel.png differ
diff --git a/img/hair/sides/scorpion tails/short.png b/img/hair/sides/scorpion tails/short.png
new file mode 100644
index 0000000000000000000000000000000000000000..04bbd3883e32443d429b1f658b9d6a8129684964
Binary files /dev/null and b/img/hair/sides/scorpion tails/short.png differ
diff --git a/img/hair/sides/scorpion tails/shoulder.png b/img/hair/sides/scorpion tails/shoulder.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e65af617099e497142c12e86bf6e32ef0fba124
Binary files /dev/null and b/img/hair/sides/scorpion tails/shoulder.png differ
diff --git a/img/hair/sides/scorpion tails/thighs.png b/img/hair/sides/scorpion tails/thighs.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c6827b6ec5c3e369273b4844b64796a2b0b5c1f
Binary files /dev/null and b/img/hair/sides/scorpion tails/thighs.png differ
diff --git a/img/hair/sides/side tail left/chest.png b/img/hair/sides/sidetail left/chest.png
similarity index 100%
rename from img/hair/sides/side tail left/chest.png
rename to img/hair/sides/sidetail left/chest.png
diff --git a/img/hair/sides/side tail left/feet.png b/img/hair/sides/sidetail left/feet.png
similarity index 100%
rename from img/hair/sides/side tail left/feet.png
rename to img/hair/sides/sidetail left/feet.png
diff --git a/img/hair/sides/side tail left/navel.png b/img/hair/sides/sidetail left/navel.png
similarity index 100%
rename from img/hair/sides/side tail left/navel.png
rename to img/hair/sides/sidetail left/navel.png
diff --git a/img/hair/sides/side tail left/short.png b/img/hair/sides/sidetail left/short.png
similarity index 100%
rename from img/hair/sides/side tail left/short.png
rename to img/hair/sides/sidetail left/short.png
diff --git a/img/hair/sides/side tail left/shoulder.png b/img/hair/sides/sidetail left/shoulder.png
similarity index 100%
rename from img/hair/sides/side tail left/shoulder.png
rename to img/hair/sides/sidetail left/shoulder.png
diff --git a/img/hair/sides/side tail left/thighs.png b/img/hair/sides/sidetail left/thighs.png
similarity index 100%
rename from img/hair/sides/side tail left/thighs.png
rename to img/hair/sides/sidetail left/thighs.png
diff --git a/img/hair/sides/side tail right/chest.png b/img/hair/sides/sidetail right/chest.png
similarity index 100%
rename from img/hair/sides/side tail right/chest.png
rename to img/hair/sides/sidetail right/chest.png
diff --git a/img/hair/sides/side tail right/feet.png b/img/hair/sides/sidetail right/feet.png
similarity index 100%
rename from img/hair/sides/side tail right/feet.png
rename to img/hair/sides/sidetail right/feet.png
diff --git a/img/hair/sides/side tail right/navel.png b/img/hair/sides/sidetail right/navel.png
similarity index 100%
rename from img/hair/sides/side tail right/navel.png
rename to img/hair/sides/sidetail right/navel.png
diff --git a/img/hair/sides/side tail right/short.png b/img/hair/sides/sidetail right/short.png
similarity index 100%
rename from img/hair/sides/side tail right/short.png
rename to img/hair/sides/sidetail right/short.png
diff --git a/img/hair/sides/side tail right/shoulder.png b/img/hair/sides/sidetail right/shoulder.png
similarity index 100%
rename from img/hair/sides/side tail right/shoulder.png
rename to img/hair/sides/sidetail right/shoulder.png
diff --git a/img/hair/sides/side tail right/thighs.png b/img/hair/sides/sidetail right/thighs.png
similarity index 100%
rename from img/hair/sides/side tail right/thighs.png
rename to img/hair/sides/sidetail right/thighs.png
diff --git a/img/hair/sides/side thicktail/chest.png b/img/hair/sides/thick sidetail/chest.png
similarity index 100%
rename from img/hair/sides/side thicktail/chest.png
rename to img/hair/sides/thick sidetail/chest.png
diff --git a/img/hair/sides/side thicktail/feet.png b/img/hair/sides/thick sidetail/feet.png
similarity index 100%
rename from img/hair/sides/side thicktail/feet.png
rename to img/hair/sides/thick sidetail/feet.png
diff --git a/img/hair/sides/side thicktail/navel.png b/img/hair/sides/thick sidetail/navel.png
similarity index 100%
rename from img/hair/sides/side thicktail/navel.png
rename to img/hair/sides/thick sidetail/navel.png
diff --git a/img/hair/sides/side thicktail/short.png b/img/hair/sides/thick sidetail/short.png
similarity index 100%
rename from img/hair/sides/side thicktail/short.png
rename to img/hair/sides/thick sidetail/short.png
diff --git a/img/hair/sides/side thicktail/shoulder.png b/img/hair/sides/thick sidetail/shoulder.png
similarity index 100%
rename from img/hair/sides/side thicktail/shoulder.png
rename to img/hair/sides/thick sidetail/shoulder.png
diff --git a/img/hair/sides/side thicktail/thighs.png b/img/hair/sides/thick sidetail/thighs.png
similarity index 100%
rename from img/hair/sides/side thicktail/thighs.png
rename to img/hair/sides/thick sidetail/thighs.png
diff --git a/img/misc/icon/clothes/gym_shorts.png b/img/misc/icon/clothes/gym_shorts.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d4fcb6c7df45dd36394f0b750edcfd71a0a6f08
Binary files /dev/null and b/img/misc/icon/clothes/gym_shorts.png differ
diff --git a/img/misc/icon/clothes/loose_socks.png b/img/misc/icon/clothes/loose_socks.png
new file mode 100644
index 0000000000000000000000000000000000000000..1af08c2fdc20758e0e446148d7543c0143e91757
Binary files /dev/null and b/img/misc/icon/clothes/loose_socks.png differ
diff --git a/img/misc/icon/clothes/ribbon_tie.png b/img/misc/icon/clothes/ribbon_tie.png
new file mode 100644
index 0000000000000000000000000000000000000000..6577191786653c1271ac73ab7a3ef3acca4286d3
Binary files /dev/null and b/img/misc/icon/clothes/ribbon_tie.png differ
diff --git a/img/misc/icon/clothes/school_vest.png b/img/misc/icon/clothes/school_vest.png
new file mode 100644
index 0000000000000000000000000000000000000000..baf3483a4ad30bd6f1d37bf989f8f5013020adac
Binary files /dev/null and b/img/misc/icon/clothes/school_vest.png differ
diff --git a/img/misc/icon/clothes/school_vest_acc.png b/img/misc/icon/clothes/school_vest_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..91efb6b70fa2628428282b2ea5198e4c15a72300
Binary files /dev/null and b/img/misc/icon/clothes/school_vest_acc.png differ
diff --git a/img/misc/icon/clothes/shortalls.png b/img/misc/icon/clothes/shortalls.png
new file mode 100644
index 0000000000000000000000000000000000000000..740a76274d0fb8613c8f3322986343ddd6dfe700
Binary files /dev/null and b/img/misc/icon/clothes/shortalls.png differ
diff --git a/img/misc/icon/clothes/shortalls_acc.png b/img/misc/icon/clothes/shortalls_acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c0b71477955815b3d1ee0004113fb923b1805d8
Binary files /dev/null and b/img/misc/icon/clothes/shortalls_acc.png differ
diff --git a/img/misc/icon/ticket.png b/img/misc/icon/ticket.png
new file mode 100644
index 0000000000000000000000000000000000000000..419f096c7863f1e93878f4f8f1dfd6d7ef50f695
Binary files /dev/null and b/img/misc/icon/ticket.png differ
diff --git a/img/sex/missionary/active/body/activebase.png b/img/sex/missionary/active/body/activebase.png
index a447bc1cd5a0c5debbc14a8aaccc79d3a7ca291b..2e3ebf24756e1a73a888ad30e8eb72402b7d1e31 100644
Binary files a/img/sex/missionary/active/body/activebase.png and b/img/sex/missionary/active/body/activebase.png differ
diff --git a/img/sex/missionary/active/body/activebaselegl.png b/img/sex/missionary/active/body/activebaselegl.png
index f3c490c9d79570b751b6a5d2d24e22c24fdfe2fa..3e37cdda7866a70dacdb3990a637cded79dd629f 100644
Binary files a/img/sex/missionary/active/body/activebaselegl.png and b/img/sex/missionary/active/body/activebaselegl.png differ