diff --git a/game/scripts/characters/astoria/events/imperio_training.rpy b/game/scripts/characters/astoria/events/imperio_training.rpy
index 097ddbd3..feb1eb13 100644
--- a/game/scripts/characters/astoria/events/imperio_training.rpy
+++ b/game/scripts/characters/astoria/events/imperio_training.rpy
@@ -183,8 +183,8 @@ label ag_st_imperio_E1:
 
     play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
     ast "" ("clench", "base", "angry", "L", xpos="base", ypos="base")
-    ton "........................." ("mad", "wide", "shocked", "ahegao", hair="scared", xpos="right", ypos="base") # shock
-    ton "*Aaaaaah*..." ("horny", "base", "base", "ahegao", hair="horny") # inhales
+    ton @ hair scared "........................." ("mad", "wide", "shocked", "ahegao", xpos="right", ypos="base") # shock
+    ton @ hair horny "*Aaaaaah*..." ("horny", "base", "base", "ahegao") # inhales
     ast "......................" ("clench", "base", "worried", "L") # clenched teeth
     gen "What's happening to her?" ("base", xpos="far_left", ypos="head")
     ast "I just cast the spell on her..." ("open", "closed", "base", "mid")
@@ -217,7 +217,7 @@ label ag_st_imperio_E1:
     ast "................" ("annoyed", "base", "worried", "R")
     gen "Try something else now." ("base", xpos="far_left", ypos="head")
     ast "" ("annoyed", "base", "base", "L")
-    ton "I feel so good!" ("soft", "wide", "shocked", "stare", hair="horny")
+    ton @ hair horny "I feel so good!" ("soft", "wide", "shocked", "stare")
     ton @ cheeks blush "What is happening to me?" ("mad", "base", "raised", "stare")
     ton @ cheeks blush "Are you playing with me?" ("open", "base", "worried", "stare")
     ton "I want you to play with me!" ("open_wide_tongue", "narrow", "shocked", "stare") # horny
@@ -582,10 +582,10 @@ label ag_st_imperio_E2:
             ast "Professor Tonks, show us your breasts! Now!" ("open", "base", "angry", "L")
             gen "(It was easier for her to resist doing pig noises...)" ("base", xpos="far_left", ypos="head")
             gen "(Could it be that she {b}wants{/b} to show them to us?{w} And is resisting that inner urge?)" ("base", xpos="far_left", ypos="head")
-            ton "................................" ("mad", "wide", "worried", "stare", hair="horny") # Really struggling!
+            ton @ hair horny "................................" ("mad", "wide", "worried", "stare") # Really struggling!
             gen "(What a slut!)" ("angry", xpos="far_left", ypos="head") # Small text
             ast "Come on, do it!" ("clench", "narrow", "angry", "L")
-            ton "*Hnnnngh*!..." ("mad", "wide", "worried", "ahegao", hair="horny")
+            ton @ hair horny "*Hnnnngh*!..." ("mad", "wide", "worried", "ahegao")
             call cum_block
             ton @ cheeks blush "*Aaaaahhh*..." ("open_wide_tongue", "base", "worried", "ahegao") # Relieved
             gen "(Did she just--)" ("angry", xpos="far_left", ypos="head")
@@ -705,7 +705,7 @@ label ag_st_imperio_E3:
     play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
     ast "" ("clench", "base", "angry", "L")
     ton "*Hngh*!..." ("mad", "wide", "shocked", "ahegao") # shock
-    ton "*Hmm*..." ("base", "base", "base", "ahegao", hair="horny")
+    ton @ hair horny "*Hmm*..." ("base", "base", "base", "ahegao")
 
     call ast_chibi("wand",530,"base")
     with d3
@@ -741,14 +741,14 @@ label ag_st_imperio_E3:
     ast "If I can pull off the Imperius curse on Professor Tonks..." ("open", "closed", "base", "mid")
     ast "Any of the other girls will be easy game for me!" ("smile", "narrow", "angry", "down") # Game as in "prey".
     ast "I'll make them rue the day they ever made fun of me!" ("clench", "closed", "angry", "mid")
-    ton "..................................................." ("annoyed", "wide", "shocked", "stare", hair="upset") # Angry at Astoria
+    ton @ hair upset "..................................................." ("annoyed", "wide", "shocked", "stare") # Angry at Astoria
     gen "......................." ("base", xpos="far_left", ypos="head")
     ast "Tomorrow, I shall have Susan walk through school - parading those ridiculous udders of hers for all to see! That'll show her!" ("angry", "narrow", "angry", "R")
-    ton "!!!" ("upset", "wide", "shocked", "stare", hair="angry") # Very angry
+    ton @ hair angry "!!!" ("upset", "wide", "shocked", "stare") # Very angry
     ast "And then shove her into our common room - and all the boys will laugh at her cow udders!" ("smile", "closed", "angry", "R")
     gen "And she'll love every second of it!" ("grin", xpos="far_left", ypos="head")
     ast "And she'll--" ("smile", "closed", "angry", "R")
-    ton "*Tzzzzz*!..." ("upset", "closed", "annoyed", "mid", hair="angry", emote="angry")
+    ton @ hair angry "*Tzzzzz*!..." ("upset", "closed", "annoyed", "mid", emote="angry")
     ton "That's enough!" ("scream", "base", "angry", "R", trans=hpunch)
 
     # Tonks returns to normal, and puts her clothes back on.
@@ -768,7 +768,7 @@ label ag_st_imperio_E3:
     # Astoria leaves.
     call ast_walk(action="leave")
 
-    ton "The nerve on that girl, I can't believe it!" ("open", "base", "angry", "R", hair="angry", xpos="mid", ypos="base")
+    ton @ hair angry "The nerve on that girl, I can't believe it!" ("open", "base", "angry", "R", xpos="mid", ypos="base")
     ton "I'm beginning to think teaching her an \"unforgivable curse\" might've been a bad idea after all..." ("normal", "closed", "annoyed", "mid")
     gen "How so?" ("base", xpos="far_left", ypos="head")
     ton "Didn't you hear her?" ("open", "base", "angry", "mid")
@@ -778,7 +778,7 @@ label ag_st_imperio_E3:
     ton "We can't have her roaming the school - cursing people as she pleases!" ("annoyed", "base", "annoyed", "mid")
 
     gen "So, should we stop?" ("base", xpos="far_left", ypos="head")
-    ton ".................." ("annoyed", "closed", "annoyed", "mid", hair="neutral")
+    ton @ hair neutral ".................." ("annoyed", "closed", "annoyed", "mid")
     ton "Only if she refuses to follow our rules..." ("open", "narrow", "annoyed", "downR")
     ton "As long as what we're doing stays within these walls, it shouldn't be too bad." ("normal", "base", "annoyed", "R")
     ton "And besides, Imperio isn't the worst curse you could be a target of, all things considered..." ("upset", "base", "annoyed", "down")
@@ -788,7 +788,7 @@ label ag_st_imperio_E3:
     ton "The curse itself is quite harmless." ("annoyed", "closed", "base", "mid")
     ton "And it feels really good when you're under its effect..." ("soft", "base", "base", "R")
     gen "It does?" ("base", xpos="far_left", ypos="head")
-    ton "*Mhmm*... yeah..." ("horny", "base", "annoyed", "up", hair="horny")
+    ton @ hair horny "*Mhmm*... yeah..." ("horny", "base", "annoyed", "up")
     ton "It's so goood! {heart}" ("soft", "narrow", "worried", "ahegao")
     gen "I think you're enjoying this a bit too much!" ("grin", xpos="far_left", ypos="head")
     gen "What would your students think if they knew their teacher gets off on being mind controlled?" ("grin", xpos="far_left", ypos="head")
@@ -924,10 +924,10 @@ label ag_st_imperio_E4:
 
     play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
     ast "" ("annoyed", "base", "base", "L")
-    ton "........................." ("mad", "wide", "shocked", "ahegao", hair="horny") # shock
+    ton @ hair horny "........................." ("mad", "wide", "shocked", "ahegao") # shock
 
     gen "......................" ("base", xpos="far_left", ypos="head")
-    ton @ cheeks blush "*Aaaaah*..." ("open", "base", "shocked", "ahegao", hair="horny")
+    ton @ cheeks blush hair horny "*Aaaaah*..." ("open", "base", "shocked", "ahegao")
     call ast_chibi("wand",530,"base")
     with d3
     ast "I'm getting really good at this!" ("smile", "base", "angry", "L")
@@ -989,7 +989,7 @@ label ag_st_imperio_E4:
         gen "Why? Scared of your teacher's enormous rack?" ("base", xpos="far_left", ypos="head")
         ast "What?{w} As if!" ("annoyed", "narrow", "angry", "R")
         gen "I doubt she'd like to show them to you anyway..." ("grin", xpos="far_left", ypos="head")
-        ton "......................" ("soft", "base", "base", "ahegao", hair="horny") # Ahegao
+        ton @ hair horny "......................" ("soft", "base", "base", "ahegao") # Ahegao
         ast "............" ("annoyed", "base", "worried", "mid")
         gen "Go on..." ("base", xpos="far_left", ypos="head")
 
@@ -1038,13 +1038,13 @@ label ag_st_imperio_E4:
         ast "..." ("clench", "wink", "base", "mid")
         ast "...................." ("annoyed", "narrow", "worried", "R")
         gen "That wasn't too bad now, was it?" ("grin", xpos="far_left", ypos="head")
-        ton @ cheeks blush "......................." ("base", "base", "base", "ahegao", hair="horny") # ahegao
+        ton @ cheeks blush hair horny "......................." ("base", "base", "base", "ahegao") # ahegao
 
     else:
         gen "Now would you look at that!" ("grin", xpos="far_left", ypos="head")
         ton "................" ("soft", "wide", "shocked", "stare") # horny
         gen "Those are some great breasts your teacher has there!" ("base", xpos="far_left", ypos="head")
-        ton "................" ("soft", "wide", "base", "stare", hair="horny") # ahegao
+        ton @ hair horny "................" ("soft", "wide", "base", "stare") # ahegao
         ast "I asked you not to look, Professor!" ("open", "closed", "angry", "mid")
         gen "I don't believe she minds, does she?" ("grin", xpos="far_left", ypos="head")
         ast "" ("clench", "narrow", "worried", "R")
@@ -1054,7 +1054,7 @@ label ag_st_imperio_E4:
     gen "We might be able to push her even further!" ("base", xpos="far_left", ypos="head")
     ast "Further, Sir? How?" ("annoyed", "wink", "base", "mid")
     gen "By getting her to remove the rest of her clothing, of course!" ("grin", xpos="far_left", ypos="head")
-    ton @ cheeks heavy_blush ".............." ("horny", "base", "shocked", "ahegao", hair="horny") # angry/horny expression
+    ton @ cheeks heavy_blush hair horny ".............." ("horny", "base", "shocked", "ahegao") # angry/horny expression
     gen "What do you think? Want to give it a try?" ("grin", xpos="far_left", ypos="head")
     ast "Would that really be necessary, Sir?" ("open", "base", "base", "R")
     gen "Yes.{w=0.3} it.{w=0.3} would." ("base", xpos="far_left", ypos="head")
@@ -1098,11 +1098,11 @@ label ag_st_imperio_E4:
     pause.8
 
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
-    ton "Well, that was interesting..." ("annoyed", "wide", "base", "downR", hair="neutral", xpos="mid", ypos="base", flip=False, trans=dissolve)
+    ton @ hair neutral "Well, that was interesting..." ("annoyed", "wide", "base", "downR", xpos="mid", ypos="base", flip=False, trans=dissolve)
     gen "Do you have any idea why she wanted to leave so abruptly?" ("base", xpos="far_left", ypos="head")
     ton "I have a couple of theories, actually..." ("soft", "closed", "base", "mid")
     gen "*Mhmm*... That curse thing is it?" ("base", xpos="far_left", ypos="head")
-    ton ".................." ("soft", "wide", "base", "down", hair="horny") # horny stare
+    ton @ hair horny ".................." ("soft", "wide", "base", "down") # horny stare
     ton "Would you like me to put my clothes back on?" ("grin", "narrow", "raised", "mid")
     gen "Don't feel pressured!" ("grin", xpos="far_left", ypos="head")
     ton "Very well, then..." ("base", "narrow", "base", "mid")
@@ -1180,7 +1180,7 @@ label ag_st_imperio_E5:
     gen "Care for a demonstration?" ("grin", xpos="far_left", ypos="head")
     ast "" ("smile", "base", "base", "mid")
     ton "Of course." ("base", "base", "base", "mid")
-    ton "I'm confident she'll be able to make me do {b}anything{/b} you want today." ("horny", "base", "base", "R", hair="horny") # Horny stare
+    ton @ hair horny "I'm confident she'll be able to make me do {b}anything{/b} you want today." ("horny", "base", "base", "R") # Horny stare
     gen "Counting on it!" ("grin", xpos="far_left", ypos="head")
     ton "Make sure to give her some good suggestions, Professor!" ("open", "base", "angry", "mid")
     gen "Absolutely!" ("grin", xpos="far_left", ypos="head")
@@ -1219,7 +1219,7 @@ label ag_st_imperio_E5:
 
     play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
     ast "" ("base", "base", "base", "L")
-    ton "*Hmm*............" ("soft", "base", "worried", "ahegao", hair="horny")
+    ton @ hair horny "*Hmm*............" ("soft", "base", "worried", "ahegao")
 
     gen "(Here we go!)" ("grin", xpos="far_left", ypos="head")
     ast ".............." ("grin", "base", "base", "L")
@@ -1279,9 +1279,9 @@ label ag_st_imperio_E5:
     gen "Explain yourself!" ("grin", xpos="far_left", ypos="head")
     ton @ cheeks blush "*Hmm*......." ("normal", "base", "worried", "stare")
     ast "Answer us!" ("clench", "closed", "angry", "mid")
-    ton @ cheeks blush "I don't like to wear them..." ("open", "wide", "worried", "stare", hair="sad")
+    ton @ cheeks blush hair sad "I don't like to wear them..." ("open", "wide", "worried", "stare")
     ast "Why?!" ("open", "narrow", "angry", "L") # angry
-    ton "I feel so much better without a bra on... or panties..." ("soft", "wide", "base", "stare", hair="horny")
+    ton @ hair horny "I feel so much better without a bra on... or panties..." ("soft", "wide", "base", "stare")
     ast "You're a teacher! This is disgusting!" ("clench", "closed", "angry", "mid", emote="angry")
     gen "Dis-{w=0.8}gusting!" ("angry", xpos="far_left", ypos="head")
 
@@ -1292,19 +1292,19 @@ label ag_st_imperio_E5:
     ast "Are you a slut, Professor?" ("open", "narrow", "angry", "L")
     ton @ cheeks blush "..............." ("normal", "shocked", "worried", "stare") # ahegao
     ast "Are you?!" ("clench", "base", "angry", "L")
-    ton @ cheeks blush "I am! {heart}" ("soft", "base", "worried", "ahegao", hair="horny")
+    ton @ cheeks blush hair horny "I am! {heart}" ("soft", "base", "worried", "ahegao")
     ast "I knew it!" ("smile", "narrow", "angry", "L")
     ast "That's why she has such difficulty resisting our commands!" ("open", "base", "worried", "mid")
     gen "Yes. She's clearly trying her hardest..." ("base", xpos="far_left", ypos="head")
 
-    ton @ cheeks blush "" ("normal", "base", "shocked", "ahegao", hair="horny")
+    ton @ cheeks blush hair horny "" ("normal", "base", "shocked", "ahegao")
     ast "Professor Dumbledore, you knew exactly what her weakness would be!" ("smile", "base", "base", "mid")
     gen "I did?" ("base", xpos="far_left", ypos="head")
     gen "*Ahem*... I mean, of course I did!" ("base", xpos="far_left", ypos="head")
     ast "We're taking off her clothes, because that's what she enjoys! But could never do in school!" ("angry", "narrow", "angry", "L")
     ast "Which makes it easier for me to channel the Imperius curse..." ("grin", "base", "angry", "mid")
     ast "Because she's nothing but a weak-minded slut!" ("open", "narrow", "angry", "L") # angry
-    ton @ cheeks blush "................" ("soft", "narrow", "shocked", "ahegao", hair="horny") # ahegao
+    ton @ cheeks blush hair horny "................" ("soft", "narrow", "shocked", "ahegao") # ahegao
     gen "You're on point!" ("base", xpos="far_left", ypos="head")
 
     ast "Take off the rest of your clothes!" ("clench", "base", "angry", "L") # angry
@@ -1315,7 +1315,7 @@ label ag_st_imperio_E5:
     # Strip naked. Removes clothes and stockings.
     play sound "sounds/cloth_sound3.ogg"
     $ tonks.strip("clothes")
-    ton @ cheeks blush "" ("grin", "base", "base", "ahegao", hair="horny")
+    ton @ cheeks blush hair horny "" ("grin", "base", "base", "ahegao")
     ast "(She did it...)" ("horny", "narrow", "angry", "L")
     call ctc
 
@@ -1349,7 +1349,7 @@ label ag_st_imperio_E5:
     ton @ cheeks blush "" ("horny", "narrow", "raised", "L")
     ast "What shall I have her do now?" ("open", "base", "base", "L")
     "*fap-fap-fap*"
-    ton @ cheeks blush "" ("soft", "narrow", "shocked", "L", hair="horny")
+    ton @ cheeks blush hair horny "" ("soft", "narrow", "shocked", "L")
     ast "Professor?" ("annoyed", "narrow", "angry", "mid")
     gen "What?" ("base", xpos="far_left", ypos="head")
     gen "Oh..." ("base", xpos="far_left", ypos="head")
@@ -1357,7 +1357,7 @@ label ag_st_imperio_E5:
     gen "Have her do a little dance for us." ("grin", xpos="far_left", ypos="head")
     ast "Did you hear him, Professor?" ("smile", "closed", "base", "mid")
     ast "Get on that desk, and start dancing!" ("open", "narrow", "angry", "L")
-    ton "Yes...{heart}" ("grin", "wink", "base", "mid", hair="horny")
+    ton @ hair horny "Yes...{heart}" ("grin", "wink", "base", "mid")
 
     # Climb desk and dance.
     call hide_characters
@@ -1472,7 +1472,7 @@ label ag_st_imperio_E5:
     with d3
     pause.5
 
-    ton "Shit!" ("mad", "base", "angry", "L", hair="upset", xpos="left", flip=True)
+    ton @ hair upset "Shit!" ("mad", "base", "angry", "L", xpos="left", flip=True)
     hide tonks_main
     hide screen bld1
     with d3
@@ -1517,8 +1517,8 @@ label ag_st_imperio_E5:
     play music "music/Dark Fog.ogg" fadein 1 if_changed
     sna "What on Earth is going on here?!" ("snape_08", xpos=580 ,ypos="base")
     sna "You two better explain to me what I just witnessed!" ("snape_32")
-    ton "Stop being such a wuss, Severus!" ("mad", "base", "angry", "L", hair="angry", xpos="mid", flip=True)
-    ton "We were just practising some spells with Miss Greengrass." ("annoyed", "base", "base", "R", hair="upset")
+    ton @ hair angry "Stop being such a wuss, Severus!" ("mad", "base", "angry", "L", xpos="mid", flip=True)
+    ton @ hair upset "We were just practising some spells with Miss Greengrass." ("annoyed", "base", "base", "R")
     sna "And that required you to be undressed? In front of a student?" ("snape_10")
     ton @ cheeks blush "Well... she was the cause of it..." ("clench", "base", "base", "down")
     sna "Caused you to strip?" ("snape_34")
@@ -1577,16 +1577,16 @@ label ag_st_imperio_E5:
     sna "........................." ("snape_05", xpos=580 ,ypos="base")
 
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
-    ton "Like what you see?" ("upset", "base", "raised", "L", hair="horny") # Bit flirty, maybe just to calm Snape down.
+    ton @ hair horny "Like what you see?" ("upset", "base", "raised", "L") # Bit flirty, maybe just to calm Snape down.
     sna "............................." ("snape_12") # blushing
     gen "You couldn't have picked a worse time to burst in here..." ("angry", xpos="far_left", ypos="head")
     sna "I can imagine that..." ("snape_18")
 
     sna "So, Nymphadora..." ("snape_04")
-    ton "*Tzzzzs*!......" ("annoyed", "closed", "annoyed", "mid", hair="angry")
+    ton @ hair angry "*Tzzzzs*!......" ("annoyed", "closed", "annoyed", "mid")
     sna "Would you mind explaining to me why you were naked in the headmaster's office - with a student present?" ("snape_03")
     sna "One of my students - at that." ("snape_10")
-    ton "Are you jealous?" ("soft", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Are you jealous?" ("soft", "narrow", "base", "L")
     sna "............" ("snape_14")
 
     sna "The question..." ("snape_18")
@@ -1613,7 +1613,7 @@ label ag_st_imperio_E5:
     sna ".................." ("snape_04")
     sna "Very well..." ("snape_03")
     sna "Genie...{w} Nymphadora..." ("snape_09")
-    ton ".................." ("mad", "base", "angry", "L", hair="angry") # Angry stare
+    ton @ hair angry ".................." ("mad", "base", "angry", "L") # Angry stare
 
     #Snape leaves
     call sna_walk(action="leave")
@@ -1624,7 +1624,7 @@ label ag_st_imperio_E5:
     call ton_walk("desk","base")
     pause.5
 
-    ton "Thank you..." ("normal", "base", "worried", "mid", hair="neutral", xpos="mid", ypos="base", flip=False)
+    ton @ hair neutral "Thank you..." ("normal", "base", "worried", "mid", xpos="mid", ypos="base", flip=False)
     gen "..." ("base", xpos="far_left", ypos="head")
     gen "Now..." ("base", xpos="far_left", ypos="head")
 
@@ -1657,9 +1657,9 @@ label ag_st_imperio_E5:
             gen "We both know that is not the reason why we're doing this." ("base", xpos="far_left", ypos="head")
             ton "Yes..." ("upset", "base", "base", "down")
             ton "A small voice in my head knows it..." ("annoyed", "base", "base", "mid")
-            ton "And I can't help that I'm just so god...{w=0.4} damn...{w=0.3} horny!" ("open_wide", "closed", "angry", "mid", hair="angry")
-            ton "All the bloody time!" ("open_wide_tongue", "base", "base", "ahegao", hair="horny")
-            ton "See!" ("annoyed", "base", "annoyed", "up", hair="horny")
+            ton @ hair angry "And I can't help that I'm just so god...{w=0.4} damn...{w=0.3} horny!" ("open_wide", "closed", "angry", "mid")
+            ton @ hair horny "All the bloody time!" ("open_wide_tongue", "base", "base", "ahegao")
+            ton @ hair horny "See!" ("annoyed", "base", "annoyed", "up")
             nar "You notice the bright pink colour of her hair - once again..."
             gen "You should stop lying to yourself, it's not healthy..." ("base", xpos="far_left", ypos="head")
             gen "I'm immortal - and even I know that!" ("base", xpos="far_left", ypos="head")
@@ -1686,11 +1686,11 @@ label ag_st_imperio_E5:
             ton "N-no..." ("upset", "wide", "worried", "R")
             gen "I think that you've been fabricating this curse, to get what you really wanted - all along." ("base", xpos="far_left", ypos="head")
             gen "Not for the good of Miss Greengrass..." ("base", xpos="far_left", ypos="head")
-            ton "..." ("mad", "base", "worried", "R", hair="upset")
+            ton @ hair upset "..." ("mad", "base", "worried", "R")
             gen "Someone's been a naughty girl... Acting all innocent with the ones that welcomed her into their scheme..." ("angry", xpos="far_left", ypos="head")
             gen "Or perhaps you've been trying to justify your actions... to yourself?" ("base", xpos="far_left", ypos="head")
             gen "Is that right?" ("base", xpos="far_left", ypos="head")
-            ton "That's..." ("upset", "closed", "worried", "mid", hair="scared")
+            ton @ hair scared "That's..." ("upset", "closed", "worried", "mid")
             gen "I think we both know what this means, don't we?" ("base", xpos="far_left", ypos="head")
             gen "Miss Tonks..." ("base", xpos="far_left", ypos="head")
             gen "What this means is that you're no different than Snape and I." ("base", xpos="far_left", ypos="head")
@@ -1704,14 +1704,14 @@ label ag_st_imperio_E5:
             $ menu_y = 0.7
             menu:
                 "\"You're a selfish slut!\"":
-                    ton "Yes!" ("mad", "wide", "shocked", "stare", hair="horny")
-                    ton "I'm a selfish slut!" ("open_wide_tongue", "closed", "worried", "mid", hair="horny")
+                    ton @ hair horny "Yes!" ("mad", "wide", "shocked", "stare")
+                    ton @ hair horny "I'm a selfish slut!" ("open_wide_tongue", "closed", "worried", "mid")
                 "\"You're a filthy pervert!\"":
-                    ton "Yes!" ("mad", "base", "worried", "mid", hair="horny")
-                    ton "I'm a filthy,{w=0.6} {b}fucking{/b}{w=0.4} pervert!" ("open_wide_tongue", "closed", "worried", "mid", hair="horny")
+                    ton @ hair horny "Yes!" ("mad", "base", "worried", "mid")
+                    ton @ hair horny "I'm a filthy,{w=0.6} {b}fucking{/b}{w=0.4} pervert!" ("open_wide_tongue", "closed", "worried", "mid")
                 "\"You're nothing more than a whore!\"":
-                    ton "Yes!" ("mad", "base", "worried", "mid", hair="horny")
-                    ton "I'm nothing but a cheap,{w=0.6} {b}fucking{/b}{w=0.4} whore!" ("open_wide_tongue", "closed", "worried", "mid", hair="horny")
+                    ton @ hair horny "Yes!" ("mad", "base", "worried", "mid")
+                    ton @ hair horny "I'm nothing but a cheap,{w=0.6} {b}fucking{/b}{w=0.4} whore!" ("open_wide_tongue", "closed", "worried", "mid")
             call reset_menu_position
 
             ton "... {w}This is what I want!" ("mad", "wide", "annoyed", "down")
@@ -1740,7 +1740,7 @@ label ag_st_imperio_E5:
     gen "That Susan girl... How about her?" ("grin", xpos="far_left", ypos="head")
 
     ton "Susan Bones?" ("open", "wide", "shocked", "stare")
-    ton "But, she's a Hufflepuff...{w=0.8} I used to be..." ("open", "base", "worried", "up", hair="sad") # Tonks looks concerned (Blue)
+    ton @ hair sad "But, she's a Hufflepuff...{w=0.8} I used to be..." ("open", "base", "worried", "up") # Tonks looks concerned (Blue)
     gen "I don't see how that makes any difference..." ("base", xpos="far_left", ypos="head")
     gen "Remember why we're doing this, you want Miss Greengrass to be able to curse you properly, correct?" ("base", xpos="far_left", ypos="head")
     ton @ cheeks blush "Yes..." ("soft", "base", "worried", "downR")
@@ -1750,14 +1750,14 @@ label ag_st_imperio_E5:
     gen "Perhaps I could learn a thing or two about this Susan girl is what I meant..." ("base", xpos="far_left", ypos="head")
     ton @ cheeks blush "Right." ("open", "base", "worried", "mid")
     gen "Any objections?" ("base", xpos="far_left", ypos="head")
-    ton @ cheeks blush "No sir..." ("open", "base", "base", "down", hair="neutral")
+    ton @ cheeks blush hair neutral "No sir..." ("open", "base", "base", "down")
     gen "But for now... Just make sure to obliterate her afterwards." ("base", xpos="far_left", ypos="head")
     ton "Erase her memory?" ("open", "base", "base", "mid")
     gen "That's what I said." ("base", xpos="far_left", ypos="head")
     gen "Well then, I believe we're done here..." ("base", xpos="far_left", ypos="head")
     ton "Alright..." ("annoyed", "base", "base", "down")
-    ton "I'm gonna need some \"me\" time now..." ("open", "closed", "base", "ahegao", hair="horny")
-    ton "If you know what I mean..." ("grin", "narrow", "raised", "down", hair="horny")
+    ton @ hair horny "I'm gonna need some \"me\" time now..." ("open", "closed", "base", "ahegao")
+    ton @ hair horny "If you know what I mean..." ("grin", "narrow", "raised", "down")
     ton "I suppose I should wish you good luck with the training..." ("soft", "base", "shocked", "L")
     gen "Have a good night." ("grin", xpos="far_left", ypos="head")
     ton "Oh - I will, [name_genie_tonks]!" ("base", "base", "raised", "R")
diff --git a/game/scripts/characters/astoria/events/intro.rpy b/game/scripts/characters/astoria/events/intro.rpy
index cb987852..76371889 100644
--- a/game/scripts/characters/astoria/events/intro.rpy
+++ b/game/scripts/characters/astoria/events/intro.rpy
@@ -180,7 +180,7 @@ label astoria_intro_E1:
                     gen "You can count on that!" ("grin", xpos="far_left", ypos="head")
                     ton "Hold on!{w} Are you going to hang it up here? In your office?!" ("open", "wide", "shocked", "stare")
                     gen "Sure... It's not like there are that many other rooms I can go to..." ("base", xpos="far_left", ypos="head")
-                    ton "Oh my... I'll have to put a concealment charm on it then..." ("upset", "base", "worried", "R", hair="horny")
+                    ton @ hair horny "Oh my... I'll have to put a concealment charm on it then..." ("upset", "base", "worried", "R")
                     gen "A what charm?" ("base", xpos="far_left", ypos="head")
                     ton "Only you will be able to see its true form... Everyone else..." ("open", "base", "base", "mid")
                     ton "Well they'll just see some dull landscape or another..." ("normal", "base", "base", "downR")
@@ -676,10 +676,10 @@ label astoria_intro_E3:
     call ast_chibi("stand","desk","base", flip=True)
     with d3
 
-    ton "Snape. How good to see you!" ("soft", "shocked", "base", "mid", hair="neutral", xpos="far_right", ypos="head")
+    ton @ hair neutral "Snape. How good to see you!" ("soft", "shocked", "base", "mid", xpos="far_right", ypos="head")
     sna "Save your compliments for someone else... I'm in a bit of a hurry." ("snape_03", xpos="far_right", ypos="head")
     ton "Still mad at me for taking your post?" ("base", "base", "angry", "mid")
-    ton "I'd be willing to compensate you for it, you know..." ("horny", "base", "base", "mid", hair="horny")
+    ton @ hair horny "I'd be willing to compensate you for it, you know..." ("horny", "base", "base", "mid")
     sna "..." ("snape_12")
     gen "*Ahem*..." ("base", xpos="far_left", ypos="head")
     sna "Would you mind?" ("snape_12")
@@ -698,7 +698,7 @@ label astoria_intro_E3:
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
     pause.1
     ast "" ("annoyed", "base", "base", "mid", trans=dissolve)
-    ton "Hello, Professor." ("base", "base", "base", "mid", hair="neutral", xpos="base", ypos="base", trans=dissolve)
+    ton @ hair neutral "Hello, Professor." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=dissolve)
 
     ton "Astoria? What are you doing here?" ("upset", "base", "worried", "L")
     ton "You didn't cause any mischief, I hope." ("open", "narrow", "base", "L")
@@ -706,7 +706,7 @@ label astoria_intro_E3:
     ton "Wait. Is she the one who cursed Miss Bones?" ("clench", "wide", "shocked", "stare")
     ton "" ("upset", "base", "worried", "mid")
     gen "Yep." ("base", xpos="far_left", ypos="head")
-    ton "(Oh shit!)" ("horny", "base", "raised", "L", hair="horny")
+    ton @ hair horny "(Oh shit!)" ("horny", "base", "raised", "L")
 
     ast "I'm really sorry! I promise I won't ever cast it again!" ("open", "narrow", "base", "R")
     ton "Really? It was you who cast the spell?" ("grin", "base", "raised", "L")
@@ -849,8 +849,8 @@ label nt_he_astoria_E1:
     ton "Astoria Greengrass." ("open", "wide", "base", "mid")
     gen "Ah yes, the hot-headed one." ("base", xpos="far_left", ypos="head")
     ton "Yes, she's pretty cute isn't she..." ("base", "happyCl", "base", "mid")
-    ton "I wouldn't mind giving her a thorough robe inspection - if you know what I'm saying." ("horny", "base", "raised", "mid", hair="horny")
-    ton "This girl...{w=0.5} she's special...{w=0.8} different..." ("open", "base", "base", "R", hair="neutral")
+    ton @ hair horny "I wouldn't mind giving her a thorough robe inspection - if you know what I'm saying." ("horny", "base", "raised", "mid")
+    ton @ hair neutral "This girl...{w=0.5} she's special...{w=0.8} different..." ("open", "base", "base", "R")
     gen "You've got the hots for this girl?" ("base", xpos="far_left", ypos="head")
     ton "She's a Slytherin!" ("mad", "base", "raised", "mid")
     gen "People keep saying that, as if I'd know what the problem is." ("base", xpos="far_left", ypos="head")
@@ -924,7 +924,7 @@ label nt_he_astoria_E1:
     ton "It's not contagious, you numpty!" ("open", "base", "annoyed", "mid")
     ton "Have you not been paying attention? It's a family curse!" ("mad", "base", "angry", "mid")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton "That being said, I'd rather have her do it with me..." ("base", "base", "raised", "R", hair="horny")
+    ton @ hair horny "That being said, I'd rather have her do it with me..." ("base", "base", "raised", "R")
     gen "Are we still talking about the \"Imperio\" thingy?" ("base", xpos="far_left", ypos="head")
     ton "Yes..." ("soft", "narrow", "raised", "downR")
     gen "So your goal is to get rid of this curse she's inherited by somehow awakening her sexuality?" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
index 38c89133..0a1ad183 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
@@ -385,24 +385,24 @@ label cc_pf_strip_T3_intro_E2:
             ton "I'm not the one to question the headmaster's judgement." ("base", "narrow", "base", "mid")
             gen "Great, then I'll look forward to hearing your assessment -- from head to toe please -- let us know if there's anything she could improve." ("grin", xpos="far_left", ypos="head")
             cho @ cheeks blush "" ("normal", "happyCl", "worried", "mid")
-            ton "Oh, I doubt I'll find anything to improve on this one..." ("horny", "narrow", "base", "L", hair="horny") # horny
+            ton @ hair horny "Oh, I doubt I'll find anything to improve on this one..." ("horny", "narrow", "base", "L") # horny
             gen "Okay then..." ("base", xpos="far_left", ypos="head")
             gen "Girl, You may start with the show." ("base", xpos="far_left", ypos="head")
             ton "The show?!" ("soft", "base", "raised", "mid")
             gen "She'll have to take her clothes off, obviously!" ("grin", xpos="far_left", ypos="head")
-            ton "Oh my!" ("grin", "base", "shocked", "mid", hair="horny") # lip bite?
+            ton @ hair horny "Oh my!" ("grin", "base", "shocked", "mid") # lip bite?
             gen "Let's get started then, shall we." ("base", xpos="far_left", ypos="head")
-            ton "" ("base", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "" ("base", "narrow", "base", "L")
             gen "Get on that desk, Miss Chang!" ("grin", xpos="far_left", ypos="head")
             cho @ cheeks blush "Okay." ("soft", "narrow", "worried", "downR")
 
         "\"She's going to strip for us...\"":
             cho @ cheeks heavy_blush "" ("normal", "happyCl", "worried", "mid")
-            ton "Really?" ("crooked_smile", "base", "shocked", "mid", hair="horny")
+            ton @ hair horny "Really?" ("crooked_smile", "base", "shocked", "mid")
             cho @ cheeks blush "..." ("mad", "narrow", "worried", "downR") # embarrassed
             gen "It's all just part of the girl's training..." ("base", xpos="far_left", ypos="head")
             gen "To improve her confidence, and all that. And not shy away from a bit of nudity." ("grin", xpos="far_left", ypos="head")
-            ton "I see... so this is why you've been such a daredevil on the pitch lately..." ("horny", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "I see... so this is why you've been such a daredevil on the pitch lately..." ("horny", "narrow", "base", "L")
             cho @ cheeks blush "..." ("normal", "happyCl", "worried", "mid") #Blushes
             ton "Well, if you think I can be of assistance, then you have my full support." ("base", "base", "base", "L")
             cho @ cheeks blush "Thank you, Professor." ("soft", "narrow", "worried", "L")
@@ -441,7 +441,7 @@ label cc_pf_strip_T3_intro_E2:
     cho @ cheeks blush "" ("quiver", "narrow", "worried", "L", xpos=330, ypos="base", flip=True)
     ton "" ("base", "narrow", "base", "L", xpos=460, ypos="base")
     gen "Are you more into the girl's tits... or her ass?" ("grin", xpos="far_left", ypos="head")
-    ton "*Hmm*--" ("base", "narrow", "annoyed", "L", hair="horny")
+    ton @ hair horny "*Hmm*--" ("base", "narrow", "annoyed", "L")
     cho @ cheeks heavy_blush "Sir!" ("soft", "happyCl", "worried", "mid")
     gen "It's a fair question..." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "..." ("soft", "narrow", "worried", "L")
@@ -485,26 +485,26 @@ label cc_pf_strip_T3_intro_E2:
     with d3
     pause .5
 
-    ton "" ("base", "narrow", "raised", "L", hair="horny")
+    ton @ hair horny "" ("base", "narrow", "raised", "L")
     cho @ cheeks heavy_blush "" ("quiver", "narrow", "base", "downR")
     call ctc
 
-    ton "Merlin's burly bosom!" ("grin", "narrow", "annoyed", "L", hair="horny")
+    ton @ hair horny "Merlin's burly bosom!" ("grin", "narrow", "annoyed", "L")
     cho @ cheeks heavy_blush "" ("upset", "happyCl", "worried", "mid")
     gen "How about now?" ("grin", xpos="far_left", ypos="head")
     gen "Ever seen such a perfectly shaped pair of quaffles before?" ("base", xpos="far_left", ypos="head")
-    ton "Did you just call them quaffles?" ("soft", "narrow", "raised", "mid", hair="horny")
+    ton @ hair horny "Did you just call them quaffles?" ("soft", "narrow", "raised", "mid")
     cho @ cheeks blush "..." ("mad", "narrow", "worried", "downR")
     gen "So, what's your opinion?" ("base", xpos="far_left", ypos="head")
-    ton "What would you like me to say, Professor?" ("base", "narrow", "base", "mid", hair="horny")
-    ton "That I'd like to run my mouth all over those perky nipples of hers?" ("horny", "narrow", "angry", "L", hair="horny")
+    ton @ hair horny "What would you like me to say, Professor?" ("base", "narrow", "base", "mid")
+    ton @ hair horny "That I'd like to run my mouth all over those perky nipples of hers?" ("horny", "narrow", "angry", "L")
     cho @ cheeks heavy_blush "Professor!" ("open", "happyCl", "worried", "mid") # closed eyes, worried, embarrassed.
-    ton "Sorry sweetie, but Professor Dumbledore wanted my honest opinion." ("open", "closed", "raised", "mid", hair="horny")
-    ton "Your breasts are quite perfect, Miss Chang." ("base", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Sorry sweetie, but Professor Dumbledore wanted my honest opinion." ("open", "closed", "raised", "mid")
+    ton @ hair horny "Your breasts are quite perfect, Miss Chang." ("base", "narrow", "base", "L")
     cho @ cheeks blush "..." ("normal", "narrow", "worried", "L")
     cho @ cheeks heavy_blush "I don't think they're big enough." ("open", "narrow", "worried", "downR") # sad
     cho @ cheeks heavy_blush "" ("normal", "narrow", "worried", "down")
-    ton "Big enough for what? Impress some idiot?" ("open", "narrow", "annoyed", "L", hair="angry")
+    ton @ hair angry "Big enough for what? Impress some idiot?" ("open", "narrow", "annoyed", "L")
     ton "No offence, Professor." ("soft", "narrow", "base", "mid")
     gen "None taken..." ("base", xpos="far_left", ypos="head")
     ton "You don't need large breasts. Especially not if you want to have a career in Quidditch." ("open", "base", "base", "L")
@@ -534,18 +534,18 @@ label cc_pf_strip_T3_intro_E2:
     with d3
     pause .5
 
-    ton "" ("horny", "narrow", "annoyed", "L", hair="horny")
+    ton @ hair horny "" ("horny", "narrow", "annoyed", "L")
     call ctc
 
     cho @ cheeks heavy_blush "P-{w=0.3}Professor!" ("silly", "happyCl", "worried", "mid") #lip bite "glances away from Tonks #Heavy blush
     gen "*He-he-he!*" ("grin", xpos="far_left", ypos="head")
-    ton "No need to be shy, Miss Chang." ("base", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "No need to be shy, Miss Chang." ("base", "narrow", "base", "L")
     gen "Yes, it's not like she has any bits you haven't seen before... is that not what you said, Cho?" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "R-Right." ("angry", "happyCl", "worried", "mid")
     cho @ cheeks blush "" ("horny", "narrow", "worried", "L")
     gen "So... what would you like to see next, Miss Tonks?" ("base", xpos="far_left", ypos="head")
-    ton "Her ass cheeks sure looked great on top of that broom..." ("soft", "narrow", "base", "mid", hair="horny")
-    ton "I'd love to see them up close..." ("base", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Her ass cheeks sure looked great on top of that broom..." ("soft", "narrow", "base", "mid")
+    ton @ hair horny "I'd love to see them up close..." ("base", "narrow", "base", "L")
     gen "Couldn't agree more!" ("grin", xpos="far_left", ypos="head")
     gen "Cho, you heard your teacher's request." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "" ("horny", "narrow", "worried", "mid")
@@ -559,7 +559,7 @@ label cc_pf_strip_T3_intro_E2:
     call cho_chibi(flip=False)
     cho @ cheeks blush "" ("quiver", "narrow", "worried", "down", xpos=260, ypos="base", flip=False, trans=d5)
     pause .8
-    ton "" ("base", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "" ("base", "narrow", "base", "down")
     gen "Slowly..." ("base", xpos="far_left", ypos="head")
     pause .5
 
@@ -573,7 +573,7 @@ label cc_pf_strip_T3_intro_E2:
     call ctc
 
     gen "And now the rest, Miss Chang." ("base", xpos="far_left", ypos="head")
-    ton "..." ("horny", "narrow", "base", "down", hair="horny") # horny
+    ton @ hair horny "..." ("horny", "narrow", "base", "down") # horny
     pause .2
 
     # Remove all.
@@ -591,21 +591,21 @@ label cc_pf_strip_T3_intro_E2:
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
     gen "Quite firm, aren't they?" ("grin", xpos="far_left", ypos="head")
     play sound "sounds/giggle2_loud.ogg"
-    ton "*giggles*" ("base", "happyCl", "base", "mid", hair="horny")
-    ton "Yes, Indeed..." ("grin", "narrow", "base", "mid", hair="horny")
-    ton "No wonder she's so steady on that broomstick." ("horny", "narrow", "angry", "down", hair="horny")
+    ton @ hair horny "*giggles*" ("base", "happyCl", "base", "mid")
+    ton @ hair horny "Yes, Indeed..." ("grin", "narrow", "base", "mid")
+    ton @ hair horny "No wonder she's so steady on that broomstick." ("horny", "narrow", "angry", "down")
     cho @ cheeks blush "..." ("horny", "narrow", "base", "mid") # blushing
-    ton "Can't see anyone beating that, that's for sure." ("open", "narrow", "raised", "down", hair="horny")
+    ton @ hair horny "Can't see anyone beating that, that's for sure." ("open", "narrow", "raised", "down")
     # ton "Although, maybe in a physical--"
 
     gen "So... what's your opinion, what do you prefer?" ("base", xpos="far_left", ypos="head")
     gen "Her tits, or her ass?" ("base", xpos="far_left", ypos="head")
-    ton "*Hmm*..." ("base", "narrow", "base", "down", hair="horny")
-    ton "You're not holding out on me, are you, Miss Chang?" ("open", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "*Hmm*..." ("base", "narrow", "base", "down")
+    ton @ hair horny "You're not holding out on me, are you, Miss Chang?" ("open", "narrow", "base", "L")
     cho @ cheeks blush "What do you--" ("angry", "narrow", "worried", "R")
-    ton "There's something missing...{w=0.5} I haven't seen everything yet, have I?" ("crooked_smile", "narrow", "raised", "mid", hair="horny")
+    ton @ hair horny "There's something missing...{w=0.5} I haven't seen everything yet, have I?" ("crooked_smile", "narrow", "raised", "mid")
     gen "But of course!" ("grin", xpos="far_left", ypos="head")
-    ton @ cheeks blush "If I were to do any sort of judgement, I'd first need to see that cute little Snitch of yours." ("soft", "narrow", "base", "down", hair="horny")
+    ton @ cheeks blush hair horny "If I were to do any sort of judgement, I'd first need to see that cute little Snitch of yours." ("soft", "narrow", "base", "down")
     cho @ cheeks heavy_blush "!!!" ("clench", "wide", "base", "mid") # shock
     gen "Miss Chang, why don't you turn around so Professor Tonks can give you a proper assessment." ("grin", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "..." ("clench", "happyCl", "worried", "mid") # blush
@@ -618,26 +618,26 @@ label cc_pf_strip_T3_intro_E2:
     cho @ cheeks heavy_blush "" ("normal", "happyCl", "worried", "mid", xpos=330, ypos="base", flip=True, trans=d5)
     pause .8
 
-    ton "*Hmm*... Will you look at that..." ("base", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "*Hmm*... Will you look at that..." ("base", "narrow", "base", "down")
     cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "L")
-    ton "Now, this is a level of confidence I haven't seen in a student before..." ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Now, this is a level of confidence I haven't seen in a student before..." ("horny", "narrow", "base", "mid")
     gen "Yes, she's quite something, isn't she?" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks blush "..." ("base", "closed", "base", "mid") # blushing but faking confidence
-    ton "Although..." ("base", "narrow", "base", "L", hair="horny")
-    ton "Does this snitch get frightened and dart away, once you try and get up close to it?" ("grin", "narrow", "raised", "mid", hair="horny")
+    ton @ hair horny "Although..." ("base", "narrow", "base", "L")
+    ton @ hair horny "Does this snitch get frightened and dart away, once you try and get up close to it?" ("grin", "narrow", "raised", "mid")
     cho @ cheeks blush ".........." ("base", "closed", "base", "mid") #not paying much attention/didn't know she was being addressed
-    ton "Miss Chang?" ("open", "narrow", "raised", "L", hair="horny")
+    ton @ hair horny "Miss Chang?" ("open", "narrow", "raised", "L")
     cho @ cheeks heavy_blush "Oh, sorry!" ("crooked_smile", "happyCl", "worried", "mid")
     cho @ cheeks blush "Of course not, Professor -- I don't dart away from anything!" ("soft", "narrow", "worried", "downR")
 
     ## Tonks wants to strip too. ##
-    ton "Excellent, since that question has been answered..." ("base", "happyCl", "base", "mid", hair="horny")
-    ton "I assume you don't mind if I joined you on that desk, do you?" ("horny", "narrow", "angry", "L", hair="horny")
+    ton @ hair horny "Excellent, since that question has been answered..." ("base", "happyCl", "base", "mid")
+    ton @ hair horny "I assume you don't mind if I joined you on that desk, do you?" ("horny", "narrow", "angry", "L")
 
     stop music fadeout 1
     cho @ cheeks blush "What?!" ("soft", "wide", "raised", "mid") # blushing
     gen "!!!" ("grin", xpos="far_left", ypos="head")
-    ton "*Hmm*... Or is that snitch of yours going to dart off after all?" ("soft", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "*Hmm*... Or is that snitch of yours going to dart off after all?" ("soft", "narrow", "base", "down")
     cho @ cheeks blush "" ("angry", "happyCl", "worried", "mid")
     gen "(I sure hope the desk is sturdy enough...)" ("base", xpos="far_left", ypos="head")
     call hide_characters
@@ -658,16 +658,16 @@ label cc_pf_strip_T3_intro_E2:
 
     $ cho.zorder = 16 # in front of Tonks. 15 is default.
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
-    ton "" ("base", "narrow", "base", "L", hair="horny", xpos=345, ypos="base")
+    ton @ hair horny "" ("base", "narrow", "base", "L", xpos=345, ypos="base")
     cho @ cheeks heavy_blush "T-Tonks!" ("clench", "happyCl", "raised", "L", xpos=280, ypos="base", flip=True) #Closed eyes, embarrassed
-    ton "That's {b}Professor Tonks{/b} to you, Miss Chang." ("open", "narrow", "angry", "L", hair="angry") # stern look
+    ton @ hair angry "That's {b}Professor Tonks{/b} to you, Miss Chang." ("open", "narrow", "angry", "L") # stern look
     cho @ cheeks heavy_blush "Sorry!" ("clench", "happyCl", "worried", "mid")
     play sound "sounds/giggle2_loud.ogg"
-    ton "*giggles*" ("base", "happyCl", "base", "mid", hair="horny")
-    ton "I'm just kidding, you can call me whatever you like, sweetie..." ("soft", "narrow", "base", "L", hair="horny")
-    ton "Catch that Snitch for me, will you..." ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "*giggles*" ("base", "happyCl", "base", "mid")
+    ton @ hair horny "I'm just kidding, you can call me whatever you like, sweetie..." ("soft", "narrow", "base", "L")
+    ton @ hair horny "Catch that Snitch for me, will you..." ("horny", "narrow", "base", "L")
     cho @ cheeks blush "Snitch? What Snitch?" ("soft", "narrow", "base", "L")
-    ton "Down here." ("grin", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "Down here." ("grin", "narrow", "base", "down")
     cho @ cheeks blush "" ("annoyed", "narrow", "base", "down")
     pause .2
 
@@ -677,13 +677,13 @@ label cc_pf_strip_T3_intro_E2:
     with d3
     pause .5
 
-    ton "" ("horny", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "" ("horny", "narrow", "base", "down")
     pause .8
 
     cho @ cheeks blush "!!!" ("normal", "wide", "raised", "down")
     gen "Now that's what I'm talking about!" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "Professor!" ("clench", "wide", "raised", "down")
-    ton "Believe me, I'm just getting started..." ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Believe me, I'm just getting started..." ("base", "narrow", "base", "mid")
     pause .5
 
     # Remove other clothes.
@@ -692,17 +692,17 @@ label cc_pf_strip_T3_intro_E2:
     with d3
     pause .5
 
-    ton "" ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "" ("horny", "narrow", "base", "L")
     cho @ cheeks heavy_blush "" ("base", "narrow", "worried", "down")
     call ctc
 
     cho @ cheeks heavy_blush "..." ("angry", "narrow", "worried", "downR") # heavy blush
     gen "Don't be shy, Miss Chang." ("grin", xpos="far_left", ypos="head")
-    ton "*Hmm*... Yes, don't be shy." ("crooked_smile", "narrow", "base", "L", hair="horny")
-    ton "I've yet to give you my verdict." ("soft", "narrow", "raised", "down", hair="horny")
+    ton @ hair horny "*Hmm*... Yes, don't be shy." ("crooked_smile", "narrow", "base", "L")
+    ton @ hair horny "I've yet to give you my verdict." ("soft", "narrow", "raised", "down")
     cho @ cheeks heavy_blush "..." ("normal", "happyCl", "worried", "mid")
-    ton "Now, up this close, it's obvious what your best feature is, Miss Chang..." ("open", "narrow", "base", "down", hair="horny")
-    ton "I must say I simply love your--" ("horny", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "Now, up this close, it's obvious what your best feature is, Miss Chang..." ("open", "narrow", "base", "down")
+    ton @ hair horny "I must say I simply love your--" ("horny", "narrow", "base", "down")
 
     # Snape enters.
     stop music fadeout 1
@@ -751,17 +751,17 @@ label cc_pf_strip_T3_intro_E2:
     cho @ cheeks heavy_blush "{size=-4}Yes-- Thank you.{/size}" ("disgust", "happyCl", "worried", "mid", xpos=295, ypos=17, flip=True, trans=d3) # Sprite is slightly lowered.
 
     ton "What are you doing here?" ("annoyed", "base", "angry", "stare")
-    ton "Have you been spying on us behind that door?" ("soft", "narrow", "base", "up", hair="horny")
+    ton @ hair horny "Have you been spying on us behind that door?" ("soft", "narrow", "base", "up")
     sna "Of course not..." ("snape_46")
     cho @ cheeks heavy_blush "P-{w=0.3}Professor..." ("open", "happyCl", "worried", "mid")
-    ton "" ("base", "narrow", "base", "downR", hair="horny")
+    ton @ hair horny "" ("base", "narrow", "base", "downR")
 
     sna "Ah, Miss Chang... Hiding behind Professor Tonks, are we?" ("snape_02")
     sna "I take it you're here to repay our headmaster for his help with your sudden Quidditch success?" ("snape_37")
     #sna "But how come Professor Tonks--" ("snape_01")
-    ton "Well, what if she is,{w=0.5} Snivellus?" ("soft", "narrow", "annoyed", "R", hair="horny")
+    ton @ hair horny "Well, what if she is,{w=0.5} Snivellus?" ("soft", "narrow", "annoyed", "R")
     sna "" ("snape_38")
-    ton "She isn't doing anything wrong... at least not by your standards." ("grin", "closed", "shocked", "mid", hair="horny")
+    ton @ hair horny "She isn't doing anything wrong... at least not by your standards." ("grin", "closed", "shocked", "mid")
     sna "Did I accuse her of doing anything wrong?" ("snape_09")
     sna "On the contrary..." ("snape_02")
     ton "" ("annoyed", "narrow", "raised", "up")
@@ -810,7 +810,7 @@ label cc_pf_strip_T3_intro_E2:
                 cho @ cheeks heavy_blush "Sir, you can't be serious!" ("angry", "wide", "raised", "mid")
                 gen "Calm yourself, girl." ("base", xpos="far_left", ypos="head")
                 gen "There's no touching allowed anyway... Those are the rules." ("base", xpos="far_left", ypos="head")
-                ton "Really? You never told me--" ("annoyed", "narrow", "raised", "mid", hair="horny") #pout
+                ton @ hair horny "Really? You never told me--" ("annoyed", "narrow", "raised", "mid") #pout
                 cho @ cheeks heavy_blush "Send him away!" ("clench", "base", "angry", "mid")
                 gen "Whatever... no need to get all indignant about this." ("angry", xpos="far_left", ypos="head")
                 sna "..." ("snape_09")
@@ -873,11 +873,11 @@ label cc_pf_strip_T3_intro_E2:
     $ cho.zorder = 16 # In front of Tonks. Default is 15.
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
     sna "" ("snape_13")
-    ton "" ("annoyed", "shocked", "raised", "stare", hair="horny", xpos=310, ypos="base", flip=True)
+    ton @ hair horny "" ("annoyed", "shocked", "raised", "stare", xpos=310, ypos="base", flip=True)
     cho "First you're going to explain yourself!" ("clench", "base", "angry", "L", xpos=415, ypos="base", flip=True, trans=hpunch)
-    ton @ cheeks blush "" ("clench", "wide", "shocked", "L", hair="horny")
+    ton @ cheeks blush hair horny "" ("clench", "wide", "shocked", "L")
     cho "You somehow tricked them! They played far better than usual." ("mad", "base", "angry", "L")
-    ton @ cheeks heavy_blush "" ("horny", "narrow", "worried", "down", hair="horny")
+    ton @ cheeks heavy_blush hair horny "" ("horny", "narrow", "worried", "down")
     sna "*Hmm*... Very well, Miss Chang." ("snape_20")
 
     # Space Jam
@@ -889,13 +889,13 @@ label cc_pf_strip_T3_intro_E2:
     gen "Don't interrupt your teacher." ("base", xpos="far_left", ypos="head")
     cho "" ("annoyed", "narrow", "angry", "mid")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton @ cheeks heavy_blush "" ("base", "narrow", "worried", "L", hair="horny")
+    ton @ cheeks heavy_blush hair horny "" ("base", "narrow", "worried", "L")
     cho "" ("annoyed", "narrow", "angry", "L")
     sna "All I did was give them a vial of pumpkin juice..." ("snape_41")
     sna "Then I told them I mixed in some liquid luck." ("snape_13")
     cho "What stupid kind of tactic is that?" ("soft", "narrow", "angry", "mid")
     sna "" ("snape_39")
-    ton @ cheeks blush "" ("base", "narrow", "base", "mid", hair="horny")
+    ton @ cheeks blush hair horny "" ("base", "narrow", "base", "mid")
     gen "Hold on a minute..." ("angry", xpos="far_left", ypos="head")
     gen "Are you seriously telling me you gave them pumpkin juice... and pretended it was \"{b}Michael's secret stuff{/b}\"?" ("base", xpos="far_left", ypos="head")
     sna "Michael's...{w=0.3} what?" ("snape_38")
@@ -903,16 +903,16 @@ label cc_pf_strip_T3_intro_E2:
     sna "I'm sorry?" ("snape_25") # confused
     gen "You ripped off the plot of Space Jam!" ("angry", xpos="far_left", ypos="head")
     sna "I have no idea what you're talking about..." ("snape_44")
-    ton "Neither do I." ("annoyed", "base", "raised", "mid", hair="horny")
+    ton @ hair horny "Neither do I." ("annoyed", "base", "raised", "mid")
     cho "Sir, is this about that basketball thing again?" ("disgust", "narrow", "angry", "mid")
     #gen "Well you clearly didn't watch the outcome, did you?" ("base", xpos="far_left", ypos="head")
     gen "Even Bugs Bunny couldn't help him win. Serves you right!" ("grin", xpos="far_left", ypos="head")
-    ton "Who's Bugs Bunny?" ("soft", "narrow", "raised", "mid", hair="horny")
+    ton @ hair horny "Who's Bugs Bunny?" ("soft", "narrow", "raised", "mid")
     gen "Oh boy, let me tell you--" ("grin", xpos="far_left", ypos="head")
     sna "Anyway." ("snape_31")
     cho "" ("annoyed", "narrow", "angry", "L")
     sna "Miss Chang, I wish you the very best of luck on your next match." ("snape_45")
-    ton "" ("normal", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "" ("normal", "narrow", "base", "L")
     sna "You lot look like you're going to need it..." ("snape_42")
     cho "*Hmph*..." ("annoyed", "base", "angry", "L")
     gen "(...)" ("base", xpos="far_left", ypos="head")
@@ -932,7 +932,7 @@ label cc_pf_strip_T3_intro_E2:
 
     sna "Until then, Albus... Miss Chang..." ("snape_20", xpos="base", ypos="head")
     sna "{cps=7}Nymphadora...{/cps}" ("snape_41", xpos="base", ypos="head")
-    ton "Stop calling me--" ("clench", "closed", "angry", "mid", hair="angry", ypos="head", flip=True)
+    ton @ hair angry "Stop calling me--" ("clench", "closed", "angry", "mid", ypos="head", flip=True)
 
     # Snape leaves.
     call sna_chibi("stand", "door", "base", flip=True)
@@ -967,9 +967,9 @@ label cc_pf_strip_T3_intro_E2:
     cho "" ("annoyed", "narrow", "angry", "mid")
 
     if game.daytime:
-        ton "Let me escort you back to class, Miss Chang." ("soft", "base", "base", "L", hair="horny")
+        ton @ hair horny "Let me escort you back to class, Miss Chang." ("soft", "base", "base", "L")
     else:
-        ton "Let me escort you back to your common room. It's getting late." ("soft", "base", "base", "L", hair="horny")
+        ton @ hair horny "Let me escort you back to your common room. It's getting late." ("soft", "base", "base", "L")
 
     # Fade to black.
     call hide_characters
@@ -1142,27 +1142,27 @@ label cc_pf_strip_T3_intro_E3:
         "\".............\"": # Genie lets them speak
             cho "I take divination lessons solely as an opportunity to climb the north tower once a week." ("base", "happyCl", "base", "mid")
             ton "Of course you do..." ("base", "base", "base", "L")
-            ton "(Those thick legs have to come from somewhere.)" ("grin", "narrow", "base", "mid", hair="horny")
-            ton "I had a hunch that something special was in store for me today." ("horny", "narrow", "raised", "mid", hair="horny")
+            ton @ hair horny "(Those thick legs have to come from somewhere.)" ("grin", "narrow", "base", "mid")
+            ton @ hair horny "I had a hunch that something special was in store for me today." ("horny", "narrow", "raised", "mid")
 
         "\"You could exercise with me!\"":
             gen "I can give you a workout of the likes you've never seen!" ("grin", xpos="far_left", ypos="head")
-            ton "" ("base", "narrow", "annoyed", "mid", hair="horny")
+            ton @ hair horny "" ("base", "narrow", "annoyed", "mid")
             cho "*Hmm*?" ("soft", "base", "raised", "mid")
             gen "I'll wear you out until your muscles are sorer than ever!" ("angry", xpos="far_left", ypos="head")
             cho "Really!?" ("crooked_smile", "base", "base", "mid") # happy
-            ton "Now-now, Professor. Don't make promises you can't keep..." ("soft", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "Now-now, Professor. Don't make promises you can't keep..." ("soft", "narrow", "base", "mid")
             cho "Why haven't you shown me any of these workouts, sir?" ("open", "base", "angry", "mid")
             gen "We'll get to it at some point I'm sure." ("base", xpos="far_left", ypos="head")
-            ton "I sure wouldn't mind seeing you try out his techniques as well." ("grin", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "I sure wouldn't mind seeing you try out his techniques as well." ("grin", "narrow", "base", "L")
             gen "No objections here!" ("grin", xpos="far_left", ypos="head")
             cho "Wicked!" ("grin", "happyCl", "base", "mid")
 
-    ton "Come on, Miss Chang..." ("open", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Come on, Miss Chang..." ("open", "narrow", "base", "L")
     cho "" ("annoyed", "base", "base", "L")
-    ton "Let's give our headmaster a good show!" ("crooked_smile", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Let's give our headmaster a good show!" ("crooked_smile", "narrow", "base", "mid")
     cho "Alright." ("open", "happyCl", "base", "mid")
-    ton "Now, after you..." ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Now, after you..." ("horny", "narrow", "base", "L")
 
     # Cho and Tonks hop onto the desk.
     call hide_characters
@@ -1193,17 +1193,17 @@ label cc_pf_strip_T3_intro_E3:
 
     $ cho.zorder = 16 # in front of Tonks. 15 is default.
     cho @ cheeks heavy_blush "" ("base", "narrow", "base", "L", xpos=280, ypos="base", flip=True)
-    ton "..." ("base", "narrow", "raised", "L", hair="horny", xpos=345, ypos="base")
-    ton "Are you watching closely, Professor?" ("open", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "..." ("base", "narrow", "raised", "L", xpos=345, ypos="base")
+    ton @ hair horny "Are you watching closely, Professor?" ("open", "narrow", "base", "mid")
     gen "You bet!" ("grin", xpos="far_left", ypos="head")
-    ton "I wouldn't want you to miss what's about to happen..." ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "I wouldn't want you to miss what's about to happen..." ("base", "narrow", "base", "mid")
 
     # Cho and Tonks undress.
     $ temp_var = False
     if cho.is_any_worn("robe", "top", "bottom"):
         $ temp_var = True
-        ton "Let me help you with that, Miss Chang." ("soft", "narrow", "base", "L", hair="horny")
-        ton "" ("base", "narrow", "base", "L", hair="horny")
+        ton @ hair horny "Let me help you with that, Miss Chang." ("soft", "narrow", "base", "L")
+        ton @ hair horny "" ("base", "narrow", "base", "L")
 
     # Remove Cho's robe. #TODO are they not already removed near the start of the event?
     if cho.is_worn("robe"):
@@ -1244,15 +1244,15 @@ label cc_pf_strip_T3_intro_E3:
     if temp_var == True:
         cho @ cheeks heavy_blush "Please, Professor...{w=0.4} not so fast." ("clench", "happyCl", "base", "mid") # embarrassed?
         gen "..." ("grin", xpos="far_left", ypos="head")
-        ton "*Hmm*... Okay then." ("base", "narrow", "raised", "mid", hair="horny")
-        ton "I'll go next, shall I?" ("grin", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "*Hmm*... Okay then." ("base", "narrow", "raised", "mid")
+        ton @ hair horny "I'll go next, shall I?" ("grin", "narrow", "base", "mid")
     else: # Cho was already in underwear or nude.
-        ton "Couldn't you have waited for me, Miss Chang?" ("soft", "narrow", "base", "L", hair="horny")
-        ton "I would have loved to help you undress..." ("base", "narrow", "base", "L", hair="horny")
+        ton @ hair horny "Couldn't you have waited for me, Miss Chang?" ("soft", "narrow", "base", "L")
+        ton @ hair horny "I would have loved to help you undress..." ("base", "narrow", "base", "L")
         gen "No, that's just the girl's regular dress code around my office." ("base", xpos="far_left", ypos="head")
         cho @ cheeks heavy_blush "" ("clench", "narrow", "base", "downR")
-        ton "Is that so..." ("soft", "narrow", "raised", "mid", hair="horny")
-        ton "*Hmm*... I suppose I should follow suit, then?" ("base", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "Is that so..." ("soft", "narrow", "raised", "mid")
+        ton @ hair horny "*Hmm*... I suppose I should follow suit, then?" ("base", "narrow", "base", "mid")
         cho @ cheeks blush "..." ("horny", "narrow", "base", "R") # embarrassed
 
     gen "Go right ahead!" ("grin", xpos="far_left", ypos="head")
@@ -1287,9 +1287,9 @@ label cc_pf_strip_T3_intro_E3:
     $ cho.zorder = 15 # reset to default.
     $ tonks.zorder = 16 # in front of Cho # Default is 15.
     cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=345, ypos="base", flip=False)
-    ton "..." ("crooked_smile", "narrow", "base", "mid", hair="horny", xpos=215, ypos="base", flip=False)
+    ton @ hair horny "..." ("crooked_smile", "narrow", "base", "mid", xpos=215, ypos="base", flip=False)
 
-    ton "Miss Chang, would you be so kind and assist me with my shirt?" ("soft", "base", "shocked", "down", hair="horny")
+    ton @ hair horny "Miss Chang, would you be so kind and assist me with my shirt?" ("soft", "base", "shocked", "down")
     cho @ cheeks heavy_blush "Yes, Professor..." ("smile", "narrow", "base", "down")
     pause .2
     cho @ cheeks heavy_blush "" ("base", "narrow", "raised", "down", xpos=315, ypos="base", flip=False, trans=d5) # moves closer to Tonks.
@@ -1303,16 +1303,16 @@ label cc_pf_strip_T3_intro_E3:
     with d3
     pause .5
 
-    ton "" ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "" ("horny", "narrow", "base", "mid")
     pause .8
 
     nar "With some effort, Cho manages to remove her teacher's shirt."
-    ton "Thank you, sweetie." ("soft", "narrow", "raised", "downR", hair="horny")
+    ton @ hair horny "Thank you, sweetie." ("soft", "narrow", "raised", "downR")
     cho @ cheeks heavy_blush "" ("base", "narrow", "base", "mid")
-    ton "*Hmm*..." ("annoyed", "base", "raised", "down", hair="horny")
-    ton "I guess my tight trousers are next..." ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "*Hmm*..." ("annoyed", "base", "raised", "down")
+    ton @ hair horny "I guess my tight trousers are next..." ("base", "narrow", "base", "mid")
     cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "down") # blush
-    ton "I'll take it from here..." ("soft", "narrow", "shocked", "downR", hair="horny")
+    ton @ hair horny "I'll take it from here..." ("soft", "narrow", "shocked", "downR")
     pause .2
 
     # Tonks turns around facing Cho.
@@ -1320,10 +1320,10 @@ label cc_pf_strip_T3_intro_E3:
     #$ tonks.zorder = 15 # Reset to default.
     #$ cho.zorder = 16 # in front of Tonks # Default is 15.
     #cho @ cheeks heavy_blush "" ("base", "narrow", "raised", "L", xpos=345, ypos="base", flip=False)
-    ton "Let me show you how it's done. {heart}" ("crooked_smile", "narrow", "base", "down", hair="horny", xpos=280, ypos="base", flip=True, trans=d5)
+    ton @ hair horny "Let me show you how it's done. {heart}" ("crooked_smile", "narrow", "base", "down", xpos=280, ypos="base", flip=True, trans=d5)
 
     cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "down") # lip bite
-    ton @ cheeks heavy_blush "With trousers like these, you should start slowly... that's how the headmaster likes it. {heart}" ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ cheeks heavy_blush hair horny "With trousers like these, you should start slowly... that's how the headmaster likes it. {heart}" ("horny", "narrow", "base", "mid")
 
     nar "Tonks carefully tugs at the thin fabric of her leggings, and slowly pulls them past her cheeks..."
     nar "As the fabric bundles up between her fingers, reaching lower and lower past her thighs, she pulls them off in one swift motion."
@@ -1334,13 +1334,13 @@ label cc_pf_strip_T3_intro_E3:
     with hpunch
     pause .5
 
-    ton @ cheeks blush "" ("horny", "narrow", "raised", "mid", hair="horny")
+    ton @ cheeks blush hair horny "" ("horny", "narrow", "raised", "mid")
     pause .8
 
     gen "Not wearing any underwear, I see..." ("base", xpos="far_left", ypos="head")
-    ton "I avoid it when I can..." ("crooked_smile", "narrow", "base", "mid", hair="horny")
-    ton "Even while I'm in uniform. {heart}" ("grin", "wink", "raised", "mid", hair="horny") #wink
-    ton "" ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "I avoid it when I can..." ("crooked_smile", "narrow", "base", "mid")
+    ton @ hair horny "Even while I'm in uniform. {heart}" ("grin", "wink", "raised", "mid") #wink
+    ton @ hair horny "" ("base", "narrow", "base", "mid")
     gen "Anything you'd like to say, Miss Chang?" ("base", xpos="far_left", ypos="head")
     gen "It's not every day you get to see such a gorgeous woman strip for you..." ("grin", xpos="far_left", ypos="head")
     gen "(...)" ("base", xpos="far_left", ypos="head")
@@ -1349,36 +1349,36 @@ label cc_pf_strip_T3_intro_E3:
     # Slap Tonks' ass!
     call slap_her
     cho @ cheeks heavy_blush "" ("open", "wide", "base", "mid")
-    ton @ cheeks heavy_blush "!!!" ("clench", "shocked", "base", "stare", hair="scared") # shocked
+    ton @ cheeks heavy_blush hair scared "!!!" ("clench", "shocked", "base", "stare") # shocked
     nar "You give Tonks a hard slap on her ass."
     cho @ cheeks heavy_blush "" ("horny", "base", "base", "down")
-    ton @ cheeks heavy_blush "Ouch...{w=0.4} Professor!" ("crooked_smile", "narrow", "annoyed", "mid", hair="horny")
+    ton @ cheeks heavy_blush hair horny "Ouch...{w=0.4} Professor!" ("crooked_smile", "narrow", "annoyed", "mid")
     gen "Right, should've warned you, shouldn't I..." ("base", xpos="far_left", ypos="head")
 
     menu:
         "-Slap it one more time!-":
             call slap_her
-            ton @ cheeks blush "..." ("clench", "base", "shocked", "ahegao", hair="horny") #pout #blush
+            ton @ cheeks blush hair horny "..." ("clench", "base", "shocked", "ahegao") #pout #blush
             gen "Want another?" ("grin", xpos="far_left", ypos="head")
-            ton @ cheeks heavy_blush "Yes, please. {heart}" ("crooked_smile", "narrow", "base", "mid", hair="horny")
+            ton @ cheeks heavy_blush hair horny "Yes, please. {heart}" ("crooked_smile", "narrow", "base", "mid")
 
             menu:
                 "-Slap it again!-":
                     call slap_her
-                    ton @ cheeks heavy_blush "*Mmm*... Spank me, Sir!" ("horny", "narrow", "angry", "mid", hair="horny")
+                    ton @ cheeks heavy_blush hair horny "*Mmm*... Spank me, Sir!" ("horny", "narrow", "angry", "mid")
 
                     menu:
                         "-Again!-":
                             pass
                     call slap_her
-                    ton @ cheeks heavy_blush "More...{w=0.3} Harder!" ("clench", "base", "angry", "mid", hair="angry")
+                    ton @ cheeks heavy_blush hair angry "More...{w=0.3} Harder!" ("clench", "base", "angry", "mid")
                     cho @ cheeks heavy_blush "..." ("disgust", "happyCl", "worried", "mid") # blushing #lip bite #looking away
 
                     menu:
                         "-Slap it hard!-":
                             pass
                     call slap_her
-                    ton @ cheeks heavy_blush "" ("clench", "base", "shocked", "ahegao", hair="scared")
+                    ton @ cheeks heavy_blush hair scared "" ("clench", "base", "shocked", "ahegao")
                     pause .5
                     call slap_her
                     pause .3
@@ -1386,8 +1386,8 @@ label cc_pf_strip_T3_intro_E3:
                     pause .3
                     call slap_her
                     cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "mid")
-                    ton @ cheeks heavy_blush "*Hngh*..." ("upset", "narrow", "base", "ahegao", hair="horny")
-                    ton @ cheeks heavy_blush "Thank you, Professor. {heart}{heart}{heart}" ("crooked_smile", "narrow", "worried", "mid", hair="horny")
+                    ton @ cheeks heavy_blush hair horny "*Hngh*..." ("upset", "narrow", "base", "ahegao")
+                    ton @ cheeks heavy_blush hair horny "Thank you, Professor. {heart}{heart}{heart}" ("crooked_smile", "narrow", "worried", "mid")
                     gen "You're welcome." ("grin", xpos="far_left", ypos="head")
                     cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "downR")
 
@@ -1397,17 +1397,17 @@ label cc_pf_strip_T3_intro_E3:
 
                     # Tonks turns around.
                     call ton_chibi(flip=False)
-                    ton @ cheeks blush "" ("base", "base", "base", "mid", hair="horny", xpos=215, ypos="base", flip=False, trans=d5)
+                    ton @ cheeks blush hair horny "" ("base", "base", "base", "mid", xpos=215, ypos="base", flip=False, trans=d5)
                     pause .5
 
-                    ton @ cheeks blush "It's fine, Cho. Just give it a little slap." ("soft", "narrow", "base", "downR", hair="horny")
+                    ton @ cheeks blush hair horny "It's fine, Cho. Just give it a little slap." ("soft", "narrow", "base", "downR")
                     cho @ cheeks heavy_blush "..." ("angry", "base", "raised", "down")
                     call slap_her
-                    ton @ cheeks blush "That's it! Try a little harder..." ("horny", "narrow", "base", "downR", hair="horny")
+                    ton @ cheeks blush hair horny "That's it! Try a little harder..." ("horny", "narrow", "base", "downR")
                     call slap_her
                     ton @ cheeks blush "One more time..." ("soft", "narrow", "shocked", "up")
                     call slap_her
-                    ton @ cheeks heavy_blush "*Hngh*..." ("upset", "narrow", "shocked", "ahegao", hair="horny")
+                    ton @ cheeks heavy_blush hair horny "*Hngh*..." ("upset", "narrow", "shocked", "ahegao")
                     pause .2
 
                     # Tonks turns around.
@@ -1422,40 +1422,40 @@ label cc_pf_strip_T3_intro_E3:
             pass
 
     gen "Tell me, Cho...{w=0.3} do you like your teacher's body?" ("base", xpos="far_left", ypos="head")
-    ton @ cheeks heavy_blush "" ("base", "narrow", "base", "mid", hair="horny")
+    ton @ cheeks heavy_blush hair horny "" ("base", "narrow", "base", "mid")
     cho @ cheeks heavy_blush "Of course I do." ("open", "narrow", "base", "down")
-    ton @ cheeks blush "" ("base", "narrow", "base", "down", hair="horny")
+    ton @ cheeks blush hair horny "" ("base", "narrow", "base", "down")
     cho @ cheeks blush "She's very fit and athletic and pretty, just like me." ("crooked_smile", "happyCl", "base", "mid")
     gen "That's not what I meant..." ("base", xpos="far_left", ypos="head")
     gen "Does her body turn you on?" ("grin", xpos="far_left", ypos="head")
-    ton @ cheeks blush "" ("base", "narrow", "annoyed", "mid", hair="horny") # eager look at Cho.
+    ton @ cheeks blush hair horny "" ("base", "narrow", "annoyed", "mid") # eager look at Cho.
     cho @ cheeks heavy_blush "Sir!" ("clench", "wide", "base", "mid")
     gen "It's a simple question..." ("base", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "Do I really need to answer?" ("clench", "happyCl", "worried", "mid")
-    ton @ cheeks blush "Please, Miss Chang..." ("open", "narrow", "base", "L", hair="horny")
-    ton @ cheeks blush "I'm quite curious about your thoughts as well. {heart}" ("base", "narrow", "base", "L", hair="horny")
-    ton @ cheeks blush "We'll keep it our little secret, I promise..." ("crooked_smile", "narrow", "annoyed", "down", hair="horny")
+    ton @ cheeks blush hair horny "Please, Miss Chang..." ("open", "narrow", "base", "L")
+    ton @ cheeks blush hair horny "I'm quite curious about your thoughts as well. {heart}" ("base", "narrow", "base", "L")
+    ton @ cheeks blush hair horny "We'll keep it our little secret, I promise..." ("crooked_smile", "narrow", "annoyed", "down")
     cho @ cheeks heavy_blush "*Hmm*..." ("mad", "narrow", "worried", "down")
     cho @ cheeks heavy_blush "Fine...{w=0.3} I do think you're quite attractive, Professor." ("soft", "narrow", "worried", "downR")
     #gen "Thanks." ("grin", xpos="far_left", ypos="head")
     #cho "" ("annoyed", "narrow", "base", "mid")
-    #ton "Very funny, Professor Dumbledore... But I believe she was talking to me." ("open", "narrow", "raised", "mid", hair="horny")
-    ton @ cheeks blush "..." ("base", "narrow", "annoyed", "mid", hair="horny") # sharp look at Genie
+    #ton @ hair horny "Very funny, Professor Dumbledore... But I believe she was talking to me." ("open", "narrow", "raised", "mid")
+    ton @ cheeks blush hair horny "..." ("base", "narrow", "annoyed", "mid") # sharp look at Genie
     cho @ cheeks heavy_blush "Especially for a teacher." ("clench", "narrow", "raised", "down")
-    ton "For a teacher?" ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "For a teacher?" ("horny", "narrow", "base", "L")
     cho @ cheeks heavy_blush "I mean--" ("soft", "happyCl", "worried", "mid") #clench #worried
-    ton "*Ha-ha*... I'll have to add that to my resume." ("grin", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "*Ha-ha*... I'll have to add that to my resume." ("grin", "narrow", "base", "mid")
     cho @ cheeks heavy_blush "" ("base", "narrow", "worried", "down")
 
-    ton @ cheeks blush "Although, teachers shouldn't be employed for their looks, but for their competence, isn't that right?" ("open", "narrow", "annoyed", "mid", hair="horny")
+    ton @ cheeks blush hair horny "Although, teachers shouldn't be employed for their looks, but for their competence, isn't that right?" ("open", "narrow", "annoyed", "mid")
     gen "What?" ("base", xpos="far_left", ypos="head")
     gen "Oh-- I mean yes...{w=0.3} of course..." ("angry", xpos="far_left", ypos="head")
     play sound "sounds/giggle2_loud.ogg"
-    ton @ cheeks blush "*giggles*..." ("base", "happyCl", "base", "mid", hair="horny")
-    ton @ cheeks blush "Enough with the small talk -- let's get these clothes off!" ("soft", "base", "annoyed", "mid", hair="horny")
+    ton @ cheeks blush hair horny "*giggles*..." ("base", "happyCl", "base", "mid")
+    ton @ cheeks blush hair horny "Enough with the small talk -- let's get these clothes off!" ("soft", "base", "annoyed", "mid")
 
     stop music fadeout 1
-    ton "" ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "" ("horny", "narrow", "base", "mid")
     pause .1
 
     # Tonks removes the rest of her clothes.
@@ -1470,18 +1470,18 @@ label cc_pf_strip_T3_intro_E3:
     nar "Within a blink of an eye, Tonks has removed all of her remaining clothing."
     # nar "One minute her clothes were there, and then they were gone! It was like magic!"
     cho @ cheeks heavy_blush "..." ("clench", "narrow", "worried", "downR")
-    ton "Get in front of me, Miss Chang." ("open", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Get in front of me, Miss Chang." ("open", "narrow", "base", "L")
 
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
     if cho.is_worn("bra"):
-        ton "It's time you show your headmaster your cute little breasts as well." ("soft", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "It's time you show your headmaster your cute little breasts as well." ("soft", "narrow", "base", "mid")
     else:
-        ton "Let's show your headmaster these cute little breasts of yours." ("soft", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "Let's show your headmaster these cute little breasts of yours." ("soft", "narrow", "base", "mid")
 
     cho @ cheeks heavy_blush "They aren't that little..." ("annoyed", "narrow", "worried", "down") # annoyed
-    ton "No, you're right, sweetie..." ("soft", "narrow", "base", "down", hair="horny")
-    ton "They're just about perfect." ("horny", "narrow", "raised", "down", hair="horny")
-    ton @ cheeks blush "Now stand here so the Headmaster can see your tits." ("crooked_smile", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "No, you're right, sweetie..." ("soft", "narrow", "base", "down")
+    ton @ hair horny "They're just about perfect." ("horny", "narrow", "raised", "down")
+    ton @ cheeks blush hair horny "Now stand here so the Headmaster can see your tits." ("crooked_smile", "narrow", "base", "mid")
     cho @ cheeks heavy_blush "..." ("annoyed", "happyCl", "base", "mid")
     pause .2
 
@@ -1494,7 +1494,7 @@ label cc_pf_strip_T3_intro_E3:
     # Remove Cho's bra.
     if cho.is_worn("bra"):
 
-        ton "Let me help you with that, Miss Chang." ("base", "narrow", "raised", "down", hair="horny")
+        ton @ hair horny "Let me help you with that, Miss Chang." ("base", "narrow", "raised", "down")
         pause .2
 
         # Remove Cho top.
@@ -1509,8 +1509,8 @@ label cc_pf_strip_T3_intro_E3:
         nar "The lust filled teacher effortlessly removes the bra of her student."
 
     cho @ cheeks heavy_blush "..." ("crooked_smile", "narrow", "worried", "mid")
-    ton "Fucking perfect {heart} aren't they, Professor?..." ("horny", "narrow", "base", "mid", hair="horny")
-    ton "Move next to me, Cho. I need you to stand -- right here {heart}{heart}{heart}" ("open", "base", "base", "downR", hair="horny")
+    ton @ hair horny "Fucking perfect {heart} aren't they, Professor?..." ("horny", "narrow", "base", "mid")
+    ton @ hair horny "Move next to me, Cho. I need you to stand -- right here {heart}{heart}{heart}" ("open", "base", "base", "downR")
     cho @ cheeks heavy_blush "*Ehm*... yes, Professor." ("soft", "narrow", "worried", "L")
     call hide_characters
     hide screen bld1
@@ -1524,15 +1524,15 @@ label cc_pf_strip_T3_intro_E3:
     pause .5
 
     cho @ cheeks heavy_blush "" ("base", "narrow", "base", "mid", xpos=280, ypos="base", flip=True)
-    ton "..." ("grin", "narrow", "base", "L", hair="horny", xpos=345, ypos="base", flip=False, trans=d5)
+    ton @ hair horny "..." ("grin", "narrow", "base", "L", xpos=345, ypos="base", flip=False, trans=d5)
 
     play sound "sounds/giggle2_loud.ogg"
-    ton "*giggles*..." ("grin", "narrow", "shocked", "mid", hair="horny")
-    ton @ cheeks blush "This is so much fun!" ("base", "narrow", "base", "up", hair="horny")
+    ton @ hair horny "*giggles*..." ("grin", "narrow", "shocked", "mid")
+    ton @ cheeks blush hair horny "This is so much fun!" ("base", "narrow", "base", "up")
 
     if cho.is_worn("panties"):
         cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "L")
-        ton "Lets unveil this magnificent thing, next!" ("crooked_smile", "narrow", "base", "down", hair="horny")
+        ton @ hair horny "Lets unveil this magnificent thing, next!" ("crooked_smile", "narrow", "base", "down")
 
         nar "Tonks eyes up Cho's panties and before you can blink, she undresses her completely."
         cho @ cheeks heavy_blush "Professor, not so fast--" ("horny", "narrow", "worried", "down")
@@ -1563,17 +1563,17 @@ label cc_pf_strip_T3_intro_E3:
         call ctc
 
 
-    ton @ cheeks blush "*Hmm*... I can't decide which teacher has the best view now..." ("horny", "narrow", "base", "down", hair="horny")
+    ton @ cheeks blush hair horny "*Hmm*... I can't decide which teacher has the best view now..." ("horny", "narrow", "base", "down")
     gen "Looking pretty good from where I'm sitting..." ("grin", xpos="far_left", ypos="head")
 
     play sound "sounds/giggle2_loud.ogg"
     cho @ cheeks blush "" ("horny", "narrow", "base", "mid")
-    ton @ cheeks blush "*giggles*" ("grin", "base", "base", "mid", hair="horny")
+    ton @ cheeks blush hair horny "*giggles*" ("grin", "base", "base", "mid")
 
-    ton @ cheeks blush "Well, we still have the best saved for last." ("grin", "narrow", "base", "down", hair="horny")
-    ton @ cheeks blush "Let's give Professor Dumbledore a proper view of what a real athlete can achieve..." ("grin", "base", "base", "L", hair="horny")
+    ton @ cheeks blush hair horny "Well, we still have the best saved for last." ("grin", "narrow", "base", "down")
+    ton @ cheeks blush hair horny "Let's give Professor Dumbledore a proper view of what a real athlete can achieve..." ("grin", "base", "base", "L")
     cho @ cheeks blush "*Ehm*..." ("disgust", "narrow", "base", "L")
-    ton @ cheeks blush "Your buns, hun." ("crooked_smile", "narrow", "base", "L", hair="horny")
+    ton @ cheeks blush hair horny "Your buns, hun." ("crooked_smile", "narrow", "base", "L")
 
     stop music fadeout 1.0
 
@@ -2790,7 +2790,7 @@ label cc_pf_strip_T3_intro_E3:
     cho @ cheeks blush "Thanks, [name_genie_cho]..." ("base", "narrow", "base", "down")
 
     if name_genie_cho in ("Sir", "Professor"): #Acceptable names that she should be using
-        ton @ cheeks blush "If you ever have any questions about men, you know where my door is..." ("base", "narrow", "base", "L", hair="neutral")
+        ton @ cheeks blush hair neutral "If you ever have any questions about men, you know where my door is..." ("base", "narrow", "base", "L")
         gen "Got it." ("base", xpos="far_left", ypos="head")
         ton @ cheeks blush "I was referring to Miss Chang." ("soft", "narrow", "base", "mid")
         gen "Oh... Yeah, me too." ("base", xpos="far_left", ypos="head")
@@ -2841,14 +2841,14 @@ label cc_pf_strip_T3_intro_E3:
     cho @ cheeks blush "Yes, professor?" ("angry", "base", "base", "mid")
     gen "I think this would be the perfect time to ask Professor Tonks your question." ("grin", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "W-what...{w=0.4} Oh, yes!" ("soft", "base", "raised", "mid")
-    ton "*Hmm*?" ("base", "base", "raised", "L", hair="horny")
+    ton @ hair horny "*Hmm*?" ("base", "base", "raised", "L")
     cho @ cheeks blush "Professor Dumbledore told me about how you helped me during the Slytherin game." ("open", "base", "base", "L")
-    ton "What? You told her I'm a Metamorphmagi?" ("mad", "wide", "shocked", "mid", hair="neutral")
+    ton @ hair neutral "What? You told her I'm a Metamorphmagi?" ("mad", "wide", "shocked", "mid")
     cho @ cheeks blush "You are?!?" ("open", "wide", "raised", "L")
     cho @ cheeks heavy_blush "That's so cool!" ("grin", "happyCl", "base", "mid")
-    ton @ cheeks heavy_blush "Did I just spoil the surprise myself?{w=0.5} Whoopsie!" ("mad", "narrow", "worried", "downR", hair="horny")
+    ton @ cheeks heavy_blush hair horny "Did I just spoil the surprise myself?{w=0.5} Whoopsie!" ("mad", "narrow", "worried", "downR")
     gen "Well... I didn't exactly tell her that much." ("base", xpos="far_left", ypos="head")
-    ton @ cheeks blush "Well, what's done is done..." ("upset", "narrow", "worried", "downR", hair="horny")
+    ton @ cheeks blush hair horny "Well, what's done is done..." ("upset", "narrow", "worried", "downR")
 
     play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
 
@@ -2960,20 +2960,20 @@ label cc_pf_strip_T3_intro_E3:
     $ cho_chibi.zorder = 3 # Reset to default.
     $ tonks_chibi.zorder = 2 # behind Cho. Default is 3.
     call ton_chibi("stand", 370, 360, flip=False)
-    ton "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", hair="neutral", flip=False, trans=morph)
+    ton @ hair neutral "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False, trans=morph)
     pause .2
 
     cho @ cheeks heavy_blush "" ("clench", "base", "raised", "down")
     call ctc
 
-    ton "Let's do this again some other time, shall we." ("horny", "narrow", "raised", "mid", hair="horny")
+    ton @ hair horny "Let's do this again some other time, shall we." ("horny", "narrow", "raised", "mid")
     gen "Gladly." ("grin", xpos="far_left", ypos="head")
-    ton @ cheeks heavy_blush "And, Miss Chang... if you ever want to have some quiet time with Miss Granger... my office door is always open." ("grin", "narrow", "base", "L", hair="horny")
+    ton @ cheeks heavy_blush hair horny "And, Miss Chang... if you ever want to have some quiet time with Miss Granger... my office door is always open." ("grin", "narrow", "base", "L")
     cho @ cheeks heavy_blush "I-- *Ehm*..." ("soft", "narrow", "worried", "downR") # super embarrassed
     gen "Maybe you could wait with that until Quidditch is over." ("base", xpos="far_left", ypos="head")
     gen "She has to stay focused, you know..." ("base", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "..." ("disgust", "narrow", "worried", "down")
-    ton "*Sigh*... Alright..." ("open", "closed", "shocked", "mid", hair="horny")
+    ton @ hair horny "*Sigh*... Alright..." ("open", "closed", "shocked", "mid")
 
     # Fade to black.
     call hide_characters
@@ -3008,14 +3008,14 @@ label cc_pf_strip_T3_intro_E3:
 
     call bld
     gen "And Tonks, next time we do this, wear the clothes I usually ask you to wear around my office." ("grin", xpos="far_left", ypos="head")
-    ton "With pleasure." ("base", "narrow", "base", "mid", hair="horny", ypos="head", flip=False)
+    ton @ hair horny "With pleasure." ("base", "narrow", "base", "mid", ypos="head", flip=False)
 
     if game.daytime:
-        ton "I'll escort you back to classes, Miss Chang." ("open", "narrow", "base", "L", hair="horny")
-        ton "Have a good day, Professor." ("base", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "I'll escort you back to classes, Miss Chang." ("open", "narrow", "base", "L")
+        ton @ hair horny "Have a good day, Professor." ("base", "narrow", "base", "mid")
     else:
-        ton "I'll escort you back to your dormitories, Miss Chang." ("open", "narrow", "base", "L", hair="horny")
-        ton "Have a good night, Professor." ("base", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "I'll escort you back to your dormitories, Miss Chang." ("open", "narrow", "base", "L")
+        ton @ hair horny "Have a good night, Professor." ("base", "narrow", "base", "mid")
 
     gen "Until next time." ("grin", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "..." ("upset", "happyCl", "worried", "mid", ypos="head", flip=False)
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
index c3ea8f15..f74ebde6 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
@@ -116,13 +116,13 @@ label cc_pf_strip_T3_tonks:
         if tonks.is_worn("robe") or ( tonks.is_worn("top") and tonks.is_worn("bottom") ):
             pass
         else: #Tonks in in her underwear or naked.
-            ton "*Hmm*...{w=0.3} Who needs clothing anyway?" ("horny", "narrow", "base", "L", hair="horny")
-            ton "But I'll give you a show if that's what you want...{heart}" ("horny", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "*Hmm*...{w=0.3} Who needs clothing anyway?" ("horny", "narrow", "base", "L")
+            ton @ hair horny "But I'll give you a show if that's what you want...{heart}" ("horny", "narrow", "base", "mid")
         gen "..." ("grin", xpos="far_left", ypos="head")
 
     else: # repeat
         cho @ cheeks blush "The headmaster wants us to strip for him again." ("base", "narrow", "base", "mid")
-        ton "Does he now?" ("horny", "narrow", "base", "L", hair="horny")
+        ton @ hair horny "Does he now?" ("horny", "narrow", "base", "L")
         if cho.is_worn("robe") or ( cho.is_worn("top") and cho.is_worn("bottom") ):
             pass
         else:
@@ -132,11 +132,11 @@ label cc_pf_strip_T3_tonks:
         if tonks.is_worn("robe") or ( tonks.is_worn("top") and tonks.is_worn("bottom") ):
             pass
         else: #Tonks in in her underwear or naked.
-            ton "Stripping's out of the question for me that's for sure..." ("horny", "narrow", "base", "L", hair="horny")
-            ton "But I'll give you a good view at the very least...{heart}" ("horny", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "Stripping's out of the question for me that's for sure..." ("horny", "narrow", "base", "L")
+            ton @ hair horny "But I'll give you a good view at the very least...{heart}" ("horny", "narrow", "base", "mid")
 
-    ton "Well in that case we shouldn't keep him waiting, should we?" ("horny", "narrow", "base", "L", hair="horny")
-    ton "After you, [name_cho_tonks]." ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Well in that case we shouldn't keep him waiting, should we?" ("horny", "narrow", "base", "L")
+    ton @ hair horny "After you, [name_cho_tonks]." ("horny", "narrow", "base", "L")
     stop music fadeout 1
 
     # Cho and Tonks hop onto the desk.
@@ -168,13 +168,13 @@ label cc_pf_strip_T3_tonks:
     $ cho.zorder = 16 # in front of Tonks # Default is 15.
     $ tonks.zorder = 15 # reset to default.
     cho @ cheeks heavy_blush "" ("base", "narrow", "base", "L", xpos=280, ypos="base", flip=True)
-    ton "..." ("base", "narrow", "raised", "L", hair="horny", xpos=345, ypos="base")
+    ton @ hair horny "..." ("base", "narrow", "raised", "L", xpos=345, ypos="base")
 
-    ton "This feels quite familiar, doesn't it, Miss Chang?" ("crooked_smile", "narrow", "raised", "L", hair="horny")
+    ton @ hair horny "This feels quite familiar, doesn't it, Miss Chang?" ("crooked_smile", "narrow", "raised", "L")
     cho @ cheeks blush "..." ("horny", "narrow", "base", "mid")
-    ton "Let's not waste any more time..." ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Let's not waste any more time..." ("horny", "narrow", "base", "L")
 
-    ton "Who of us would you like to start, Professor?" ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Who of us would you like to start, Professor?" ("base", "narrow", "base", "mid")
     gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
 
     menu:
@@ -185,8 +185,8 @@ label cc_pf_strip_T3_tonks:
             jump cc_pf_strip_T3_tonks.strip_cho
 
         "\"You go first, Miss Tonks!\"":
-            ton "*Hmm*..." ("base", "narrow", "base", "L", hair="horny")
-            ton "Saving the best for last, are we?" ("base", "narrow", "raised", "mid", hair="horny")
+            ton @ hair horny "*Hmm*..." ("base", "narrow", "base", "L")
+            ton @ hair horny "Saving the best for last, are we?" ("base", "narrow", "raised", "mid")
             cho @ cheeks blush "..." ("horny", "narrow", "base", "downR")
             $ cho_position = 1 # Cho's current position is in the middle.
 
@@ -202,8 +202,8 @@ label .strip_cho:
 
     # Check their positions. If Cho stands to the right she'll get moved to the middle.
     if cho_position == 2: # to the right.
-        ton "Move between us, Cho." ("soft", "narrow", "shocked", "L", hair="horny")
-        ton "That way the headmaster can see you better." ("base", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "Move between us, Cho." ("soft", "narrow", "shocked", "L")
+        ton @ hair horny "That way the headmaster can see you better." ("base", "narrow", "base", "mid")
         cho @ cheeks blush "Yes, Professor." ("smile", "narrow", "base", "L")
         call hide_characters
         hide screen bld1
@@ -217,7 +217,7 @@ label .strip_cho:
         call cho_chibi("stand", 314, 366, flip=True)
         call ton_chibi("stand", 370, 360, flip=False)
         cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=280, ypos="base", flip=True)
-        ton "" ("base", "narrow", "base", "mid", hair="horny", xpos=345, ypos="base", flip=False)
+        ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False)
         with d5
     call ctc
 
@@ -226,8 +226,8 @@ label .strip_cho:
     if cho.is_any_worn("robe", "top", "bottom", "bra", "panties"):
         pass
     else: # Cho is already naked.
-        ton "Well, since you're not really wearing much already..." ("soft", "narrow", "base", "L", hair="horny")
-        ton "There isn't that much more for me to help her take off, is there?" ("soft", "narrow", "base", "L", hair="horny")
+        ton @ hair horny "Well, since you're not really wearing much already..." ("soft", "narrow", "base", "L")
+        ton @ hair horny "There isn't that much more for me to help her take off, is there?" ("soft", "narrow", "base", "L")
         cho @ cheeks heavy_blush "..." ("base", "narrow", "base", "downR")
         pause .2
         $ cho.strip("clothes")
@@ -239,9 +239,9 @@ label .strip_cho:
 
     # Remove Top and Bottom.
     if cho.is_any_worn("robe", "top", "bottom"):
-        ton "Let me help you get out of these clothes, Miss Chang." ("soft", "narrow", "base", "L", hair="horny")
+        ton @ hair horny "Let me help you get out of these clothes, Miss Chang." ("soft", "narrow", "base", "L")
         cho @ cheeks heavy_blush "Yes, Professor." ("base", "narrow", "base", "down")
-        ton "" ("base", "narrow", "base", "down", hair="horny", xpos=300, ypos="base", flip=False, trans=d5) # moves closer to Cho.
+        ton @ hair horny "" ("base", "narrow", "base", "down", xpos=300, ypos="base", flip=False, trans=d5) # moves closer to Cho.
         pause .2
 
         if cho.is_worn("robe"):
@@ -272,12 +272,12 @@ label .strip_cho:
 
     # Remove Bra and Panties.
     if cho.is_any_worn("bra", "panties"):
-        ton "I like your underwear Miss Chang... Very cute!" ("soft", "narrow", "base", "L", hair="horny")
+        ton @ hair horny "I like your underwear Miss Chang... Very cute!" ("soft", "narrow", "base", "L")
         cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "downR")
-        ton "" ("soft", "narrow", "base", "L", hair="horny", xpos=300, ypos="base", flip=False, trans=d5) # moves closer to Cho.
+        ton @ hair horny "" ("soft", "narrow", "base", "L", xpos=300, ypos="base", flip=False, trans=d5) # moves closer to Cho.
 
         if cho.is_worn("bra"):
-            ton "But...{w=0.3} That bra definitely has to come off." ("soft", "narrow", "angry", "down", hair="horny")
+            ton @ hair horny "But...{w=0.3} That bra definitely has to come off." ("soft", "narrow", "angry", "down")
             pause .5
             play sound "sounds/cloth_sound3.ogg"
             $ cho.strip("bra")
@@ -289,7 +289,7 @@ label .strip_cho:
             pause .2
         if cho.is_worn("panties"):
             cho @ cheeks blush "..." ("mad", "narrow", "base", "down")
-            ton "Wearing panties is so silly, let's take those off... {heart}" ("crooked_smile", "narrow", "angry", "down", hair="horny")
+            ton @ hair horny "Wearing panties is so silly, let's take those off... {heart}" ("crooked_smile", "narrow", "angry", "down")
             pause .5
             play sound "sounds/cloth_sound3.ogg"
             $ cho.strip("panties")
@@ -307,21 +307,21 @@ label .strip_cho:
     cho @ cheeks heavy_blush "" ("base", "narrow", "base", "mid")
     call ctc
 
-    ton "" ("base", "narrow", "base", "mid", hair="horny", xpos=345, ypos="base", flip=False) # Tonks moves to her original position.
+    ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False) # Tonks moves to her original position.
     with d5
 
     random:
         block:
-            ton "Look at all these muscles!" ("horny", "narrow", "raised", "down", hair="horny")
-            ton "I mean... I could easily get some muscles as well, but not without cheating..." ("open", "closed", "base", "mid", hair="horny")
-            ton "I'm quite impressed, Miss Chang." ("base", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "Look at all these muscles!" ("horny", "narrow", "raised", "down")
+            ton @ hair horny "I mean... I could easily get some muscles as well, but not without cheating..." ("open", "closed", "base", "mid")
+            ton @ hair horny "I'm quite impressed, Miss Chang." ("base", "narrow", "base", "L")
             cho @ cheeks blush "Thank you." ("soft", "narrow", "base", "L")
         block:
-            ton "You look quite tasty, Miss Chang." ("horny", "narrow", "raised", "down", hair="horny")
+            ton @ hair horny "You look quite tasty, Miss Chang." ("horny", "narrow", "raised", "down")
             cho @ cheeks heavy_blush "*Ehm*..." ("clench", "narrow", "worried", "down")
             cho @ cheeks heavy_blush "Thanks?" ("soft", "narrow", "worried", "L")
         block:
-            ton "Looks like we're done here, Professor." ("horny", "narrow", "raised", "mid", hair="horny")
+            ton @ hair horny "Looks like we're done here, Professor." ("horny", "narrow", "raised", "mid")
             gen "Excellent!" ("base", xpos="far_left", ypos="head")
             gen "I do love watching you two." ("grin", xpos="far_left", ypos="head")
 
@@ -341,18 +341,18 @@ label .spank_cho:
             return
 
     call slap_her
-    ton "" ("crooked_smile", "narrow", "raised", "L", hair="horny")
+    ton @ hair horny "" ("crooked_smile", "narrow", "raised", "L")
     cho @ cheeks heavy_blush "!!!" ("clench", "wide", "base", "mid") # shocked
     cho @ cheeks heavy_blush "Ouch... Professor!" ("silly", "happyCl", "worried", "mid")
     play sound "sounds/giggle2_loud.ogg"
-    ton @ cheeks blush "*Giggles*... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid", hair="horny")
-    ton "..." ("base", "narrow", "base", "mid", hair="horny")
+    ton @ cheeks blush hair horny "*Giggles*... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid")
+    ton @ hair horny "..." ("base", "narrow", "base", "mid")
 
     menu:
         gen "(...)" ("base", xpos="far_left", ypos="head")
         "-Spank her again!-":
             call slap_her
-            ton "" ("crooked_smile", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "" ("crooked_smile", "narrow", "base", "mid")
             cho @ cheeks heavy_blush "Professor!" ("clench", "wide", "raised", "mid")
             gen "What? I know you like it." ("grin", xpos="far_left", ypos="head")
             cho @ cheeks heavy_blush "I do not..." ("annoyed", "narrow", "angry", "mid")
@@ -371,7 +371,7 @@ label .spank_cho:
                     pass
             call slap_her
             cho @ cheeks heavy_blush "" ("clench", "wide", "raised", "mid")
-            ton @ cheeks blush "" ("grin", "narrow", "base", "mid", hair="horny")
+            ton @ cheeks blush hair horny "" ("grin", "narrow", "base", "mid")
             pause .5
             call slap_her
             pause .3
@@ -382,68 +382,68 @@ label .spank_cho:
             cho @ cheeks blush "That's enough..." ("annoyed", "narrow", "angry", "mid")
             gen "You'd probably enjoy it more if your teacher were to spank you, wouldn't you?" ("grin", xpos="far_left", ypos="head")
             cho @ cheeks blush "..." ("annoyed", "narrow", "base", "L")
-            ton "" ("base", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "" ("base", "narrow", "base", "L")
             cho @ cheeks heavy_blush "*Ehm*..." ("annoyed", "narrow", "raised", "mid")
             play sound "sounds/giggle2_loud.ogg"
-            ton @ cheeks heavy_blush "*Giggles*... {heart}{heart}{heart}" ("base", "happyCl", "base", "mid", hair="horny")
-            ton "I won't be gentle on you either, Miss Chang." ("soft", "narrow", "base", "L", hair="horny")
+            ton @ cheeks heavy_blush hair horny "*Giggles*... {heart}{heart}{heart}" ("base", "happyCl", "base", "mid")
+            ton @ hair horny "I won't be gentle on you either, Miss Chang." ("soft", "narrow", "base", "L")
             cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "down")
 
             return
 
         "-Ask Tonks to spank her.-":
             gen "Miss Tonks, If you may..." ("grin", xpos="far_left", ypos="head")
-            ton "With pleasure!" ("grin", "narrow", "angry", "mid", hair="horny")
+            ton @ hair horny "With pleasure!" ("grin", "narrow", "angry", "mid")
             cho @ cheeks heavy_blush "But-- Professor Tonks!" ("clench", "base", "worried", "L")
-            ton "Don't worry, [name_cho_tonks]. You'll learn to love it! {heart}" ("horny", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "Don't worry, [name_cho_tonks]. You'll learn to love it! {heart}" ("horny", "narrow", "base", "L")
             cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "mid")
-            ton "Now, turn around for me, please." ("soft", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "Now, turn around for me, please." ("soft", "narrow", "base", "L")
             cho @ cheeks heavy_blush "..." ("clench", "narrow", "worried", "down")
             pause .2
 
             # Cho turns around.
             call cho_chibi("stand", 325, 366, flip=False)
             call ton_chibi("stand", 360, 360, flip=False)
-            ton "" ("base", "narrow", "base", "down", hair="horny", xpos=325, ypos="base", flip=False)
+            ton @ hair horny "" ("base", "narrow", "base", "down", xpos=325, ypos="base", flip=False)
             cho @ cheeks blush "" ("disgust", "narrow", "worried", "down", xpos=235, ypos="base", flip=False, trans=d5)
             pause .5
 
             call slap_her
             cho @ cheeks blush "" ("normal", "happyCl", "worried", "mid")
-            ton "Such a firm ass you have, Miss Chang!" ("horny", "narrow", "raised", "down", hair="horny")
+            ton @ hair horny "Such a firm ass you have, Miss Chang!" ("horny", "narrow", "raised", "down")
             cho @ cheeks blush "" ("mad", "narrow", "worried", "downR")
             call ctc
 
             gen "..." ("base", xpos="far_left", ypos="head")
-            ton "Lovely indeed... {heart}" ("grin", "narrow", "base", "down", hair="horny")
+            ton @ hair horny "Lovely indeed... {heart}" ("grin", "narrow", "base", "down")
             gen ".........." ("base", xpos="far_left", ypos="head")
             gen "I don't hear any spanking." ("base", xpos="far_left", ypos="head")
-            ton "Don't worry, Sir. I'll get to that eventually... {heart}" ("open", "narrow", "annoyed", "mid", hair="horny")
+            ton @ hair horny "Don't worry, Sir. I'll get to that eventually... {heart}" ("open", "narrow", "annoyed", "mid")
             gen "Building up the suspense are--" ("base", xpos="far_left", ypos="head")
             call slap_her
             cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "downR")
-            ton "You should get a good feel of it first, before you--" ("crooked_smile", "narrow", "annoyed", "down", hair="horny")
+            ton @ hair horny "You should get a good feel of it first, before you--" ("crooked_smile", "narrow", "annoyed", "down")
             call slap_her
             cho @ cheeks heavy_blush "" ("mad", "wide", "base", "mid")
-            ton "" ("horny", "narrow", "angry", "down", hair="angry")
+            ton @ hair angry "" ("horny", "narrow", "angry", "down")
             pause .6
             call slap_her
             pause .3
             call slap_her
             pause .4
-            ton "" ("horny", "narrow", "angry", "down", hair="horny")
+            ton @ hair horny "" ("horny", "narrow", "angry", "down")
             cho @ cheeks heavy_blush "Please!" ("clench", "happyCl", "base", "mid")
-            ton "What's wrong, Miss Chang?" ("open", "narrow", "angry", "mid", hair="horny")
-            ton "You never get this flustered when you get hit by a bludger..." ("open", "narrow", "angry", "down", hair="horny")
+            ton @ hair horny "What's wrong, Miss Chang?" ("open", "narrow", "angry", "mid")
+            ton @ hair horny "You never get this flustered when you get hit by a bludger..." ("open", "narrow", "angry", "down")
             call slap_her
-            ton "Surely a bit of a spanking isn't enough for you to..." ("horny", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "Surely a bit of a spanking isn't enough for you to..." ("horny", "narrow", "base", "mid")
             cho @ cheeks blush "..." ("clench", "narrow", "worried", "down")
-            ton "Ask me nicely and I'll do it again, [name_cho_tonks]." ("crooked_smile", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "Ask me nicely and I'll do it again, [name_cho_tonks]." ("crooked_smile", "narrow", "base", "mid")
             gen "Go on, Cho... Ask your teacher to spank you." ("grin", xpos="far_left", ypos="head")
             cho @ cheeks heavy_blush "..." ("disgust", "narrow", "worried", "downR")
             cho @ cheeks heavy_blush "Please spank me again, Professor." ("soft", "narrow", "worried", "R")
-            ton "Of course sweetie...{w=0.4} Since you're asking so nicely." ("base", "narrow", "base", "L", hair="horny")
-            ton "" ("base", "narrow", "base", "down", hair="horny")
+            ton @ hair horny "Of course sweetie...{w=0.4} Since you're asking so nicely." ("base", "narrow", "base", "L")
+            ton @ hair horny "" ("base", "narrow", "base", "down")
             call slap_her
             cho @ cheeks heavy_blush "" ("angry", "narrow", "worried", "up")
             pause .5
@@ -454,12 +454,12 @@ label .spank_cho:
             call ctc
 
             cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "R")
-            ton "*Hmm*..." ("annoyed", "narrow", "shocked", "down", hair="horny")
-            ton "A well behaved girl like you should be rewarded. {heart}" ("crooked_smile", "narrow", "raised", "L", hair="horny")
-            ton "Ten points for Ravenclaw, Miss Chang." ("soft", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "*Hmm*..." ("annoyed", "narrow", "shocked", "down")
+            ton @ hair horny "A well behaved girl like you should be rewarded. {heart}" ("crooked_smile", "narrow", "raised", "L")
+            ton @ hair horny "Ten points for Ravenclaw, Miss Chang." ("soft", "narrow", "base", "L")
             $ ravenclaw += 10
             cho @ cheeks heavy_blush "Thank you I guess--" ("crooked_smile", "narrow", "worried", "R")
-            ton "" ("horny", "narrow", "angry", "down", hair="horny")
+            ton @ hair horny "" ("horny", "narrow", "angry", "down")
             call slap_her
             cho @ cheeks heavy_blush "!!!" ("clench", "wide", "base", "mid")
             cho @ cheeks heavy_blush "Ouch..." ("horny", "narrow", "worried", "R")
@@ -468,7 +468,7 @@ label .spank_cho:
             # Cho turns around.
             call cho_chibi("stand", 314, 366, flip=True)
             call ton_chibi("stand", 370, 360, flip=False)
-            ton "" ("base", "narrow", "base", "mid", hair="horny", xpos=345, ypos="base", flip=False)
+            ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False)
             cho @ cheeks blush "" ("annoyed", "narrow", "base", "mid", xpos=280, ypos="base", flip=True, trans=d5)
             pause .8
 
@@ -483,10 +483,10 @@ label .strip_tonks:
 
     # Check their positions. If Tonks stands to the right she'll get moved to the middle.
     if cho_position == 1: # middle.
-        ton "Cho, would you mind if I stood between you two?" ("open", "narrow", "base", "L", hair="horny")
-        ton "I'd like to give the headmaster a better view of my body." ("base", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "Cho, would you mind if I stood between you two?" ("open", "narrow", "base", "L")
+        ton @ hair horny "I'd like to give the headmaster a better view of my body." ("base", "narrow", "base", "mid")
         cho @ cheeks blush "Not at all, Professor." ("smile", "narrow", "base", "L")
-        ton "Thank you, [name_cho_tonks]." ("soft", "narrow", "shocked", "L", hair="horny")
+        ton @ hair horny "Thank you, [name_cho_tonks]." ("soft", "narrow", "shocked", "L")
         call hide_characters
         hide screen bld1
         with d5
@@ -503,7 +503,7 @@ label .strip_tonks:
         pause .5
 
         cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=315, ypos="base", flip=False)
-        ton "" ("base", "narrow", "base", "mid", hair="horny", xpos=280, ypos="base", flip=True)
+        ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=280, ypos="base", flip=True)
         with d5
     call ctc
 
@@ -512,14 +512,14 @@ label .strip_tonks:
     if tonks.is_worn("robe") or tonks.is_worn("top") or tonks.is_worn("bottom") or tonks.is_worn("bra") or tonks.is_worn("panties"):
         cho @ cheeks blush "..." ("horny", "narrow", "base", "L")
         if tonks.is_worn("top"):
-            ton "You don't mind if Miss Chang helps me undress, do you, Professor?" ("horny", "wink", "base", "mid", hair="horny")
+            ton @ hair horny "You don't mind if Miss Chang helps me undress, do you, Professor?" ("horny", "wink", "base", "mid")
             gen "Of course not!" ("grin", xpos="far_left", ypos="head")
         else:
-            ton "Just enjoy the show, Professor..." ("horny", "wink", "base", "mid", hair="horny")
+            ton @ hair horny "Just enjoy the show, Professor..." ("horny", "wink", "base", "mid")
         pass
     else: # Tonks is already naked.
-        ton "Professor... It seems like I'm not wearing much..." ("soft", "narrow", "base", "L", hair="horny")
-        ton "How shameful of me... Am I to get detention now?" ("horny", "narrow", "base", "mid", hair="horny")
+        ton @ hair horny "Professor... It seems like I'm not wearing much..." ("soft", "narrow", "base", "L")
+        ton @ hair horny "How shameful of me... Am I to get detention now?" ("horny", "narrow", "base", "mid")
         gen "Damn right you are!" ("grin", xpos="far_left", ypos="head")
         cho @ cheeks heavy_blush "..." ("base", "narrow", "base", "downR")
         pause .2
@@ -532,7 +532,7 @@ label .strip_tonks:
 
     # Remove Top and Bottom.
     if tonks.is_worn("robe") or tonks.is_worn("top") or tonks.is_worn("bottom"):
-        ton "Help me get out of these clothes, Miss Chang." ("soft", "narrow", "base", "L", hair="horny")
+        ton @ hair horny "Help me get out of these clothes, Miss Chang." ("soft", "narrow", "base", "L")
         cho @ cheeks blush "Yes, Professor." ("soft", "narrow", "base", "down")
         cho @ cheeks blush "" ("horny", "narrow", "base", "down", xpos=315, ypos="base", flip=False, trans=d5) # Cho moves closer to Tonks.
         pause .2
@@ -542,63 +542,63 @@ label .strip_tonks:
             $ tonks.strip("robe")
             with d3
             pause .5
-            ton "" ("horny", "narrow", "raised", "down", hair="horny")
+            ton @ hair horny "" ("horny", "narrow", "raised", "down")
             call ctc
         if tonks.is_worn("top"):
             play sound "sounds/cloth_sound3.ogg"
             $ tonks.strip("top")
             with d3
             pause .5
-            ton "" ("horny", "narrow", "raised", "mid", hair="horny")
+            ton @ hair horny "" ("horny", "narrow", "raised", "mid")
             pause .8
             nar "Cho eagerly helps her teacher take off her top."
             pause .2
         if tonks.is_worn("bottom"):
-            ton "Remember... Always take your time when undressing in front of somebody." ("soft", "narrow", "base", "L", hair="horny")
-            ton "" ("base", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "Remember... Always take your time when undressing in front of somebody." ("soft", "narrow", "base", "L")
+            ton @ hair horny "" ("base", "narrow", "base", "mid")
             nar "Slowly, and with gracile movements, Tonks takes off her bottom piece of clothing."
             play sound "sounds/cloth_sound3.ogg"
             $ tonks.strip("bottom")
             with hpunch
             pause .5
-            ton @ cheeks blush "" ("horny", "narrow", "raised", "mid", hair="horny")
+            ton @ cheeks blush hair horny "" ("horny", "narrow", "raised", "mid")
             pause .8
             nar "And then flicks it out of sigh with one swift motion."
             call ctc
 
     # Remove Bra and Panties.
     if tonks.is_worn("bra") or tonks.is_worn("panties"):
-        ton "*Hmm*... It's been a while since I had to remove underwear." ("annoyed", "narrow", "base", "down", hair="horny")
-        ton "Help me take them off, [name_cho_tonks]." ("base", "narrow", "base", "down", hair="horny")
+        ton @ hair horny "*Hmm*... It's been a while since I had to remove underwear." ("annoyed", "narrow", "base", "down")
+        ton @ hair horny "Help me take them off, [name_cho_tonks]." ("base", "narrow", "base", "down")
         cho @ cheeks blush "Of course..." ("smile", "narrow", "base", "down")
         cho @ cheeks blush "" ("horny", "narrow", "base", "down", xpos=315, ypos="base", flip=False, trans=d5) # Cho moves closer to Tonks.
 
         if tonks.is_worn("bra"):
-            ton "Let's get these tits out already!" ("base", "narrow", "angry", "mid", hair="horny")
+            ton @ hair horny "Let's get these tits out already!" ("base", "narrow", "angry", "mid")
             pause .5
             play sound "sounds/cloth_sound3.ogg"
             $ tonks.strip("bra")
             with d3
             pause .5
-            ton "" ("base", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "" ("base", "narrow", "base", "mid")
             pause .8
             nar "Tonks bares her impressive bosom for you both."
             pause .2
         if tonks.is_worn("panties"):
-            ton "Oh my... what happened to my panties..." ("soft", "narrow", "base", "down", hair="horny")
-            ton "I can't believe how wet they got!" ("clench", "narrow", "shocked", "down", hair="horny")
+            ton @ hair horny "Oh my... what happened to my panties..." ("soft", "narrow", "base", "down")
+            ton @ hair horny "I can't believe how wet they got!" ("clench", "narrow", "shocked", "down")
             pause .5
             play sound "sounds/cloth_sound3.ogg"
             $ tonks.strip("panties")
             with d3
             pause .5
-            ton "" ("horny", "narrow", "angry", "mid", hair="horny")
+            ton @ hair horny "" ("horny", "narrow", "angry", "mid")
             pause .8
             nar "Without much hesitation, Tonks panties are swiftly flung out of sight and out of mind."
             pause .2
 
     # Remove all Cho clothes.
-    ton "" ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "" ("base", "narrow", "base", "mid")
     $ tonks.strip("clothes")
     with d3
     call ctc
@@ -608,16 +608,16 @@ label .strip_tonks:
 
     random:
         block:
-            ton "How immoral for a teacher to do this sort of thing in front of a student..." ("open", "closed", "annoyed", "mid", hair="horny")
-            ton "You aren't going to report me for my wanton behaviour, are you, Miss Chang?" ("soft", "narrow", "annoyed", "L", hair="horny")
+            ton @ hair horny "How immoral for a teacher to do this sort of thing in front of a student..." ("open", "closed", "annoyed", "mid")
+            ton @ hair horny "You aren't going to report me for my wanton behaviour, are you, Miss Chang?" ("soft", "narrow", "annoyed", "L")
             cho @ cheeks heavy_blush "No. Of course not, Professor." ("base", "narrow", "base", "L")
-            ton "Good girl." ("horny", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "Good girl." ("horny", "narrow", "base", "L")
             cho @ cheeks blush "..." ("angry", "narrow", "base", "down")
         block:
-            ton "Are you enjoying yourself, Professor?" ("open", "narrow", "raised", "mid", hair="horny")
+            ton @ hair horny "Are you enjoying yourself, Professor?" ("open", "narrow", "raised", "mid")
             gen "With those tits in front of me? Always!" ("grin", xpos="far_left", ypos="head")
         block:
-            ton "Did you like that, Professor?" ("horny", "narrow", "raised", "mid", hair="horny")
+            ton @ hair horny "Did you like that, Professor?" ("horny", "narrow", "raised", "mid")
             gen "I bloody love it!" ("grin", xpos="far_left", ypos="head")
 
     call cc_pf_strip_T3_tonks.spank_tonks
@@ -635,31 +635,31 @@ label .spank_tonks:
             return
 
     call slap_her
-    ton @ cheeks heavy_blush "!!!" ("clench", "shocked", "base", "stare", hair="scared") # shocked
-    ton @ cheeks blush "*Mmm*... You're so naughty, Professor!" ("silly", "narrow", "angry", "mid", hair="horny")
-    ton @ cheeks blush "Right in front of a student and everything..." ("base", "narrow", "base", "mid", hair="horny")
+    ton @ cheeks heavy_blush hair scared "!!!" ("clench", "shocked", "base", "stare") # shocked
+    ton @ cheeks blush hair horny "*Mmm*... You're so naughty, Professor!" ("silly", "narrow", "angry", "mid")
+    ton @ cheeks blush hair horny "Right in front of a student and everything..." ("base", "narrow", "base", "mid")
     call slap_her
-    ton @ cheeks blush "Ouch... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid", hair="horny")
+    ton @ cheeks blush hair horny "Ouch... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid")
     cho @ cheeks blush "..." ("grin", "narrow", "base", "mid")
 
     menu:
         gen "(...)" ("base", xpos="far_left", ypos="head")
         "-Spank her again!-":
             call slap_her
-            ton @ cheeks heavy_blush "*Mmm*... Spank me, Professor!" ("horny", "narrow", "angry", "mid", hair="horny")
+            ton @ cheeks heavy_blush hair horny "*Mmm*... Spank me, Professor!" ("horny", "narrow", "angry", "mid")
 
             menu:
                 "-Again!-":
                     pass
             call slap_her
-            ton @ cheeks heavy_blush "Not so rough, Sir! {heart}" ("soft", "narrow", "base", "mid", hair="horny")
+            ton @ cheeks heavy_blush hair horny "Not so rough, Sir! {heart}" ("soft", "narrow", "base", "mid")
             cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "down") # blushing #lip bite #looking away
 
             menu:
                 "-Slap it hard!-":
                     pass
             call slap_her
-            ton @ cheeks heavy_blush "" ("clench", "base", "shocked", "ahegao", hair="scared")
+            ton @ cheeks heavy_blush hair scared "" ("clench", "base", "shocked", "ahegao")
             pause .5
             call slap_her
             pause .3
@@ -667,8 +667,8 @@ label .spank_tonks:
             pause .3
             call slap_her
             cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "mid")
-            ton @ cheeks heavy_blush "*Hngh*..." ("upset", "narrow", "base", "ahegao", hair="horny")
-            ton @ cheeks heavy_blush "Thank you, Professor. {heart}{heart}{heart}" ("soft", "narrow", "worried", "mid", hair="horny")
+            ton @ cheeks heavy_blush hair horny "*Hngh*..." ("upset", "narrow", "base", "ahegao")
+            ton @ cheeks heavy_blush hair horny "Thank you, Professor. {heart}{heart}{heart}" ("soft", "narrow", "worried", "mid")
             gen "You're welcome." ("grin", xpos="far_left", ypos="head")
             cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "downR")
 
@@ -676,62 +676,62 @@ label .spank_tonks:
 
         "-Ask Cho to spank her.-":
             gen "Miss Chang, would you be so kind and slap your teacher's ass for me?" ("grin", xpos="far_left", ypos="head")
-            ton "" ("base", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "" ("base", "narrow", "base", "mid")
             cho @ cheeks blush "Yes, Sir." ("open", "narrow", "angry", "mid")
-            ton "Do it, [name_cho_tonks]!" ("base", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "Do it, [name_cho_tonks]!" ("base", "narrow", "base", "L")
             pause .2
 
             # Tonks turns around.
             call ton_chibi(flip=False)
-            ton @ cheeks blush "" ("base", "base", "base", "mid", hair="horny", xpos=215, ypos="base", flip=False, trans=d5)
+            ton @ cheeks blush hair horny "" ("base", "base", "base", "mid", xpos=215, ypos="base", flip=False, trans=d5)
             pause .5
 
-            ton @ cheeks blush "Slap this naughty teacher's ass!" ("crooked_smile", "narrow", "angry", "R", hair="horny")
+            ton @ cheeks blush hair horny "Slap this naughty teacher's ass!" ("crooked_smile", "narrow", "angry", "R")
             cho @ cheeks blush "..." ("base", "narrow", "angry", "down")
             call slap_her
-            ton "Surely you can do better than that, Cho." ("soft", "narrow", "base", "downR", hair="horny")
+            ton @ hair horny "Surely you can do better than that, Cho." ("soft", "narrow", "base", "downR")
             cho @ cheeks blush "" ("annoyed", "narrow", "angry", "down")
             call slap_her
-            ton @ cheeks blush "*Hngh*..." ("crooked_smile", "narrow", "base", "mid", hair="horny")
-            ton "Do I have to fetch a beaters bat so you can hit it properly, Miss Chang?" ("open", "narrow", "annoyed", "downR", hair="angry")
-            ton "I thought I asked you to slap it harder!" ("scream", "narrow", "angry", "downR", hair="angry")
+            ton @ cheeks blush hair horny "*Hngh*..." ("crooked_smile", "narrow", "base", "mid")
+            ton @ hair angry "Do I have to fetch a beaters bat so you can hit it properly, Miss Chang?" ("open", "narrow", "annoyed", "downR")
+            ton @ hair angry "I thought I asked you to slap it harder!" ("scream", "narrow", "angry", "downR")
             cho @ cheeks blush "" ("clench", "narrow", "angry", "down")
             call slap_her
-            ton "" ("mad", "wide", "shocked", "stare", hair="scared")
+            ton @ hair scared "" ("mad", "wide", "shocked", "stare")
             pause .5
             call slap_her
             pause .3
             call slap_her
             pause .2
             call slap_her
-            ton @ cheeks heavy_blush "!!!" ("clench", "narrow", "base", "ahegao", hair="horny")
+            ton @ cheeks heavy_blush hair horny "!!!" ("clench", "narrow", "base", "ahegao")
             cho @ cheeks blush "Good enough for you, Professor?" ("open", "narrow", "angry", "L")
-            ton "*Ah*...{w=0.4} Yes, [name_cho_tonks]... I'd say that was quite--" ("open", "narrow", "worried", "R", hair="horny")
+            ton @ hair horny "*Ah*...{w=0.4} Yes, [name_cho_tonks]... I'd say that was quite--" ("open", "narrow", "worried", "R")
             cho @ cheeks blush "" ("annoyed", "narrow", "angry", "down")
             call slap_her
-            ton "" ("clench", "narrow", "base", "ahegao", hair="scared")
+            ton @ hair scared "" ("clench", "narrow", "base", "ahegao")
             pause .5
             call slap_her
             pause .3
             call slap_her
             pause .2
             call slap_her
-            ton @ cheeks heavy_blush "" ("horny", "narrow", "base", "ahegao", hair="horny")
+            ton @ cheeks heavy_blush hair horny "" ("horny", "narrow", "base", "ahegao")
             call ctc
 
             gen "That's enough." ("base", xpos="far_left", ypos="head")
             cho @ cheeks blush "Oh wow, it's really red now..." ("grin", "narrow", "base", "down")
-            ton @ cheeks heavy_blush "Very good, Miss Chang. {heart}" ("horny", "narrow", "worried", "R", hair="horny")
+            ton @ cheeks heavy_blush hair horny "Very good, Miss Chang. {heart}" ("horny", "narrow", "worried", "R")
             pause .2
 
             # Tonks turns around.
             call ton_chibi(flip=True)
-            ton @ cheeks heavy_blush "" ("base", "base", "base", "mid", hair="horny", xpos=280, ypos="base", flip=True, trans=dissolve)
+            ton @ cheeks heavy_blush hair horny "" ("base", "base", "base", "mid", xpos=280, ypos="base", flip=True, trans=dissolve)
             pause .8
 
-            ton @ cheeks heavy_blush "Ten points for Ravenclaw." ("soft", "narrow", "base", "L", hair="horny")
+            ton @ cheeks heavy_blush hair horny "Ten points for Ravenclaw." ("soft", "narrow", "base", "L")
             $ ravenclaw += 10
-            ton @ cheeks heavy_blush "For this thorough ass spanking!" ("horny", "narrow", "base", "mid", hair="horny")
+            ton @ cheeks heavy_blush hair horny "For this thorough ass spanking!" ("horny", "narrow", "base", "mid")
             cho "Thank you, Professor Tonks." ("crooked_smile", "narrow", "base", "down")
 
             return
@@ -761,7 +761,7 @@ label .transformations:
     $ tonks.zorder = 15 # reset to default.
     call cho_chibi("stand", 314, 366, flip=True)
     call ton_chibi("stand", 370, 360, flip=False)
-    ton "" ("base", "narrow", "base", "L", hair="horny", xpos=345, ypos="base", flip=False)
+    ton @ hair horny "" ("base", "narrow", "base", "L", xpos=345, ypos="base", flip=False)
     cho @ cheeks blush "" ("grin", "base", "base", "L", xpos=280, ypos="base", flip=True)
     with d5
 
@@ -794,7 +794,7 @@ label .transformations:
             ton "*Hmm*... not so nervous around me anymore, are you, Cho?" ("crooked_smile", "narrow", "base", "L")
             cho @ cheeks blush "Oh, I guess not. It seems like I got used to it..." ("crooked_smile", "narrow", "worried", "R")
             cho @ cheeks blush "It's fun doing this sort of thing at school... I'm quite enjoying it." ("smile", "narrow", "base", "downR")
-            ton "Well, there's somebody who enjoys it even more than we do, isn't that right, Professor?" ("horny", "base", "raised", "mid", hair="horny")
+            ton @ hair horny "Well, there's somebody who enjoys it even more than we do, isn't that right, Professor?" ("horny", "base", "raised", "mid")
             gen "(...)" ("base", xpos="far_left", ypos="head")
             ton "Professor?" ("soft", "narrow", "base", "mid")
             cho @ cheeks blush "" ("annoyed", "narrow", "base", "mid")
@@ -864,22 +864,22 @@ label cc_pf_strip_T3_tonks.doppler_E1:
     cho "That does sound quite suspicious, Professor..." ("open", "narrow", "angry", "mid")
     cho @ cheeks blush "After all, she's been abusing her powers to flaunt my bum at people!" ("annoyed", "narrow", "angry", "mid")
     gen "That's true!" ("grin", xpos="far_left", ypos="head")
-    ton "Surely you can't blame me for that... As I said, it wasn't anything they hadn't seen before." ("soft", "base", "base", "R", hair="horny")
+    ton @ hair horny "Surely you can't blame me for that... As I said, it wasn't anything they hadn't seen before." ("soft", "base", "base", "R")
     cho @ cheeks heavy_blush "But-- Professor!" ("annoyed", "narrow", "angry", "L")
     gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
-    ton @ cheeks blush "I'm not doing anything harmful, I promise." ("upset", "happyCl", "worried", "mid", hair="horny")
+    ton @ cheeks blush hair horny "I'm not doing anything harmful, I promise." ("upset", "happyCl", "worried", "mid")
     cho @ cheeks blush "..." ("annoyed", "narrow", "angry", "mid") # annoyed
 
-    ton "So, what other \"Evidence\" do you have to further prove this theory?" ("soft", "narrow", "base", "mid", hair="horny") #Amused
+    ton @ hair horny "So, what other \"Evidence\" do you have to further prove this theory?" ("soft", "narrow", "base", "mid") #Amused
     gen "Well, there's a big reason why Dopplers indulge themselves when they get the chance to." ("base", xpos="far_left", ypos="head")
     gen "Since they're incredibly ugly creatures, it wouldn't surprise me in the slightest that they'd change their appearance into a highly attractive woman when given the chance." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "" ("annoyed", "base", "base", "L")
-    ton "" ("annoyed", "base", "base", "mid", hair="horny")
+    ton @ hair horny "" ("annoyed", "base", "base", "mid")
     gen "Miss Tonks, your appearance, it's almost too perfect..." ("base", xpos="far_left", ypos="head")
     gen "You didn't find some smoking hot woman in a magazine did you?" ("base", xpos="far_left", ypos="head")
     gen "We all know those are highly edited..." ("base", xpos="far_left", ypos="head")
-    ton "So I'm smoking hot, huh?" ("horny", "narrow", "base", "mid", hair="horny")
-    ton "You flatter me, but no... I've always looked like this." ("base", "happyCl", "base", "mid", hair="horny")
+    ton @ hair horny "So I'm smoking hot, huh?" ("horny", "narrow", "base", "mid")
+    ton @ hair horny "You flatter me, but no... I've always looked like this." ("base", "happyCl", "base", "mid")
     gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "..." ("annoyed", "base", "base", "mid") # blushing
 
@@ -892,11 +892,11 @@ label cc_pf_strip_T3_tonks.doppler_E1:
     gen "You may say that, but we all know shape-shifting is the source of all kinds of evil sorcery!" ("angry", xpos="far_left", ypos="head")
     ton "No it's not..." ("open", "closed", "annoyed", "mid")
     gen "The last thing we need at this school is a rogue shapeshifter -- abusive of its powers..." ("angry", xpos="far_left", ypos="head")
-    ton "..." ("upset", "base", "base", "mid", hair="horny")
+    ton @ hair horny "..." ("upset", "base", "base", "mid")
 
     gen "Anyway... Promise me you won't start murdering people and steal their identities." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "" ("angry", "base", "raised", "mid")
-    ton "What?! How could you even suggest that I would--" ("clench", "shocked", "shocked", "mid", hair="scared") # shocked
+    ton @ hair scared "What?! How could you even suggest that I would--" ("clench", "shocked", "shocked", "mid") # shocked
     gen "Identity theft is not a joke, Tonks! Millions of families suffer every year!" ("angry", xpos="far_left", ypos="head")
     ton "Yikes! Of course I won't do that, Professor!" ("clench", "happyCl", "base", "mid")
     gen "Good." ("base", xpos="far_left", ypos="head")
@@ -929,53 +929,53 @@ label cc_pf_strip_T3_tonks.succubus_E1:
 
     $ states.cho.ev.inspect_her_body.tonks_succubus_encounter = True
     ton "I mean... I'm quite flattered, Professor..." ("open", "narrow", "raised", "mid")
-    ton "Who doesn't want to be compared to a demonic, sex-driven temptress!" ("soft", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Who doesn't want to be compared to a demonic, sex-driven temptress!" ("soft", "narrow", "base", "mid")
     cho @ cheeks blush "" ("annoyed", "base", "base", "mid")
     gen "I knew it! You're a Succubus!" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks blush "" ("annoyed", "base", "raised", "L")
     ton "No I'm not, silly!" ("open", "closed", "base", "mid")
-    ton "..." ("annoyed", "base", "shocked", "L", hair="horny") # thinks
-    ton "Well, I do have similar shapeshifting abilities, that's true..." ("soft", "base", "base", "down", hair="horny")
-    ton "And share some of their more raunchy characteristics..." ("crooked_smile", "happyCl", "base", "mid", hair="horny")
+    ton @ hair horny "..." ("annoyed", "base", "shocked", "L") # thinks
+    ton @ hair horny "Well, I do have similar shapeshifting abilities, that's true..." ("soft", "base", "base", "down")
+    ton @ hair horny "And share some of their more raunchy characteristics..." ("crooked_smile", "happyCl", "base", "mid")
     gen "Not to mention a banger body!" ("grin", xpos="far_left", ypos="head")
-    ton "Obviously." ("soft", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Obviously." ("soft", "narrow", "base", "mid")
     cho @ cheeks blush "..." ("horny", "narrow", "base", "L") # blushing
-    ton "I may also act like one on the occasion..." ("open", "base", "base", "R", hair="horny")
+    ton @ hair horny "I may also act like one on the occasion..." ("open", "base", "base", "R")
 
     # TODO: v v v Added this bit of writing. Needs review
     gen "But you're still denying that you're an alluring sex-demon, even after that last demonstration?" ("base", xpos="far_left", ypos="head")
-    ton "I might have some unusual talents, that's all..." ("open", "base", "base", "R", hair="horny")
-    ton "Why are you so scared of them anyway?" ("open", "narrow", "base", "mid", hair="horny")
-    ton "What's the worst a succubus could do to you?" ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "I might have some unusual talents, that's all..." ("open", "base", "base", "R")
+    ton @ hair horny "Why are you so scared of them anyway?" ("open", "narrow", "base", "mid")
+    ton @ hair horny "What's the worst a succubus could do to you?" ("horny", "narrow", "base", "mid")
     gen "Do I really have to tell the two of you of what they do?" ("angry", xpos="far_left", ypos="head")
     gen "I won't let any demon suck the life-blood out of my penis!" ("angry", xpos="far_left", ypos="head")
-    ton "" ("normal", "base", "base", "mid", hair="horny")
+    ton @ hair horny "" ("normal", "base", "base", "mid")
     cho "What?!" ("clench", "base", "base", "mid") # bit shocked.
-    ton "Well, if I was one, I promise you I wouldn't do that..." ("mad", "narrow", "base", "mid", hair="horny")
-    ton "Not as long as there's plenty of other essence to be gathered." ("horny", "narrow", "angry", "mid", hair="horny")
+    ton @ hair horny "Well, if I was one, I promise you I wouldn't do that..." ("mad", "narrow", "base", "mid")
+    ton @ hair horny "Not as long as there's plenty of other essence to be gathered." ("horny", "narrow", "angry", "mid")
     cho "Professors?!" ("mad", "narrow", "base", "downR") # uncomfortable
     gen "Then I better not run out of essence!" ("grin", xpos="far_left", ypos="head")
     cho "..." ("disgust", "narrow", "base", "mid")
     gen "Thought you could trick me, you semen loving sex-demon!" ("grin", xpos="far_left", ypos="head")
     # TODO: ^ ^ ^ Added this bit of writing. Needs review
 
-    ton "I'm still human, and not a sex-demon...{w=0.5} Believe it or not." ("open", "narrow", "raised", "mid", hair="horny")
+    ton @ hair horny "I'm still human, and not a sex-demon...{w=0.5} Believe it or not." ("open", "narrow", "raised", "mid")
     gen "If you say so..." ("base", xpos="far_left", ypos="head")
-    ton "If you'd met one before, you'd know the difference between me and a succubus right away..." ("base", "narrow", "base", "mid", hair="horny")
-    ton "They are quite relentless when it comes to sex, you know. -- Even more so than I am!" ("horny", "narrow", "annoyed", "mid", hair="horny")
+    ton @ hair horny "If you'd met one before, you'd know the difference between me and a succubus right away..." ("base", "narrow", "base", "mid")
+    ton @ hair horny "They are quite relentless when it comes to sex, you know. -- Even more so than I am!" ("horny", "narrow", "annoyed", "mid")
     cho "You have met a Succubus, Professor? But I thought they're extremely dangerous." ("mad", "base", "base", "mid")
-    ton "Oh yes! You have to be extremely careful around them..." ("soft", "base", "base", "L", hair="horny")
+    ton @ hair horny "Oh yes! You have to be extremely careful around them..." ("soft", "base", "base", "L")
     gen "Don't tell me you--" ("base", xpos="far_left", ypos="head")
-    ton "Who do you think you're talking to, Professor.{w=0.5} Of course I did." ("base", "narrow", "base", "mid", hair="horny") # horny, confident
+    ton @ hair horny "Who do you think you're talking to, Professor.{w=0.5} Of course I did." ("base", "narrow", "base", "mid") # horny, confident
     cho @ cheeks heavy_blush "No way!" ("horny", "base", "base", "L")
-    ton "It was part of an auror job, obviously. Maybe I'll tell you about it some time." ("crooked_smile", "base", "base", "mid", hair="horny")
+    ton @ hair horny "It was part of an auror job, obviously. Maybe I'll tell you about it some time." ("crooked_smile", "base", "base", "mid")
     cho "Yes! I want to hear it!" ("grin", "base", "base", "mid")
-    ton "Are you sure you'd want that, honey?" ("soft", "narrow", "base", "L", hair="horny")
-    ton "It's quite the filthy story... You don't walk away from a Succubus unscarred unless you can impress her!" ("horny", "narrow", "raised", "mid", hair="horny") # horny
+    ton @ hair horny "Are you sure you'd want that, honey?" ("soft", "narrow", "base", "L")
+    ton @ hair horny "It's quite the filthy story... You don't walk away from a Succubus unscarred unless you can impress her!" ("horny", "narrow", "raised", "mid") # horny
     cho @ cheeks heavy_blush "*Uhm*..." ("disgust", "narrow", "worried", "downR")
     play sound "sounds/gulp.ogg"
     gen "*gulp*..." ("angry", xpos="far_left", ypos="head") # sound
-    ton "Of course I could tone it down for you guys." ("base", "happyCl", "base", "mid", hair="horny")
+    ton @ hair horny "Of course I could tone it down for you guys." ("base", "happyCl", "base", "mid")
     gen "No, please. We'd love to hear the full story!" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks blush "..." ("horny", "narrow", "base", "mid")
     ton "Next time. I promise." ("base", "narrow", "base", "mid")
@@ -1009,33 +1009,33 @@ label .succubus_E2:
     ton "{heart}{heart}{heart}"
     gen "Marvellous!" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks blush "..." ("horny", "narrow", "raised", "down") # blush
-    ton "*Giggles*" ("horny", "narrow", "raised", "L", hair="horny") #sound
-    ton "What do you think?" ("grin", "narrow", "base", "mid", hair="horny")
-    ton "Do you like it?" ("horny", "narrow", "annoyed", "down", hair="horny")
+    ton @ hair horny "*Giggles*" ("horny", "narrow", "raised", "L") #sound
+    ton @ hair horny "What do you think?" ("grin", "narrow", "base", "mid")
+    ton @ hair horny "Do you like it?" ("horny", "narrow", "annoyed", "down")
     cho @ cheeks blush "..." ("horny", "narrow", "worried", "down")
     pause .8
-    ton "Miss Chang?" ("soft", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Miss Chang?" ("soft", "narrow", "base", "L")
     cho @ cheeks heavy_blush "Oh! Yes... Very impressive, Professor!" ("soft", "narrow", "worried", "L")
-    ton "I don't think my skin tone is quite right... I believe they're usually more devilish looking." ("upset", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "I don't think my skin tone is quite right... I believe they're usually more devilish looking." ("upset", "narrow", "base", "down")
     gen "I can already feel my balls retract by fear." ("angry", xpos="far_left", ypos="head")
-    ton "" ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "" ("base", "narrow", "base", "mid")
     cho "Your... What, Sir?" ("clench", "wide", "base", "mid") #wide eyed
-    ton "Don't worry, Miss Chang... Unless you're in a state of high arousal then you have nothing to worry about." ("crooked_smile", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Don't worry, Miss Chang... Unless you're in a state of high arousal then you have nothing to worry about." ("crooked_smile", "narrow", "base", "L")
     cho @ cheeks blush "*Ehm*... If you say so, Professor." ("normal", "happyCl", "worried", "mid")
-    ton "Now the Professor on the other hand..." ("mad", "narrow", "angry", "mid", hair="angry")
+    ton @ hair angry "Now the Professor on the other hand..." ("mad", "narrow", "angry", "mid")
     cho @ cheeks blush "" ("mad", "base", "raised", "mid")
-    ton "He can call himself very lucky that I'm not a real Succubus." ("soft", "narrow", "base", "mid", hair="angry")
+    ton @ hair angry "He can call himself very lucky that I'm not a real Succubus." ("soft", "narrow", "base", "mid")
     gen "I'm not ruling out the possibility..." ("base", xpos="far_left", ypos="head")
-    ton "*Tsk*..." ("upset", "narrow", "base", "mid", hair="angry")
+    ton @ hair angry "*Tsk*..." ("upset", "narrow", "base", "mid")
     gen "Though I must say you're much more attractive than the last demon who visited me..." ("base", xpos="far_left", ypos="head")
-    ton "" ("annoyed", "narrow", "raised", "mid", hair="angry")
+    ton @ hair angry "" ("annoyed", "narrow", "raised", "mid")
     cho "You were visited by a demon, Professor?" ("soft", "narrow", "base", "mid")
     gen "Yes... Although it was just your regular sleep paralysis demon." ("base", xpos="far_left", ypos="head")
-    ton "" ("base", "narrow", "base", "mid", hair="angry")
+    ton @ hair angry "" ("base", "narrow", "base", "mid")
     cho "Oh..." ("disgust", "narrow", "base", "down")
     gen "A rather horrifying looking one at that... Not sexy in the slightest!" ("angry", xpos="far_left", ypos="head")
     gen "Mating with it proved itself to be quite difficult..." ("grin", xpos="far_left", ypos="head")
-    ton "Of course you did..." ("horny", "narrow", "angry", "mid", hair="angry")
+    ton @ hair angry "Of course you did..." ("horny", "narrow", "angry", "mid")
     cho "You... Wait, did you say {b}it{/b}, Sir?" ("open", "base", "base", "mid") #wide eyed
     gen "*Ahem*... So, how does one summon a Succubus anyway?" ("base", xpos="far_left", ypos="head")
     gen "I'm sure you're an expert in the subject, Miss Tonks." ("grin", xpos="far_left", ypos="head")
@@ -1055,81 +1055,81 @@ label .succubus_E2:
     ton "In most cases you'd only encounter them if {b}they{/b} want you to..." ("base", "narrow", "base", "mid")
     ton "So summoning one would be quite difficult." ("base", "narrow", "base", "L")
     gen "Well... Luckily I have the ability to summon you any time I want!" ("grin", xpos="far_left", ypos="head")
-    ton "*Hmmm*... Be careful what you wish for, Professor..." ("horny", "narrow", "base", "mid", hair="horny")
-    ton "I can be just as dangerous and seductive... {heart}" ("horny", "narrow", "angry", "mid", hair="angry")
+    ton @ hair horny "*Hmmm*... Be careful what you wish for, Professor..." ("horny", "narrow", "base", "mid")
+    ton @ hair angry "I can be just as dangerous and seductive... {heart}" ("horny", "narrow", "angry", "mid")
     cho @ cheeks blush "" ("horny", "narrow", "worried", "mid")
     gen "See that hungry look in her eyes, Cho?" ("angry", xpos="far_left", ypos="head")
     cho @ cheeks blush "" ("horny", "narrow", "worried", "L")
     gen "This Succubus is out to steal all my semen!" ("grin", xpos="far_left", ypos="head")
-    ton "Oh, don't tempt me, Professor..." ("crooked_smile", "narrow", "angry", "mid", hair="horny")
+    ton @ hair horny "Oh, don't tempt me, Professor..." ("crooked_smile", "narrow", "angry", "mid")
     cho @ cheeks blush "..." ("base", "narrow", "worried", "down") # embarrassed
 
     #Tonks succubus encounter story
     cho @ cheeks blush "*Ehm*...{w=0.5} So, did you actually confront a real Succubus, Professor?" ("soft", "narrow", "base", "L")
-    ton "Oh, Yes indeed, Miss Chang!" ("base", "happyCl", "base", "mid", hair="horny")
+    ton @ hair horny "Oh, Yes indeed, Miss Chang!" ("base", "happyCl", "base", "mid")
     ton "It happened during my first year of Auror training, when I was still a complete novice." ("open", "narrow", "raised", "L")
     ton "We were tracked down by one during a scouting mission... Unbeknownst to us, of course." ("crooked_smile", "narrow", "base", "mid")
     cho @ cheeks blush "She tracked you down?" ("mad", "base", "raised", "L")
     ton "Yes... They can sense the arousal of humans from miles away... Even further if they haven't had any relief for some time." ("base", "narrow", "base", "L")
     gen "Well, who can blame your partner with you around?" ("base", xpos="far_left", ypos="head")
-    ton "*giggles*" ("base", "happyCl", "base", "mid", hair="horny") #sound
-    ton "Oh silly... She was after me, of course!" ("soft", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "*giggles*" ("base", "happyCl", "base", "mid") #sound
+    ton @ hair horny "Oh silly... She was after me, of course!" ("soft", "narrow", "base", "mid")
     cho @ cheeks blush "No way!?" ("horny", "narrow", "raised", "L")
-    ton "I know what you're going to say, Professor... And yes... They don't usually go after females." ("open", "closed", "base", "mid", hair="horny")
+    ton @ hair horny "I know what you're going to say, Professor... And yes... They don't usually go after females." ("open", "closed", "base", "mid")
     cho @ cheeks blush "But she still came after you?" ("soft", "narrow", "raised", "L")
     cho @ cheeks blush "When did you and your partner notice her?" ("mad", "narrow", "base", "L")
-    ton "Well... My partner didn't notice her exactly... I might've wandered a bit further away from our camp than I should have..." ("soft", "narrow", "base", "downR", hair="horny")
-    ton @ cheeks blush "You know... To get some privacy." ("crooked_smile", "narrow", "base", "mid", hair="horny")
-    ton "She must've taken some great caution to be able to sneak up on me, but after a while of... *Ehm*..." ("clench", "narrow", "base", "L", hair="horny")
-    ton "After some time I noticed her movements among the bushes." ("open", "closed", "base", "mid", hair="horny")
-    ton "Once I noticed her presence there was no doubt in my mind why she had snuck up on me..." ("grin", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Well... My partner didn't notice her exactly... I might've wandered a bit further away from our camp than I should have..." ("soft", "narrow", "base", "downR")
+    ton @ cheeks blush hair horny "You know... To get some privacy." ("crooked_smile", "narrow", "base", "mid")
+    ton @ hair horny "She must've taken some great caution to be able to sneak up on me, but after a while of... *Ehm*..." ("clench", "narrow", "base", "L")
+    ton @ hair horny "After some time I noticed her movements among the bushes." ("open", "closed", "base", "mid")
+    ton @ hair horny "Once I noticed her presence there was no doubt in my mind why she had snuck up on me..." ("grin", "narrow", "base", "mid")
     gen "Let me guess... She was--" ("base", xpos="far_left", ypos="head")
-    ton "She was going full force, pleasuring herself... Not even noticing that I had stopped and spotted her!" ("grin", "narrow", "angry", "mid", hair="horny")
+    ton @ hair horny "She was going full force, pleasuring herself... Not even noticing that I had stopped and spotted her!" ("grin", "narrow", "angry", "mid")
     cho "Stopped what?" ("annoyed", "base", "raised", "mid")
     gen "Shush, Miss Chang... Don't interrupt the story!" ("grin", xpos="far_left", ypos="head")
-    ton "Of course I had to be a hundred percent sure what creature she was, so I went to take out my wand to make some light, but..." ("base", "narrow", "base", "L", hair="horny")
-    ton "Before I knew it she had flown right up next to me, grabbing my wrists." ("open", "narrow", "angry", "mid", hair="angry")
+    ton @ hair horny "Of course I had to be a hundred percent sure what creature she was, so I went to take out my wand to make some light, but..." ("base", "narrow", "base", "L")
+    ton @ hair angry "Before I knew it she had flown right up next to me, grabbing my wrists." ("open", "narrow", "angry", "mid")
     cho "And then you used your auror training to fight her!" ("grin", "narrow", "angry", "L")
     play sound "sounds/giggle2_loud.ogg"
-    ton "*Giggles*...{w=0.4} No, we made out instead." ("horny", "narrow", "raised", "L", hair="horny") #sound
+    ton @ hair horny "*Giggles*...{w=0.4} No, we made out instead." ("horny", "narrow", "raised", "L") #sound
     cho "You...{w} Made out with her!?" ("clench", "wide", "base", "L")
-    ton "Of course! She couldn't get enough of me!" ("grin", "happyCl", "base", "mid", hair="horny")
-    ton "After all... I'm quite skilled with my tongue." ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Of course! She couldn't get enough of me!" ("grin", "happyCl", "base", "mid")
+    ton @ hair horny "After all... I'm quite skilled with my tongue." ("horny", "narrow", "base", "mid")
     cho @ cheeks blush "Your--" ("soft", "narrow", "worried", "L")
     gen "Tongue!" ("grin", xpos="far_left", ypos="head")
     play sound "sounds/giggle2_loud.ogg"
-    ton "*giggles*" ("base", "happyCl", "base", "mid", hair="horny")
-    ton "Yes indeed... Would you like a demonstration?" ("crooked_smile", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "*giggles*" ("base", "happyCl", "base", "mid")
+    ton @ hair horny "Yes indeed... Would you like a demonstration?" ("crooked_smile", "narrow", "base", "mid")
 
     menu:
         gen "!!!" ("grin", xpos="far_left", ypos="head")
         "\"Yes please!\"":
-            ton "Yeah, I bet you'd like that, Professor. {heart}" ("horny", "narrow", "base", "mid", hair="horny")
-            ton "Maybe some other time." ("soft", "narrow", "base", "mid", hair="horny")
+            ton @ hair horny "Yeah, I bet you'd like that, Professor. {heart}" ("horny", "narrow", "base", "mid")
+            ton @ hair horny "Maybe some other time." ("soft", "narrow", "base", "mid")
             cho @ cheeks blush "..." ("clench", "narrow", "worried", "down") # curious look
 
         "\"What do you say, Miss Chang?\"":
             cho @ cheeks heavy_blush "With m-me?" ("clench", "wide", "raised", "mid")
-            ton "No, silly... Well not today at least. {heart}" ("soft", "narrow", "base", "L", hair="horny")
+            ton @ hair horny "No, silly... Well not today at least. {heart}" ("soft", "narrow", "base", "L")
             cho @ cheeks blush "..." ("clench", "narrow", "worried", "down") # blushing
 
     # Tonks shows her tongue.
-    ton "You'll have to settle for a peek for now..." ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "You'll have to settle for a peek for now..." ("horny", "narrow", "base", "mid")
     cho @ cheeks blush "..." ("horny", "narrow", "base", "L") #blush
     gen "*Hmm?*..." ("base", xpos="far_left", ypos="head")
-    ton "*Ahh*..." ("open_wide", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "*Ahh*..." ("open_wide", "narrow", "base", "down")
     cho @ cheeks blush "" ("horny", "base", "raised", "L")
-    ton "*Ahhhhhhh*........." ("open_wide_tongue", "narrow", "angry", "down", hair="horny") # Tonks shows her tongue.
+    ton @ hair horny "*Ahhhhhhh*........." ("open_wide_tongue", "narrow", "angry", "down") # Tonks shows her tongue.
     cho @ cheeks blush "Wow!" ("open", "base", "raised", "L")
     gen "..." ("grin", xpos="far_left", ypos="head")
-    ton "Ae I chahn mhehk i ash ong ashh I whan..." ("open_wide_tongue", "narrow", "angry", "mid", hair="horny")
-    ton "... shee!" ("open_wide_tongue2", "narrow", "angry", "down", hair="horny") # Tongue all the way out.
+    ton @ hair horny "Ae I chahn mhehk i ash ong ashh I whan..." ("open_wide_tongue", "narrow", "angry", "mid")
+    ton @ hair horny "... shee!" ("open_wide_tongue2", "narrow", "angry", "down") # Tongue all the way out.
     cho @ cheeks heavy_blush "By Merlin's beard!" ("clench", "narrow", "worried", "L") #blush
     gen "Nice..." ("grin", xpos="far_left", ypos="head")
     gen "Although with a succubus I highly doubt there was just kissing going on..." ("grin", xpos="far_left", ypos="head")
-    ton "*Hmm*... Yesh, thaht little devil..." ("open_wide_tongue", "narrow", "angry", "mid", hair="horny")
-    ton "She was very quick to lock my head in place between her thighs, and then impaled herself on my tongue." ("open_wide_tongue", "narrow", "raised", "mid", hair="horny")
-    ton "Rode my tongue for a good hour, that freak..." ("horny", "narrow", "angry", "mid", hair="horny")
+    ton @ hair horny "*Hmm*... Yesh, thaht little devil..." ("open_wide_tongue", "narrow", "angry", "mid")
+    ton @ hair horny "She was very quick to lock my head in place between her thighs, and then impaled herself on my tongue." ("open_wide_tongue", "narrow", "raised", "mid")
+    ton @ hair horny "Rode my tongue for a good hour, that freak..." ("horny", "narrow", "angry", "mid")
 
     #gen "You're calling her a freak? Your tongue is longer than my dick!" ("angry", xpos="far_left", ypos="head")
     #cho "Professor?"
@@ -1146,41 +1146,41 @@ label .succubus_E2:
     #ton "Don't you worry professor... There's always the need for that masculine touch..."
 
     gen "(Like you didn't enjoy every minute of it...)" ("grin", xpos="far_left", ypos="head")
-    ton "Pleasuring her was quite exhausting to say the least..." ("soft", "narrow", "base", "L", hair="horny")
-    ton "I licked her inside out until my whole face was covered in her devilish love-juices... {heart}" ("horny", "narrow", "angry", "mid", hair="angry")
+    ton @ hair horny "Pleasuring her was quite exhausting to say the least..." ("soft", "narrow", "base", "L")
+    ton @ hair angry "I licked her inside out until my whole face was covered in her devilish love-juices... {heart}" ("horny", "narrow", "angry", "mid")
     cho @ cheeks heavy_blush "" ("clench", "narrow", "worried", "down") #Horny #looks at tonks
     call ctc
 
-    ton "Although... I did almost drown..." ("upset", "base", "raised", "up", hair="horny") # thinking back
-    ton "Her thighs, practically glued to my cheeks meant there was no other way for her juices to flow than into my mouth..." ("open", "narrow", "annoyed", "mid", hair="horny")
-    ton "Her essence becoming too much for me to handle as it eventually ran up my nose." ("horny", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "Although... I did almost drown..." ("upset", "base", "raised", "up") # thinking back
+    ton @ hair horny "Her thighs, practically glued to my cheeks meant there was no other way for her juices to flow than into my mouth..." ("open", "narrow", "annoyed", "mid")
+    ton @ hair horny "Her essence becoming too much for me to handle as it eventually ran up my nose." ("horny", "narrow", "base", "down")
     gen "Holy shit." ("base", xpos="far_left", ypos="head")
-    ton "I had no other choice but to swallow all of it..." ("grin", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "I had no other choice but to swallow all of it..." ("grin", "narrow", "base", "mid")
     cho @ cheeks heavy_blush "" ("normal", "happyCl", "worried", "mid")
     play sound "sounds/gulp.ogg"
     gen "*gulp*" ("angry", xpos="far_left", ypos="head")
     cho @ cheeks blush "" ("horny", "narrow", "worried", "L")
-    ton "That little demon must've come at least twenty times that night. {heart}" ("open_wide_tongue", "narrow", "raised", "L", hair="horny")
-    ton @ cheeks heavy_blush "I could give you a ride on this as well if you'd like, Miss Chang." ("open_wide_tongue2", "narrow", "angry", "L", hair="horny") # tongue out
+    ton @ hair horny "That little demon must've come at least twenty times that night. {heart}" ("open_wide_tongue", "narrow", "raised", "L")
+    ton @ cheeks heavy_blush hair horny "I could give you a ride on this as well if you'd like, Miss Chang." ("open_wide_tongue2", "narrow", "angry", "L") # tongue out
     cho @ cheeks heavy_blush "Professor--" ("soft", "narrow", "worried", "mid") # embarrassed #looks at you
     gen "Tonks, not before--" ("base", xpos="far_left", ypos="head")
-    ton @ cheeks heavy_blush "Yes, yes... Not before you win that silly Quidditch cup." ("mad", "closed", "angry", "mid", hair="angry")
+    ton @ cheeks heavy_blush hair angry "Yes, yes... Not before you win that silly Quidditch cup." ("mad", "closed", "angry", "mid")
     cho @ cheeks blush "It's not silly!" ("annoyed", "narrow", "angry", "L")
-    ton @ cheeks heavy_blush "Winning that cup won't feel as good as having my tongue inside you, Miss Chang... I can promise you that much." ("annoyed", "narrow", "angry", "L", hair="horny")
+    ton @ cheeks heavy_blush hair horny "Winning that cup won't feel as good as having my tongue inside you, Miss Chang... I can promise you that much." ("annoyed", "narrow", "angry", "L")
     cho @ cheeks heavy_blush "..." ("clench", "happyCl", "worried", "mid") #Pout #blush
-    ton "Well then... I hope you two liked my little story. {heart}" ("open", "closed", "base", "mid", hair="horny")
-    ton "And my new outfit of course..." ("crooked_smile", "narrow", "base", "down", hair="horny")
+    ton @ hair horny "Well then... I hope you two liked my little story. {heart}" ("open", "closed", "base", "mid")
+    ton @ hair horny "And my new outfit of course..." ("crooked_smile", "narrow", "base", "down")
 
     # Unlock outfit message. Should only appear once.
     if not ton_outfit_succubus.unlocked:
         call unlock_clothing(text="New clothing items for Tonks have been unlocked!", item=ton_outfit_succubus)
 
     cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "L")
-    ton "Maybe I could dress as a Succubus for Halloween. I'm sure the boys would love it..." ("base", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "Maybe I could dress as a Succubus for Halloween. I'm sure the boys would love it..." ("base", "narrow", "base", "mid")
     gen "With or without the tits out?" ("grin", xpos="far_left", ypos="head")
-    ton "*Hmm*... Haven't decided yet." ("upset", "narrow", "raised", "down", hair="horny")
+    ton @ hair horny "*Hmm*... Haven't decided yet." ("upset", "narrow", "raised", "down")
     cho @ cheeks blush "..." ("clench", "narrow", "worried", "mid")
-    ton "Well then... Off we go Miss Chang..." ("soft", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "Well then... Off we go Miss Chang..." ("soft", "narrow", "base", "L")
 
     # End Event.
     jump cc_pf_strip_T3_tonks.end_event
@@ -1199,7 +1199,7 @@ label .hermione_E1:
     gen "Do tell me, I'd love to know!" ("grin", xpos="far_left", ypos="head")
     cho "Just forget I said anything..." ("annoyed", "narrow", "base", "L")
     ton "Well, I for one am not going to disagree with you, Professor." ("crooked_smile", "narrow", "base", "mid")
-    ton "Miss Granger's tits are quite nice indeed..." ("horny", "narrow", "angry", "mid", hair="horny")
+    ton @ hair horny "Miss Granger's tits are quite nice indeed..." ("horny", "narrow", "angry", "mid")
     cho "..." ("normal", "narrow", "base", "up")
     ton "I mean we could do something else if you'd like, Miss--" ("open", "base", "base", "L")
     gen "No, No-- Do the thing!" ("grin", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
index c763f5a8..6f91b417 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
@@ -524,7 +524,7 @@ label gryffindor_match:
     pause 0.5
 
     gen "But I haven't gotten to the good part yet!" ("angry", xpos="far_left", ypos="head")
-    ton "*piercing gaze*" ("normal", "narrow", "annoyed", "mid", hair="upset") #The look
+    ton @ hair upset "*piercing gaze*" ("normal", "narrow", "annoyed", "mid") #The look
     gen "Fine..." ("base")
 
     call ton_chibi("stand", 250, 380, flip=True)
@@ -638,7 +638,7 @@ label gryffindor_match:
     her @ cheeks blush "*Hmph*...{w=0.4} It appears some of us aren't here just for sports." ("open", "squint", "annoyed", "L")
     call quidditch_stands(crowd_react=[None, None, None])
     sna "She sure has become quite popular amongst the students hasn't she." ("snape_37")
-    ton "*Mhmm* And not just amongst students..." ("horny", "narrow", "base", "stare", hair="horny")
+    ton @ hair horny "*Mhmm* And not just amongst students..." ("horny", "narrow", "base", "stare")
 
     #Whistling (catcalling)
     play sound "sounds/wolf_whistle.ogg"
@@ -1341,7 +1341,7 @@ label gryffindor_match:
     gen "She's got their team under a spell." ("base", xpos="far_left", ypos="head")
 
 
-    ton "*Mmm*... Me too..." ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "*Mmm*... Me too..." ("horny", "narrow", "base", "mid")
 
     sna "Now this is a plan I can get behind." ("snape_02")
     gen "Hah, yeah this was my plan alright..." ("base", xpos="far_left", ypos="head")
@@ -1359,7 +1359,7 @@ label gryffindor_match:
 
     her @ cheeks blush "I believe I told you to stop looking at her!" ("grin", "narrow", "base", "L")
     gen "Miss Granger!" ("base", xpos="far_left", ypos="head")
-    ton @ cheeks heavy_blush "Oh dear..." ("soft", "base", "base", "mid", hair="horny")
+    ton @ cheeks heavy_blush hair horny "Oh dear..." ("soft", "base", "base", "mid")
     her @ cheeks blush "You boys are despicable!" ("open", "closed", "angry", "mid")
     her @ cheeks blush "Why would you pay any attention towards that walking stick when the girls of your own house are a hundred times more appealing!" ("disgust", "squint", "angry", "L")
     cho @ cheeks heavy_blush "*inaudible noise*" ("disgust", "narrow", "angry", "R")
@@ -1380,9 +1380,9 @@ label gryffindor_match:
     play sound "sounds/crowd_stomping.ogg"
     qcr "Cho! Cho! Cho!"
 
-    ton @ cheeks blush "*Hmm*... We should probably put a stop to this..." ("disgust", "base", "base", "mid", hair="horny")
+    ton @ cheeks blush hair horny "*Hmm*... We should probably put a stop to this..." ("disgust", "base", "base", "mid")
     her @ cheeks blush "*Grr*!!!" ("clench", "wide", "angry", "stare_soft")
-    ton "*Ehm*...{w=0.4} Why don't you do it Severus?" ("mad", "narrow", "shocked", "R", hair="upset")
+    ton @ hair upset "*Ehm*...{w=0.4} Why don't you do it Severus?" ("mad", "narrow", "shocked", "R")
 
     #Hermione takes off bra
     $ hermione.strip("bra")
@@ -1698,7 +1698,7 @@ label gryffindor_match:
 
     call ton_walk(path=[(100, 334), (194, 400)])
 
-    ton "Nice, free panties." ("horny", "base", "base", "down", hair="horny", trans=d3)
+    ton @ hair horny "Nice, free panties." ("horny", "base", "base", "down", trans=d3)
 
     play sound "sounds/cloth_sound2.ogg"
     hide image panties
@@ -1706,12 +1706,12 @@ label gryffindor_match:
 
     pause 0.8
 
-    ton "*Hmm*...{w=0.1} Someone should probably pick up the rest of her clothes..." ("soft", "base", "base", "R", hair="horny", trans=d3)
-    ton "{w=0.8}{nw}" ("annoyed", "base", "base", "L", hair="horny")
-    ton "{w=0.8}{nw}" ("annoyed", "base", "base", "R", hair="horny")
-    ton "Nobody?{w=0.8}{nw}" ("annoyed", "base", "base", "R", hair="horny")
-    ton "Nobody?{fast} Oh fine, I suppose I'll do it then..." ("base", "base", "base", "R", hair="horny")
-    ton "(Before Madam Hooch gets there first.)" ("soft", "base", "base", "R", hair="horny")
+    ton @ hair horny "*Hmm*...{w=0.1} Someone should probably pick up the rest of her clothes..." ("soft", "base", "base", "R", trans=d3)
+    ton @ hair horny "{w=0.8}{nw}" ("annoyed", "base", "base", "L")
+    ton @ hair horny "{w=0.8}{nw}" ("annoyed", "base", "base", "R")
+    ton @ hair horny "Nobody?{w=0.8}{nw}" ("annoyed", "base", "base", "R")
+    ton @ hair horny "Nobody?{fast} Oh fine, I suppose I'll do it then..." ("base", "base", "base", "R")
+    ton @ hair horny "(Before Madam Hooch gets there first.)" ("soft", "base", "base", "R")
 
     hide tonks_main
     call ton_chibi("hide")
@@ -1845,8 +1845,8 @@ label gryffindor_match_return:
     play music "music/Under-the-Radar by PhobyAk.ogg" if_changed
 
 
-    ton "We've got a situation--{w=0.2}" ("mad", "base", "base", "R", hair="upset", xpos="base", ypos="base")
-    ton @ cheeks blush "Cho?!" ("clench", "wide", "shocked", "L", hair="horny")
+    ton @ hair upset "We've got a situation--{w=0.2}" ("mad", "base", "base", "R", xpos="base", ypos="base")
+    ton @ cheeks blush hair horny "Cho?!" ("clench", "wide", "shocked", "L")
     cho @ cheeks heavy_blush "Professor?!" ("angry", "wide", "base", "L")
     gen "(For fucks sake... {i}Always something{/i}...)" ("angry", xpos="far_left", ypos="head")
     ton "Shit... You have to hide, now!" ("mad", "base", "base", "R")
@@ -2161,13 +2161,13 @@ label gryffindor_match_return:
     #Cho chibi appears next to the desk.
 
     gen "(Damn...)" ("base", xpos="far_left", ypos="head")
-    ton "There you are..." ("horny", "base", "base", "L", hair="horny")
-    ton "I apologise for making you hide under the headmaster's desk like that, Miss Chang." ("soft", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "There you are..." ("horny", "base", "base", "L")
+    ton @ hair horny "I apologise for making you hide under the headmaster's desk like that, Miss Chang." ("soft", "narrow", "base", "L")
     cho @ cheeks heavy_blush "Thank you professor." ("open", "narrow", "base", "down", xpos="left", ypos="base", flip=True, trans=d3)
     cho @ cheeks heavy_blush "" ("soft", "narrow", "base", "R", xpos="left", ypos="base")
-    ton "*Hmm*?" ("soft", "narrow", "raised", "L", hair="horny")
-    ton "Oh yes, the potion thing... I'm sorry Miss Chang but you're quite distracting." ("base", "base", "base", "L", hair="horny")
-    ton "*Mmm*...{w=0.4} Although I'm not complaining." ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "*Hmm*?" ("soft", "narrow", "raised", "L")
+    ton @ hair horny "Oh yes, the potion thing... I'm sorry Miss Chang but you're quite distracting." ("base", "base", "base", "L")
+    ton @ hair horny "*Mmm*...{w=0.4} Although I'm not complaining." ("horny", "narrow", "base", "L")
     ton "You should probably put something on before entering the hallways though." ("base", "narrow", "base", "R")
     ton "I took the liberty of fetching your clothes for you, put them on once you two are finished in here will you?" ("grin", "wink", "base", "mid")
     cho @ cheeks heavy_blush "Yes, professor." ("soft", "narrow", "base", "L")
@@ -2178,8 +2178,8 @@ label gryffindor_match_return:
     with d3
 
     ton "Good girl." ("grin", "base", "base", "L")
-    ton "Make sure you use that potion to its full extent now, Miss Chang." ("horny", "base", "shocked", "L", hair="horny")
-    ton "Have fun!" ("grin", "wink", "base", "mid", hair="horny")
+    ton @ hair horny "Make sure you use that potion to its full extent now, Miss Chang." ("horny", "base", "shocked", "L")
+    ton @ hair horny "Have fun!" ("grin", "wink", "base", "mid")
 
     #Tonks leaves
     call ton_walk(action="leave")
diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy
index c67be8d4..bc50713d 100644
--- a/game/scripts/characters/cho/events/quidditch/intros.rpy
+++ b/game/scripts/characters/cho/events/quidditch/intros.rpy
@@ -823,8 +823,8 @@ label cho_quid_E8:
     gen "Yes, the little Ravenclaw minx, correct." ("base", xpos="far_left", ypos="head")
     ton "Well, I figured you'd be talking about her - if it has to do with Quidditch." ("open", "base", "base", "R")
     gen "She's one of the girls I buy favours from." ("base", xpos="far_left", ypos="head")
-    ton "No way!" ("open_wide", "shocked", "shocked", "mid", hair="horny")
-    ton "You got that little hotty--" ("horny", "base", "raised", "R", hair="horny")
+    ton @ hair horny "No way!" ("open_wide", "shocked", "shocked", "mid")
+    ton @ hair horny "You got that little hotty--" ("horny", "base", "raised", "R")
     ton "*Ehm*... hot-head to sell you favours?" ("mad", "base", "raised", "R")
     gen "Once or twice..." ("base", xpos="far_left", ypos="head")
     ton "Impressive." ("horny", "base", "raised", "mid")
@@ -836,11 +836,11 @@ label cho_quid_E8:
             gen "She's been stripping for me." ("base", xpos="far_left", ypos="head")
             ton "Cho?! And I'm supposed to believe that?" ("upset", "wide", "raised", "mid")
             gen "Oh, you better believe it!" ("grin", xpos="far_left", ypos="head")
-            ton "Holy shit!" ("upset", "wide", "shocked", "stare", hair="horny")
+            ton @ hair horny "Holy shit!" ("upset", "wide", "shocked", "stare")
             ton "I'd pay so much gold to watch that girl take her clothes off..." ("base", "base", "raised", "R")
-            ton "You need to invite me next time!" ("annoyed", "base", "angry", "mid", hair="angry") # angry
+            ton @ hair angry "You need to invite me next time!" ("annoyed", "base", "angry", "mid") # angry
             gen "And how would I get her to agree to that?" ("base", xpos="far_left", ypos="head")
-            ton "Well... *Ehm*..." ("upset", "base", "worried", "down", hair="horny")
+            ton @ hair horny "Well... *Ehm*..." ("upset", "base", "worried", "down")
             gen "It was difficult enough to get her to strip just for me..." ("base", xpos="far_left", ypos="head")
             gen "She only did it because I helped her win against Hufflepuff." ("base", xpos="far_left", ypos="head")
             ton "So that was your idea with the skirt? Very clever." ("horny", "base", "annoyed", "mid")
@@ -857,7 +857,7 @@ label cho_quid_E8:
             gen "Miss Chang wouldn't like anybody to know." ("base", xpos="far_left", ypos="head")
             ton "I can keep a secret!" ("upset", "base", "worried", "R")
             gen "I really shouldn't..." ("base", xpos="far_left", ypos="head")
-            ton "Tell me, or I'll jinx your balls off!" ("upset", "base", "angry", "mid", hair="angry")
+            ton @ hair angry "Tell me, or I'll jinx your balls off!" ("upset", "base", "angry", "mid")
             gen "*Ghzzz!* Alright! Alright!" ("angry", xpos="far_left", ypos="head")
             gen "You sure know how to get me to talk..." ("base", xpos="far_left", ypos="head")
 
@@ -937,7 +937,7 @@ label cho_quid_E8:
     with hpunch
     play sound "sounds/hiccup_fem.ogg"
     ton "*Hick*!... whoopsie..." ("upset", "wide", "base", "mid")
-    ton "Now, I better get going convincing those boys to play again..." ("open", "base", "raised", "R", hair="horny")
+    ton @ hair horny "Now, I better get going convincing those boys to play again..." ("open", "base", "raised", "R")
 
     if game.daytime:
         nar "You finish your drinks before calling it a day."
diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
index d13af799..49260f32 100644
--- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
@@ -129,8 +129,8 @@ label slytherin_match:
     ton "I'd love to be able to watch her--{w} The game from the commentator booth." ("clench", "narrow", "raised", "R")
     ton "So... *Ahem*... May I be allowed to accompany you on the way to the pitch?" ("base", "base", "base", "mid") #sad
     gen "Of course! I'd be delighted to have you!" ("grin", xpos="far_left", ypos="head")
-    ton "Thank you, [name_genie_tonks].{heart}" ("base", "happyCl", "base", "mid", hair="happy")
-    ton "Are we to expect another great performance this time around?" ("horny", "narrow", "base", "downR", hair="neutral")
+    ton @ hair happy "Thank you, [name_genie_tonks].{heart}" ("base", "happyCl", "base", "mid")
+    ton @ hair neutral "Are we to expect another great performance this time around?" ("horny", "narrow", "base", "downR")
     gen "Oh, you'll see..." ("grin", xpos="far_left", ypos="head")
     ton "Great, shall we?" ("base", "wink", "shocked", "mid")
     gen "We certainly shall!" ("grin", xpos="far_left", ypos="head")
@@ -401,12 +401,12 @@ label slytherin_match:
 
     ton "{size=-4}Do I hear some jealousy back there?{/size}" ("grin", "narrow", "raised", "R", ypos="head", flip=True)
     sna "{size=-4}Of course not... just a cough,{w=0.3} {cps=15}Nymphadora{/cps}.{/size}" ("snape_03", ypos="head")
-    ton "{size=-2}That's Tonks to you...{w=0.3} {i}dungeon dweller.{/i}{/size}" ("open", "wide", "angry", "R", hair="angry")
+    ton @ hair angry "{size=-2}That's Tonks to you...{w=0.3} {i}dungeon dweller.{/i}{/size}" ("open", "wide", "angry", "R")
     sna "Dungeon dw--" ("snape_32", ypos="head")
     sna "I'll give you a dungeon dweller in a minute you--" ("snape_08", ypos="head")
 
     her "Professor Tonks, your hair!" ("soft", "base", "base", "L", ypos="head", flip=False)
-    ton "Whoopsie...{w=0.5} Miss Granger, so glad to see you!" ("base", "happyCl", "base", "L", hair="neutral", ypos="head", flip=True)
+    ton @ hair neutral "Whoopsie...{w=0.5} Miss Granger, so glad to see you!" ("base", "happyCl", "base", "L", ypos="head", flip=True)
     sna "{size=-2}*Hmph*{/size}" ("snape_31", ypos="head")
     her "Of course, as you know I take my responsibilities seriously!" ("open", "base", "angry", "L")
 
@@ -552,7 +552,7 @@ label slytherin_match:
     her "Oh! Davies catches it and passes to Bradley..." ("smile", "base", "angry", "up")
     ton "She's pretty cute when she's excited, isn't she." ("soft", "narrow", "base", "L")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton "I feel like we've got the best seats in the house, right behind the podium..." ("horny", "narrow", "raised", "L", hair="horny")
+    ton @ hair horny "I feel like we've got the best seats in the house, right behind the podium..." ("horny", "narrow", "raised", "L")
     her "" ("open", "base", "angry", "up")
     ton "Who cares about the match if you've got a view like that..." ("horny", "base", "angry", "L")
     play sound "sounds/ball_hit.ogg"
@@ -606,7 +606,7 @@ label slytherin_match:
     sna "That's my boys!" ("snape_37")
     sna "Thick as oatmeal, but built like a brick shithouse." ("snape_28")
     play sound "sounds/ball_hit.ogg"
-    ton "They're so strong... I've never seen a bludger hit its target from that far before..." ("horny", "base", "base", "up", hair="horny") #horny
+    ton @ hair horny "They're so strong... I've never seen a bludger hit its target from that far before..." ("horny", "base", "base", "up") #horny
     ton @ cheeks blush "Is it me or is it getting a bit hot in here?" ("normal", "closed", "raised", "downR")
     sna "Something to cool you down perhaps?" ("snape_02")
     ton "Good idea, did you bring any of that firewhisky, Professor Dumbledore?" ("soft", "wink", "raised", "mid")
@@ -620,8 +620,8 @@ label slytherin_match:
     nar "Tonks' cheeks turning redder as the game continues."
     her "" ("annoyed", "base", "base", "up")
     gen "Doesn't look great..." ("base", xpos="far_left", ypos="head")
-    ton "What do you mean?" ("open", "base", "base", "L", hair="horny")
-    ton "Only thing that would make this better would be those firm cheeks on my lap!" ("horny", "narrow", "annoyed", "L", hair="horny")
+    ton @ hair horny "What do you mean?" ("open", "base", "base", "L")
+    ton @ hair horny "Only thing that would make this better would be those firm cheeks on my lap!" ("horny", "narrow", "annoyed", "L")
     sna "He's talking about the game..." ("snape_09")
     ton "Game? What game..." ("open", "wide", "raised", "L")
     ton "Oh, Quidditch! Of course!" ("clench", "wide", "base", "mid")
@@ -696,12 +696,12 @@ label slytherin_match:
 
     sna "I'm surprised she didn't swallow that one... with how wide she was blabbing her mouth." ("snape_42", ypos="head")
     sna "To think that liquid luck--" ("snape_45")
-    ton @ cheeks blush "{size=+5}What?{/size}" ("scream", "shocked", "base", "stare", hair="neutral", ypos="head", flip=True, trans=vpunch)
+    ton @ cheeks blush hair neutral "{size=+5}What?{/size}" ("scream", "shocked", "base", "stare", ypos="head", flip=True, trans=vpunch)
     gen "What the fuck is liquid luck?" ("angry", xpos="far_left", ypos="head")
-    ton @ cheeks blush "You gave those brutes a luck potion?!" ("mad", "base", "angry", "L", hair="angry")
+    ton @ cheeks blush hair angry "You gave those brutes a luck potion?!" ("mad", "base", "angry", "L")
     sna "Well..." ("snape_14")
     ton @ cheeks blush "I can't believe you, Snape...{w=0.5} look what they've done to her face!" ("mad", "base", "worried", "down")
-    ton @ cheeks blush "Her beautiful face..." ("upset", "base", "worried", "down", hair="sad")
+    ton @ cheeks blush hair sad "Her beautiful face..." ("upset", "base", "worried", "down")
     sna "Looks like an improvement to me." ("snape_46")
 
     menu:
@@ -715,7 +715,7 @@ label slytherin_match:
             gen "So yes, I think you owe me." ("base", xpos="far_left", ypos="head")
             sna "Surely you can't be--" ("snape_14")
         "\"10 points to Gryffindor!\"":
-            ton "Are you mad?" ("scream", "base", "angry", "R", hair="angry")
+            ton @ hair angry "Are you mad?" ("scream", "base", "angry", "R")
             gen "What? I'm just joking, I'm sure she'll be fine..." ("base", xpos="far_left", ypos="head")
             sna "{size=-4}10 points to Slytherin.{/size}" ("snape_38")
             gen "Did you say something--" ("base", xpos="far_left", ypos="head")
@@ -723,9 +723,9 @@ label slytherin_match:
             $ slytherin += 10
 
 
-    ton "Quiet!" ("mad", "base", "angry", "L", hair="angry")
+    ton @ hair angry "Quiet!" ("mad", "base", "angry", "L")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton "I'm taking her to the hospital wing..." ("open", "base", "angry", "down", hair="neutral")
+    ton @ hair neutral "I'm taking her to the hospital wing..." ("open", "base", "angry", "down")
     gen "What about the game...?" ("base", xpos="far_left", ypos="head")
     ton "Leave it to me..." ("open", "base", "angry", "mid")
     gen "What?" ("angry", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
index ec4cdf92..5978fcf8 100644
--- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
+++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
@@ -635,7 +635,7 @@ label hg_pf_talk_tonks:
     play sound "sounds/door.ogg"
     call ton_walk(500,"base")
 
-    ton "" ("base", "base", "base", "mid", hair="basic", xpos=600, ypos="base", trans=d3)
+    ton @ hair basic "" ("base", "base", "base", "mid", xpos=600, ypos="base", trans=d3)
     her "" ("base", "base", "base", "mid", xpos="right", ypos="base", trans=d3)
     if game.daytime:
         gen "Good day, Miss Tonks." ("base", xpos="far_left", ypos="head")
@@ -643,13 +643,13 @@ label hg_pf_talk_tonks:
     else:
         gen "Good evening, Miss Tonks." ("base", xpos="far_left", ypos="head")
         ton "Good evening, Professor." ("base", "happyCl", "base", "mid")
-    ton "Miss Granger..." ("horny", "base", "base", "L", hair="horny")
-    ton "Is there some sort of special circumstance as to why the two of you summoned me here?" ("base", "base", "raised", "mid", hair="basic")
+    ton @ hair horny "Miss Granger..." ("horny", "base", "base", "L")
+    ton @ hair basic "Is there some sort of special circumstance as to why the two of you summoned me here?" ("base", "base", "raised", "mid")
     gen "More or less." ("base", xpos="far_left", ypos="head")
     gen "I think the three of us should have a bit of a chat..." ("base", xpos="far_left", ypos="head")
     ton "Miss Granger, you didn't cause any trouble, I hope?" ("open", "base", "base", "L")
     her "Me? Of course not!" ("open", "closed", "base", "mid")
-    ton "Having some \"DADA\" issues? I could tutor you, if you'd like..." ("horny", "base", "base", "L", hair="horny")
+    ton @ hair horny "Having some \"DADA\" issues? I could tutor you, if you'd like..." ("horny", "base", "base", "L")
     her "That's not--" ("angry", "base", "base", "mid")
     gen "I figured it was about time we had a chat, regarding these favour trading allegations..." ("base", xpos="far_left", ypos="head")
     gen "Mainly the concerns that Miss Granger so kindly brought forward." ("base", xpos="far_left", ypos="head")
@@ -658,7 +658,7 @@ label hg_pf_talk_tonks:
     her "..." ("normal", "base", "base", "R")
     her @ cheeks blush "No, I'll talk about it - if you like..." ("open", "narrow", "base", "down")
     her @ cheeks blush "" ("normal", "base", "base", "mid")
-    ton "..." ("horny", "base", "base", "mid", hair="horny")
+    ton @ hair horny "..." ("horny", "base", "base", "mid")
     gen "Why don't we start with..." ("base", xpos="far_left", ypos="head")
     $ _yourself = False
 
@@ -689,7 +689,7 @@ label hg_pf_talk_tonks:
             her @ cheeks blush "There's the time Tracey Davis gave Slughorn a lap dance, in the middle of class!" ("annoyed", "narrow", "angry", "R")
             ton "In the middle of class?" ("mad", "wide", "shocked", "stare")
             her @ cheeks blush "Yes..." ("disgust", "narrow", "worried", "down")
-            ton "Oh my..." ("base", "narrow", "raised", "mid", hair="horny")
+            ton @ hair horny "Oh my..." ("base", "narrow", "raised", "mid")
             her @ cheeks blush "She was just sitting on his lap, while he taught from his desk..." ("open", "base", "base", "R")
             her @ cheeks blush "But we could all see her moving her hips!" ("annoyed", "base", "base", "R")
             ton "Interesting..." ("grin", "narrow", "shocked", "down")
@@ -706,7 +706,7 @@ label hg_pf_talk_tonks:
             ton "Actually, let's save that topic for another time..." ("normal", "narrow", "base", "L")
             if states.gen.masturbating:
                 gen "(You wanted it all for yourself, that's why!)" ("angry", xpos="far_left", ypos="head")
-            ton "Is there anything else you could tell us about these... Naughty Slytherin girls?" ("horny", "base", "angry", "mid", hair="horny")
+            ton @ hair horny "Is there anything else you could tell us about these... Naughty Slytherin girls?" ("horny", "base", "angry", "mid")
             her "Of course!" ("open", "closed", "angry", "mid")
             her "I could go on for hours about the vile things they've been up to..." ("annoyed", "narrow", "annoyed", "mid")
             ton @ cheeks blush "I'm not in a rush." ("base", "narrow", "base", "down")
@@ -718,7 +718,7 @@ label hg_pf_talk_tonks:
             gen "..." ("base", xpos="far_left", ypos="head")
             ton "Now, we can't have that, can we..." ("open", "base", "annoyed", "L")
             her "I know... It angers me to the core..." ("annoyed", "base", "worried", "mid")
-            ton "" ("upset", "base", "worried", "L", hair="basic")
+            ton @ hair basic "" ("upset", "base", "worried", "L")
             her @ cheeks blush "Everyone has been working so hard towards winning the cup... I have been working so hard..." ("open", "base", "worried", "mid")
             if states.gen.masturbating:
                 gen "(You have no idea what your hard work does to me...)" ("base", xpos="far_left", ypos="head")
@@ -730,7 +730,7 @@ label hg_pf_talk_tonks:
         "\"Yourself, Miss Granger!\"":
             $ _yourself = True
             her "What?!" ("soft", "base", "worried", "mid")
-            ton "Yes, I would love to hear a bit more about what's going on with you, Miss Granger..." ("horny", "base", "base", "L", hair="horny")
+            ton @ hair horny "Yes, I would love to hear a bit more about what's going on with you, Miss Granger..." ("horny", "base", "base", "L")
             ton "When I took the teaching position, you and I had a bit of a discussion, didn't we?" ("base", "base", "raised", "L")
             ton "From what I've been hearing on the Portrait vine, you have been selling a few favours yourself to professor Dumbledore here..." ("base", "narrow", "shocked", "down")
             her @ cheeks blush "I have not!" ("shock", "squint", "angry", "mid")
@@ -766,29 +766,29 @@ label hg_pf_talk_tonks:
                 gen "You've sold me exactly [tmp_word] favours." ("base", xpos="far_left", ypos="head")
                 her @ cheeks blush "B-but that's--" ("angry","happy", "angry", "mid")
                 if tmp_val < 10:
-                    ton "Disappointing, but it's a start." ("open", "closed", "base", "mid", hair="basic")
+                    ton @ hair basic "Disappointing, but it's a start." ("open", "closed", "base", "mid")
                     her @ cheeks blush "..." ("annoyed", "narrow", "base", "R_soft")
                 elif tmp_val >= 10 and tmp_val < 20:
-                    ton "Not bad, but I expected better from one of our top students." ("open", "base", "base", "L", hair="basic")
+                    ton @ hair basic "Not bad, but I expected better from one of our top students." ("open", "base", "base", "L")
                 elif tmp_val >= 20 and tmp_val < 30:
                     her @ cheeks blush "" ("angry", "narrow", "base", "R_soft")
-                    ton "You go girl! I expected as much from one of my students." ("open", "base", "angry", "L", hair="basic")
+                    ton @ hair basic "You go girl! I expected as much from one of my students." ("open", "base", "angry", "L")
                     gen "..." ("base", xpos="far_left", ypos="head")
-                    ton "I meant to say, one of {i}our{/i} students, of course." ("upset", "base", "worried", "mid", hair="basic")
+                    ton @ hair basic "I meant to say, one of {i}our{/i} students, of course." ("upset", "base", "worried", "mid")
                 elif tmp_val >= 30 and tmp_val < 40:
-                    ton "Aren't you a sneaky one, *huh*? Almost tricked me that you were an innocent girl with those doe-like eyes of yours." ("horny", "base", "angry", "L", hair="horny")
-                    ton "But, as it turns out, you're actually quite high on the list." ("open", "base", "raised", "L", hair="basic")
+                    ton @ hair horny "Aren't you a sneaky one, *huh*? Almost tricked me that you were an innocent girl with those doe-like eyes of yours." ("horny", "base", "angry", "L")
+                    ton @ hair basic "But, as it turns out, you're actually quite high on the list." ("open", "base", "raised", "L")
                     her @ cheeks blush "(... There's a list...?)" ("open", "happyCl", "worried", "mid")
                     ton "At the very top, in fact!" ("silly", "happyCl", "base", "mid")
                     her @ cheeks blush "..." ("angry", "narrow", "base", "down")
                 else:
                     ton "Wow! Who would have thought you're the girl at the top of the list." ("silly", "happyCl", "base", "mid")
-                    ton "Colour me surprised... Looks like they were telling the truth after all." ("horny", "base", "angry", "L", hair="horny")
+                    ton @ hair horny "Colour me surprised... Looks like they were telling the truth after all." ("horny", "base", "angry", "L")
                     her @ cheeks blush "(... A list... What list...?)" ("angry", "wide", "worried", "stare")
                     ton "Congratulations for being a \"top\" student." ("horny", "base", "raised", "L")
                     her @ cheeks blush "..." ("disgust", "narrow", "base", "R_soft")
 
-            ton "Don't be so shy, girl. I'm happy that you took my advice to heart..." ("open", "base", "base", "L", hair="basic")
+            ton @ hair basic "Don't be so shy, girl. I'm happy that you took my advice to heart..." ("open", "base", "base", "L")
             ton "Consider for a minute where your house would be if you hadn't." ("base", "base", "base", "L")
             her @ cheeks blush "I guess..." ("disgust", "narrow", "base", "down")
             her @ cheeks blush "I assure you that I wasn't considering selling favours myself, when I sent that letter..." ("annoyed", "narrow", "worried", "down")
@@ -796,8 +796,8 @@ label hg_pf_talk_tonks:
             her @ cheeks blush "And I finally decided, that if I wanted to help my house catch up in points... To help Gryffindor..." ("soft", "narrow", "worried", "down")
             if states.gen.masturbating:
                 gen "(And because you love it.)" ("grin", xpos="far_left", ypos="head")
-            ton "Well, if you can't beat them..." ("horny", "base", "base", "R", hair="horny")
-            ton "So, how has it been working out for you so far, Miss Granger?" ("open", "base", "base", "L", hair="basic")
+            ton @ hair horny "Well, if you can't beat them..." ("horny", "base", "base", "R")
+            ton @ hair basic "So, how has it been working out for you so far, Miss Granger?" ("open", "base", "base", "L")
             ton "How's the morale amongst the Gryffindor students, now?" ("base", "base", "raised", "L")
             her @ cheeks blush "It's great! Although... I still believe that it isn't fair..." ("soft", "base", "base", "mid")
             her "That is why I created the \"M.R.M\"!" ("open", "happy", "base", "mid_soft")
@@ -826,9 +826,9 @@ label hg_pf_talk_tonks:
     ton "But that the boys haven't had the same opportunities?" ("upset", "base", "raised", "L")
     her "Exactly!" ("open", "closed", "angry", "mid")
     ton "Why didn't you say so during our talk, Miss Granger?" ("grin", "narrow", "raised", "L")
-    ton "I can easily sort out that problem!" ("horny", "base", "base", "L", hair="horny")
+    ton @ hair horny "I can easily sort out that problem!" ("horny", "base", "base", "L")
     her "I {i}did{/i} mention it!" ("angry", "happyCl", "worried", "mid")
-    ton "Oh..." ("annoyed", "base", "raised", "downR", hair="basic")
+    ton @ hair basic "Oh..." ("annoyed", "base", "raised", "downR")
     if not states.gen.masturbating:
         gen "..." ("base", xpos="far_left", ypos="head")
     if not _yourself:
@@ -836,9 +836,9 @@ label hg_pf_talk_tonks:
         ton "That doesn't explain as to why {i}you{/i} decided to contribute to this problem, and sell favours as well." ("open", "base", "raised", "L")
         her "..." ("disgust", "base", "base", "R")
         ton "There is no need for you to keep up an act, Miss Granger..." ("soft", "base", "base", "down")
-        ton @ cheeks blush "You can tell us if you've changed your stance. I most certainly won't judge you..." ("horny", "base", "base", "L", hair="horny")
+        ton @ cheeks blush hair horny "You can tell us if you've changed your stance. I most certainly won't judge you..." ("horny", "base", "base", "L")
         her "I just...{w=0.6} Sometimes Gryffindor gets behind in points..." ("soft", "narrow", "base", "down")
-        ton "Oh, I see..." ("base", "base", "base", "L", hair="basic")
+        ton @ hair basic "Oh, I see..." ("base", "base", "base", "L")
         her @ cheeks blush "So when you suggested that I should try asking Professor Dumbledore for a favour..." ("soft", "base", "base", "mid")
         her @ cheeks blush "Well, I figured if an auror thought it wasn't such a bad thing... Then perhaps I could try and see for myself..." ("open", "narrow", "base", "down")
 
@@ -846,24 +846,24 @@ label hg_pf_talk_tonks:
             gen "And boy has she tried it out a bunch..." ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "*Hmph*..." ("annoyed", "narrow", "angry", "R")
 
-        ton "I'm glad you took my advice to heart, Miss Granger." ("horny", "base", "raised", "L", hair="horny")
-        ton "Gryffindor's got a much better chance at winning the house cup now, thanks to your efforts, I presume?" ("horny", "base", "raised", "L", hair="horny")
+        ton @ hair horny "I'm glad you took my advice to heart, Miss Granger." ("horny", "base", "raised", "L")
+        ton @ hair horny "Gryffindor's got a much better chance at winning the house cup now, thanks to your efforts, I presume?" ("horny", "base", "raised", "L")
         her "I... Yes, I believe so... And the morale amongst my friends has risen substantially." ("base", "narrow", "base", "down")
-        ton "Excellent." ("grin", "base", "raised", "L", hair="horny")
+        ton @ hair horny "Excellent." ("grin", "base", "raised", "L")
     else:
-        ton "Well, I'm sure your male friends appreciate the fact that you've been making up for their shortcomings..." ("base", "base", "base", "L", hair="basic")
+        ton @ hair basic "Well, I'm sure your male friends appreciate the fact that you've been making up for their shortcomings..." ("base", "base", "base", "L")
         her "It's not their fault that the teachers aren't as interested in buying favours from them." ("open", "closed", "angry", "mid")
-        ton "Yes... The women earning more than the men is a complex dilemma, that's for sure..." ("open", "base", "base", "L", hair="basic")
-        ton "Well, at least they can sleep easy, knowing that they've got you out there doing what is necessary for the sake of your house, right?" ("open", "base", "base", "L", hair="basic")
+        ton @ hair basic "Yes... The women earning more than the men is a complex dilemma, that's for sure..." ("open", "base", "base", "L")
+        ton @ hair basic "Well, at least they can sleep easy, knowing that they've got you out there doing what is necessary for the sake of your house, right?" ("open", "base", "base", "L")
         her "I suppose... {size=-4}Although they don't really know about it...{/size}" ("annoyed", "base", "base", "mid")
         her "I'm just worried it won't be enough..." ("annoyed", "closed", "base", "mid")
-    ton "In that case... Would you be against the idea of selling favours to another teacher?" ("horny", "base", "raised", "L", hair="horny")
+    ton @ hair horny "In that case... Would you be against the idea of selling favours to another teacher?" ("horny", "base", "raised", "L")
     her @ cheeks blush "I..." ("angry", "narrow", "worried", "down")
     her @ cheeks blush "*Uhm*..." ("soft", "base", "base", "R")
     her @ cheeks blush "I haven't actively considered it..." ("soft", "narrow", "base", "mid_soft")
     if states.gen.masturbating:
         gen "(Yes! You want to make out with your slutty teacher, don't you!)" ("angry", xpos="far_left", ypos="head")
-    ton "Then perhaps you should consider it, Miss Granger." ("base", "base", "base", "L", hair="basic")
+    ton @ hair basic "Then perhaps you should consider it, Miss Granger." ("base", "base", "base", "L")
     ton "I'm sure your house would be even more ecstatic about a sudden spike in house points." ("soft", "wide", "raised", "L")
     if states.gen.masturbating:
         gen "(And they're not the only ones who'd be ecstatic!)" ("angry", xpos="far_left", ypos="head")
@@ -874,7 +874,7 @@ label hg_pf_talk_tonks:
         gen "Why don't you tell us more about..." ("angry", xpos="far_left", ypos="head")
     else:
         gen "I think we've been trailing a bit off topic here..." ("base", xpos="far_left", ypos="head")
-        ton "Oh yes, perhaps..." ("base", "base", "base", "L", hair="basic")
+        ton @ hair basic "Oh yes, perhaps..." ("base", "base", "base", "L")
         gen "Miss Granger, why don't you tell us more about..." ("base", xpos="far_left", ypos="head")
 
     menu:
@@ -887,9 +887,9 @@ label hg_pf_talk_tonks:
             her "I'm not sure what you mean, Professor..." ("annoyed", "base", "base", "R")
             ton "I think what your headmaster is getting at..." ("open", "closed", "base", "mid")
             if not _yourself:
-                ton "Is there any other... uncouth behaviour going on, regarding your fellow students or teachers?" ("grin", "base", "raised", "L", hair="horny")
+                ton @ hair horny "Is there any other... uncouth behaviour going on, regarding your fellow students or teachers?" ("grin", "base", "raised", "L")
             else:
-                ton "Is there any other... uncouth behaviour going on, outside the dungeons?" ("grin", "base", "raised", "L", hair="horny")
+                ton @ hair horny "Is there any other... uncouth behaviour going on, outside the dungeons?" ("grin", "base", "raised", "L")
                 ton "You've only mentioned potions and alchemy class thus far." ("base", "base", "base", "L")
             if states.gen.masturbating:
                 gen "(Where did those bad teachers touch you?)" ("grin", xpos="far_left", ypos="head")
@@ -964,12 +964,12 @@ label hg_pf_talk_tonks:
 
                 block weight 0.9 if states.ast.unlocked: # After Astoria got caught.
                     her "That Astoria girl, casting imperio on a student, and making her lift her top..." ("soft", "narrow", "angry", "R")
-                    ton "Ah, yes... That was unfortunate." ("normal", "base", "worried", "R", hair="basic")
+                    ton @ hair basic "Ah, yes... That was unfortunate." ("normal", "base", "worried", "R")
                     if states.gen.masturbating:
                         gen "(And hot...)" ("angry", xpos="far_left", ypos="head")
                     her "I take it that has been dealt with?" ("normal", "base", "base", "R")
-                    ton "Yes, there's no need for you to worry about her, Miss Granger..." ("base", "happyCl", "raised", "mid", hair="basic")
-                    ton "She has been properly reprimanded - and both professor Dumbledore and I have taken it upon ourselves to work on her behaviour." ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair basic "Yes, there's no need for you to worry about her, Miss Granger..." ("base", "happyCl", "raised", "mid")
+                    ton @ hair horny "She has been properly reprimanded - and both professor Dumbledore and I have taken it upon ourselves to work on her behaviour." ("horny", "base", "base", "mid")
                     if states.gen.masturbating:
                         gen "(If only there was a reason to punish your naughty behaviour...)" ("grin", xpos="far_left", ypos="head")
                         nar "*fap-fap-fap*"
@@ -989,8 +989,8 @@ label hg_pf_talk_tonks:
             her "Such as that one time during our care of magical creatures class..." ("open", "closed", "angry", "mid")
             ton "Oh? You weren't studying centaurs, were you?" ("horny", "base", "raised", "mid")
             her "No? Why would you assume that?" ("normal", "wink", "base", "mid")
-            ton @ cheeks blush "No reason...{w=0.4} Please continue." ("open", "base", "raised", "R", hair="horny")
-            ton "" ("base", "base", "raised", "mid", hair="basic")
+            ton @ cheeks blush hair horny "No reason...{w=0.4} Please continue." ("open", "base", "raised", "R")
+            ton @ hair basic "" ("base", "base", "raised", "mid")
             her "One of the Slytherin students was being quite rough with a {i}Blast-ended Skrewt{/i}... Making it go off on purpose..." ("annoyed", "narrow", "worried", "down")
 
             if states.gen.masturbating:
@@ -1002,7 +1002,7 @@ label hg_pf_talk_tonks:
                 gen "(Yes, any second now...)" ("angry", xpos="far_left", ypos="head")
                 ton @ cheeks blush "Then what happened?" ("open", "base", "raised", "L")
                 her @ cheeks blush "There was a moment of shock spread across her face, just as the {i}Skrewt{/i} exploded right into it..." ("open", "narrow", "worried", "down")
-                ton @ cheeks blush "" ("horny", "base", "angry", "mid", hair="horny")
+                ton @ cheeks blush hair horny "" ("horny", "base", "angry", "mid")
                 gen "(Yes, take it right on your face, you slut!)" ("angry", xpos="far_left", ypos="head")
 
                 call hide_characters
@@ -1028,7 +1028,7 @@ label hg_pf_talk_tonks:
                 ton "Oh really?" ("horny", "narrow", "raised", "mid")
                 ton "What were we talking about then?" ("base", "base", "angry", "mid")
                 gen "Fast...{w=0.4} Blended...{w=0.6} Fruits?" ("base", xpos="far_left", ypos="head")
-                ton "Right..." ("open", "closed", "raised", "mid", hair="basic")
+                ton @ hair basic "Right..." ("open", "closed", "raised", "mid")
                 ton "Well, then... I think we're done here..." ("base", "narrow", "raised", "R")
                 her @ cheeks blush "..." ("normal", "base", "base", "R")
                 if game.daytime:
@@ -1043,7 +1043,7 @@ label hg_pf_talk_tonks:
                 call ton_walk(action="leave")
 
             else:
-                ton "Oh no, those poor things!" ("upset", "base", "worried", "mid", hair="basic")
+                ton @ hair basic "Oh no, those poor things!" ("upset", "base", "worried", "mid")
                 her "..." ("annoyed", "base", "base", "R")
                 ton "That's not how you're supposed to care for a Blast-ended skrewt..." ("open", "closed", "angry", "mid")
                 ton "Wait, what is a {i}Blast-ended Skrewt{/i} actually?" ("upset", "base", "worried", "L")
@@ -1069,7 +1069,7 @@ label hg_pf_talk_tonks:
 
         "\"Yourself.\"":
             her "Well..." ("angry", "narrow", "worried", "down")
-            ton "Tell me, Miss Granger... What does our Headmaster ask of you to earn those house points?" ("horny", "base", "angry", "mid", hair="horny")
+            ton @ hair horny "Tell me, Miss Granger... What does our Headmaster ask of you to earn those house points?" ("horny", "base", "angry", "mid")
             gen "..." ("angry", xpos="far_left", ypos="head")
             if states.gen.masturbating:
                 gen "(Let's take a short break, my hands are getting tired.)" ("base", xpos="far_left", ypos="head")
@@ -1084,9 +1084,9 @@ label hg_pf_talk_tonks:
             menu:
                 "\"That's true\"":
                     gen "Then let's end it here for today..." ("base", xpos="far_left", ypos="head")
-                    ton "But sir..." ("open", "base", "worried", "mid", hair="sad")
+                    ton @ hair sad "But sir..." ("open", "base", "worried", "mid")
                     gen "Tonks..." ("base", xpos="far_left", ypos="head")
-                    ton "Fine..." ("upset", "base", "worried", "down", hair="basic")
+                    ton @ hair basic "Fine..." ("upset", "base", "worried", "down")
                     ton "I've thoroughly enjoyed our little chat, either way." ("base", "base", "base", "L")
                     gen "Good to hear." ("grin", xpos="far_left", ypos="head")
                     ton "I'll leave you two to it..." ("base", "base", "base", "mid")
@@ -1108,7 +1108,7 @@ label hg_pf_talk_tonks:
                     gen "Or are you telling me that her word isn't good enough?" ("base", xpos="far_left", ypos="head")
                     her "No, of course not, but--" ("disgust", "narrow", "worried", "mid_soft")
                     gen "I'm sure Miss Tonks would be happy to provide you with additional points, as you'd basically be providing a favour for us both." ("base", xpos="far_left", ypos="head")
-                    ton "*Hmm*? Oh yes, I'd love to be of help for the Gryffindor house." ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair horny "*Hmm*? Oh yes, I'd love to be of help for the Gryffindor house." ("horny", "base", "base", "mid")
                     her "Well... In that case, I want another five points." ("annoyed", "base", "base", "mid")
                     gen "That can be arrange--" ("base", xpos="far_left", ypos="head")
                     ton "Done!" ("base", "base", "angry", "mid")
@@ -1172,7 +1172,7 @@ label hg_pf_talk_tonks:
                         gen "{size=-5}*Argh*! YES!{/size}" ("angry", xpos="far_left", ypos="head")
 
                         her "" ("annoyed", "base", "base", "R")
-                        ton "Seems like the headmaster enjoyed our little discussion..." ("horny", "base", "angry", "mid", hair="horny")
+                        ton @ hair horny "Seems like the headmaster enjoyed our little discussion..." ("horny", "base", "angry", "mid")
                         her "(.............)" ("soft", "base", "base", "mid")
 
                         call gen_chibi("cum_behind_desk_done")
@@ -1180,11 +1180,11 @@ label hg_pf_talk_tonks:
                         pause.2
 
                         gen "*Ah-Ah*..." ("angry", xpos="far_left", ypos="head")
-                        ton "What have you been doing back there?" ("soft", "narrow", "raised", "mid", hair="horny")
+                        ton @ hair horny "What have you been doing back there?" ("soft", "narrow", "raised", "mid")
                         gen "I--" ("base", xpos="far_left", ypos="head")
                         her @ cheeks blush "Just \"scratching his leg\"... As always." ("open", "base", "worried", "mid")
                         ton "Right..." ("normal", "base", "shocked", "R")
-                        ton "Well then, since my work here is done... I think I better get back to my regular duties." ("open", "closed", "base", "mid", hair="basic")
+                        ton @ hair basic "Well then, since my work here is done... I think I better get back to my regular duties." ("open", "closed", "base", "mid")
 
                     else:
                         gen "I sure--" ("grin", xpos="far_left", ypos="head")
@@ -1196,12 +1196,12 @@ label hg_pf_talk_tonks:
                         ton "That just means you did a great job, Miss Granger." ("base", "base", "base", "L")
                         ton "I'm sure your house benefited greatly from his enjoyment." ("horny", "base", "raised", "L")
                         her @ cheeks blush "I suppose..." ("soft", "base", "base", "R")
-                        ton "Well, I do believe we're done here..." ("open", "closed", "base", "mid", hair="basic")
+                        ton @ hair basic "Well, I do believe we're done here..." ("open", "closed", "base", "mid")
                         ton "Thank you for sharing these things with me Miss Granger... I can see that you've put significant effort into helping your house." ("open", "base", "base", "L")
                         ton "They should be proud to have you." ("base", "base", "base", "mid")
                         her @ cheeks blush "Thank you, Professor..." ("base", "base", "base", "R")
 
-                    ton "I'll leave you two to it..." ("base", "base", "base", "mid", hair="basic")
+                    ton @ hair basic "I'll leave you two to it..." ("base", "base", "base", "mid")
                     if game.daytime:
                         ton "Have a good day, Miss Granger." ("base", "base", "base", "L")
                         her "Good day, professor." ("open", "base", "base", "R")
diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy
index d145123c..f4e4657d 100644
--- a/game/scripts/characters/hermione/events/intro.rpy
+++ b/game/scripts/characters/hermione/events/intro.rpy
@@ -1035,7 +1035,7 @@ label nt_he_hermione_E1:
         gen "Not yet." ("base", xpos="far_left", ypos="head")
         ton "Why you better let him know then... I wouldn't want to step on any toes..." ("annoyed", "base", "raised", "down") # looks down
         nar "Tonks moves her gaze towards your feet."
-        ton "Unless that's something you're into..." ("horny", "narrow", "base", "mid", hair="horny") # looks at Genie
+        ton @ hair horny "Unless that's something you're into..." ("horny", "narrow", "base", "mid") # looks at Genie
         play sound "sounds/gulp.ogg"#Genie gulps
         gen "..." ("angry", xpos="far_left", ypos="head")
         if game.daytime:
@@ -1067,7 +1067,7 @@ label nt_he_hermione_E1:
     gen "That would indeed be very helpful. She's stubborn in that regard." ("base", xpos="far_left", ypos="head")
     ton "You don't have to tell me. She's been lecturing me about those \"sexual favours\" since the very day I got here..." ("upset", "base", "base", "R")
     ton "But I shouldn't complain about that..." ("open", "closed", "base", "mid")
-    ton "Hearing those naughty words spill out of her gorgeous little mouth really gets me going!" ("soft", "narrow", "base", "R", hair="horny")
+    ton @ hair horny "Hearing those naughty words spill out of her gorgeous little mouth really gets me going!" ("soft", "narrow", "base", "R")
     gen "I can imagine so." ("grin", xpos="far_left", ypos="head")
     ton "When she describes all the wrongdoings of those \"filthy Slytherin girls\"..." ("soft", "base", "shocked", "stare")
     ton "How could I possibly get tired of that!" ("crooked_smile", "narrow", "base", "stare")
diff --git a/game/scripts/characters/luna/events/intro.rpy b/game/scripts/characters/luna/events/intro.rpy
index 4a2afaf4..6dd9782f 100644
--- a/game/scripts/characters/luna/events/intro.rpy
+++ b/game/scripts/characters/luna/events/intro.rpy
@@ -408,7 +408,7 @@ label luna_intro_E1:
     gen "Yes, Miss Tonks. What in the great desert sands are you wearing?" ("angry", xpos="far_left", ypos="head")
     gen "Is this a school or a brothel?" ("grin", xpos="far_left", ypos="head")
 
-    ton "It's my nightgown... You don't like it?" ("horny", "narrow", "raised", "L", hair="horny") # Flirtatious
+    ton @ hair horny "It's my nightgown... You don't like it?" ("horny", "narrow", "raised", "L") # Flirtatious
     # Fun option
     menu:
 
@@ -420,9 +420,9 @@ label luna_intro_E1:
 
     her @ cheeks blush "Professor!" ("mad", "base", "base", "mid")
     her @ cheeks blush "How could you say such a thing!?" ("open", "happyCl", "base", "mid")
-    ton "Yes... Such a rude thing to say to your staff. {heart}" ("soft", "narrow", "annoyed", "mid", hair="horny")
+    ton @ hair horny "Yes... Such a rude thing to say to your staff. {heart}" ("soft", "narrow", "annoyed", "mid")
     gen "I'm a man of simple truths, I'm only stating the obvious." ("base", xpos="far_left", ypos="head")
-    ton "So my current attire is too slutty for you, *huh*?" ("base", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "So my current attire is too slutty for you, *huh*?" ("base", "narrow", "base", "L")
     gen "I didn't say that, Miss Tonks..." ("grin", xpos="far_left", ypos="head")
     gen "I said you look like a slut... There's a difference." ("grin", xpos="far_left", ypos="head")
     her @ cheeks blush "What if a student saw you professor?! You can't walk around the castle wearing... This!" ("angry", "narrow", "base", "down")
@@ -449,7 +449,7 @@ label luna_intro_E1:
     #Tonks walks to the door
 
     lun "But I'm not tired mummy..." ("annoyed", "closed", "base", "mid", trans=dissolve)
-    ton @ cheeks blush "..." ("disgust", "shocked", "base", "mid", hair="horny") #wide eyed
+    ton @ cheeks blush hair horny "..." ("disgust", "shocked", "base", "mid") #wide eyed
     gen "What a weirdo..." ("base", xpos="far_left", ypos="head")
     ton "Just...{w=0.4} be a good girl and follow me back to bed..." ("upset", "narrow", "worried", "L")
     lun "Yes, mummy..." ("base", "closed", "base", "mid")
diff --git a/game/scripts/characters/tonks/common.rpy b/game/scripts/characters/tonks/common.rpy
index 10f44f41..6ed6d551 100644
--- a/game/scripts/characters/tonks/common.rpy
+++ b/game/scripts/characters/tonks/common.rpy
@@ -40,7 +40,7 @@ define character.tonks_say = Character("name_tonks_genie", show_icon="tonks", dy
 
 init python:
     def ton(what, mouth=None, eyes=None, eyebrows=None, pupils=None, cheeks=None, tears=None,
-    emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, hair=None, **kwargs):
+    emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
             tonks.show()
@@ -50,6 +50,7 @@ init python:
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
+        temp_hair = None
         redraw = False
         tag = tonks.tag
         layer = tonks.layer
@@ -70,23 +71,21 @@ init python:
             last_face = tonks.get_face()
 
             d = dict(zip(temp_face[::2], temp_face[1::2]))
+            temp_hair = d.pop("hair", None)
+
             tonks.set_face(**d)
             redraw = True
 
+        if temp_hair:
+            last_hair = tonks.get_equipped("hair").color
+            col = tonks_haircolor_table.get(temp_hair)
+            tonks.get_equipped("hair").set_color(col)
+            redraw = True
+
         if emote:
             tonks.set_emote(emote)
             redraw = True
 
-        if hair:
-            if isinstance(hair, list):
-                target_color = hair
-            else:
-                target_color = tonks_haircolor_table.get(hair, tonks_haircolor)
-
-            if target_color != tonks.get_equipped("hair").color:
-                tonks.get_equipped("hair").set_color(target_color)
-                redraw = True
-
         if animation != False:
             tonks.animation = animation
             redraw = True
@@ -104,5 +103,8 @@ init python:
         if temp_face:
             tonks.set_face(**last_face)
 
+        if temp_hair:
+            tonks.get_equipped("hair").set_color(last_hair)
+
         if head_only:
             tonks.hide()
diff --git a/game/scripts/characters/tonks/events/clothing.rpy b/game/scripts/characters/tonks/events/clothing.rpy
index 56d03dcf..748ee806 100644
--- a/game/scripts/characters/tonks/events/clothing.rpy
+++ b/game/scripts/characters/tonks/events/clothing.rpy
@@ -15,42 +15,42 @@ label tonks_summon_setup:
         with hpunch
         gen "!!!" ("angry", xpos="far_left", ypos="head")
 
-        ton @ cheeks heavy_blush "" ("grin", "base", "base", "mid", hair="horny", xpos="mid", ypos="base", trans=d5)
+        ton @ cheeks heavy_blush hair horny "" ("grin", "base", "base", "mid", xpos="mid", ypos="base", trans=d5)
         call ctc
 
-        ton @ cheeks heavy_blush "Hello, [name_genie_tonks]." ("soft", "narrow", "raised", "mid", hair="horny")
+        ton @ cheeks heavy_blush hair horny "Hello, [name_genie_tonks]." ("soft", "narrow", "raised", "mid")
         gen "You're naked!" ("grin", xpos="far_left", ypos="head")
-        ton @ cheeks heavy_blush "I am?" ("soft", "narrow", "raised", "mid", hair="horny")
-        ton @ cheeks heavy_blush "Oh... Yes it appears so..." ("grin", "narrow", "shocked", "down", hair="horny")
-        ton @ cheeks heavy_blush "Is that a problem, [name_genie_tonks]?" ("annoyed", "narrow", "raised", "mid", hair="horny")
-        ton @ cheeks heavy_blush "Am I going to get fired for inappropriate behaviour?" ("annoyed", "narrow", "base", "down", hair="horny")
-        ton @ cheeks heavy_blush "Are you going to report me to the ministry?" ("base", "narrow", "raised", "down", hair="horny")
+        ton @ cheeks heavy_blush hair horny "I am?" ("soft", "narrow", "raised", "mid")
+        ton @ cheeks heavy_blush hair horny "Oh... Yes it appears so..." ("grin", "narrow", "shocked", "down")
+        ton @ cheeks heavy_blush hair horny "Is that a problem, [name_genie_tonks]?" ("annoyed", "narrow", "raised", "mid")
+        ton @ cheeks heavy_blush hair horny "Am I going to get fired for inappropriate behaviour?" ("annoyed", "narrow", "base", "down")
+        ton @ cheeks heavy_blush hair horny "Are you going to report me to the ministry?" ("base", "narrow", "raised", "down")
         gen "..." ("base", xpos="far_left", ypos="head")
         gen "Have you been drinking Wine?" ("base", xpos="far_left", ypos="head")
 
         play sound "sounds/giggle2_loud.ogg"
-        ton @ cheeks heavy_blush "*Giggles*" ("grin", "narrow", "base", "stare", hair="horny")
-        ton @ cheeks heavy_blush "Maybe..." ("grin", "wink", "base", "mid", hair="horny")
+        ton @ cheeks heavy_blush hair horny "*Giggles*" ("grin", "narrow", "base", "stare")
+        ton @ cheeks heavy_blush hair horny "Maybe..." ("grin", "wink", "base", "mid")
 
         gen "One of the students could have seen you..." ("base", xpos="far_left", ypos="head")
-        ton @ cheeks heavy_blush "Oh, I would love for them to see me like this..." ("horny", "narrow", "shocked", "R", hair="horny")
-        ton @ cheeks heavy_blush "Why don't you invite one to your office?" ("soft", "narrow", "shocked", "mid", hair="horny")
+        ton @ cheeks heavy_blush hair horny "Oh, I would love for them to see me like this..." ("horny", "narrow", "shocked", "R")
+        ton @ cheeks heavy_blush hair horny "Why don't you invite one to your office?" ("soft", "narrow", "shocked", "mid")
 
         if ag_st_imperio.counter > 0:
             gen "You'd like that wouldn't you..." ("base", xpos="far_left", ypos="head")
-            ton @ cheeks heavy_blush "Very much!" ("base", "narrow", "base", "mid", hair="horny")
+            ton @ cheeks heavy_blush hair horny "Very much!" ("base", "narrow", "base", "mid")
             gen "Like that Astoria girl you're so infatuated with?" ("base", xpos="far_left", ypos="head")
             gen "Want me to call her up here to have her shame you on your bad behaviour?" ("base", xpos="far_left", ypos="head")
-            ton @ cheeks heavy_blush "Oh, yes please!" ("horny", "base", "base", "mid", hair="horny")
+            ton @ cheeks heavy_blush hair horny "Oh, yes please!" ("horny", "base", "base", "mid")
             gen "But this sudden behaviour isn't about her is it?" ("base", xpos="far_left", ypos="head")
-            ton @ cheeks heavy_blush "*Hmm*... Is it that obvious?" ("base", "narrow", "base", "R", hair="horny")
+            ton @ cheeks heavy_blush hair horny "*Hmm*... Is it that obvious?" ("base", "narrow", "base", "R")
 
         gen "Miss Chang?" ("base", xpos="far_left", ypos="head")
-        ton @ cheeks heavy_blush "*Mmm*..." ("base", "narrow", "base", "stare", hair="horny")
+        ton @ cheeks heavy_blush hair horny "*Mmm*..." ("base", "narrow", "base", "stare")
         gen "Would you like me to bring her up here so you could rub your bodies together some more?" ("base", xpos="far_left", ypos="head")
-        ton @ cheeks heavy_blush "Yes please!" ("grin", "narrow", "base", "stare", hair="horny")
+        ton @ cheeks heavy_blush hair horny "Yes please!" ("grin", "narrow", "base", "stare")
         gen "You sure you're ready to find out just how flexible she is?" ("base", xpos="far_left", ypos="head")
-        ton @ cheeks heavy_blush "Yes!" ("crooked_smile", "base", "base", "stare", hair="horny")
+        ton @ cheeks heavy_blush hair horny "Yes!" ("crooked_smile", "base", "base", "stare")
 
         gen "(Although that's probably not the best idea in her current state...)" ("base", xpos="far_left", ypos="head")
         gen "(Doesn't mean I can't tease her a bit though...)" ("grin", xpos="far_left", ypos="head")
@@ -59,48 +59,48 @@ label tonks_summon_setup:
         menu:
             "-Play nice-":
                 gen "How about a bonus instead?" ("grin", xpos="far_left", ypos="head")
-                ton @ cheeks heavy_blush "A bonus? For showing off my body to my own boss?" ("soft", "narrow", "raised", "mid", hair="horny")
+                ton @ cheeks heavy_blush hair horny "A bonus? For showing off my body to my own boss?" ("soft", "narrow", "raised", "mid")
                 gen "That's right." ("base", xpos="far_left", ypos="head")
 
                 play sound "sounds/giggle2_loud.ogg"
-                ton @ cheeks heavy_blush "*giggles*" ("grin", "narrow", "raised", "stare", hair="horny")
+                ton @ cheeks heavy_blush hair horny "*giggles*" ("grin", "narrow", "raised", "stare")
 
-                ton @ cheeks heavy_blush "I've always wanted to find out my worth." ("grin", "base", "base", "stare", hair="horny")
+                ton @ cheeks heavy_blush hair horny "I've always wanted to find out my worth." ("grin", "base", "base", "stare")
                 gen "Alright then... Let's see, how much are you worth to me..." ("base", xpos="far_left", ypos="head")
 
                 menu:
                     "-Zero gold-" if game.gold <= 0:
                         gen "Zero gold." ("base", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "Seriously?" ("soft", "narrow", "raised", "mid", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "Seriously?" ("soft", "narrow", "raised", "mid")
                         gen "Yes, I'm a cheap bastard." ("base", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "Clearly..." ("upset", "narrow", "base", "mid", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "Clearly..." ("upset", "narrow", "base", "mid")
 
                     "-One gold-" if game.gold > 0:
                         gen "A single gold coin, if anything..." ("base", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "(Bastard... How humiliating.)" ("soft", "narrow", "worried", "up", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "(Bastard... How humiliating.)" ("soft", "narrow", "worried", "up")
                         gen "Well?" ("base", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "Yes?" ("disgust", "narrow", "raised", "mid", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "Yes?" ("disgust", "narrow", "raised", "mid")
                         gen "Shouldn't you be thanking me for this generous valuation?" ("base", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "Oh... Thank you so much, [name_genie_tonks]." ("annoyed", "narrow", "base", "stare", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "Oh... Thank you so much, [name_genie_tonks]." ("annoyed", "narrow", "base", "stare")
                         gen "Don't mention it, [name_tonks_genie]." ("base", xpos="far_left", ypos="head")
                         $ game.gold -= 1
 
                     "-Twenty gold-" if game.gold >= 20:
                         gen "How does twenty gold sound?" ("base", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "(*Hmm*... I kind of expected more.)" ("annoyed", "narrow", "raised", "downR", hair="horny")
-                        ton @ cheeks heavy_blush "Thank you, [name_genie_tonks]." ("soft", "narrow", "base", "mid", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "(*Hmm*... I kind of expected more.)" ("annoyed", "narrow", "raised", "downR")
+                        ton @ cheeks heavy_blush hair horny "Thank you, [name_genie_tonks]." ("soft", "narrow", "base", "mid")
                         gen "No, [name_tonks_genie]... Thank you." ("grin", xpos="far_left", ypos="head")
                         $ game.gold -= 20
 
                     "-A hundred gold-" if game.gold >= 100:
                         gen "Does one hundred gold sound nice to you?" ("base", xpos="far_left", ypos="head")
                         gen "With a body like that, you could earn a fortune at a strip club!" ("grin", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "Really..." ("horny", "narrow", "shocked", "mid", hair="horny")
-                        ton @ cheeks heavy_blush "You think a noble teacher and auror like me, would quit her highly regarded job to become a cheap stripper?" ("grin", "narrow", "shocked", "mid", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "Really..." ("horny", "narrow", "shocked", "mid")
+                        ton @ cheeks heavy_blush hair horny "You think a noble teacher and auror like me, would quit her highly regarded job to become a cheap stripper?" ("grin", "narrow", "shocked", "mid")
                         gen "Well, no. I still want to keep you as a teacher." ("base", xpos="far_left", ypos="head")
                         gen "I merely suggested that you could." ("base", xpos="far_left", ypos="head")
-                        ton @ cheeks heavy_blush "Maybe the duelling stage could find some extra use..." ("base", "narrow", "shocked", "stare", hair="horny")
-                        ton @ cheeks heavy_blush "Perhaps some extra curricular activities for a couple of my favourite students could be arranged..." ("horny", "narrow", "raised", "up", hair="horny")
+                        ton @ cheeks heavy_blush hair horny "Maybe the duelling stage could find some extra use..." ("base", "narrow", "shocked", "stare")
+                        ton @ cheeks heavy_blush hair horny "Perhaps some extra curricular activities for a couple of my favourite students could be arranged..." ("horny", "narrow", "raised", "up")
                         gen "I'm sure they would all love to watch their perverted teacher strip!" ("grin", xpos="far_left", ypos="head")
                         $ game.gold -= 100
 
@@ -109,10 +109,10 @@ label tonks_summon_setup:
             "-Scold her-":
                 gen "But you know what I have to do, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 gen "What were you thinking, walking into your boss' office, completely naked?" ("base", xpos="far_left", ypos="head")
-                ton @ cheeks heavy_blush "I'm terribly sorry, [name_genie_tonks]..." ("open", "narrow", "base", "down", hair="horny")
+                ton @ cheeks heavy_blush hair horny "I'm terribly sorry, [name_genie_tonks]..." ("open", "narrow", "base", "down")
                 gen "How's this befitting for a teacher..." ("angry", xpos="far_left", ypos="head")
                 gen "That surely calls for some punishment, don't you think?" ("grin", xpos="far_left", ypos="head")
-                ton @ cheeks heavy_blush "You are so right, [name_genie_tonks]!" ("horny", "narrow", "base", "stare", hair="horny")
+                ton @ cheeks heavy_blush hair horny "You are so right, [name_genie_tonks]!" ("horny", "narrow", "base", "stare")
 
                 # This section will be under some public check
                 # gen "I should make you the school's cum-dumpster instead. How would you like that position?" ("base", xpos="far_left", ypos="head")
@@ -121,44 +121,44 @@ label tonks_summon_setup:
                 # ton "Maybe some day I'll get bored of my current position here at Hogwarts... you never know..." ("horny", "base", "raised", "mid")
                 # gen "I'm not done with your punishment, Miss [name_tonks_genie]!" ("base", xpos="far_left", ypos="head")
                 gen "You went to this school, didn't you? Which house were you in?" ("base", xpos="far_left", ypos="head")
-                ton @ cheeks heavy_blush "My house? I was in Hufflepuff, but why--" ("disgust", "base", "raised", "mid", hair="horny")
+                ton @ cheeks heavy_blush hair horny "My house? I was in Hufflepuff, but why--" ("disgust", "base", "raised", "mid")
                 gen "Very well then..." ("base", xpos="far_left", ypos="head")
                 gen "Minus ten points from Hufflepuff!" ("base", xpos="far_left", ypos="head")
                 $ hufflepuff -=10
-                ton @ cheeks heavy_blush "What? But [name_genie_tonks]! I'm not even a student--" ("disgust", "base", "base", "mid", hair="upset", trans=hpunch)
+                ton @ cheeks heavy_blush hair upset "What? But [name_genie_tonks]! I'm not even a student--" ("disgust", "base", "base", "mid", trans=hpunch)
                 gen "Also--" ("base", xpos="far_left", ypos="head")
 
         menu:
             "-Those clothes stay off!-":
                 $ tonks.unequip("clothes")
 
-                ton @ cheeks heavy_blush "*Hmm*?" ("soft", "narrow", "raised", "down", hair="horny")
+                ton @ cheeks heavy_blush hair horny "*Hmm*?" ("soft", "narrow", "raised", "down")
                 gen "That's right... If they're so bothersome, why bother wearing them at all?" ("base", xpos="far_left", ypos="head")
                 gen "When you're in here with me I want you on full display!" ("base", xpos="far_left", ypos="head")
-                ton @ cheeks heavy_blush "Of course [name_genie_tonks]..." ("soft", "narrow", "base", "down", hair="horny") #Horny
-                ton @ cheeks heavy_blush "If you would allow me to put my clothes back on at any time, just let me know..." ("soft", "narrow", "base", "downR", hair="horny")
+                ton @ cheeks heavy_blush hair horny "Of course [name_genie_tonks]..." ("soft", "narrow", "base", "down") #Horny
+                ton @ cheeks heavy_blush hair horny "If you would allow me to put my clothes back on at any time, just let me know..." ("soft", "narrow", "base", "downR")
 
             "-Get dressed!-":
                 gen "No teacher of mine will strut around naked...{w} unless I say so!" ("base", xpos="far_left", ypos="head")
-                ton @ cheeks heavy_blush "Yes [name_genie_tonks]..." ("open", "narrow", "shocked", "down", hair="horny")
+                ton @ cheeks heavy_blush hair horny "Yes [name_genie_tonks]..." ("open", "narrow", "shocked", "down")
                 gen "Now, put your clothes back on..." ("base", xpos="far_left", ypos="head")
-                ton @ cheeks heavy_blush "*Ehm*... Okay..." ("soft", "base", "base", "down", hair="horny")
+                ton @ cheeks heavy_blush hair horny "*Ehm*... Okay..." ("soft", "base", "base", "down")
 
                 play sound "sounds/magic4.ogg"
                 $ tonks.wear("all")
                 ton "" (trans=morph)
-                ton @ cheeks heavy_blush "" ("soft", "narrow", "base", "mid", hair="horny")
+                ton @ cheeks heavy_blush hair horny "" ("soft", "narrow", "base", "mid")
 
                 if states.gen.ev.tonks.metamorphmagi_aware:
                     gen "...{w} You used your meta-whatsit ability just then didn't you?" ("base", xpos="far_left", ypos="head")
-                    ton @ cheeks heavy_blush "You can tell?" ("soft", "narrow", "base", "down", hair="horny")
+                    ton @ cheeks heavy_blush hair horny "You can tell?" ("soft", "narrow", "base", "down")
                     gen "Whatever, just wear your actual clothing next time..." ("base", xpos="far_left", ypos="head")
                 else:
                     gen "Much better..." ("base", xpos="far_left", ypos="head")
-                    ton @ cheeks heavy_blush "..." ("soft", "narrow", "base", "downR", hair="horny")
+                    ton @ cheeks heavy_blush hair horny "..." ("soft", "narrow", "base", "downR")
 
         gen "Now, get back to your room and think about what you've done..." ("base", xpos="far_left", ypos="head")
-        ton @ cheeks heavy_blush "Yes [name_genie_tonks]..." ("open", "narrow", "base", "down", hair="horny") #look down, blush
+        ton @ cheeks heavy_blush hair horny "Yes [name_genie_tonks]..." ("open", "narrow", "base", "down") #look down, blush
 
         #Tonks leaves
         call ton_walk(action="leave")
diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy
index 9bfb9b95..80e1c09e 100644
--- a/game/scripts/characters/tonks/events/hangout.rpy
+++ b/game/scripts/characters/tonks/events/hangout.rpy
@@ -676,7 +676,7 @@ label nt_he_story_centaur: # Not in use.
     ton "It's by far the simplest way to calm down a group of wild centaurs..." ("open", "base", "worried", "R")
     ton "As far as I could tell, they didn't have any females within their group..." ("open", "base", "base", "mid")
     ton "You can imagine the amount of tension that gets built up as a result of that..." ("mad", "base", "base", "mid")
-    ton "(Inside those heavy, cum-filled balls!)" ("horny", "base", "base", "ahegao", hair="horny") # ahegao
+    ton @ hair horny "(Inside those heavy, cum-filled balls!)" ("horny", "base", "base", "ahegao") # ahegao
     gen "So your idea was to jerk them off?" ("base", xpos="far_left", ypos="head")
 
     ton "Well, yes.{w} They can't easily reach around to do it themselves now, can they?" ("horny", "base", "base", "mid")
@@ -684,12 +684,12 @@ label nt_he_story_centaur: # Not in use.
 
     gen "Must have been a real...{w}*argh*!- relief for them!" ("angry", xpos="far_left", ypos="head")
     ton "I believe so too, Sir." ("base", "base", "base", "mid")
-    ton "You should know, I never shy away from getting my hands dirty!" ("horny", "base", "raised", "mid", hair="horny")
+    ton @ hair horny "You should know, I never shy away from getting my hands dirty!" ("horny", "base", "raised", "mid")
     gen "*Agh!* Fuck! I'm getting close..." ("angry", xpos="far_left", ypos="head")
     ton "Most of the Ministry view Centaurs as \"lesser\" beings... As animals." ("open", "base", "base", "R")
     ton "But not me. To me they're all powerful, and magnificent creatures." ("base", "base", "angry", "mid")
     ton "And it's known that above all they embody strength, dominance, and lust..." ("open", "base", "base", "mid")
-    ton "(And they are so{w} fucking{w} hung!!!)" ("horny", "base", "base", "ahegao", hair="horny") # Ahegao
+    ton @ hair horny "(And they are so{w} fucking{w} hung!!!)" ("horny", "base", "base", "ahegao") # Ahegao
 
     #Genie cums
     stop music fadeout 1.0
@@ -700,7 +700,7 @@ label nt_he_story_centaur: # Not in use.
     with d3
     pause 1
 
-    ton "For a Ministry person to submit the way I did was quite the shock to them..." ("open", "base", "raised", "R", hair="horny")
+    ton @ hair horny "For a Ministry person to submit the way I did was quite the shock to them..." ("open", "base", "raised", "R")
 
     call cum_block
     gen "*Argh* You horse-cock-loving whore!" ("base", xpos="far_left", ypos="head")
@@ -709,8 +709,8 @@ label nt_he_story_centaur: # Not in use.
     call cum_block
     gen "You dirty slut!" ("angry", xpos="far_left", ypos="head")
 
-    ton "(I'd better not tell him what I had to do for their chieftain...)" ("mad", "base", "worried", "L", hair="horny")
-    ton "(I can still taste him) {heart} {heart} {heart}" ("horny", "base", "base", "ahegao", hair="horny")
+    ton @ hair horny "(I'd better not tell him what I had to do for their chieftain...)" ("mad", "base", "worried", "L")
+    ton @ hair horny "(I can still taste him) {heart} {heart} {heart}" ("horny", "base", "base", "ahegao")
 
     call hide_characters
     hide screen bld1
@@ -724,7 +724,7 @@ label nt_he_story_centaur: # Not in use.
     gen "(Fuck me, that felt great!)" ("angry", xpos="far_left", ypos="head")
 
     ton "A remarkable wizard such as yourself would never even consider solutions of such..." ("open", "base", "base", "mid")
-    ton "Depravity..." ("horny", "base", "base", "R", hair="horny")
+    ton @ hair horny "Depravity..." ("horny", "base", "base", "R")
     gen "Are you asking me whether or not I'd jerk of a Centaur?..." ("base", xpos="far_left", ypos="head")
     gen "Because that would be a clear \"no\" from me..." ("base", xpos="far_left", ypos="head")
 
diff --git a/game/scripts/characters/tonks/events/intro.rpy b/game/scripts/characters/tonks/events/intro.rpy
index 1008efa1..1ac19448 100644
--- a/game/scripts/characters/tonks/events/intro.rpy
+++ b/game/scripts/characters/tonks/events/intro.rpy
@@ -95,7 +95,7 @@ label tonks_intro_E1:
 
     ton "I had quite the \"pleasant\" encounter with a group of centaurs." ("soft", "wide", "raised", "R")
     gen "Centaurs?!"
-    ton "*Mhmm*..." ("base", "base", "base", "mid", hair="horny")
+    ton @ hair horny "*Mhmm*..." ("base", "base", "base", "mid")
     ton "As usual, they ignored the boundaries of their allocated territory." ("open", "closed", "base", "mid")
     ton "I had to get them to comply with our rules, to the best of my abilities..." ("soft", "base", "base", "mid")
     gen "Is that so?..."
@@ -156,7 +156,7 @@ label tonks_intro_E1:
         ton "Of course, Sir." ("base", "base", "base", "mid")
         ton "I had to make a compelling offer so they'd peacefully return to their assigned territory, which isn't easy..." ("open", "base", "base", "mid")
         gen "(...)" ("base", xpos="far_left", ypos="head")
-        ton "You'd never be able to guess how I did it, it's quite the story." ("horny", "base", "base", "R", hair="horny")
+        ton @ hair horny "You'd never be able to guess how I did it, it's quite the story." ("horny", "base", "base", "R")
         ton "Unfortunately, I cannot tell you...{w} Strictly confidential Ministry information..." ("soft", "base", "raised", "mid")
         gen "(Why? Did she suck them off?)" ("base", xpos="far_left", ypos="head")
         ton "Okay then, let's get this over with." ("open", "narrow", "base", "R")
@@ -203,7 +203,7 @@ label tonks_intro_E1:
         "\"What did she want?\"":
             ton "Miss Granger wrote about several students, most commonly girls of the Slytherin House, that were inclined to do favours for their male teachers." ("open", "base", "base", "R") #Tonks is a hogwarts graduate. Slytherin doesn't need to be in quotations, she knows what it is.
             gen "So what?" ("base", xpos="far_left", ypos="head")
-            ton "According to her letter, those favours tend to be very...{w=0.1} \"sexual\" in nature..." ("soft", "base", "raised", "mid", hair="horny")
+            ton @ hair horny "According to her letter, those favours tend to be very...{w=0.1} \"sexual\" in nature..." ("soft", "base", "raised", "mid")
 
     gen "(Shit...)" ("base", xpos="far_left", ypos="head")
     ton "Professor, this is a very serious allegation, don't you agree that the ministry is under an obligation to investigate?" ("open", "wide", "raised", "mid")
@@ -310,12 +310,12 @@ label tonks_intro_E2:
     ton "I haven't gotten a chance to do my job properly so far." ("upset", "base", "base", "R")
     ton "I've been rather preoccupied listening to Miss Granger's own {i}investigations{/i}..." ("open", "narrow", "base", "R")
     ton "That girl sure is something, isn't she?" ("open", "base", "raised", "mid")
-    ton "Not that I mind listening to her." ("soft", "base", "shocked", "R", hair="horny")
+    ton @ hair horny "Not that I mind listening to her." ("soft", "base", "shocked", "R")
     ton "She gave me a very long report that went well into the evening, whilst I enjoyed a glass of firewhisky..." ("open", "base", "base", "mid")
     ton "She has been very thorough in documenting all the happenings she's witnessed..." ("base", "base", "base", "mid")
     gen "I can imagine that..." ("base", xpos="far_left", ypos="head")
     ton "Anyhow... She had no proof of any illicit activities.{w} It's all just hearsay." ("open", "closed", "base", "R")
-    ton "As much as I wish it were true..." ("horny", "closed", "base", "R", hair="horny")
+    ton @ hair horny "As much as I wish it were true..." ("horny", "closed", "base", "R")
     gen "*huh*?" ("base", xpos="far_left", ypos="head")
     ton "So I could conclude this whole business sooner, of course..." ("base", "narrow", "base", "downR")
     ton "And bring this favour trading business to an end, once, and for all." ("open", "base", "base", "mid")
@@ -503,25 +503,25 @@ label tonks_intro_E3:
     ton "Professor..." ("soft", "base", "base", "mid", xpos="mid", ypos="base", trans=dissolve)
     gen "How's the investigation going? Nothing to report I gather?" ("base", xpos="far_left", ypos="head")
     ton "On the contrary..." ("open", "wide", "shocked", "stare")
-    ton "It's worse than I could have ever imagined!" ("open", "wide", "angry", "mid", hair="angry")
+    ton @ hair angry "It's worse than I could have ever imagined!" ("open", "wide", "angry", "mid")
     gen "(........)" ("angry", xpos="far_left", ypos="head")
     ton "This school truly has changed since I was a student here." ("mad", "base", "base", "mid")
     ton "I never thought I would see Hogwarts in a state such as this..." ("open", "base", "annoyed", "down")
-    ton "Corrupted! Right down to the core!" ("mad", "base", "angry", "mid", hair="angry")
+    ton @ hair angry "Corrupted! Right down to the core!" ("mad", "base", "angry", "mid")
     gen "(What's the matter with her hair?!)" ("angry", xpos="far_left", ypos="head")
-    ton "You don't have to search for too long to uncover the vile debaucheries that are happening at this school..." ("open", "base", "annoyed", "mid", hair="angry")
+    ton @ hair angry "You don't have to search for too long to uncover the vile debaucheries that are happening at this school..." ("open", "base", "annoyed", "mid")
     gen "(Snape you fucking idiot! You blew it!!!)" ("angry", xpos="far_left", ypos="head")
-    ton "Teachers taking advantage of their students, promising house points in return for sexual acts..." ("open", "base", "angry", "R", hair="angry") #in a sexual favour, the sex act is the favour
-    ton "While they abuse their authority and power to do the most despicable things to them..." ("open", "base", "annoyed", "R", hair="horny")
-    ton "But the Dumbledore I know would never allow such disgracefulness at his school..." ("mad", "base", "angry", "mid", hair="angry")
+    ton @ hair angry "Teachers taking advantage of their students, promising house points in return for sexual acts..." ("open", "base", "angry", "R") #in a sexual favour, the sex act is the favour
+    ton @ hair horny "While they abuse their authority and power to do the most despicable things to them..." ("open", "base", "annoyed", "R")
+    ton @ hair angry "But the Dumbledore I know would never allow such disgracefulness at his school..." ("mad", "base", "angry", "mid")
     gen "(...)" ("base", xpos="far_left", ypos="head")
 
     stop music fadeout 1.0
-    ton "I had this suspicion... Since the very day I got here..." ("open", "wide", "angry", "mid", hair="angry")
+    ton @ hair angry "I had this suspicion... Since the very day I got here..." ("open", "wide", "angry", "mid")
     # Tonks threatens Genie.
     # Maybe have her chibi point her wand at him?
     play music "music/hitman.ogg" fadein 1 if_changed
-    ton "Now tell me, who are you?{w} And you better tell the truth!" ("mad", "base", "angry", "mid", hair="angry")
+    ton @ hair angry "Now tell me, who are you?{w} And you better tell the truth!" ("mad", "base", "angry", "mid")
     gen "(Shit, how often is this going to happen to me?)" ("angry", xpos="far_left", ypos="head")
 
     menu:
@@ -531,7 +531,7 @@ label tonks_intro_E3:
             gen "No wait, it was {i}Albertus Dumblerdore{/i}! That's it!" ("angry", xpos="far_left", ypos="head")
             gen "(Yes, that was probably it...)" ("base", xpos="far_left", ypos="head")
         "\"You know who!\"":
-            ton "What?!" ("open", "wide", "base", "mid", hair="scared")
+            ton @ hair scared "What?!" ("open", "wide", "base", "mid")
             gen "You...{w=0.8} know...{w=0.8} who..." ("base", xpos="far_left", ypos="head")
             ton "That can't be true, you're making it up!" ("open", "base", "annoyed", "mid")
             gen "You know who I am. You said it yourself earlier." ("base", xpos="far_left", ypos="head")
@@ -543,7 +543,7 @@ label tonks_intro_E3:
     ton "I've had enough of this!" ("mad", "base", "angry", "mid")
     ton "Reveal your true identity, dark wizard!" ("open", "base", "angry", "mid")
     gen "I'm not a dark wizard, you racist twat!" ("angry", xpos="far_left", ypos="head")
-    ton "How dare you call me a racist!" ("mad", "shocked", "angry", "mid", hair="angry")
+    ton @ hair angry "How dare you call me a racist!" ("mad", "shocked", "angry", "mid")
     gen "Bring it! Do your worst, witch!" ("angry", xpos="far_left", ypos="head")
     call hide_characters
     hide screen bld1
@@ -567,7 +567,7 @@ label tonks_intro_E3:
     $ desk_OBJ.idle = "desk_dumbledore"
     $ chair_left_OBJ.hidden = True
     call cast_spell("revelio")
-    ton "Revelio!" ("open_wide", "shocked", "annoyed", "mid", hair="angry", ypos="head", flip=False)
+    ton @ hair angry "Revelio!" ("open_wide", "shocked", "annoyed", "mid", ypos="head", flip=False)
     call bld("hide")
     pause.6
 
@@ -589,7 +589,7 @@ label tonks_intro_E3:
     gen "Some people would say I'm {b}the{/b} Genie, actually!" ("grin", xpos="far_left", ypos="head")
     gen "The most powerful being in the entire universe... Multiple universes even..." ("base", xpos="far_left", ypos="head")
     gen "Glad my reputation precedes me..." ("base", xpos="far_left", ypos="head")
-    ton "How curious. I've never had a Genie before..." ("horny", "wide", "base", "down", hair="horny") # Tonks looks horny.
+    ton @ hair horny "How curious. I've never had a Genie before..." ("horny", "wide", "base", "down") # Tonks looks horny.
     gen "I'm sorry-- what?" ("base", xpos="far_left", ypos="head")
     ton "I meant, I've never had the pleasure of meeting a Genie before. This is brilliant!" ("grin", "shocked", "shocked", "mid")
     gen "(Is she hitting on me?!)" ("base", xpos="far_left", ypos="head")
@@ -607,14 +607,14 @@ label tonks_intro_E3:
     ton "Because you were bored?!" ("upset", "base", "angry", "mid")
     gen "Hey! I'm an immortal being... boredom is my worst enemy." ("base", xpos="far_left", ypos="head")
     gen "And I didn't do much, just a nudge in the right direction..." ("base", xpos="far_left", ypos="head")
-    ton "You need to bring him back, the real Dumbledore, immediately!" ("mad", "base", "angry", "mid", hair="angry")
+    ton @ hair angry "You need to bring him back, the real Dumbledore, immediately!" ("mad", "base", "angry", "mid")
     gen "I don't know how, ... yet.{w} We're still working on it..." ("base", xpos="far_left", ypos="head")
     ton "We? Who else knows about this?" ("open", "narrow", "annoyed", "mid")
 
     menu:
         gen "(Crap...)" ("base", xpos="far_left", ypos="head")
         "\"You know who...\"":
-            ton "{size=+4}What?!{/size}" ("open", "wide", "worried", "mid", hair="scared")
+            ton @ hair scared "{size=+4}What?!{/size}" ("open", "wide", "worried", "mid")
             gen "(Why do they keep freaking out whenever I say this...)" ("base", xpos="far_left", ypos="head")
             gen "That Snape guy." ("base", xpos="far_left", ypos="head")
 
@@ -623,7 +623,7 @@ label tonks_intro_E3:
             gen "What? But I didn't--" ("base", xpos="far_left", ypos="head")
 
     ton "But of course!{w} After all he was mentioned in Miss Granger's letter as one of the main offenders." ("disgust", "wide", "shocked", "stare")
-    ton "That sleazy, vile snake...{w} Naturally he'd be all over an opportunity such as this." ("mad", "base", "angry", "R", hair="angry")
+    ton @ hair angry "That sleazy, vile snake...{w} Naturally he'd be all over an opportunity such as this." ("mad", "base", "angry", "R")
     gen "(Snake? Have I been saying his name wrong this entire time?...)" ("base", xpos="far_left", ypos="head")
     gen "(I hate when that happens...)" ("base", xpos="far_left", ypos="head")
     ton "And to think I believed that creep when I questioned him about it." ("mad", "closed", "angry", "mid")
@@ -657,13 +657,13 @@ label tonks_intro_E3:
 
     gen "Unless?" ("angry", xpos="far_left", ypos="head")
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
-    ton "You let me join in on the fun!" ("grin", "base", "raised", "mid", hair="horny")
+    ton @ hair horny "You let me join in on the fun!" ("grin", "base", "raised", "mid")
     gen "..." ("base", xpos="far_left", ypos="head")
     gen "What?" ("angry", xpos="far_left", ypos="head") #screenshake
     ton "The ministry sent me to investigate what they assumed to be a silly rumour a student made up..." ("base", "base", "angry", "R")
     ton "And whilst I could just squash the rumour and go back to a dull, quiet desk job." ("disgust", "base", "raised", "mid") #rule of 3
-    ton "I simply couldn't pass up an opportunity like this..." ("horny", "narrow", "base", "mid", hair="horny") #now that she's not being official and talking ministry business, she should slip back into more casual language
-    ton "Keeping quiet would be far more... \"exciting\"." ("soft", "base", "base", "stare", hair="horny")
+    ton @ hair horny "I simply couldn't pass up an opportunity like this..." ("horny", "narrow", "base", "mid") #now that she's not being official and talking ministry business, she should slip back into more casual language
+    ton @ hair horny "Keeping quiet would be far more... \"exciting\"." ("soft", "base", "base", "stare")
     gen "How so?" ("base", xpos="far_left", ypos="head")
     ton "I know for a fact that the Ministry has been trying to plant an inside man here at Hogwarts." ("normal", "base", "base", "R")
     gen "Then what are you suggesting?" ("base", xpos="far_left", ypos="head")
@@ -678,7 +678,7 @@ label tonks_intro_E3:
     gen "That's a relief..." ("base", xpos="far_left", ypos="head")
     ton "I'll inform the other teachers about my stay." ("open", "base", "base", "R")
     ton "And the Ministry too of course. I'll be their inside man at Hogwarts, here at the request of Professor Dumbledore himself, no less." ("base", "base", "base", "mid")
-    ton "If only they knew..." ("horny", "narrow", "base", "mid", hair="horny")
+    ton @ hair horny "If only they knew..." ("horny", "narrow", "base", "mid")
     ton "In any case, Profess--" ("open", "base", "base", "R")
     ton "I'm sorry, what would you like me to call you?" ("mad", "base", "raised", "mid")
 
@@ -693,12 +693,12 @@ label tonks_intro_E3:
         "\"Call me Daddy...\"":
             $ name_genie_tonks = "Daddy"
             ton "What? Are you serious?!" ("open", "wide", "shocked", "stare")
-            ton "*Ha-Ha-Ha!*...{w=0.3} you're too funny!" ("silly", "happyCl", "raised", "mid", hair="happy")
+            ton @ hair happy "*Ha-Ha-Ha!*...{w=0.3} you're too funny!" ("silly", "happyCl", "raised", "mid")
             gen "(What?-- Now it's yellow!)" ("angry", xpos="far_left", ypos="head")
-            ton "Are all Genies this desperate?" ("crooked_smile", "base", "raised", "mid", hair="happy")
+            ton @ hair happy "Are all Genies this desperate?" ("crooked_smile", "base", "raised", "mid")
             gen "Desperate? Why Desperate? ..." ("base", xpos="far_left", ypos="head")
-            ton "Nothing..." ("base", "base", "base", "down", hair="happy")
-            ton "Very well... \"Daddy\"! {heart}{heart}{heart}" ("horny", "narrow", "base", "mid", hair="horny")
+            ton @ hair happy "Nothing..." ("base", "base", "base", "down")
+            ton @ hair horny "Very well... \"Daddy\"! {heart}{heart}{heart}" ("horny", "narrow", "base", "mid")
             gen "*He*-*He*-*He*-He*..." ("grin", xpos="far_left", ypos="head")
 
     ton "Call me to your office whenever you require my help, [name_genie_tonks]." ("base", "base", "base", "mid") #would it be better to have her call him by the requested name here, since later on we have the bit where Tonks submits to genie and calls him sir
diff --git a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
index 70097b25..1b808d98 100644
--- a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
+++ b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
@@ -53,7 +53,7 @@ label nt_pr_teach_start:
             $ gryffindor += 10
             gen "So as far as I'm concerned, hand out as many as you want." ("base", xpos="far_left", ypos="head")
             ton "All right... Well, I better get to class." ("base", "base", "base", "R")
-            ton "I've got some boys to \"teach\"..." ("horny", "narrow", "raised", "mid", hair="neutral")
+            ton @ hair neutral "I've got some boys to \"teach\"..." ("horny", "narrow", "raised", "mid")
             gen "Don't forget to come back here after classes to fill me in." ("base", xpos="far_left", ypos="head")
             ton "Will do..." ("base", "happyCl", "base", "mid")
 
@@ -559,7 +559,7 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
     ton "So I told him I didn't {b}just{/b} want to look at it..." ("soft", "narrow", "shocked", "mid")
     ton "But watch him play with it..." ("horny", "narrow", "annoyed", "mid")
     gen "Make him an offer he can't refuse..." ("base", xpos="far_left", ypos="head")
-    ton "His eyes truly lit up after that..." ("base", "happyCl", "base", "mid", hair="horny")
+    ton @ hair horny "His eyes truly lit up after that..." ("base", "happyCl", "base", "mid")
     ton "He just kept on staring at me, while he started stroking it..." ("horny", "narrow", "base", "mid")
     ton "Getting it hard for his teacher..." ("horny", "base", "base", "ahegao")
     ton "*Mmmm*... The way he was staring at my tits... with such hunger..." ("soft", "closed", "shocked", "mid")
@@ -716,7 +716,7 @@ label nt_pr_teach_T2_E4: # Tier 2 - Event 4 - Slytherin girl
     ton "I was expecting her to at least argue at least a bit about the amount of points she would receive for it..." ("open", "base", "base", "R")
     ton "But she dropped them in an instant, without even hearing my offer." ("horny", "base", "annoyed", "mid")
     ton "Next, she just looked at me as if to ask, \"what next\"?" ("open", "base", "base", "mid")
-    ton "*Ugh*... It was so fucking hot..." ("soft", "base", "base", "stare", hair="horny")
+    ton @ hair horny "*Ugh*... It was so fucking hot..." ("soft", "base", "base", "stare")
     gen "And?... What did happen \"next\"?" ("grin", xpos="far_left", ypos="head")
     ton "I had her play with herself..." ("grin", "closed", "shocked", "mid")
     ton @ cheeks blush "But... that cute face of hers... and all the teasing..." ("open", "closed", "shocked", "R")
diff --git a/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy b/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
index f78a91db..9a539161 100644
--- a/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
+++ b/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
@@ -109,9 +109,9 @@ label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy
     ton "He didn't want to say it at first..." ("soft", "narrow", "base", "mid")
     ton "So I leaned in closer...{w} Let him feel my breath on his neck..." ("base", "closed", "annoyed", "mid")
     ton "And then I whispered the truth into his ear..." ("soft", "narrow", "annoyed", "stare")
-    ton "That he's a dirty little \"tit addict\"!" ("crooked_smile", "base", "angry", "up", hair="neutral")
+    ton @ hair neutral "That he's a dirty little \"tit addict\"!" ("crooked_smile", "base", "angry", "up")
     gen "You naughty girl!" ("grin", xpos="far_left", ypos="head")
-    ton "*Ugh*... He went redder than a tomato when I said that." ("horny", "closed", "base", "mid", hair="horny")
+    ton @ hair horny "*Ugh*... He went redder than a tomato when I said that." ("horny", "closed", "base", "mid")
     ton "And as both you and I know there's only one cure for that..." ("open", "closed", "base", "mid")
     ton "So I grabbed his wrist and forced it up to my chest!" ("open", "closed", "annoyed", "mid")
     gen "Just like that?" ("base", xpos="far_left", ypos="head")
@@ -123,7 +123,7 @@ label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy
     ton "All I know is that he wasn't afraid to give it a go." ("grin", "happyCl", "base", "mid")
     gen "I gather that he enjoyed himself?" ("base", xpos="far_left", ypos="head")
     ton "He just sat there, silently groping my tits for several minutes..." ("soft", "narrow", "shocked", "down")
-    ton "*Ugh*... It took everything I had not to hold him down and jump his bone..." ("horny", "base", "base", "up", hair="horny")
+    ton @ hair horny "*Ugh*... It took everything I had not to hold him down and jump his bone..." ("horny", "base", "base", "up")
     gen "[name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
     ton "Right, well after letting him play with them for a little while, I sent him back to class." ("mad", "narrow", "base", "down")
     gen "Think you'll gain any reputation from this encounter?" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/tonks/events/requests/oral_practice.rpy b/game/scripts/characters/tonks/events/requests/oral_practice.rpy
index 41a84320..cb95ec61 100644
--- a/game/scripts/characters/tonks/events/requests/oral_practice.rpy
+++ b/game/scripts/characters/tonks/events/requests/oral_practice.rpy
@@ -39,7 +39,7 @@ label nt_pr_kiss_start:
         else:
 
             gen "Fancy another student-snog-session?" ("base", xpos="far_left", ypos="head")
-            ton "*Mmmm*... You bet... Teaching is my job..." ("horny", "base", "base", "R", hair="horny")
+            ton @ hair horny "*Mmmm*... You bet... Teaching is my job..." ("horny", "base", "base", "R")
             ton "Even if that lesson is \"French Kissing\"..." ("soft", "wink", "shocked", "mid")
             gen "Well, don't let me stop you." ("base", xpos="far_left", ypos="head")
             ton "Thank you, sir..." ("grin", "base", "base", "mid")
@@ -56,7 +56,7 @@ label nt_pr_kiss_start:
         else: # Repeat
 
             gen "How would you feel about French kissing your students again?" ("base", xpos="far_left", ypos="head")
-            ton "*Mmmm*... Pretty good if the last few times are anything to go by..." ("horny", "base", "base", "R", hair="horny")
+            ton @ hair horny "*Mmmm*... Pretty good if the last few times are anything to go by..." ("horny", "base", "base", "R")
             ton "I'll see you after class..." ("base", "base", "angry", "mid")
 
     # Tonks leaves
@@ -195,15 +195,15 @@ label nt_pr_kiss_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
     ton "Great! That kiss must have awoken something in him..." ("crooked_smile", "base", "shocked", "mid")
     ton "He really got into it after a while..." ("base", "happyCl", "base", "mid")
     ton "*Ugh*!... I've never had someone attack me with their tongue like that..." ("horny", "base", "base", "up")
-    ton "It was intense! And neither of us wanted it to end..." ("soft", "base", "shocked", "ahegao", hair="horny")
+    ton @ hair horny "It was intense! And neither of us wanted it to end..." ("soft", "base", "shocked", "ahegao")
     gen "Is that why you were late today?" ("grin", xpos="far_left", ypos="head")
     ton "*Hmm*... Can you blame me?" ("crooked_smile", "base", "base", "up")
     gen "So you spent all afternoon French kissing one of your students?" ("grin", xpos="far_left", ypos="head")
     ton "Yes, [name_genie_tonks]..." ("soft", "closed", "base", "mid")
-    ton "I guess I fucking did!" ("crooked_smile", "base", "shocked", "mid", hair="neutral")
+    ton @ hair neutral "I guess I fucking did!" ("crooked_smile", "base", "shocked", "mid")
     gen "I'm very proud!" ("grin", xpos="far_left", ypos="head")
     gen "Great work, [name_tonks_genie]." ("base", xpos="far_left", ypos="head")
-    ton "..." ("crooked_smile", "base", "base", "up", hair="horny")
+    ton @ hair horny "..." ("crooked_smile", "base", "base", "up")
     ton "Thank you, [name_genie_tonks]. Have a good night." ("base", "wink", "base", "mid")
 
     # Tonks leaves.
@@ -264,9 +264,9 @@ label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls
     ton "Maybe not even each other..." ("base", "narrow", "annoyed", "mid")
     gen "Ought to be young again..." ("base", xpos="far_left", ypos="head")
     ton "I couldn't help myself, [name_genie_tonks]!" ("crooked_smile", "base", "base", "stare")
-    ton "I simply {b}had{/b} to play around while they did it..." ("horny", "happyCl", "shocked", "mid", hair="horny")
+    ton @ hair horny "I simply {b}had{/b} to play around while they did it..." ("horny", "happyCl", "shocked", "mid")
     gen "Did they care?" ("base", xpos="far_left", ypos="head")
-    ton "Not one bit!" ("horny", "base", "base", "down", hair="horny")
+    ton @ hair horny "Not one bit!" ("horny", "base", "base", "down")
     ton "They'd just take it in waves..." ("soft", "base", "base", "L")
     ton @ cheeks blush "Making out... Calling me a pervert..." ("horny", "base", "base", "up")
     ton @ cheeks blush "Locking their mouths together, only to break apart again to tease me  more..." ("base", "base", "base", "ahegao")
@@ -347,7 +347,7 @@ label nt_pr_kiss_T1_E4: #Level 1 Event 4
     ton "I just softly cradled her head - and spent the next five minutes teaching her how to \"french\"..." ("soft", "base", "shocked", "up")
     ton "They can't offer you an experience like that at the Ministry!" ("grin", "wink", "base", "mid")
     gen "Consider yourself lucky then." ("grin", xpos="far_left", ypos="head")
-    ton "Oh, I do!{w} Believe me!" ("crooked_smile", "closed", "shocked", "mid", hair="horny")
+    ton @ hair horny "Oh, I do!{w} Believe me!" ("crooked_smile", "closed", "shocked", "mid")
     gen "That shall be all for now..." ("base", xpos="far_left", ypos="head")
     ton "Thank you, [name_genie_tonks]." ("soft", "narrow", "base", "mid")
 
diff --git a/game/scripts/characters/tonks/talk.rpy b/game/scripts/characters/tonks/talk.rpy
index c568067c..424e2a10 100644
--- a/game/scripts/characters/tonks/talk.rpy
+++ b/game/scripts/characters/tonks/talk.rpy
@@ -90,7 +90,7 @@ label tonks_talk:
                     ton "Of course." ("base", "base", "base", "mid")
                     gen "Sweet." ("grin", xpos="far_left", ypos="head")
                     ton "Will I get my three wishes too?" ("open", "base", "base", "mid")
-                    ton "Or would I have to rub your \"thing\" first?" ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair horny "Or would I have to rub your \"thing\" first?" ("horny", "base", "base", "mid")
                     gen "My lamp?" ("base", xpos="far_left", ypos="head")
                     ton "I was talking about your--" ("base", "base", "base", "R")
                     with hpunch
@@ -125,7 +125,7 @@ label tonks_talk:
                     gen "Of course not." ("base", xpos="far_left", ypos="head")
                     gen "Once you're immortal, the last thing you need is some annoying brat on your mind..." ("base", xpos="far_left", ypos="head")
                     gen "All we really want to do is waste a majority of our existence with mindless sex!" ("grin", xpos="far_left", ypos="head")
-                    ton "Oh my..." ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair horny "Oh my..." ("horny", "base", "base", "mid")
                     gen "And sometimes a bit of kinky role-play..." ("base", xpos="far_left", ypos="head")
                     gen "Are you going to call me \"Lord Voldemort\" now or what?" ("base", xpos="far_left", ypos="head")
                     ton "Fine... I will call you, [name_genie_tonks], if it makes you happy..." ("base", "base", "base", "mid")
@@ -287,10 +287,10 @@ label tonks_talk:
                 "-Whore-": #Todo put under public checks
                     label .whore:
                     $ name_tonks_genie = "Whore"
-                    ton "Hmm... I'm a \"whore\" now, am I?" ("horny", "base", "raised", "mid", hair="horny")
+                    ton @ hair horny "Hmm... I'm a \"whore\" now, am I?" ("horny", "base", "raised", "mid")
                     gen "That's what I pay you for."
-                    ton "You pay me to--" ("soft", "narrow", "base", "mid", hair="horny")
-                    ton "Well, I suppose I do spend a lot of my time on the clock... Enticing my pupils..." ("horny", "narrow", "base", "R", hair="horny")
+                    ton @ hair horny "You pay me to--" ("soft", "narrow", "base", "mid")
+                    ton @ hair horny "Well, I suppose I do spend a lot of my time on the clock... Enticing my pupils..." ("horny", "narrow", "base", "R")
                     ton "But I can assure you it's to encourage them to do better during class." ("base", "narrow", "base", "R")
                     gen "Sure... Doesn't make you less of a whore though."
                     ton "*Mmm*... Alright, fine, If calling me a whore is the punishment for being a good teacher then you can call me a whore any day..." ("horny", "narrow", "base", "mid")
@@ -311,7 +311,7 @@ label tonks_talk:
                     ton "*Uuuh*, [name_genie_tonks]..." ("base", "base", "raised", "mid")
                     ton "You better not call me that in front of a student..." ("open", "base", "base", "mid")
                     gen "What if I do?" ("grin", xpos="far_left", ypos="head")
-                    ton "Do it, I dare you!" ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair horny "Do it, I dare you!" ("horny", "base", "base", "mid")
 
                 "-Slave-"(style="disabled") if states.ton.level < 60:
                     label .slave_fail:
diff --git a/game/scripts/doll/chibi.rpy b/game/scripts/doll/chibi.rpy
index 2d07e989..173b91f3 100644
--- a/game/scripts/doll/chibi.rpy
+++ b/game/scripts/doll/chibi.rpy
@@ -374,9 +374,9 @@ default hooch_chibi = DollChibi(name="hooch", doll=hooch)
 #     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True)
 #     "doll synchronisation"
 #     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True, pause=False)
-#     ton "Default" ("base", "base", "base", "mid", hair="default")
-#     ton "Angry" ("angry", "narrow", "angry", "mid", hair="angry")
-#     ton "Scared" ("scream", "wide", "worried", "mid", hair="scared")
+#     ton @ hair default "Default" ("base", "base", "base", "mid")
+#     ton @ hair angry "Angry" ("angry", "narrow", "angry", "mid")
+#     ton @ hair scared "Scared" ("scream", "wide", "worried", "mid")
 #     "End"
 #     hide tonks_chibi
 #     hide tonks_main
diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
index 2f99d851..2a7fa696 100644
--- a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
+++ b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
@@ -115,7 +115,7 @@ label a_christmas_tale2():
     with d3
     gen "Now check out this girl!" ("grin", xpos="far_left", ypos="head")
 
-    ton "" ("horny", "narrow", "base", "mid", hair="happy", xpos="mid", ypos="base", trans=d3)
+    ton @ hair happy "" ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=d3)
     call ctc
     hide tonks_main
     sna "Now that is a present!" ("snape_13", trans=d3)
@@ -123,9 +123,9 @@ label a_christmas_tale2():
     hide snape_main
     gen "That's not your present, that's my sexy helper elf..." ("base", xpos="far_left", ypos="head")
 
-    ton "Eye's up here boy..." ("base", "base", "base", "mid", hair="happy", trans=dissolve)
-    ton "Your present is in this sack..." ("soft", "narrow", "base", "down", hair="happy")
-    ton "These milkers belong to Santa!" ("horny", "narrow", "base", "L", hair="horny")
+    ton @ hair happy "Eye's up here boy..." ("base", "base", "base", "mid", trans=dissolve)
+    ton @ hair happy "Your present is in this sack..." ("soft", "narrow", "base", "down")
+    ton @ hair horny "These milkers belong to Santa!" ("horny", "narrow", "base", "L")
     gen "They're my after-work Christmas snack!" ("grin", xpos="far_left", ypos="head")
 
     hide tonks_main
@@ -158,14 +158,14 @@ label a_christmas_tale2():
     with d3
     gen "Now unwrap those naughty bits!" ("grin", xpos="far_left", ypos="head")
 
-    ton "Wait, I just remembered, don't unwrap the present yet!" ("mad", "shocked", "base", "L", hair="happy", trans=dissolve)
-    ton "If he's not been good this year then a gift he cannot get." ("open", "closed", "shocked", "mid", hair="happy")
+    ton @ hair happy "Wait, I just remembered, don't unwrap the present yet!" ("mad", "shocked", "base", "L", trans=dissolve)
+    ton @ hair happy "If he's not been good this year then a gift he cannot get." ("open", "closed", "shocked", "mid")
     hide tonks_main
     with d3
 
     gen "I'm certain he's been good... Now unwrap her I insist!" ("grin", xpos="far_left", ypos="head")
 
-    ton "I'm not so sure myself... His offences fill this list." ("upset", "narrow", "base", "down", hair="happy", trans=dissolve)
+    ton @ hair happy "I'm not so sure myself... His offences fill this list." ("upset", "narrow", "base", "down", trans=dissolve)
     hide tonks_main
     with d3
 
@@ -174,7 +174,7 @@ label a_christmas_tale2():
     with d3
     nar "The elf then unrolled it... A scroll six inches thick."
 
-    ton "Inflating the points gained to put the Slytherins in the lead..." ("open", "base", "raised", "down", hair="happy", trans=dissolve)
+    ton @ hair happy "Inflating the points gained to put the Slytherins in the lead..." ("open", "base", "raised", "down", trans=dissolve)
     hide tonks_main
     with d3
 
@@ -187,55 +187,55 @@ label a_christmas_tale2():
     hide snape_main
     with d3
 
-    ton "Teaching plenty of classes despite that he's blind drunk." ("upset", "base", "shocked", "down", hair="happy", trans=dissolve)
+    ton @ hair happy "Teaching plenty of classes despite that he's blind drunk." ("upset", "base", "shocked", "down", trans=dissolve)
     sna "I can't believe they bought that it was {i}\"Essence du Skunk\"{/i}..." ("snape_45", trans=d3)
     hide snape_main
     with d3
 
-    ton "Punishing students for talking in class..." ("open", "closed", "base", "mid", hair="happy")
+    ton @ hair happy "Punishing students for talking in class..." ("open", "closed", "base", "mid")
     sna "They were breaking the rules!" ("snape_07", trans=d3)
     hide snape_main
     with d3
 
-    ton "So is slapping their ass..." ("disgust", "narrow", "base", "mid", hair="happy")
+    ton @ hair happy "So is slapping their ass..." ("disgust", "narrow", "base", "mid")
     gen "Well I'm sure they're all right... It was only a slap..." ("base", xpos="far_left", ypos="head")
-    ton "I'm not done yet santa, there's more..." ("annoyed", "narrow", "base", "L", hair="happy")
+    ton @ hair happy "I'm not done yet santa, there's more..." ("annoyed", "narrow", "base", "L")
     gen "What the crap..." ("base", xpos="far_left", ypos="head")
 
-    ton "Stealing mounds of sweets and sniffing girls hair..." ("normal", "base", "raised", "down", hair="happy")
+    ton @ hair happy "Stealing mounds of sweets and sniffing girls hair..." ("normal", "base", "raised", "down")
     sna "Now let's be reasonable for a minute, this list isn't fair!" ("snape_18", trans=d3)
     hide snape_main
     with d3
 
     gen "I think he's got a point, at least he didn't curse..." ("base", xpos="far_left", ypos="head")
-    ton "You say that but now, is when the list is getting worse..." ("disgust", "base", "base", "mid", hair="happy")
+    ton @ hair happy "You say that but now, is when the list is getting worse..." ("disgust", "base", "base", "mid")
 
-    ton "He's bought blowjobs with house points... Now that doesn't sound great..." ("open", "narrow", "base", "down", hair="happy")
+    ton @ hair happy "He's bought blowjobs with house points... Now that doesn't sound great..." ("open", "narrow", "base", "down")
     gen "A misprint I'm sure!" ("grin", xpos="far_left", ypos="head")
-    ton "The list says thirty-eight..." ("mad", "wide", "base", "down", hair="happy")
+    ton @ hair happy "The list says thirty-eight..." ("mad", "wide", "base", "down")
 
-    ton "Wrapped around his finger... This is making me sick..." ("upset", "base", "base", "down", hair="upset")
-    ton "This list is massive!" ("clench", "wide", "annoyed", "down", hair="angry")
+    ton @ hair upset "Wrapped around his finger... This is making me sick..." ("upset", "base", "base", "down")
+    ton @ hair angry "This list is massive!" ("clench", "wide", "annoyed", "down")
     gen "Then just skim it real quick..." ("base", xpos="far_left", ypos="head")
 
-    ton "Taking girls books and replacing it with smut..." ("disgust", "narrow", "base", "down", hair="happy")
-    ton "Then punishing them for it by spanking their butt..." ("annoyed", "narrow", "annoyed", "mid", hair="happy")
+    ton @ hair happy "Taking girls books and replacing it with smut..." ("disgust", "narrow", "base", "down")
+    ton @ hair happy "Then punishing them for it by spanking their butt..." ("annoyed", "narrow", "annoyed", "mid")
 
     sna "She had it coming I tell you... That girl was a whore..." ("snape_12", trans=d3)
     hide snape_main
     with d3
 
-    ton "See what I mean Santa?" ("disgust", "base", "base", "L", hair="disgusted")
-    ton "And this list has even more..." ("upset", "base", "base", "down", hair="happy")
+    ton @ hair disgusted "See what I mean Santa?" ("disgust", "base", "base", "L")
+    ton @ hair happy "And this list has even more..." ("upset", "base", "base", "down")
 
-    ton "Confiscating panties... Cumming on floors..." ("soft", "base", "annoyed", "down", hair="happy")
-    ton "Spying in the toilets..." ("disgust", "narrow", "base", "down", hair="disgusted")
-    ton "Never knocks on any doors..." ("open", "closed", "base", "mid", hair="happy")
+    ton @ hair happy "Confiscating panties... Cumming on floors..." ("soft", "base", "annoyed", "down")
+    ton @ hair disgusted "Spying in the toilets..." ("disgust", "narrow", "base", "down")
+    ton @ hair happy "Never knocks on any doors..." ("open", "closed", "base", "mid")
 
     gen "Never knocks on any doors?!" ("base", xpos="far_left", ypos="head")
     nar "Said Santa at last."
     gen "Now that's a big offence!" ("base", xpos="far_left", ypos="head")
-    ton "You really think so Santa?" ("annoyed", "wide", "raised", "mid", hair="happy")
+    ton @ hair happy "You really think so Santa?" ("annoyed", "wide", "raised", "mid")
     sna "Blast..." ("snape_11", trans=d3)
     hide snape_main
     with d3
@@ -247,8 +247,8 @@ label a_christmas_tale2():
 
     gen "Now ladies it's time to leave, it is a busy time of year..." ("base", xpos="far_left", ypos="head")
     gen "Let us empty this sack and spread my Christmas cheer." ("base", xpos="far_left", ypos="head")
-    ton "This meeting took way too long so we better spread it quick..." ("mad", "base", "base", "L", hair="happy")
-    ton "I hope I get overtime for this..." ("annoyed", "base", "base", "R", hair="happy")
+    ton @ hair happy "This meeting took way too long so we better spread it quick..." ("mad", "base", "base", "L")
+    ton @ hair happy "I hope I get overtime for this..." ("annoyed", "base", "base", "R")
     hide tonks_main
     with d3
     gen "I'll let you ride my magic di--" ("grin", xpos="far_left", ypos="head")
diff --git a/game/scripts/minigames/mirror/events/blueballing_bad.rpy b/game/scripts/minigames/mirror/events/blueballing_bad.rpy
index 2214f582..218dfeac 100644
--- a/game/scripts/minigames/mirror/events/blueballing_bad.rpy
+++ b/game/scripts/minigames/mirror/events/blueballing_bad.rpy
@@ -50,7 +50,7 @@ label blueballing_bad:
     with d3
 
     her "I'm not crazy..." ("mad", "base", "annoyed", "mid")
-    ton "Miss Granger, you--" ("open", "wide", "shocked", "L", hair="neutral", xpos="far_right", ypos="head")
+    ton @ hair neutral "Miss Granger, you--" ("open", "wide", "shocked", "L", xpos="far_right", ypos="head")
     her "I {b}know{/b} what I saw. He has to be the one who stole my panties!" ("angry", "base", "annoyed", "mid")
     her "I knew that house elf was his!" ("mad", "base", "annoyed", "R")
     gen "The what?{w=0.5}{nw}" ("open", xpos="far_left", ypos="head")
@@ -67,13 +67,13 @@ label blueballing_bad:
     call her_walk(xpos="418", ypos="430", speed=1.5)
     her "He--{w=0.2} He's covered his tracks... Or he made that {size=-3}idiot{/size} teacher Snape take them!" ("angry", "base", "annoyed", "R_soft")
     call her_walk(xpos="600", ypos="410", speed=1.5)
-    ton "Miss Granger, please, you have to--{w=0.5}{nw}" ("open", "base", "annoyed", "stare", hair="upset")
+    ton @ hair upset "Miss Granger, please, you have to--{w=0.5}{nw}" ("open", "base", "annoyed", "stare")
     her "You think this is something-{w=0.25} You think this is bad?{w=0.25} This, this chicanery?!" ("angry", "wide", "angry", "L_soft", flip=True)
     call her_walk(xpos="599", ypos="410", speed=1.5)
 
     her "He's done worse!" ("shock", "base", "angry", "mid", flip=False)
     her "He asked me about my day!" ("mad", "base", "angry", "L")
-    ton "Wha--" ("normal", "shocked", "raised", "L", hair="neutral")
+    ton @ hair neutral "Wha--" ("normal", "shocked", "raised", "L")
     her "Are you telling me that you just happened to \"scratch your leg\" every time I spoke about those perverted Slytherin sluts?" ("disgust", "squint", "angry", "mid")
     gen "I really was--" ("open", xpos="far_left", ypos="head")
     her "NO!{w=0.25} {b}YOU{/b} were {b}MASTURBATING{/b}! {b}YOU{/b}, THE {b}HEADMASTER!{/b}" ("scream", "base", "angry", "L")
@@ -91,11 +91,11 @@ label blueballing_bad:
     her "{size=-3}You--{/size}{w=1.0} You have to stop him Professor Tonks!{w=0.25} You--" ("mad", "wide", "worried", "R_soft")
     with hpunch
     stop music fadeout 0.5
-    ton "{b}{size=+3}MISS GRANGER, YOU LOST YOUR SKIRT ON YOUR WAY IN!{/size}{/b}" ("scream", "closed", "angry", "mid", hair="angry")
+    ton @ hair angry "{b}{size=+3}MISS GRANGER, YOU LOST YOUR SKIRT ON YOUR WAY IN!{/size}{/b}" ("scream", "closed", "angry", "mid")
     her "" ("open", "wide", "base", "down", xpos="mid", ypos="base")
     pause
     her "..." ("open", "wide", "base", "shocked")
-    ton "..." ("annoyed", "base", "annoyed", "stare", hair="upset")
+    ton @ hair upset "..." ("annoyed", "base", "annoyed", "stare")
     gen "..." ("base", xpos="far_left", ypos="head")
     her @ cheeks blush "{w=0.5}{size=+5}-!{/size}" ("disgust", "wide", "worried", "R")
 
@@ -104,35 +104,35 @@ label blueballing_bad:
 
     call music_block
 
-    ton "..." ("annoyed", "base", "annoyed", "stare", hair="upset")
-    ton "I guess this proves that the greatest prudes are the ones with the biggest stick up their asses." ("soft", "base", "base", "L", hair="neutral")
+    ton @ hair upset "..." ("annoyed", "base", "annoyed", "stare")
+    ton @ hair neutral "I guess this proves that the greatest prudes are the ones with the biggest stick up their asses." ("soft", "base", "base", "L")
     gen "Tonks, what the fuck are you talking about?" ("open", xpos="far_left", ypos="head")
-    ton "I'm saying this girl should really learn how to loosen up." ("annoyed", "base", "annoyed", "L", hair="neutral")    
+    ton @ hair neutral "I'm saying this girl should really learn how to loosen up." ("annoyed", "base", "annoyed", "L")
     gen "Why?" ("open", xpos="far_left", ypos="head")
-    ton "I mean, so what if you stole her panties?" ("annoyed", "base", "annoyed", "L", hair="neutral")
+    ton @ hair neutral "I mean, so what if you stole her panties?" ("annoyed", "base", "annoyed", "L")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton "Wait, you didn't steal her panties?" ("annoyed", "base", "raised", "L", hair="neutral")
+    ton @ hair neutral "Wait, you didn't steal her panties?" ("annoyed", "base", "raised", "L")
     gen "No?! Why would I do that?" ("base", xpos="far_left", ypos="head")
-    ton "Really? You didn't do anything perverted for a whole month?" ("open", "shocked", "shocked", "mid", hair="neutral")
+    ton @ hair neutral "Really? You didn't do anything perverted for a whole month?" ("open", "shocked", "shocked", "mid")
     gen "No! I've just been reading, and sometimes summoning her to my office to talk and tutor her in exchange for house points!" ("open", xpos="far_left", ypos="head")
-    ton "What about the silly faces?" ("annoyed", "base", "raised", "L", hair="neutral")
+    ton @ hair neutral "What about the silly faces?" ("annoyed", "base", "raised", "L")
     gen "I panicked! She was begging for house points and I didn't want to blow my cover!" ("open", xpos="far_left", ypos="head")
-    ton "My god, you really are an innocent idiot." ("open", "wide", "shocked", "stare", hair="neutral")
+    ton @ hair neutral "My god, you really are an innocent idiot." ("open", "wide", "shocked", "stare")
     gen "Hey!" ("open", xpos="far_left", ypos="head")
-    ton "You know I could erase people memories if you get caught? Right?" ("open", "base", "base", "mid", hair="neutral")
+    ton @ hair neutral "You know I could erase people memories if you get caught? Right?" ("open", "base", "base", "mid")
     gen "...Wait,{w=0.5} you can do that?" ("base", xpos="far_left", ypos="head")
-    ton "Well, not too often or it might affect their brain, but--" ("open", "base", "raised", "mid", hair="neutral")
+    ton @ hair neutral "Well, not too often or it might affect their brain, but--" ("open", "base", "raised", "mid")
     with hpunch
     play sound "sounds/card_punch1.ogg"
     gen "{b}{size=+6}I'VE BEEN BLUEBALLING MYSELF THIS WHOLE TIME, FOR NOTHING?!{/size}{/b}" ("open", xpos="far_left", ypos="head")
-    ton "Well..." ("soft", "base", "base", "R", hair="neutral")
+    ton @ hair neutral "Well..." ("soft", "base", "base", "R")
     with hpunch
     play sound "sounds/card_punch2.ogg"
     call gen_chibi("stand")
     call gen_walk("door", "base", speed=2.0)
     gen "{b}{size=+4}MISS GRANGER, COME BACK. I'LL PAY YOU ONE THOUSAND POINTS IF YOU LET ME MASTURBATE IN FRONT OF YOU!{/size}{/b}" ("open", xpos="far_left", ypos="head")
     call gen_chibi("leave")
-    ton "{b}WAIT NO! What are you doing?!{/b}" ("open", "shocked", "shocked", "R", hair="neutral")
+    ton @ hair neutral "{b}WAIT NO! What are you doing?!{/b}" ("open", "shocked", "shocked", "R")
     call ton_chibi("leave")
     "Genie""{size=-3}{b}Hermione?! {w=0.5}Hermioooooooooooone!!!{/b}{/size}"
 
diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index 50bb309b..efd3b73c 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -241,7 +241,7 @@ label genies_christmas_wish:
     call ton_chibi("stand", 810, 440)
 
     ton "I've detected some foreign magic--" ("clench", "wide", "base", "mid", xpos="base", ypos="base", trans=d5)
-    ton "Oh, hello girls! Back already?" ("grin", "wide", "base", "L", hair="horny")
+    ton @ hair horny "Oh, hello girls! Back already?" ("grin", "wide", "base", "L")
 
     gen "Wait, you were here the whole time?!" ("angry", xpos="far_left", ypos="head")
 
diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy
index 3b86230a..cf28285c 100644
--- a/game/scripts/minigames/mirror/events/suck_and_run.rpy
+++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy
@@ -130,7 +130,7 @@ label suck_and_run:
 
         gen "So... What is it then?" ("base", xpos="far_left", ypos="head")
         ton "*Hmm*... Not sure I should ruin the surprise." ("horny", "wink", "base", "mid")
-        ton "I'm sure you'll find out soon enough..." ("base", "narrow", "base", "R", hair="horny") #Glance #hornyhair
+        ton @ hair horny "I'm sure you'll find out soon enough..." ("base", "narrow", "base", "R") #Glance #hornyhair
         gen "Looking forward to it." ("grin", xpos="far_left", ypos="head")
         ton "Anyway..." ("open", "base", "shocked", "mid")
         ton "Anything else going on that I should know of?" ("soft", "base", "base", "mid")
@@ -144,19 +144,19 @@ label suck_and_run:
         gen "Yes... He seemed quite eager to find out what the girls will be wearing this year in fact." ("base", xpos="far_left", ypos="head")
         ton "Oh, so it's like that is it?" ("base", "narrow", "raised", "mid")
         gen "He also mentioned that some Hufflepuff boys have been falling asleep during his lessons... What do you think--" ("base", xpos="far_left", ypos="head")
-        ton @ cheeks heavy_blush "What?! Why do you think I'd know anything about Hufflepuff boys falling asleep in class!?" ("silly", "happyCl", "worried", "mid", hair="horny")
-        ton @ cheeks blush "Are you implying that I'm sneaking into their room to fuck them? That I'm draining their cocks dry every night!?" ("scream", "base", "angry", "mid", hair="horny")
+        ton @ cheeks heavy_blush hair horny "What?! Why do you think I'd know anything about Hufflepuff boys falling asleep in class!?" ("silly", "happyCl", "worried", "mid")
+        ton @ cheeks blush hair horny "Are you implying that I'm sneaking into their room to fuck them? That I'm draining their cocks dry every night!?" ("scream", "base", "angry", "mid")
         gen "What? I was just going to ask if you thought they'd been staying up late partying or something." ("base", xpos="far_left", ypos="head")
-        ton @ cheeks blush "Oh... No, I don't think they're doing anything like that." ("soft", "base", "base", "R", hair="horny")
+        ton @ cheeks blush hair horny "Oh... No, I don't think they're doing anything like that." ("soft", "base", "base", "R")
         gen "What was that about sucking them dry at night?" ("base", xpos="far_left", ypos="head")
-        ton @ cheeks blush "Did I say that? Are you sure you didn't just hear what you wanted to hear, Genie?" ("disgust", "narrow", "base", "mid", hair="horny")
+        ton @ cheeks blush hair horny "Did I say that? Are you sure you didn't just hear what you wanted to hear, Genie?" ("disgust", "narrow", "base", "mid")
         gen "I'm pretty sure I heard you ask if I thought you were fucking your students at night." ("base", xpos="far_left", ypos="head")
-        ton "Then you must've misheard me..." ("normal", "closed", "base", "mid", hair="horny")
+        ton @ hair horny "Then you must've misheard me..." ("normal", "closed", "base", "mid")
         gen "... Are you drooling?" ("base", xpos="far_left", ypos="head")
         ton "*Mhmm*?" ("normal", "wide", "base", "down")
         ton "Oh, this?" ("mad", "base", "raised", "mid")
         ton "I was just thinking about what I'll be having for dinner tonight..." ("soft", "closed", "base", "R")
-        ton @ cheeks blush "Creamy mushroom soup... Delicious!" ("horny", "narrow", "shocked", "up", hair="horny")
+        ton @ cheeks blush hair horny "Creamy mushroom soup... Delicious!" ("horny", "narrow", "shocked", "up")
         gen "I see...{w=0.3} Very well." ("base", xpos="far_left", ypos="head")
         gen "Please keep an eye on those Hufflepuff boys, alright?" ("base", xpos="far_left", ypos="head")
         ton "Of course.... I'll make sure to inspect their dorms thoroughly." ("open", "closed", "base", "mid")
@@ -230,7 +230,7 @@ label suck_and_run:
         ton "*Slurp* *Slurp* *slurp*!" ("open_wide_tongue", "narrow", "shocked", "stare")
         gen "*Ngh*... But it feels so real!" ("angry", xpos="far_left", ypos="head")
         stop background
-        ton "..." ("base", "closed", "annoyed", "up", hair="angry") #Hair turns red
+        ton @ hair angry "..." ("base", "closed", "annoyed", "up") #Hair turns red
         call ton_chibi_scene("bj_desk_shocked")
         gen "*Ah*... T-Tonks?!" ("base", xpos="far_left", ypos="head")
 
@@ -256,53 +256,53 @@ label suck_and_run:
         play sound "sounds/punch01.ogg"
         with vpunch
         gen "Unhand me, foul demon!" ("angry", xpos="far_left", ypos="head")
-        ton "Of course, Sir..." ("grin", "base", "base", "L", hair="angry", ypos="head", flip=False)
+        ton @ hair angry "Of course, Sir..." ("grin", "base", "base", "L", ypos="head", flip=False)
         play sound "sounds/giggle2_loud.ogg"
         pause .8
-        ton "Right away, Sir..." ("crooked_smile", "base", "angry", "mid", hair="angry")
-        ton "Once I've gotten what I want..." ("soft", "narrow", "shocked", "up", hair="angry")
+        ton @ hair angry "Right away, Sir..." ("crooked_smile", "base", "angry", "mid")
+        ton @ hair angry "Once I've gotten what I want..." ("soft", "narrow", "shocked", "up")
 
         gen "You may not have my life essence, you foul--" ("angry", xpos="far_left", ypos="head")
 
 
         stop music fadeout 1.0
-        ton "" ("horny", "base", "angry", "mid", hair="angry")
+        ton @ hair angry "" ("horny", "base", "angry", "mid")
         play sound "sounds/spit.ogg"
         pause 1
         gen "Temptress?" ("angry", xpos="far_left", ypos="head")
         play sound "sounds/giggle2_loud.ogg"
-        ton "*giggles*" ("grin", "base", "angry", "up", hair="angry")
-        ton "Just close your eyes and relax..." ("normal", "narrow", "angry", "stare", hair="angry")
+        ton @ hair angry "*giggles*" ("grin", "base", "angry", "up")
+        ton @ hair angry "Just close your eyes and relax..." ("normal", "narrow", "angry", "stare")
         call ton_chibi_scene("bj_desk")
         gen "*Ehm*..." ("base", xpos="far_left", ypos="head")
         gen "So you don't want my soul?" ("base", xpos="far_left", ypos="head")
-        ton @ cheeks blush "Me? Want a soul as tainted and corrupt as yours?" ("silly", "happyCl", "shocked", "stare", hair="angry")
-        ton "Don't make me laugh..." ("normal", "base", "angry", "mid", hair="angry")
+        ton @ cheeks blush hair angry "Me? Want a soul as tainted and corrupt as yours?" ("silly", "happyCl", "shocked", "stare")
+        ton @ hair angry "Don't make me laugh..." ("normal", "base", "angry", "mid")
         gen "Then what do you--" ("base", xpos="far_left", ypos="head")
-        ton "{heart}" ("soft", "narrow", "base", "up", hair="angry")
+        ton @ hair angry "{heart}" ("soft", "narrow", "base", "up")
         gen "I see..." ("base", xpos="far_left", ypos="head")
-        ton "Now just relax and enjoy it...{heart}" ("horny", "narrow", "base", "mid", hair="angry")
+        ton @ hair angry "Now just relax and enjoy it...{heart}" ("horny", "narrow", "base", "mid")
         gen "Well I guess that could be arranged..." ("base", xpos="far_left", ypos="head")
         play sound "sounds/giggle2_loud.ogg"
         pause 1
         gen "Excellent..." ("base", xpos="far_left", ypos="head")
         play background "sounds/slickloopfast.ogg" fadein 2
-        ton "*Slurp* *Slurp* *slurp*!" ("open_wide_tongue", "narrow", "base", "up", hair="angry")
+        ton @ hair angry "*Slurp* *Slurp* *slurp*!" ("open_wide_tongue", "narrow", "base", "up")
         gen "*Argh*!" ("angry", xpos="far_left", ypos="head")
         gen "So...{w=0.4} *Ah*... What is it then?" ("angry", xpos="far_left", ypos="head")
-        ton "*Slurp*?" ("open_wide_tongue", "base", "base", "mid", hair="angry")
+        ton @ hair angry "*Slurp*?" ("open_wide_tongue", "base", "base", "mid")
         gen "What kind of foul creature am I dealing with?" ("base", xpos="far_left", ypos="head")
-        ton "*Slurp*?" ("open_wide_tongue", "base", "raised", "mid", hair="angry")
+        ton @ hair angry "*Slurp*?" ("open_wide_tongue", "base", "raised", "mid")
         gen "Oh! Let me guess!" ("base", xpos="far_left", ypos="head")
         gen "Are you a--" ("base", xpos="far_left", ypos="head")
 
         play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
 
         stop background
-        ton "A succubus?" ("crooked_smile", "base", "angry", "mid", hair="angry")
+        ton @ hair angry "A succubus?" ("crooked_smile", "base", "angry", "mid")
         gen "*Argh*... You're no fun, I was just about to--" ("base", xpos="far_left", ypos="head")
         play background "sounds/slickloopveryfast.ogg" fadein 2
-        ton @ cheeks blush "*Slurp* *Slurp* *Slurp*" ("open_wide_tongue2", "narrow", "base", "up", hair="horny")
+        ton @ cheeks blush hair horny "*Slurp* *Slurp* *Slurp*" ("open_wide_tongue2", "narrow", "base", "up")
         gen "*Nghh*...{w=0.4} To..." ("base", xpos="far_left", ypos="head")
         ton @ cheeks blush "*Slurp*! *Slurp*! *Slurp*!" ("open_wide_tongue2", "closed", "base", "up")
         gen "Cum down your throat!" ("base", xpos="far_left", ypos="head")
@@ -344,12 +344,12 @@ label suck_and_run:
         ton "You idiot!" ("open", "wide", "angry", "mid")
         gen "What?!" ("angry", xpos="far_left", ypos="head")
         ton "Halloween is the only time I can get away with this..." ("clench", "base", "annoyed", "down")
-        ton "And now you've ruined it!" ("annoyed", "closed", "worried", "mid", hair="sad")
+        ton @ hair sad "And now you've ruined it!" ("annoyed", "closed", "worried", "mid")
         gen "Surely it is not my fault that my semen contains such immeasurable--" ("base", xpos="far_left", ypos="head")
-        ton "..." ("annoyed", "narrow", "base", "down", hair="sad") #sad
+        ton @ hair sad "..." ("annoyed", "narrow", "base", "down") #sad
         gen "*Ahem*..." ("base", xpos="far_left", ypos="head")
         gen "So... A Succubus... *eh*?" ("base", xpos="far_left", ypos="head")
-        ton "Obviously..." ("open", "narrow", "shocked", "downR", hair="sad")
+        ton @ hair sad "Obviously..." ("open", "narrow", "shocked", "downR")
         gen "A sexual deviant that can't hold in their own desires..." ("base", xpos="far_left", ypos="head")
         gen "Not sure why I didn't figure it out sooner..." ("grin", xpos="far_left", ypos="head")
         ton "Don't you dare tell anybody..." ("annoyed", "base", "annoyed", "mid")