From bccce7b11573c243203079e482ae910c16f33e90 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Wed, 26 Apr 2023 01:31:25 +0100
Subject: [PATCH] Refactoring blush and tears (Tonks)

---
 .../astoria/events/imperio_training.rpy       | 130 +++++++++---------
 .../events/favors/inspect_her_body_tier3.rpy  | 126 ++++++++---------
 .../favors/inspect_her_body_tier3_tonks.rpy   |  54 ++++----
 .../cho/events/quidditch/gryffindor_match.rpy |   8 +-
 .../cho/events/quidditch/slytherin_match.rpy  |  10 +-
 .../hermione/events/favors/talk_to_me.rpy     |  22 +--
 game/scripts/characters/luna/events/intro.rpy |   2 +-
 .../characters/tonks/events/clothing.rpy      |  88 ++++++------
 .../characters/tonks/events/hangout.rpy       |   2 +-
 .../scripts/characters/tonks/events/intro.rpy |   2 +-
 .../events/requests/detention_with_tonks.rpy  |  16 +--
 .../events/requests/hands-on_lessons.rpy      |   2 +-
 .../tonks/events/requests/oral_practice.rpy   |   6 +-
 .../mirror/events/a_white_christmas.rpy       |  16 +--
 .../minigames/mirror/events/suck_and_run.rpy  |  28 ++--
 15 files changed, 256 insertions(+), 256 deletions(-)

diff --git a/game/scripts/characters/astoria/events/imperio_training.rpy b/game/scripts/characters/astoria/events/imperio_training.rpy
index f5d54e32..097ddbd3 100644
--- a/game/scripts/characters/astoria/events/imperio_training.rpy
+++ b/game/scripts/characters/astoria/events/imperio_training.rpy
@@ -142,8 +142,8 @@ label ag_st_imperio_E1:
     ast "Right here? In front of Professor Dumbledore?" ("open", "base", "base", "mid")
     ton "Naturally!" ("base", "closed", "base", "mid")
     ast "But who do I cast it on? Susan?" ("smile", "base", "base", "R")
-    ton "Not this time, sweetheart." ("upset", "narrow", "base", "down", cheeks="blush")
-    ton "Today, I'd like you to cast it on me, if you don't mind..." ("open", "closed", "base", "mid", cheeks="blush")
+    ton @ cheeks blush "Not this time, sweetheart." ("upset", "narrow", "base", "down")
+    ton @ cheeks blush "Today, I'd like you to cast it on me, if you don't mind..." ("open", "closed", "base", "mid")
     ast "Wicked!" ("grin", "narrow", "worried", "down")
     ton "Let's give this old man a quick demonstration of your talents, shall we..." ("grin", "base", "shocked", "mid")
 
@@ -218,8 +218,8 @@ label ag_st_imperio_E1:
     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 "What is happening to me?" ("mad", "base", "raised", "stare", cheeks="blush")
-    ton "Are you playing with me?" ("open", "base", "worried", "stare", cheeks="blush")
+    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
     gen "I think she's tripping..." ("base", xpos="far_left", ypos="head")
     ast "No!{w=0.6} Keep{w=0.4} - standing{w=0.4} - still!" ("clench", "closed", "worried", "mid")
@@ -232,7 +232,7 @@ label ag_st_imperio_E1:
     ast "Professor Tonks, I demand that you *oink*!" ("open", "base", "base", "L")
     ton "*Huh*?..." ("open", "wide", "base", "stare")
     ast "*Oink*!" ("open", "base", "angry", "L")
-    ton "..................." ("normal", "wide", "base", "stare", cheeks="blush")
+    ton @ cheeks blush "..................." ("normal", "wide", "base", "stare")
     ast "Do it already!" ("angry", "base", "angry", "L")
     ast "*Oink!*{w=0.8}-*oink*!{w=0.8}-*oink*!" ("clench", "closed", "angry", "mid") # Angry
     gen "*He-he-he!*" ("grin", xpos="far_left", ypos="head")
@@ -253,10 +253,10 @@ label ag_st_imperio_E1:
     pause.8
 
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
-    ton "" ("soft", "base", "worried", "down", cheeks="blush", xpos="right", ypos="base", trans=dissolve)
+    ton @ cheeks blush "" ("soft", "base", "worried", "down", xpos="right", ypos="base", trans=dissolve)
     ast "" ("annoyed", "base", "angry", "mid", xpos="base", ypos="base", trans=dissolve)
-    ton "Oh my..." ("soft", "base", "worried", "down", cheeks="blush", xpos="right", ypos="base")
-    ton "Well that was fun!" ("base", "happyCl", "base", "down", cheeks="blush") # Happy
+    ton @ cheeks blush "Oh my..." ("soft", "base", "worried", "down", xpos="right", ypos="base")
+    ton @ cheeks blush "Well that was fun!" ("base", "happyCl", "base", "down") # Happy
     ast "No it wasn't!" ("clench", "narrow", "angry", "mid")
     ast "Why weren't you doing pig noises!?" ("scream", "closed", "angry", "mid", trans=hpunch)
     ast "You refused to do what I demanded!" ("annoyed", "narrow", "angry", "R")
@@ -390,7 +390,7 @@ label ag_st_imperio_E2:
 
             call ctc
 
-            ton "" ("normal", "wide", "base", "stare", cheeks="blush", flip=False)
+            ton @ cheeks blush "" ("normal", "wide", "base", "stare", flip=False)
             pause.8
 
 
@@ -413,12 +413,12 @@ label ag_st_imperio_E2:
             ton "" ("normal", "happyCl", "base", "mid")
             gen "Well done!" ("grin", xpos="far_left", ypos="head")
             ast "Do it again!" ("smile", "base", "angry", "L")
-            ton "*oink*!" ("open_wide", "shocked", "worried", "stare", cheeks="blush")
+            ton @ cheeks blush "*oink*!" ("open_wide", "shocked", "worried", "stare")
             ast "*hi-hi-hi-hi*!" ("smile", "closed", "base", "mid")
-            ton "" ("normal", "wide", "worried", "stare", cheeks="blush")
+            ton @ cheeks blush "" ("normal", "wide", "worried", "stare")
             gen "I believe that's enough--" ("base", xpos="far_left", ypos="head")
             ast "Do it again piggy! Ten times!" ("clench", "narrow", "angry", "L") # Angry
-            ton "*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*!" ("open_wide_tongue", "wide", "base", "ahegao", cheeks="blush")
+            ton @ cheeks blush "*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*!" ("open_wide_tongue", "wide", "base", "ahegao")
             gen "......................." ("base", xpos="far_left", ypos="head")
             ast "Agai--" ("scream", "closed", "angry", "mid", trans=hpunch)
             gen "That's enough, Astoria!" ("angry", xpos="far_left", ypos="head")
@@ -433,8 +433,8 @@ label ag_st_imperio_E2:
 
             play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
             ast "" ("open", "base", "base", "down")
-            ton "Oh wow..." ("mad", "base", "shocked", "down", cheeks="blush", flip=False)
-            ton "You made me squeal like a pig!" ("mad", "happyCl", "base", "mid", cheeks="blush")
+            ton @ cheeks blush "Oh wow..." ("mad", "base", "shocked", "down", flip=False)
+            ton @ cheeks blush "You made me squeal like a pig!" ("mad", "happyCl", "base", "mid")
             ton "You've made quite some progress, well done Astoria!" ("grin", "narrow", "shocked", "R")
             ast "Thank you!" ("smile", "base", "base", "L")
             gen "..." ("base", xpos="far_left", ypos="head")
@@ -492,10 +492,10 @@ label ag_st_imperio_E2:
             ast "I... am... a..." ("open", "base", "worried", "L")
             ton "I am a--" ("soft", "wide", "base", "stare")
             ast "dirty!{w} filthy!{w} pig!" ("open", "narrow", "base", "L")
-            ton "..................................." ("soft", "base", "base", "stare", cheeks="blush")
+            ton @ cheeks blush "..................................." ("soft", "base", "base", "stare")
             ast "Go on, say it!" ("clench", "narrow", "base", "L")
             ast "I'm a dirty... Filthy... Pig!" ("open", "closed", "base", "mid")
-            ton "*Hi-hi*!..." ("base", "happyCl", "shocked", "mid", cheeks="blush")
+            ton @ cheeks blush "*Hi-hi*!..." ("base", "happyCl", "shocked", "mid")
             ast "SAY IT!" ("scream", "base", "angry", "L") # Scream
             gen "Time-out!" ("angry", xpos="far_left", ypos="head")
             ast "No! She has to do what she's told!" ("clench", "narrow", "angry", "mid")
@@ -587,13 +587,13 @@ label ag_st_imperio_E2:
             ast "Come on, do it!" ("clench", "narrow", "angry", "L")
             ton "*Hnnnngh*!..." ("mad", "wide", "worried", "ahegao", hair="horny")
             call cum_block
-            ton "*Aaaaahhh*..." ("open_wide_tongue", "base", "worried", "ahegao", cheeks="blush") # Relieved
+            ton @ cheeks blush "*Aaaaahhh*..." ("open_wide_tongue", "base", "worried", "ahegao") # Relieved
             gen "(Did she just--)" ("angry", xpos="far_left", ypos="head")
-            ton "" ("open", "narrow", "worried", "stare", cheeks="blush")
+            ton @ cheeks blush "" ("open", "narrow", "worried", "stare")
             gen "..." ("base", xpos="far_left", ypos="head")
             gen "Girl, I think your teacher is done for..." ("base", xpos="far_left", ypos="head")
             ast "What?" ("clench", "base", "worried", "mid")
-            ton "" ("normal", "closed", "worried", "stare", cheeks="blush")
+            ton @ cheeks blush "" ("normal", "closed", "worried", "stare")
             gen "She \"broke the curse.\" You can stop now..." ("base", xpos="far_left", ypos="head")
             ast "*Aww*..." ("upset", "narrow", "base", "down")
             ast "If you say so, Professor..." ("annoyed", "base", "base", "mid")
@@ -608,15 +608,15 @@ label ag_st_imperio_E2:
 
             play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
             ast "" ("annoyed", "base", "base", "mid")
-            ton "*Ouch*... That was painful!" ("mad", "closed", "base", "mid", cheeks="blush", flip=False)
-            ton "You nearly got me there." ("disgust", "base", "shocked", "R", cheeks="blush")
+            ton @ cheeks blush "*Ouch*... That was painful!" ("mad", "closed", "base", "mid", flip=False)
+            ton @ cheeks blush "You nearly got me there." ("disgust", "base", "shocked", "R")
             ast "Did I really?" ("smile", "base", "base", "mid")
-            ton "Yes, well done, Astoria!" ("open", "base", "base", "down", cheeks="blush")
+            ton @ cheeks blush "Yes, well done, Astoria!" ("open", "base", "base", "down")
             ast "Thank you!" ("smile", "closed", "base", "mid")
             gen "Was it really such a struggle for you to not get your breasts out?" ("base", xpos="far_left", ypos="head")
-            ton "*Uhm*..." ("mad", "base", "base", "down", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "*Uhm*..." ("mad", "base", "base", "down")
             gen "*He-he-he*!" ("grin", xpos="far_left", ypos="head")
-            ton "Shall we wrap it up for today?" ("upset", "base", "shocked", "downR", cheeks="blush")
+            ton @ cheeks blush "Shall we wrap it up for today?" ("upset", "base", "shocked", "downR")
             ton "I'm sure you'll do even better next time, Astoria." ("soft", "base", "shocked", "R")
             ast "{size=-4}Yes... Finally I shall release my unlimited power...{/size}" ("smile", "narrow", "base", "L")
 
@@ -729,7 +729,7 @@ label ag_st_imperio_E3:
 
     call ctc
 
-    ton "" ("base", "base", "base", "stare", cheeks="blush")
+    ton @ cheeks blush "" ("base", "base", "base", "stare")
     pause.8
 
     ast "See, I told you I could do it!" ("smile", "narrow", "base", "mid")
@@ -927,7 +927,7 @@ label ag_st_imperio_E4:
     ton "........................." ("mad", "wide", "shocked", "ahegao", hair="horny") # shock
 
     gen "......................" ("base", xpos="far_left", ypos="head")
-    ton "*Aaaaah*..." ("open", "base", "shocked", "ahegao", hair="horny", cheeks="blush")
+    ton @ cheeks blush "*Aaaaah*..." ("open", "base", "shocked", "ahegao", hair="horny")
     call ast_chibi("wand",530,"base")
     with d3
     ast "I'm getting really good at this!" ("smile", "base", "angry", "L")
@@ -1019,13 +1019,13 @@ label ag_st_imperio_E4:
         ast "and your bra..." ("clench", "base", "base", "down")
         play sound "sounds/cloth_sound3.ogg"
         $ tonks.strip("bra")
-    ton "" ("base", "wide", "shocked", "ahegao", cheeks="blush")
+    ton @ cheeks blush "" ("base", "wide", "shocked", "ahegao")
     ast "" ("annoyed", "closed", "base", "mid")
     call ctc
 
     if tonks.xzoom == -1: # Facing Astoria
         ast "Is she... is she doing it?" ("clench", "closed", "worried", "mid") # closed eyes
-        ton "............." ("grin", "wink", "base", "mid", cheeks="blush") # horny
+        ton @ cheeks blush "............." ("grin", "wink", "base", "mid") # horny
         gen "Why don't you see for yourself?" ("grin", xpos="far_left", ypos="head")
         gen "Open your eyes, girl!" ("grin", xpos="far_left", ypos="head")
         ast "I don't want to..." ("open", "closed", "worried", "mid")
@@ -1034,11 +1034,11 @@ label ag_st_imperio_E4:
         gen "Now, now... Don't be rude to your teacher..." ("base", xpos="far_left", ypos="head")
         gen "It seems to me like she would really like to show you!" ("grin", xpos="far_left", ypos="head")
         ast "...................." ("clench", "closed", "base", "mid") # eyes still closed
-        ton "" ("base", "wide", "base", "stare", cheeks="blush")
+        ton @ cheeks blush "" ("base", "wide", "base", "stare")
         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 "......................." ("base", "base", "base", "ahegao", hair="horny", cheeks="blush") # ahegao
+        ton @ cheeks blush "......................." ("base", "base", "base", "ahegao", hair="horny") # ahegao
 
     else:
         gen "Now would you look at that!" ("grin", xpos="far_left", ypos="head")
@@ -1048,13 +1048,13 @@ label ag_st_imperio_E4:
         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")
-        ton "................" ("horny", "wide", "base", "stare", cheeks="blush") # ahegao
+        ton @ cheeks blush "................" ("horny", "wide", "base", "stare") # ahegao
 
     gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
     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 ".............." ("horny", "base", "shocked", "ahegao", hair="horny", cheeks="heavy_blush") # angry/horny expression
+    ton @ cheeks heavy_blush ".............." ("horny", "base", "shocked", "ahegao", hair="horny") # 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")
@@ -1065,7 +1065,7 @@ label ag_st_imperio_E4:
     ast "Yes, but..." ("annoyed", "narrow", "base", "down")
     gen "Yes?" ("base", xpos="far_left", ypos="head")
     ast "I don't have to explain myself to you!" ("annoyed", "narrow", "angry", "down")
-    ton "" ("annoyed", "wide", "shocked", "ahegao", cheeks="blush")
+    ton @ cheeks blush "" ("annoyed", "wide", "shocked", "ahegao")
     ast "..." ("annoyed", "narrow", "angry", "R")
 
     stop music fadeout 2.0
@@ -1244,13 +1244,13 @@ label ag_st_imperio_E5:
     ast "Her shirt was next, right?" ("base", "base", "angry", "mid")
     gen "That is correct." ("base", xpos="far_left", ypos="head")
     ast "Yes! Take off your shirt, Professor!" ("clench", "base", "angry", "L") # menacing
-    ton "*Ahhh*................" ("soft", "base", "base", "ahegao", cheeks="blush")
+    ton @ cheeks blush "*Ahhh*................" ("soft", "base", "base", "ahegao")
 
     # Remove top.
     play sound "sounds/cloth_sound3.ogg"
     $ tonks.strip("top")
     $ tonks.strip("bra")
-    ton "" ("base", "base", "base", "ahegao", cheeks="blush")
+    ton @ cheeks blush "" ("base", "base", "base", "ahegao")
     pause.8
 
     ast @ cheeks blush "She did it!" ("smile", "base", "base", "mid")
@@ -1259,7 +1259,7 @@ label ag_st_imperio_E5:
     ast "Ask her to take off her trousers!" ("grin", "base", "angry", "L")
     gen "Yes please!" ("grin", xpos="far_left", ypos="head")
     ast "Professor, please take off your trousers..." ("open", "closed", "base", "mid")
-    ton "*hngh*..." ("mad", "closed", "base", "ahegao", cheeks="blush")
+    ton @ cheeks blush "*hngh*..." ("mad", "closed", "base", "ahegao")
 
     # Remove bottom.
     play sound "sounds/cloth_sound3.ogg"
@@ -1269,53 +1269,53 @@ label ag_st_imperio_E5:
     pause.5
     ast "" ("annoyed", "narrow", "angry", "down")
     pause.8
-    ton "" ("horny", "wide", "shocked", "ahegao", cheeks="blush")
+    ton @ cheeks blush "" ("horny", "wide", "shocked", "ahegao")
     call ctc
 
     ast "Oh wow..." ("angry", "base", "base", "down")
-    ton "..................." ("horny", "base", "base", "ahegao", cheeks="blush")
+    ton @ cheeks blush "..................." ("horny", "base", "base", "ahegao")
     ast "Professor, how can it be that you're not wearing any underwear?!" ("angry", "base", "worried", "down") # angry embarrassed
     gen "Yes, Miss Tonks." ("base", xpos="far_left", ypos="head")
     gen "Explain yourself!" ("grin", xpos="far_left", ypos="head")
-    ton "*Hmm*......." ("normal", "base", "worried", "stare", cheeks="blush")
+    ton @ cheeks blush "*Hmm*......." ("normal", "base", "worried", "stare")
     ast "Answer us!" ("clench", "closed", "angry", "mid")
-    ton "I don't like to wear them..." ("open", "wide", "worried", "stare", hair="sad", cheeks="blush")
+    ton @ cheeks blush "I don't like to wear them..." ("open", "wide", "worried", "stare", hair="sad")
     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")
     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")
 
     with hpunch
-    ton "{heart} {heart} {heart}" ("soft", "happyCl", "worried", "ahegao", cheeks="blush")
+    ton @ cheeks blush "{heart} {heart} {heart}" ("soft", "happyCl", "worried", "ahegao")
     ast "I can't believe my teacher is such a slut!" ("angry", "narrow", "angry", "L")
     gen "Des-{w=0.8}picable!" ("angry", xpos="far_left", ypos="head")
     ast "Are you a slut, Professor?" ("open", "narrow", "angry", "L")
-    ton "..............." ("normal", "shocked", "worried", "stare", cheeks="blush") # ahegao
+    ton @ cheeks blush "..............." ("normal", "shocked", "worried", "stare") # ahegao
     ast "Are you?!" ("clench", "base", "angry", "L")
-    ton "I am! {heart}" ("soft", "base", "worried", "ahegao", hair="horny", cheeks="blush")
+    ton @ cheeks blush "I am! {heart}" ("soft", "base", "worried", "ahegao", hair="horny")
     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 "" ("normal", "base", "shocked", "ahegao", hair="horny", cheeks="blush")
+    ton @ cheeks blush "" ("normal", "base", "shocked", "ahegao", hair="horny")
     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 "................" ("soft", "narrow", "shocked", "ahegao", hair="horny", cheeks="blush") # ahegao
+    ton @ cheeks blush "................" ("soft", "narrow", "shocked", "ahegao", hair="horny") # 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
     gen "Yes!" ("grin", xpos="far_left", ypos="head")
     ast "Take them off, you slut!" ("scream", "closed", "angry", "mid", trans=hpunch) # scream
-    ton "........{heart}" ("normal", "wide", "shocked", "stare", cheeks="blush")
+    ton @ cheeks blush "........{heart}" ("normal", "wide", "shocked", "stare")
 
     # Strip naked. Removes clothes and stockings.
     play sound "sounds/cloth_sound3.ogg"
     $ tonks.strip("clothes")
-    ton "" ("grin", "base", "base", "ahegao", hair="horny", cheeks="blush")
+    ton @ cheeks blush "" ("grin", "base", "base", "ahegao", hair="horny")
     ast "(She did it...)" ("horny", "narrow", "angry", "L")
     call ctc
 
@@ -1323,7 +1323,7 @@ label ag_st_imperio_E5:
     ast "I got her to be completely naked!" ("smile", "base", "angry", "mid")
     gen "Excellent work, [name_astoria_genie]!" ("grin", xpos="far_left", ypos="head")
     ast "Thank you, Sir!" ("smile", "closed", "base", "mid")
-    ton "............." ("silly", "happyCl", "base", "stare", cheeks="blush")
+    ton @ cheeks blush "............." ("silly", "happyCl", "base", "stare")
 
     #screenshake
     with hpunch
@@ -1346,10 +1346,10 @@ label ag_st_imperio_E5:
 
             nar "You take out your cock and start jacking off."
 
-    ton "" ("horny", "narrow", "raised", "L", cheeks="blush")
+    ton @ cheeks blush "" ("horny", "narrow", "raised", "L")
     ast "What shall I have her do now?" ("open", "base", "base", "L")
     "*fap-fap-fap*"
-    ton "" ("soft", "narrow", "shocked", "L", hair="horny", cheeks="blush")
+    ton @ cheeks blush "" ("soft", "narrow", "shocked", "L", hair="horny")
     ast "Professor?" ("annoyed", "narrow", "angry", "mid")
     gen "What?" ("base", xpos="far_left", ypos="head")
     gen "Oh..." ("base", xpos="far_left", ypos="head")
@@ -1520,11 +1520,11 @@ label ag_st_imperio_E5:
     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")
     sna "And that required you to be undressed? In front of a student?" ("snape_10")
-    ton "Well... she was the cause of it..." ("clench", "base", "base", "down", cheeks="blush")
+    ton @ cheeks blush "Well... she was the cause of it..." ("clench", "base", "base", "down")
     sna "Caused you to strip?" ("snape_34")
     sna "Which spells are you teaching that girl?!" ("snape_25")
     sna "Don't tell me you--" ("snape_36") # Shocked
-    ton "The Imperius Curse." ("soft", "closed", "base", "mid", cheeks="blush")
+    ton @ cheeks blush "The Imperius Curse." ("soft", "closed", "base", "mid")
     sna "I can't believe you two..." ("snape_08")
     ast "Am I in trouble now, Professor?" ("annoyed", "base", "base", "L", xpos=10) # Asking Snape
     sna "Keep quiet, girl!" ("snape_34")
@@ -1590,7 +1590,7 @@ label ag_st_imperio_E5:
     sna "............" ("snape_14")
 
     sna "The question..." ("snape_18")
-    ton "It's this Astoria girl..." ("soft", "base", "annoyed", "R", cheeks="blush")
+    ton @ cheeks blush "It's this Astoria girl..." ("soft", "base", "annoyed", "R")
     ton "There's something wrong with her..." ("open", "narrow", "base", "down")
     ton "She's cursed you see!" ("open", "wide", "worried", "L")
     ton "A blood curse... very unfortunate." ("mad", "base", "worried", "down")
@@ -1634,23 +1634,23 @@ label ag_st_imperio_E5:
             ton "Regarding?" ("soft", "base", "shocked", "downR")
             gen "Everything that we've been doing with the Astoria girl." ("base", xpos="far_left", ypos="head")
             ton "Oh..." ("upset", "base", "worried", "down")
-            ton "Well, we've been helping her haven't we?" ("open", "base", "shocked", "down", cheeks="blush")
-            ton "She's such an uptight and oppressed cute little...{w=0.4} girl." ("upset", "closed", "raised", "down", cheeks="blush")
-            ton "..." ("mad", "narrow", "base", "downR", cheeks="blush")
-            ton "How can I not help her, even if she's a Slytherin." ("upset", "closed", "base", "mid", cheeks="blush")
+            ton @ cheeks blush "Well, we've been helping her haven't we?" ("open", "base", "shocked", "down")
+            ton @ cheeks blush "She's such an uptight and oppressed cute little...{w=0.4} girl." ("upset", "closed", "raised", "down")
+            ton @ cheeks blush "..." ("mad", "narrow", "base", "downR")
+            ton @ cheeks blush "How can I not help her, even if she's a Slytherin." ("upset", "closed", "base", "mid")
             gen "[name_tonks_genie]... You aren't convincing anyone." ("base", xpos="far_left", ypos="head")
-            ton "To think such an innocent girl could be the victim of such an--" ("open", "closed", "base", "down", cheeks="blush")
+            ton @ cheeks blush "To think such an innocent girl could be the victim of such an--" ("open", "closed", "base", "down")
             gen "Tonks!" ("base", xpos="far_left", ypos="head")
             ton "Alright..." ("annoyed", "base", "annoyed", "down") #exasperated
             ton "The blood curse may have been a little white lie on my part." ("annoyed", "narrow", "base", "down")
             gen "And?" ("base", xpos="far_left", ypos="head")
             ton "And the imperio training with Astoria may have been for my own benefit." ("soft", "narrow", "annoyed", "downR")
             gen "..." ("base", xpos="far_left", ypos="head")
-            ton "Having her cast it on me was exclusively for my own personal enjoyment." ("annoyed", "base", "base", "down", cheeks="blush")
+            ton @ cheeks blush "Having her cast it on me was exclusively for my own personal enjoyment." ("annoyed", "base", "base", "down")
             gen "(What a surprise...)" ("base", xpos="far_left", ypos="head")
             gen "Why weren't you honest with me?" ("base", xpos="far_left", ypos="head")
             ton "*Sigh*..." ("open", "narrow", "base", "R")
-            ton "Perhaps I've been taking this favour business... thing a bit too lightly." ("open", "narrow", "raised", "down", cheeks="blush")
+            ton @ cheeks blush "Perhaps I've been taking this favour business... thing a bit too lightly." ("open", "narrow", "raised", "down")
             ton "I've been telling myself that it's as much for the students benefit as it is my own." ("upset", "closed", "worried", "mid")
             ton "\"I'll help them explore their sexuality\"." ("annoyed", "closed", "base", "mid")
             ton "\"It'll do them good\"." ("annoyed", "closed", "base", "mid")
@@ -1717,7 +1717,7 @@ label ag_st_imperio_E5:
             ton "... {w}This is what I want!" ("mad", "wide", "annoyed", "down")
             gen "Good, you're doing this for yourself, and nobody else..." ("base", xpos="far_left", ypos="head")
             gen "You'd do good to remember that." ("base", xpos="far_left", ypos="head")
-            ton "Yes, Sir." ("base", "happyCl", "shocked", "mid", cheeks="blush")
+            ton @ cheeks blush "Yes, Sir." ("base", "happyCl", "shocked", "mid")
 
             #Overlay goes away and music returns to normal
             play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
@@ -1743,14 +1743,14 @@ label ag_st_imperio_E5:
     ton "But, she's a Hufflepuff...{w=0.8} I used to be..." ("open", "base", "worried", "up", hair="sad") # 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 "Yes..." ("soft", "base", "worried", "downR", cheeks="blush")
+    ton @ cheeks blush "Yes..." ("soft", "base", "worried", "downR")
     gen "This Susan girl sounds like the perfect target then." ("base", xpos="far_left", ypos="head")
     gen "Maybe we could even hit two birds with one stone." ("base", xpos="far_left", ypos="head")
-    ton "*Huh*?" ("soft", "base", "worried", "mid", cheeks="blush")
+    ton @ cheeks blush "*Huh*?" ("soft", "base", "worried", "mid")
     gen "Perhaps I could learn a thing or two about this Susan girl is what I meant..." ("base", xpos="far_left", ypos="head")
-    ton "Right." ("open", "base", "worried", "mid", cheeks="blush")
+    ton @ cheeks blush "Right." ("open", "base", "worried", "mid")
     gen "Any objections?" ("base", xpos="far_left", ypos="head")
-    ton "No sir..." ("open", "base", "base", "down", hair="neutral", cheeks="blush")
+    ton @ cheeks blush "No sir..." ("open", "base", "base", "down", hair="neutral")
     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")
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 4700879d..38c89133 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
@@ -605,7 +605,7 @@ label cc_pf_strip_T3_intro_E2:
     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")
     gen "But of course!" ("grin", xpos="far_left", ypos="head")
-    ton "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", cheeks="blush", hair="horny")
+    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")
     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
@@ -875,9 +875,9 @@ label cc_pf_strip_T3_intro_E2:
     sna "" ("snape_13")
     ton "" ("annoyed", "shocked", "raised", "stare", hair="horny", 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 "" ("clench", "wide", "shocked", "L", hair="horny", cheeks="blush")
+    ton @ cheeks blush "" ("clench", "wide", "shocked", "L", hair="horny")
     cho "You somehow tricked them! They played far better than usual." ("mad", "base", "angry", "L")
-    ton "" ("horny", "narrow", "worried", "down", hair="horny", cheeks="heavy_blush")
+    ton @ cheeks heavy_blush "" ("horny", "narrow", "worried", "down", hair="horny")
     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 "" ("base", "narrow", "worried", "L", hair="horny", cheeks="heavy_blush")
+    ton @ cheeks heavy_blush "" ("base", "narrow", "worried", "L", hair="horny")
     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 "" ("base", "narrow", "base", "mid", hair="horny", cheeks="blush")
+    ton @ cheeks blush "" ("base", "narrow", "base", "mid", hair="horny")
     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")
@@ -1323,7 +1323,7 @@ label cc_pf_strip_T3_intro_E3:
     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)
 
     cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "down") # lip bite
-    ton "With trousers like these, you should start slowly... that's how the headmaster likes it. {heart}" ("horny", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+    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")
 
     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,7 +1334,7 @@ label cc_pf_strip_T3_intro_E3:
     with hpunch
     pause .5
 
-    ton "" ("horny", "narrow", "raised", "mid", hair="horny", cheeks="blush")
+    ton @ cheeks blush "" ("horny", "narrow", "raised", "mid", hair="horny")
     pause .8
 
     gen "Not wearing any underwear, I see..." ("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 "!!!" ("clench", "shocked", "base", "stare", hair="scared", cheeks="heavy_blush") # shocked
+    ton @ cheeks heavy_blush "!!!" ("clench", "shocked", "base", "stare", hair="scared") # shocked
     nar "You give Tonks a hard slap on her ass."
     cho @ cheeks heavy_blush "" ("horny", "base", "base", "down")
-    ton "Ouch...{w=0.4} Professor!" ("crooked_smile", "narrow", "annoyed", "mid", hair="horny", cheeks="heavy_blush")
+    ton @ cheeks heavy_blush "Ouch...{w=0.4} Professor!" ("crooked_smile", "narrow", "annoyed", "mid", hair="horny")
     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 "..." ("clench", "base", "shocked", "ahegao", hair="horny", cheeks="blush") #pout #blush
+            ton @ cheeks blush "..." ("clench", "base", "shocked", "ahegao", hair="horny") #pout #blush
             gen "Want another?" ("grin", xpos="far_left", ypos="head")
-            ton "Yes, please. {heart}" ("crooked_smile", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "Yes, please. {heart}" ("crooked_smile", "narrow", "base", "mid", hair="horny")
 
             menu:
                 "-Slap it again!-":
                     call slap_her
-                    ton "*Mmm*... Spank me, Sir!" ("horny", "narrow", "angry", "mid", hair="horny", cheeks="heavy_blush")
+                    ton @ cheeks heavy_blush "*Mmm*... Spank me, Sir!" ("horny", "narrow", "angry", "mid", hair="horny")
 
                     menu:
                         "-Again!-":
                             pass
                     call slap_her
-                    ton "More...{w=0.3} Harder!" ("clench", "base", "angry", "mid", hair="angry", cheeks="heavy_blush")
+                    ton @ cheeks heavy_blush "More...{w=0.3} Harder!" ("clench", "base", "angry", "mid", hair="angry")
                     cho @ cheeks heavy_blush "..." ("disgust", "happyCl", "worried", "mid") # blushing #lip bite #looking away
 
                     menu:
                         "-Slap it hard!-":
                             pass
                     call slap_her
-                    ton "" ("clench", "base", "shocked", "ahegao", hair="scared", cheeks="heavy_blush")
+                    ton @ cheeks heavy_blush "" ("clench", "base", "shocked", "ahegao", hair="scared")
                     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 "*Hngh*..." ("upset", "narrow", "base", "ahegao", hair="horny", cheeks="heavy_blush")
-                    ton "Thank you, Professor. {heart}{heart}{heart}" ("crooked_smile", "narrow", "worried", "mid", hair="horny", cheeks="heavy_blush")
+                    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")
                     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 "" ("base", "base", "base", "mid", hair="horny", cheeks="blush", xpos=215, ypos="base", flip=False, trans=d5)
+                    ton @ cheeks blush "" ("base", "base", "base", "mid", hair="horny", xpos=215, ypos="base", flip=False, trans=d5)
                     pause .5
 
-                    ton "It's fine, Cho. Just give it a little slap." ("soft", "narrow", "base", "downR", hair="horny", cheeks="blush")
+                    ton @ cheeks blush "It's fine, Cho. Just give it a little slap." ("soft", "narrow", "base", "downR", hair="horny")
                     cho @ cheeks heavy_blush "..." ("angry", "base", "raised", "down")
                     call slap_her
-                    ton "That's it! Try a little harder..." ("horny", "narrow", "base", "downR", hair="horny", cheeks="blush")
+                    ton @ cheeks blush "That's it! Try a little harder..." ("horny", "narrow", "base", "downR", hair="horny")
                     call slap_her
-                    ton "One more time..." ("soft", "narrow", "shocked", "up", cheeks="blush")
+                    ton @ cheeks blush "One more time..." ("soft", "narrow", "shocked", "up")
                     call slap_her
-                    ton "*Hngh*..." ("upset", "narrow", "shocked", "ahegao", hair="horny", cheeks="heavy_blush")
+                    ton @ cheeks heavy_blush "*Hngh*..." ("upset", "narrow", "shocked", "ahegao", hair="horny")
                     pause .2
 
                     # Tonks turns around.
@@ -1415,44 +1415,44 @@ label cc_pf_strip_T3_intro_E3:
                     ton "" ("base", "base", "base", "mid", xpos=280, ypos="base", flip=True, trans=d5)
                     pause .8
 
-                    ton "Thank you, sweetie." ("crooked_smile", "narrow", "base", "L", cheeks="heavy_blush")
+                    ton @ cheeks heavy_blush "Thank you, sweetie." ("crooked_smile", "narrow", "base", "L")
                     cho @ cheeks heavy_blush "..." ("quiver", "narrow", "worried", "down")
 
         "-Stop here...-":
             pass
 
     gen "Tell me, Cho...{w=0.3} do you like your teacher's body?" ("base", xpos="far_left", ypos="head")
-    ton "" ("base", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+    ton @ cheeks heavy_blush "" ("base", "narrow", "base", "mid", hair="horny")
     cho @ cheeks heavy_blush "Of course I do." ("open", "narrow", "base", "down")
-    ton "" ("base", "narrow", "base", "down", hair="horny", cheeks="blush")
+    ton @ cheeks blush "" ("base", "narrow", "base", "down", hair="horny")
     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 "" ("base", "narrow", "annoyed", "mid", hair="horny", cheeks="blush") # eager look at Cho.
+    ton @ cheeks blush "" ("base", "narrow", "annoyed", "mid", hair="horny") # 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 "Please, Miss Chang..." ("open", "narrow", "base", "L", hair="horny", cheeks="blush")
-    ton "I'm quite curious about your thoughts as well. {heart}" ("base", "narrow", "base", "L", hair="horny", cheeks="blush")
-    ton "We'll keep it our little secret, I promise..." ("crooked_smile", "narrow", "annoyed", "down", hair="horny", cheeks="blush")
+    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")
     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 "..." ("base", "narrow", "annoyed", "mid", hair="horny", cheeks="blush") # sharp look at Genie
+    ton @ cheeks blush "..." ("base", "narrow", "annoyed", "mid", hair="horny") # 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")
     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")
     cho @ cheeks heavy_blush "" ("base", "narrow", "worried", "down")
 
-    ton "Although, teachers shouldn't be employed for their looks, but for their competence, isn't that right?" ("open", "narrow", "annoyed", "mid", hair="horny", cheeks="blush")
+    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")
     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 "*giggles*..." ("base", "happyCl", "base", "mid", hair="horny", cheeks="blush")
-    ton "Enough with the small talk -- let's get these clothes off!" ("soft", "base", "annoyed", "mid", hair="horny", cheeks="blush")
+    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")
 
     stop music fadeout 1
     ton "" ("horny", "narrow", "base", "mid", hair="horny")
@@ -1481,7 +1481,7 @@ label cc_pf_strip_T3_intro_E3:
     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 "Now stand here so the Headmaster can see your tits." ("crooked_smile", "narrow", "base", "mid", hair="horny", cheeks="blush")
+    ton @ cheeks blush "Now stand here so the Headmaster can see your tits." ("crooked_smile", "narrow", "base", "mid", hair="horny")
     cho @ cheeks heavy_blush "..." ("annoyed", "happyCl", "base", "mid")
     pause .2
 
@@ -1528,7 +1528,7 @@ label cc_pf_strip_T3_intro_E3:
 
     play sound "sounds/giggle2_loud.ogg"
     ton "*giggles*..." ("grin", "narrow", "shocked", "mid", hair="horny")
-    ton "This is so much fun!" ("base", "narrow", "base", "up", hair="horny", cheeks="blush")
+    ton @ cheeks blush "This is so much fun!" ("base", "narrow", "base", "up", hair="horny")
 
     if cho.is_worn("panties"):
         cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "L")
@@ -1563,17 +1563,17 @@ label cc_pf_strip_T3_intro_E3:
         call ctc
 
 
-    ton "*Hmm*... I can't decide which teacher has the best view now..." ("horny", "narrow", "base", "down", cheeks="blush", hair="horny")
+    ton @ cheeks blush "*Hmm*... I can't decide which teacher has the best view now..." ("horny", "narrow", "base", "down", hair="horny")
     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 "*giggles*" ("grin", "base", "base", "mid", cheeks="blush", hair="horny")
+    ton @ cheeks blush "*giggles*" ("grin", "base", "base", "mid", hair="horny")
 
-    ton "Well, we still have the best saved for last." ("grin", "narrow", "base", "down", cheeks="blush", hair="horny")
-    ton "Let's give Professor Dumbledore a proper view of what a real athlete can achieve..." ("grin", "base", "base", "L", cheeks="blush", hair="horny")
+    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")
     cho @ cheeks blush "*Ehm*..." ("disgust", "narrow", "base", "L")
-    ton "Your buns, hun." ("crooked_smile", "narrow", "base", "L", cheeks="blush", hair="horny")
+    ton @ cheeks blush "Your buns, hun." ("crooked_smile", "narrow", "base", "L", hair="horny")
 
     stop music fadeout 1.0
 
@@ -2776,7 +2776,7 @@ label cc_pf_strip_T3_intro_E3:
     hide cg
 
     cho @ cheeks blush "" ("soft", "narrow", "base", "downR")
-    ton "" ("grin", "base", "base", "L", cheeks="blush")
+    ton @ cheeks blush "" ("grin", "base", "base", "L")
 
     hide screen blkfade
     with d5
@@ -2784,58 +2784,58 @@ label cc_pf_strip_T3_intro_E3:
     ## Transformation Section ##
 
 
-    ton "Great job Miss Chang... I'm sure no man will be able to resist you now...{nw}" ("grin", "narrow", "base", "L", cheeks="blush")
-    ton "Great job Miss Chang... I'm sure no man will be able to resist you now...{fast} Wouldn't you agree, professor?" ("grin", "narrow", "base", "mid", cheeks="blush")
+    ton @ cheeks blush "Great job Miss Chang... I'm sure no man will be able to resist you now...{nw}" ("grin", "narrow", "base", "L")
+    ton @ cheeks blush "Great job Miss Chang... I'm sure no man will be able to resist you now...{fast} Wouldn't you agree, professor?" ("grin", "narrow", "base", "mid")
     gen "What? Oh yes, sure! Nice job!" ("grin", xpos="far_left", ypos="head")
     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 "If you ever have any questions about men, you know where my door is..." ("base", "narrow", "base", "L", cheeks="blush", hair="neutral")
+        ton @ cheeks blush "If you ever have any questions about men, you know where my door is..." ("base", "narrow", "base", "L", hair="neutral")
         gen "Got it." ("base", xpos="far_left", ypos="head")
-        ton "I was referring to Miss Chang." ("soft", "narrow", "base", "mid", cheeks="blush")
+        ton @ cheeks blush "I was referring to Miss Chang." ("soft", "narrow", "base", "mid")
         gen "Oh... Yeah, me too." ("base", xpos="far_left", ypos="head")
     elif name_genie_cho == "Dumbledore":
-        ton "Using first names already, I see..." ("soft", "base", "raised", "L", cheeks="blush")
+        ton @ cheeks blush "Using first names already, I see..." ("soft", "base", "raised", "L")
         cho @ cheeks heavy_blush "I mean, Sir!" ("angry", "base", "base", "stare")
-        ton "Don't worry Miss Chang, if that's what he would like you to call him, then I won't tell anyone." ("base", "wink", "base", "L", cheeks="blush")
-        ton "" ("base", "base", "base", "L", cheeks="blush")
+        ton @ cheeks blush "Don't worry Miss Chang, if that's what he would like you to call him, then I won't tell anyone." ("base", "wink", "base", "L")
+        ton @ cheeks blush "" ("base", "base", "base", "L")
         cho @ cheeks heavy_blush "*Ehm*... Thank you, Professor." ("disgust", "narrow", "base", "down")
     elif name_genie_cho == "Coach":
-        ton "So you do call him coach!" ("grin", "narrow", "shocked", "L", cheeks="blush")
+        ton @ cheeks blush "So you do call him coach!" ("grin", "narrow", "shocked", "L")
         cho @ cheeks heavy_blush "Oh, *Ehm*... Well..." ("angry", "narrow", "base", "L")
-        ton "Well, seeing that he's helping you, it's only appropriate." ("base", "narrow", "base", "L", cheeks="blush")
+        ton @ cheeks blush "Well, seeing that he's helping you, it's only appropriate." ("base", "narrow", "base", "L")
         gen "That's what I said." ("grin", xpos="far_left", ypos="head")
         cho @ cheeks heavy_blush "..." ("base", "narrow", "base", "down")
     else:
         gen "*Cough*..." ("base", xpos="far_left", ypos="head")
         cho @ cheeks blush "I mean--{w=0.2} Thank you Sir..." ("angry", "base", "base", "mid")
-        ton "*chuckles* So, this is what he has you call him... Well, nothing wrong with that..." ("soft", "base", "base", "mid", cheeks="blush")
+        ton @ cheeks blush "*chuckles* So, this is what he has you call him... Well, nothing wrong with that..." ("soft", "base", "base", "mid")
         cho @ cheeks heavy_blush "..." ("base", "narrow", "base", "down")
 
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
 
     if _temp_facial:
         cho @ cheeks blush "*Ehm*...{w=0.4} Professor..." ("soft", "narrow", "base", "L")
-        ton "Yes, Miss Chang?" ("base", "narrow", "raised", "L", cheeks="blush")
+        ton @ cheeks blush "Yes, Miss Chang?" ("base", "narrow", "raised", "L")
         cho @ cheeks heavy_blush "What did you mean when you said...{w=0.4} Repay him with my body?" ("open", "narrow", "base", "L")
-        ton "*Hmm*?" ("base", "base", "raised", "mid", cheeks="blush")
-        ton "You're selling favours to Professor Dumbledore, are you not?" ("base", "narrow", "base", "L", cheeks="blush")
+        ton @ cheeks blush "*Hmm*?" ("base", "base", "raised", "mid")
+        ton @ cheeks blush "You're selling favours to Professor Dumbledore, are you not?" ("base", "narrow", "base", "L")
         cho @ cheeks heavy_blush "I--{w=0.2} Yes, but that's not--{w=0.2} I mean...{w=0.2} They're meant to help me with Quidditch, I swear!" ("mad", "narrow", "base", "L")
     else:
-        ton "*Mmm*... Your coach is very lucky to have the opportunity to buy favours from you." ("base", "base", "base", "mid", cheeks="blush")
+        ton @ cheeks blush "*Mmm*... Your coach is very lucky to have the opportunity to buy favours from you." ("base", "base", "base", "mid")
         cho @ cheeks heavy_blush "He's--{w=0.2} They're meant to help me with Quidditch, I swear!" ("mad", "narrow", "base", "L")
 
     play sound "sounds/giggle2_loud.ogg"
-    ton "*giggles*" ("crooked_smile", "closed", "base", "mid", cheeks="blush")
+    ton @ cheeks blush "*giggles*" ("crooked_smile", "closed", "base", "mid")
 
-    ton "Your reasons for selling favours does not concern me, Miss Chang..." ("base", "narrow", "base", "L", cheeks="blush")
+    ton @ cheeks blush "Your reasons for selling favours does not concern me, Miss Chang..." ("base", "narrow", "base", "L")
     cho @ cheeks blush "Oh..." ("disgust", "narrow", "base", "down")
-    ton "As long as both ends of the bargain is met at a satisfactory level." ("soft", "narrow", "base", "mid", cheeks="blush")
-    ton "They are, I presume?" ("normal", "narrow", "raised", "L", cheeks="blush")
+    ton @ cheeks blush "As long as both ends of the bargain is met at a satisfactory level." ("soft", "narrow", "base", "mid")
+    ton @ cheeks blush "They are, I presume?" ("normal", "narrow", "raised", "L")
     cho @ cheeks blush "Yes..." ("angry", "narrow", "base", "down")
     gen "I mean..." ("base", xpos="far_left", ypos="head")
-    ton "Then that is everything I need to know." ("grin", "closed", "base", "mid", cheeks="blush")
-    ton "Now, if that's everything... I think I'll better be off." ("soft", "base", "base", "R", cheeks="blush")
+    ton @ cheeks blush "Then that is everything I need to know." ("grin", "closed", "base", "mid")
+    ton @ cheeks blush "Now, if that's everything... I think I'll better be off." ("soft", "base", "base", "R")
     cho @ cheeks blush "Oh... Okay then!" ("angry", "narrow", "base", "L")
     gen "*Ahem*... Miss Chang." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "Yes, professor?" ("angry", "base", "base", "mid")
@@ -2846,9 +2846,9 @@ label cc_pf_strip_T3_intro_E3:
     ton "What? You told her I'm a Metamorphmagi?" ("mad", "wide", "shocked", "mid", hair="neutral")
     cho @ cheeks blush "You are?!?" ("open", "wide", "raised", "L")
     cho @ cheeks heavy_blush "That's so cool!" ("grin", "happyCl", "base", "mid")
-    ton "Did I just spoil the surprise myself?{w=0.5} Whoopsie!" ("mad", "narrow", "worried", "downR", hair="horny", cheeks="heavy_blush")
+    ton @ cheeks heavy_blush "Did I just spoil the surprise myself?{w=0.5} Whoopsie!" ("mad", "narrow", "worried", "downR", hair="horny")
     gen "Well... I didn't exactly tell her that much." ("base", xpos="far_left", ypos="head")
-    ton "Well, what's done is done..." ("upset", "narrow", "worried", "downR", hair="horny", cheeks="blush")
+    ton @ cheeks blush "Well, what's done is done..." ("upset", "narrow", "worried", "downR", hair="horny")
 
     play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
 
@@ -2968,7 +2968,7 @@ label cc_pf_strip_T3_intro_E3:
 
     ton "Let's do this again some other time, shall we." ("horny", "narrow", "raised", "mid", hair="horny")
     gen "Gladly." ("grin", xpos="far_left", ypos="head")
-    ton "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", cheeks="heavy_blush")
+    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")
     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")
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 e92635ef..c3ea8f15 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
@@ -345,7 +345,7 @@ label .spank_cho:
     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 "*Giggles*... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid", hair="horny", cheeks="blush")
+    ton @ cheeks blush "*Giggles*... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid", hair="horny")
     ton "..." ("base", "narrow", "base", "mid", hair="horny")
 
     menu:
@@ -371,7 +371,7 @@ label .spank_cho:
                     pass
             call slap_her
             cho @ cheeks heavy_blush "" ("clench", "wide", "raised", "mid")
-            ton "" ("grin", "narrow", "base", "mid", hair="horny", cheeks="blush")
+            ton @ cheeks blush "" ("grin", "narrow", "base", "mid", hair="horny")
             pause .5
             call slap_her
             pause .3
@@ -385,7 +385,7 @@ label .spank_cho:
             ton "" ("base", "narrow", "base", "L", hair="horny")
             cho @ cheeks heavy_blush "*Ehm*..." ("annoyed", "narrow", "raised", "mid")
             play sound "sounds/giggle2_loud.ogg"
-            ton "*Giggles*... {heart}{heart}{heart}" ("base", "happyCl", "base", "mid", hair="horny", cheeks="heavy_blush")
+            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")
             cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "down")
 
@@ -561,7 +561,7 @@ label .strip_tonks:
             $ tonks.strip("bottom")
             with hpunch
             pause .5
-            ton "" ("horny", "narrow", "raised", "mid", hair="horny", cheeks="blush")
+            ton @ cheeks blush "" ("horny", "narrow", "raised", "mid", hair="horny")
             pause .8
             nar "And then flicks it out of sigh with one swift motion."
             call ctc
@@ -635,31 +635,31 @@ label .spank_tonks:
             return
 
     call slap_her
-    ton "!!!" ("clench", "shocked", "base", "stare", hair="scared", cheeks="heavy_blush") # shocked
-    ton "*Mmm*... You're so naughty, Professor!" ("silly", "narrow", "angry", "mid", hair="horny", cheeks="blush")
-    ton "Right in front of a student and everything..." ("base", "narrow", "base", "mid", hair="horny", cheeks="blush")
+    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")
     call slap_her
-    ton "Ouch... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid", hair="horny", cheeks="blush")
+    ton @ cheeks blush "Ouch... {heart}{heart}{heart}" ("silly", "happyCl", "base", "mid", hair="horny")
     cho @ cheeks blush "..." ("grin", "narrow", "base", "mid")
 
     menu:
         gen "(...)" ("base", xpos="far_left", ypos="head")
         "-Spank her again!-":
             call slap_her
-            ton "*Mmm*... Spank me, Professor!" ("horny", "narrow", "angry", "mid", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "*Mmm*... Spank me, Professor!" ("horny", "narrow", "angry", "mid", hair="horny")
 
             menu:
                 "-Again!-":
                     pass
             call slap_her
-            ton "Not so rough, Sir! {heart}" ("soft", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "Not so rough, Sir! {heart}" ("soft", "narrow", "base", "mid", hair="horny")
             cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "down") # blushing #lip bite #looking away
 
             menu:
                 "-Slap it hard!-":
                     pass
             call slap_her
-            ton "" ("clench", "base", "shocked", "ahegao", hair="scared", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "" ("clench", "base", "shocked", "ahegao", hair="scared")
             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 "*Hngh*..." ("upset", "narrow", "base", "ahegao", hair="horny", cheeks="heavy_blush")
-            ton "Thank you, Professor. {heart}{heart}{heart}" ("soft", "narrow", "worried", "mid", hair="horny", cheeks="heavy_blush")
+            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")
             gen "You're welcome." ("grin", xpos="far_left", ypos="head")
             cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "downR")
 
@@ -683,16 +683,16 @@ label .spank_tonks:
 
             # Tonks turns around.
             call ton_chibi(flip=False)
-            ton "" ("base", "base", "base", "mid", hair="horny", cheeks="blush", xpos=215, ypos="base", flip=False, trans=d5)
+            ton @ cheeks blush "" ("base", "base", "base", "mid", hair="horny", xpos=215, ypos="base", flip=False, trans=d5)
             pause .5
 
-            ton "Slap this naughty teacher's ass!" ("crooked_smile", "narrow", "angry", "R", hair="horny", cheeks="blush")
+            ton @ cheeks blush "Slap this naughty teacher's ass!" ("crooked_smile", "narrow", "angry", "R", hair="horny")
             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")
             cho @ cheeks blush "" ("annoyed", "narrow", "angry", "down")
             call slap_her
-            ton "*Hngh*..." ("crooked_smile", "narrow", "base", "mid", hair="horny", cheeks="blush")
+            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")
             cho @ cheeks blush "" ("clench", "narrow", "angry", "down")
@@ -704,7 +704,7 @@ label .spank_tonks:
             call slap_her
             pause .2
             call slap_her
-            ton "!!!" ("clench", "narrow", "base", "ahegao", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "!!!" ("clench", "narrow", "base", "ahegao", hair="horny")
             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")
             cho @ cheeks blush "" ("annoyed", "narrow", "angry", "down")
@@ -716,22 +716,22 @@ label .spank_tonks:
             call slap_her
             pause .2
             call slap_her
-            ton "" ("horny", "narrow", "base", "ahegao", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "" ("horny", "narrow", "base", "ahegao", hair="horny")
             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 "Very good, Miss Chang. {heart}" ("horny", "narrow", "worried", "R", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "Very good, Miss Chang. {heart}" ("horny", "narrow", "worried", "R", hair="horny")
             pause .2
 
             # Tonks turns around.
             call ton_chibi(flip=True)
-            ton "" ("base", "base", "base", "mid", hair="horny", cheeks="heavy_blush", xpos=280, ypos="base", flip=True, trans=dissolve)
+            ton @ cheeks heavy_blush "" ("base", "base", "base", "mid", hair="horny", xpos=280, ypos="base", flip=True, trans=dissolve)
             pause .8
 
-            ton "Ten points for Ravenclaw." ("soft", "narrow", "base", "L", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "Ten points for Ravenclaw." ("soft", "narrow", "base", "L", hair="horny")
             $ ravenclaw += 10
-            ton "For this thorough ass spanking!" ("horny", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "For this thorough ass spanking!" ("horny", "narrow", "base", "mid", hair="horny")
             cho "Thank you, Professor Tonks." ("crooked_smile", "narrow", "base", "down")
 
             return
@@ -867,7 +867,7 @@ label cc_pf_strip_T3_tonks.doppler_E1:
     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")
     cho @ cheeks heavy_blush "But-- Professor!" ("annoyed", "narrow", "angry", "L")
     gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
-    ton "I'm not doing anything harmful, I promise." ("upset", "happyCl", "worried", "mid", hair="horny", cheeks="blush")
+    ton @ cheeks blush "I'm not doing anything harmful, I promise." ("upset", "happyCl", "worried", "mid", hair="horny")
     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
@@ -1079,7 +1079,7 @@ label .succubus_E2:
     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 "You know... To get some privacy." ("crooked_smile", "narrow", "base", "mid", hair="horny", cheeks="blush")
+    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")
@@ -1161,12 +1161,12 @@ label .succubus_E2:
     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 "I could give you a ride on this as well if you'd like, Miss Chang." ("open_wide_tongue2", "narrow", "angry", "L", hair="horny", cheeks="heavy_blush") # tongue out
+    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
     cho @ cheeks heavy_blush "Professor--" ("soft", "narrow", "worried", "mid") # embarrassed #looks at you
     gen "Tonks, not before--" ("base", xpos="far_left", ypos="head")
-    ton "Yes, yes... Not before you win that silly Quidditch cup." ("mad", "closed", "angry", "mid", hair="angry", cheeks="heavy_blush")
+    ton @ cheeks heavy_blush "Yes, yes... Not before you win that silly Quidditch cup." ("mad", "closed", "angry", "mid", hair="angry")
     cho @ cheeks blush "It's not silly!" ("annoyed", "narrow", "angry", "L")
-    ton "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", cheeks="heavy_blush")
+    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")
     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")
diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
index 00cd1cab..c763f5a8 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
@@ -1345,7 +1345,7 @@ label gryffindor_match:
 
     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")
-    ton "But perhaps we should call for a--" ("soft", "base", "base", "R", cheeks="blush")
+    ton @ cheeks blush "But perhaps we should call for a--" ("soft", "base", "base", "R")
     her "{size=+7}Boys!{/size}" with hpunch
     nar "The boys quickly snap out of it and move their gaze towards the commentator booth."
 
@@ -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 "Oh dear..." ("soft", "base", "base", "mid", hair="horny", cheeks="heavy_blush")
+    ton @ cheeks heavy_blush "Oh dear..." ("soft", "base", "base", "mid", hair="horny")
     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,7 +1380,7 @@ label gryffindor_match:
     play sound "sounds/crowd_stomping.ogg"
     qcr "Cho! Cho! Cho!"
 
-    ton "*Hmm*... We should probably put a stop to this..." ("disgust", "base", "base", "mid", hair="horny", cheeks="blush")
+    ton @ cheeks blush "*Hmm*... We should probably put a stop to this..." ("disgust", "base", "base", "mid", hair="horny")
     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")
 
@@ -1846,7 +1846,7 @@ label gryffindor_match_return:
 
 
     ton "We've got a situation--{w=0.2}" ("mad", "base", "base", "R", hair="upset", xpos="base", ypos="base")
-    ton "Cho?!" ("clench", "wide", "shocked", "L", hair="horny", cheeks="blush")
+    ton @ cheeks blush "Cho?!" ("clench", "wide", "shocked", "L", hair="horny")
     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")
diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
index b75074ae..d13af799 100644
--- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
@@ -607,7 +607,7 @@ label slytherin_match:
     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 "Is it me or is it getting a bit hot in here?" ("normal", "closed", "raised", "downR", cheeks="blush")
+    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")
     gen "Err..." ("base", xpos="far_left", ypos="head")
@@ -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 "{size=+5}What?{/size}" ("scream", "shocked", "base", "stare", hair="neutral", cheeks="blush", ypos="head", flip=True, trans=vpunch)
+    ton @ cheeks blush "{size=+5}What?{/size}" ("scream", "shocked", "base", "stare", hair="neutral", ypos="head", flip=True, trans=vpunch)
     gen "What the fuck is liquid luck?" ("angry", xpos="far_left", ypos="head")
-    ton "You gave those brutes a luck potion?!" ("mad", "base", "angry", "L", hair="angry", cheeks="blush")
+    ton @ cheeks blush "You gave those brutes a luck potion?!" ("mad", "base", "angry", "L", hair="angry")
     sna "Well..." ("snape_14")
-    ton "I can't believe you, Snape...{w=0.5} look what they've done to her face!" ("mad", "base", "worried", "down", cheeks="blush")
-    ton "Her beautiful face..." ("upset", "base", "worried", "down", hair="sad", cheeks="blush")
+    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")
     sna "Looks like an improvement to me." ("snape_46")
 
     menu:
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 28e317a1..ec4cdf92 100644
--- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
+++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
@@ -693,7 +693,7 @@ label hg_pf_talk_tonks:
             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")
-            ton "Any other incidents, Miss Granger?" ("upset", "wide", "shocked", "L", cheeks="blush")
+            ton @ cheeks blush "Any other incidents, Miss Granger?" ("upset", "wide", "shocked", "L")
             her "More than I could count!" ("open", "closed", "angry", "mid")
             ton "" ("mad", "base", "base", "mid")
             her "I'm almost certain one of the girls wasn't wearing any underwear in class - which is completely unhygienic." ("angry", "narrow", "worried", "mid_soft")
@@ -709,8 +709,8 @@ label hg_pf_talk_tonks:
             ton "Is there anything else you could tell us about these... Naughty Slytherin girls?" ("horny", "base", "angry", "mid", hair="horny")
             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 "I'm not in a rush." ("base", "narrow", "base", "down", cheeks="blush")
-            ton "But even if I was, it can wait until later." ("horny", "base", "raised", "L", cheeks="blush")
+            ton @ cheeks blush "I'm not in a rush." ("base", "narrow", "base", "down")
+            ton @ cheeks blush "But even if I was, it can wait until later." ("horny", "base", "raised", "L")
             her "Well, there's another Slytherin girl...{w=0.3} Pansy Parkinson..." ("open", "closed", "angry", "mid")
             her "She just lets Snape grab her ass whenever he wants... and gives her five points each time..." ("annoyed", "base", "angry", "mid")
             ton "Only five measly points?" ("open", "shocked", "worried", "R")
@@ -836,7 +836,7 @@ 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 "You can tell us if you've changed your stance. I most certainly won't judge you..." ("horny", "base", "base", "L", cheeks="blush", hair="horny")
+        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")
         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")
         her @ cheeks blush "So when you suggested that I should try asking Professor Dumbledore for a favour..." ("soft", "base", "base", "mid")
@@ -989,7 +989,7 @@ 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 "No reason...{w=0.4} Please continue." ("open", "base", "raised", "R", cheeks="blush", hair="horny")
+            ton @ cheeks blush "No reason...{w=0.4} Please continue." ("open", "base", "raised", "R", hair="horny")
             ton "" ("base", "base", "raised", "mid", hair="basic")
             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")
 
@@ -1000,9 +1000,9 @@ label hg_pf_talk_tonks:
                 gen "(Yes, any minute now...)" ("angry", xpos="far_left", ypos="head")
                 her "I was just about to call her out on her disgraceful behaviour, when suddenly the Skrewt started shaking violently." ("open", "base", "base", "R")
                 gen "(Yes, any second now...)" ("angry", xpos="far_left", ypos="head")
-                ton "Then what happened?" ("open", "base", "raised", "L", cheeks="blush")
+                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 "" ("horny", "base", "angry", "mid", cheeks="blush", hair="horny")
+                ton @ cheeks blush "" ("horny", "base", "angry", "mid", hair="horny")
                 gen "(Yes, take it right on your face, you slut!)" ("angry", xpos="far_left", ypos="head")
 
                 call hide_characters
@@ -1018,7 +1018,7 @@ label hg_pf_talk_tonks:
                 gen "{size=-5}*Argh*! YES!{/size}" ("angry", xpos="far_left", ypos="head")
 
                 her @ cheeks blush "" ("annoyed", "base", "base", "mid")
-                ton "Are you okay, professor? You're awfully quiet..." ("base", "base", "raised", "mid", cheeks="blush")
+                ton @ cheeks blush "Are you okay, professor? You're awfully quiet..." ("base", "base", "raised", "mid")
                 her "(.............)" ("soft", "base", "base", "mid")
                 call gen_chibi("cum_behind_desk_done")
                 with d3
@@ -1128,17 +1128,17 @@ label hg_pf_talk_tonks:
                             gen "(And you loved every second of it, judged by how much that butt was bouncing...)" ("angry", xpos="far_left", ypos="head")
                     #elif hg_pf_admire_panties.counter > 1: # Has shown panties
                         #her @ cheeks blush "Well, he made me show him my panties..." ("open", "narrow", "base", "R_soft")
-                        #ton "Your panties, you say..." ("base", "base", "raised", "L", cheeks="blush")
+                        #ton @ cheeks blush "Your panties, you say..." ("base", "base", "raised", "L")
                         #if states.gen.masturbating:
                             #gen "(And you loved every second of it... I bet you were totally wet under those panties!)" ("angry", xpos="far_left", ypos="head")
                     #elif: # Has shown bra/breasts
                         #her @ cheeks blush "Well, he made take my top off..." ("open", "narrow", "base", "R_soft")
-                        #ton "Your top, you say..." ("base", "base", "raised", "L", cheeks="blush")
+                        #ton @ cheeks blush "Your top, you say..." ("base", "base", "raised", "L")
                     else: # Only done talk to me (mentions genie masturbating when she talks)
                         her @ cheeks blush "Well, he made me stand here and talk to him about my day, while he touched himself..." ("open", "narrow", "base", "R_soft")
                         gen "We both know there's no proof of that happening, I was merely scratching my leg." ("base", xpos="far_left", ypos="head")
                         her @ cheeks blush "..." ("disgust", "narrow", "base", "mid")
-                    ton "And how did that make you feel?" ("soft", "base", "raised", "L", cheeks="blush")
+                    ton @ cheeks blush "And how did that make you feel?" ("soft", "base", "raised", "L")
                     her @ cheeks blush "Humiliated!" ("annoyed", "narrow", "base", "R_soft")
                     ton "And your headmaster, did he enjoy it?" ("base", "narrow", "raised", "mid")
 
diff --git a/game/scripts/characters/luna/events/intro.rpy b/game/scripts/characters/luna/events/intro.rpy
index 8c042d1f..4a2afaf4 100644
--- a/game/scripts/characters/luna/events/intro.rpy
+++ b/game/scripts/characters/luna/events/intro.rpy
@@ -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 "..." ("disgust", "shocked", "base", "mid", hair="horny", cheeks="blush") #wide eyed
+    ton @ cheeks blush "..." ("disgust", "shocked", "base", "mid", hair="horny") #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/events/clothing.rpy b/game/scripts/characters/tonks/events/clothing.rpy
index 45ca79cb..56d03dcf 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 "" ("grin", "base", "base", "mid", hair="horny", cheeks="heavy_blush", xpos="mid", ypos="base", trans=d5)
+        ton @ cheeks heavy_blush "" ("grin", "base", "base", "mid", hair="horny", xpos="mid", ypos="base", trans=d5)
         call ctc
 
-        ton "Hello, [name_genie_tonks]." ("soft", "narrow", "raised", "mid", hair="horny", cheeks="heavy_blush")
+        ton @ cheeks heavy_blush "Hello, [name_genie_tonks]." ("soft", "narrow", "raised", "mid", hair="horny")
         gen "You're naked!" ("grin", xpos="far_left", ypos="head")
-        ton "I am?" ("soft", "narrow", "raised", "mid", hair="horny", cheeks="heavy_blush")
-        ton "Oh... Yes it appears so..." ("grin", "narrow", "shocked", "down", hair="horny", cheeks="heavy_blush")
-        ton "Is that a problem, [name_genie_tonks]?" ("annoyed", "narrow", "raised", "mid", hair="horny", cheeks="heavy_blush")
-        ton "Am I going to get fired for inappropriate behaviour?" ("annoyed", "narrow", "base", "down", hair="horny", cheeks="heavy_blush")
-        ton "Are you going to report me to the ministry?" ("base", "narrow", "raised", "down", hair="horny", cheeks="heavy_blush")
+        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")
         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 "*Giggles*" ("grin", "narrow", "base", "stare", hair="horny", cheeks="heavy_blush")
-        ton "Maybe..." ("grin", "wink", "base", "mid", hair="horny", cheeks="heavy_blush")
+        ton @ cheeks heavy_blush "*Giggles*" ("grin", "narrow", "base", "stare", hair="horny")
+        ton @ cheeks heavy_blush "Maybe..." ("grin", "wink", "base", "mid", hair="horny")
 
         gen "One of the students could have seen you..." ("base", xpos="far_left", ypos="head")
-        ton "Oh, I would love for them to see me like this..." ("horny", "narrow", "shocked", "R", hair="horny", cheeks="heavy_blush")
-        ton "Why don't you invite one to your office?" ("soft", "narrow", "shocked", "mid", hair="horny", cheeks="heavy_blush")
+        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")
 
         if ag_st_imperio.counter > 0:
             gen "You'd like that wouldn't you..." ("base", xpos="far_left", ypos="head")
-            ton "Very much!" ("base", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "Very much!" ("base", "narrow", "base", "mid", hair="horny")
             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 "Oh, yes please!" ("horny", "base", "base", "mid", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "Oh, yes please!" ("horny", "base", "base", "mid", hair="horny")
             gen "But this sudden behaviour isn't about her is it?" ("base", xpos="far_left", ypos="head")
-            ton "*Hmm*... Is it that obvious?" ("base", "narrow", "base", "R", hair="horny", cheeks="heavy_blush")
+            ton @ cheeks heavy_blush "*Hmm*... Is it that obvious?" ("base", "narrow", "base", "R", hair="horny")
 
         gen "Miss Chang?" ("base", xpos="far_left", ypos="head")
-        ton "*Mmm*..." ("base", "narrow", "base", "stare", hair="horny", cheeks="heavy_blush")
+        ton @ cheeks heavy_blush "*Mmm*..." ("base", "narrow", "base", "stare", hair="horny")
         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 "Yes please!" ("grin", "narrow", "base", "stare", hair="horny", cheeks="heavy_blush")
+        ton @ cheeks heavy_blush "Yes please!" ("grin", "narrow", "base", "stare", hair="horny")
         gen "You sure you're ready to find out just how flexible she is?" ("base", xpos="far_left", ypos="head")
-        ton "Yes!" ("crooked_smile", "base", "base", "stare", hair="horny", cheeks="heavy_blush")
+        ton @ cheeks heavy_blush "Yes!" ("crooked_smile", "base", "base", "stare", hair="horny")
 
         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 "A bonus? For showing off my body to my own boss?" ("soft", "narrow", "raised", "mid", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "A bonus? For showing off my body to my own boss?" ("soft", "narrow", "raised", "mid", hair="horny")
                 gen "That's right." ("base", xpos="far_left", ypos="head")
 
                 play sound "sounds/giggle2_loud.ogg"
-                ton "*giggles*" ("grin", "narrow", "raised", "stare", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "*giggles*" ("grin", "narrow", "raised", "stare", hair="horny")
 
-                ton "I've always wanted to find out my worth." ("grin", "base", "base", "stare", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "I've always wanted to find out my worth." ("grin", "base", "base", "stare", hair="horny")
                 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 "Seriously?" ("soft", "narrow", "raised", "mid", hair="horny", cheeks="heavy_blush")
+                        ton @ cheeks heavy_blush "Seriously?" ("soft", "narrow", "raised", "mid", hair="horny")
                         gen "Yes, I'm a cheap bastard." ("base", xpos="far_left", ypos="head")
-                        ton "Clearly..." ("upset", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+                        ton @ cheeks heavy_blush "Clearly..." ("upset", "narrow", "base", "mid", hair="horny")
 
                     "-One gold-" if game.gold > 0:
                         gen "A single gold coin, if anything..." ("base", xpos="far_left", ypos="head")
-                        ton "(Bastard... How humiliating.)" ("soft", "narrow", "worried", "up", hair="horny", cheeks="heavy_blush")
+                        ton @ cheeks heavy_blush "(Bastard... How humiliating.)" ("soft", "narrow", "worried", "up", hair="horny")
                         gen "Well?" ("base", xpos="far_left", ypos="head")
-                        ton "Yes?" ("disgust", "narrow", "raised", "mid", hair="horny", cheeks="heavy_blush")
+                        ton @ cheeks heavy_blush "Yes?" ("disgust", "narrow", "raised", "mid", hair="horny")
                         gen "Shouldn't you be thanking me for this generous valuation?" ("base", xpos="far_left", ypos="head")
-                        ton "Oh... Thank you so much, [name_genie_tonks]." ("annoyed", "narrow", "base", "stare", hair="horny", cheeks="heavy_blush")
+                        ton @ cheeks heavy_blush "Oh... Thank you so much, [name_genie_tonks]." ("annoyed", "narrow", "base", "stare", hair="horny")
                         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 "(*Hmm*... I kind of expected more.)" ("annoyed", "narrow", "raised", "downR", hair="horny", cheeks="heavy_blush")
-                        ton "Thank you, [name_genie_tonks]." ("soft", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+                        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")
                         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 "Really..." ("horny", "narrow", "shocked", "mid", hair="horny", cheeks="heavy_blush")
-                        ton "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", cheeks="heavy_blush")
+                        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")
                         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 "Maybe the duelling stage could find some extra use..." ("base", "narrow", "shocked", "stare", hair="horny", cheeks="heavy_blush")
-                        ton "Perhaps some extra curricular activities for a couple of my favourite students could be arranged..." ("horny", "narrow", "raised", "up", hair="horny", cheeks="heavy_blush")
+                        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")
                         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 "I'm terribly sorry, [name_genie_tonks]..." ("open", "narrow", "base", "down", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "I'm terribly sorry, [name_genie_tonks]..." ("open", "narrow", "base", "down", hair="horny")
                 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 "You are so right, [name_genie_tonks]!" ("horny", "narrow", "base", "stare", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "You are so right, [name_genie_tonks]!" ("horny", "narrow", "base", "stare", hair="horny")
 
                 # 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 "My house? I was in Hufflepuff, but why--" ("disgust", "base", "raised", "mid", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "My house? I was in Hufflepuff, but why--" ("disgust", "base", "raised", "mid", hair="horny")
                 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 "What? But [name_genie_tonks]! I'm not even a student--" ("disgust", "base", "base", "mid", hair="upset", cheeks="heavy_blush", trans=hpunch)
+                ton @ cheeks heavy_blush "What? But [name_genie_tonks]! I'm not even a student--" ("disgust", "base", "base", "mid", hair="upset", trans=hpunch)
                 gen "Also--" ("base", xpos="far_left", ypos="head")
 
         menu:
             "-Those clothes stay off!-":
                 $ tonks.unequip("clothes")
 
-                ton "*Hmm*?" ("soft", "narrow", "raised", "down", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "*Hmm*?" ("soft", "narrow", "raised", "down", hair="horny")
                 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 "Of course [name_genie_tonks]..." ("soft", "narrow", "base", "down", hair="horny", cheeks="heavy_blush") #Horny
-                ton "If you would allow me to put my clothes back on at any time, just let me know..." ("soft", "narrow", "base", "downR", hair="horny", cheeks="heavy_blush")
+                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")
 
             "-Get dressed!-":
                 gen "No teacher of mine will strut around naked...{w} unless I say so!" ("base", xpos="far_left", ypos="head")
-                ton "Yes [name_genie_tonks]..." ("open", "narrow", "shocked", "down", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "Yes [name_genie_tonks]..." ("open", "narrow", "shocked", "down", hair="horny")
                 gen "Now, put your clothes back on..." ("base", xpos="far_left", ypos="head")
-                ton "*Ehm*... Okay..." ("soft", "base", "base", "down", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "*Ehm*... Okay..." ("soft", "base", "base", "down", hair="horny")
 
                 play sound "sounds/magic4.ogg"
                 $ tonks.wear("all")
                 ton "" (trans=morph)
-                ton "" ("soft", "narrow", "base", "mid", hair="horny", cheeks="heavy_blush")
+                ton @ cheeks heavy_blush "" ("soft", "narrow", "base", "mid", hair="horny")
 
                 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 "You can tell?" ("soft", "narrow", "base", "down", hair="horny", cheeks="heavy_blush")
+                    ton @ cheeks heavy_blush "You can tell?" ("soft", "narrow", "base", "down", hair="horny")
                     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 "..." ("soft", "narrow", "base", "downR", hair="horny", cheeks="heavy_blush")
+                    ton @ cheeks heavy_blush "..." ("soft", "narrow", "base", "downR", hair="horny")
 
         gen "Now, get back to your room and think about what you've done..." ("base", xpos="far_left", ypos="head")
-        ton "Yes [name_genie_tonks]..." ("open", "narrow", "base", "down", hair="horny", cheeks="heavy_blush") #look down, blush
+        ton @ cheeks heavy_blush "Yes [name_genie_tonks]..." ("open", "narrow", "base", "down", hair="horny") #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 2b94fe72..9bfb9b95 100644
--- a/game/scripts/characters/tonks/events/hangout.rpy
+++ b/game/scripts/characters/tonks/events/hangout.rpy
@@ -93,7 +93,7 @@ label tonks_hangout:
 label nt_he_wine_intro:
     call bld
     gen "Care for a drink?" ("base", xpos="far_left", ypos="head")
-    ton "Of course, [name_genie_tonks]." ("base", "base", "shocked", "mid", cheeks="blush", ypos="head", flip=False)
+    ton @ cheeks blush "Of course, [name_genie_tonks]." ("base", "base", "shocked", "mid", ypos="head", flip=False)
     ton "Hit me!" ("horny", "base", "base", "down")
     pause.1
 
diff --git a/game/scripts/characters/tonks/events/intro.rpy b/game/scripts/characters/tonks/events/intro.rpy
index 482dca23..1008efa1 100644
--- a/game/scripts/characters/tonks/events/intro.rpy
+++ b/game/scripts/characters/tonks/events/intro.rpy
@@ -139,7 +139,7 @@ label tonks_intro_E1:
         gen "I'd like to hear more about the things you did with those centaurs!" ("grin", xpos="far_left", ypos="head")
         ton "I'm sorry Professor, but that's classified information." ("open", "closed", "shocked", "mid")
         ton "The Ministry would be furious if they knew I had told you!" ("upset", "wide", "raised", "mid")
-        ton "(Not that I would mention any of it... They'd probably sack me on the spot for that...)" ("mad", "base", "worried", "R", cheeks="blush")
+        ton @ cheeks blush "(Not that I would mention any of it... They'd probably sack me on the spot for that...)" ("mad", "base", "worried", "R")
         ton "(I did the job. That's all that should matter to them...)" ("upset", "base", "base", "down")
         gen "Come on! ..." ("angry", xpos="far_left", ypos="head")
         ton "I'm sorry, Professor, but I really shouldn't!" ("open", "base", "base", "mid")
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 a4bc405b..70097b25 100644
--- a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
+++ b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
@@ -42,7 +42,7 @@ label nt_pr_teach_start:
             ton "Oh, wow! Are you serious?" ("crooked_smile", "wide", "shocked", "stare")
             gen "I don't see why not." ("base", xpos="far_left", ypos="head")
             gen "It isn't such a big deal for a boy to show a girl his wiener..." ("base", xpos="far_left", ypos="head")
-            ton "Seeing their dicks... That does sound good..." ("soft", "happyCl", "base", "mid", cheeks="blush")
+            ton @ cheeks blush "Seeing their dicks... That does sound good..." ("soft", "happyCl", "base", "mid")
             ton "Can I touch them?" ("horny", "narrow", "raised", "mid")
             gen "Let's stick with looking for now..." ("base", xpos="far_left", ypos="head")
             ton "Fine... So how many am I allowed to look at?" ("annoyed", "base", "base", "down")
@@ -278,7 +278,7 @@ label nt_pr_teach_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys. Guess who...
     ton "Which probably meant that they were going too far..." ("upset", "base", "base", "mid")
     ton "So... I kept them after class... Gave them the whole lecture about \"responsibility\" and \"respect\"..." ("open", "closed", "base", "mid")
     gen "................" ("base", xpos="far_left", ypos="head")
-    ton "Then I told them that I'd pay them both ten points, to show me their cocks... {heart}" ("grin", "closed", "base", "mid", cheeks="blush")
+    ton @ cheeks blush "Then I told them that I'd pay them both ten points, to show me their cocks... {heart}" ("grin", "closed", "base", "mid")
     gen "Just like that?" ("base", xpos="far_left", ypos="head")
     ton "Well, there's a lot more subtlety to it in practice..." ("soft", "base", "base", "stare")
     ton "Not that I think I needed subtlety, given how horny they were..." ("crooked_smile", "base", "shocked", "mid")
@@ -344,7 +344,7 @@ label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl
     ton "So, I know my job is to try and balance out the favour trading a little..." ("soft", "narrow", "base", "R")
     ton "But I just couldn't help myself today..." ("normal", "base", "worried", "R")
     gen "Help yourself? You mean..." ("base", xpos="far_left", ypos="head")
-    ton "*Ugh*... I don't normally mess around with girls..." ("open", "base", "base", "down", cheeks="blush")
+    ton @ cheeks blush "*Ugh*... I don't normally mess around with girls..." ("open", "base", "base", "down")
     ton "(Not since I left here anyway...)" ("mad", "base", "raised", "R")
     ton "But today there was {b}the tastiest morsel{/b} I have ever seen in my class!" ("horny", "wide", "base", "stare")
     gen "...................." ("base", xpos="far_left", ypos="head")
@@ -565,8 +565,8 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
     ton "*Mmmm*... The way he was staring at my tits... with such hunger..." ("soft", "closed", "shocked", "mid")
     ton "I just {b}had{/b} to get them out for him..." ("silly", "base", "shocked", "mid")
     gen "Nice!" ("grin", xpos="far_left", ypos="head")
-    ton "They got him even more excited..." ("horny", "base", "base", "ahegao", cheeks="blush")
-    ton "He even started to speak after that..." ("base", "closed", "base", "mid", cheeks="blush")
+    ton @ cheeks blush "They got him even more excited..." ("horny", "base", "base", "ahegao")
+    ton @ cheeks blush "He even started to speak after that..." ("base", "closed", "base", "mid")
     gen "What did he say?" ("base", xpos="far_left", ypos="head")
     ton "The usual stuff..." ("soft", "base", "base", "R")
     ton "How pretty I was, how nice my tits looked..." ("crooked_smile", "base", "base", "down")
@@ -719,11 +719,11 @@ label nt_pr_teach_T2_E4: # Tier 2 - Event 4 - Slytherin girl
     ton "*Ugh*... It was so fucking hot..." ("soft", "base", "base", "stare", hair="horny")
     gen "And?... What did happen \"next\"?" ("grin", xpos="far_left", ypos="head")
     ton "I had her play with herself..." ("grin", "closed", "shocked", "mid")
-    ton "But... that cute face of hers... and all the teasing..." ("open", "closed", "shocked", "R", cheeks="blush")
-    ton "I decided to take matters into my own hands..." ("grin", "base", "base", "stare", cheeks="blush")
+    ton @ cheeks blush "But... that cute face of hers... and all the teasing..." ("open", "closed", "shocked", "R")
+    ton @ cheeks blush "I decided to take matters into my own hands..." ("grin", "base", "base", "stare")
     ton "Specifically her matter..." ("horny", "base", "base", "mid")
     gen "You couldn't help yourself, could you?" ("base", xpos="far_left", ypos="head")
-    ton "Can you blame me for wanting to \"finger\" that cute little slut?" ("soft", "base", "annoyed", "mid", cheeks="blush")
+    ton @ cheeks blush "Can you blame me for wanting to \"finger\" that cute little slut?" ("soft", "base", "annoyed", "mid")
     gen "You're a bad teacher, you know that?" ("grin", xpos="far_left", ypos="head")
     ton "Tell me about it..." ("horny", "narrow", "base", "up")
     gen "What did she have to say about the whole thing?" ("base", xpos="far_left", ypos="head")
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 84c41f37..f78a91db 100644
--- a/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
+++ b/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
@@ -34,7 +34,7 @@ label nt_pr_grope_start:
             gen "That I am." ("base", xpos="far_left", ypos="head")
             gen "Now get out there and buy some favours!" ("base", xpos="far_left", ypos="head")
             ton "Yes, sir!" ("grin", "closed", "base", "mid")
-            ton "(This is way better than being an auror!)" ("horny", "base", "base", "stare", cheeks="blush")
+            ton @ cheeks blush "(This is way better than being an auror!)" ("horny", "base", "base", "stare")
 
         else:
             gen "Think you're up for messing around with your students again?" ("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 af60ea1e..41a84320 100644
--- a/game/scripts/characters/tonks/events/requests/oral_practice.rpy
+++ b/game/scripts/characters/tonks/events/requests/oral_practice.rpy
@@ -268,9 +268,9 @@ label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls
     gen "Did they care?" ("base", xpos="far_left", ypos="head")
     ton "Not one bit!" ("horny", "base", "base", "down", hair="horny")
     ton "They'd just take it in waves..." ("soft", "base", "base", "L")
-    ton "Making out... Calling me a pervert..." ("horny", "base", "base", "up", cheeks="blush")
-    ton "Locking their mouths together, only to break apart again to tease me  more..." ("base", "base", "base", "ahegao", cheeks="blush")
-    ton "*Ugh*... It was so {b}bloody hot!{/b}..." ("open_wide_tongue", "base", "base", "ahegao", cheeks="blush")
+    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")
+    ton @ cheeks blush "*Ugh*... It was so {b}bloody hot!{/b}..." ("open_wide_tongue", "base", "base", "ahegao")
     gen "I take your word for it..." ("base", xpos="far_left", ypos="head")
     ton "This really is the best job ever!" ("grin", "wide", "shocked", "mid")
     gen "Very good! That shall be all for now, [name_tonks_genie]." ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/minigames/mirror/events/a_white_christmas.rpy b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
index 1f78a091..623d79df 100644
--- a/game/scripts/minigames/mirror/events/a_white_christmas.rpy
+++ b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
@@ -220,10 +220,10 @@ label a_white_christmas:
 
     nar "Hermione's panties then dropped and slid down to the floor, as she plunged her fingers inside her pussy, faster than she'd ever done before."
 
-    ton "First to cum will win, now get to stroking that dick!" ("grin", "narrow", "base", "L", cheeks="blush")
-    ton "Keep your eyes on your opponent." ("grin", "base", "base", "L", cheeks="blush")
+    ton @ cheeks blush "First to cum will win, now get to stroking that dick!" ("grin", "narrow", "base", "L")
+    ton @ cheeks blush "Keep your eyes on your opponent." ("grin", "base", "base", "L")
     her "" ("soft", "base", "worried", "L", trans=d3)
-    ton "Show who's the master of cumming quick!" ("horny", "base", "base", "L", cheeks="blush")
+    ton @ cheeks blush "Show who's the master of cumming quick!" ("horny", "base", "base", "L")
 
     call gen_chibi("dick_out")
     gen "Then you've picked the wrong opponent." (face="grin", base="hard", trans=d3)
@@ -231,8 +231,8 @@ label a_white_christmas:
     gen "You'll never have me beat." (face="grin", base="hard")
     gen "I've had hundreds of years of practice, of stroking this precious meat." (face="grin", base="hard", trans=d3)
 
-    ton "Then hurry up will you, she's already begun." ("open", "base", "shocked", "L", cheeks="blush")
-    ton "Start stroking that meat of yours, in five...{w=0.4} four...{w=0.4} three...{w=0.4} two...{w=0.4} one!" ("grin", "narrow", "annoyed", "L", cheeks="blush")
+    ton @ cheeks blush "Then hurry up will you, she's already begun." ("open", "base", "shocked", "L")
+    ton @ cheeks blush "Start stroking that meat of yours, in five...{w=0.4} four...{w=0.4} three...{w=0.4} two...{w=0.4} one!" ("grin", "narrow", "annoyed", "L")
 
     play music "music/firebrand-by-kevin-macleod.ogg" fadein 1 if_changed
     play sound "sounds/wrestling_bell.ogg"
@@ -277,7 +277,7 @@ label a_white_christmas:
     her @ cheeks blush "" ("grin", "narrow", "base", "up")
     play sound "sounds/slick_02.ogg"
     nar "Hermione shook even more when she pushed deep into her gash..."
-    ton "" ("horny", "narrow", "base", "down", cheeks="blush")
+    ton @ cheeks blush "" ("horny", "narrow", "base", "down")
     nar "Genie loss imminent--"
     gen "NO!" (face="open", base="grab_dick")
     nar "As she pulled them out with a--"
@@ -290,7 +290,7 @@ label a_white_christmas:
     $ hermione.set_cum(pussy="squirt_post")
     her @ cheeks blush "" ("smile", "happyCl", "base", "mid")
     gen "" (face="angry", base="grab_dick")
-    ton "" ("grin", "base", "base", "L", cheeks="blush")
+    ton @ cheeks blush "" ("grin", "base", "base", "L")
     "{size=+4}*Splash!*{/size}" #Big text
     stop music fadeout 2
     call gen_chibi("hold_dick")
@@ -310,7 +310,7 @@ label a_white_christmas:
     nar "The genie finally defeated, like never seen--"
     play music "music/firebrand-by-kevin-macleod.ogg" fadein 1 if_changed
     her @ cheeks blush "" ("angry", "base", "base", "L")
-    ton "" ("clench", "wide", "base", "L", cheeks="blush")
+    ton @ cheeks blush "" ("clench", "wide", "base", "L")
     call gen_chibi("jerk_off")
     with hpunch
     gen "{size=+4}You fucking whore!{/size}" (face="open", base="grab_dick")
diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy
index f1673897..3b86230a 100644
--- a/game/scripts/minigames/mirror/events/suck_and_run.rpy
+++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy
@@ -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 "What?! Why do you think I'd know anything about Hufflepuff boys falling asleep in class!?" ("silly", "happyCl", "worried", "mid", cheeks="heavy_blush", hair="horny")
-        ton "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", cheeks="blush", hair="horny")
+        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")
         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 "Oh... No, I don't think they're doing anything like that." ("soft", "base", "base", "R", cheeks="blush", hair="horny")
+        ton @ cheeks blush "Oh... No, I don't think they're doing anything like that." ("soft", "base", "base", "R", hair="horny")
         gen "What was that about sucking them dry at night?" ("base", xpos="far_left", ypos="head")
-        ton "Did I say that? Are you sure you didn't just hear what you wanted to hear, Genie?" ("disgust", "narrow", "base", "mid", cheeks="blush", hair="horny")
+        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")
         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")
         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 "Creamy mushroom soup... Delicious!" ("horny", "narrow", "shocked", "up", cheeks="blush", hair="horny")
+        ton @ cheeks blush "Creamy mushroom soup... Delicious!" ("horny", "narrow", "shocked", "up", hair="horny")
         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")
@@ -276,7 +276,7 @@ label suck_and_run:
         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 "Me? Want a soul as tainted and corrupt as yours?" ("silly", "happyCl", "shocked", "stare", hair="angry", cheeks="blush")
+        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")
         gen "Then what do you--" ("base", xpos="far_left", ypos="head")
         ton "{heart}" ("soft", "narrow", "base", "up", hair="angry")
@@ -302,16 +302,16 @@ label suck_and_run:
         ton "A succubus?" ("crooked_smile", "base", "angry", "mid", hair="angry")
         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 "*Slurp* *Slurp* *Slurp*" ("open_wide_tongue2", "narrow", "base", "up", hair="horny", cheeks="blush")
+        ton @ cheeks blush "*Slurp* *Slurp* *Slurp*" ("open_wide_tongue2", "narrow", "base", "up", hair="horny")
         gen "*Nghh*...{w=0.4} To..." ("base", xpos="far_left", ypos="head")
-        ton "*Slurp*! *Slurp*! *Slurp*!" ("open_wide_tongue2", "closed", "base", "up", cheeks="blush")
+        ton @ cheeks blush "*Slurp*! *Slurp*! *Slurp*!" ("open_wide_tongue2", "closed", "base", "up")
         gen "Cum down your throat!" ("base", xpos="far_left", ypos="head")
-        ton "*Slurp* *Slurp* *Slurp*" ("open_wide_tongue", "happyCl", "shocked", "mid", cheeks="blush")
+        ton @ cheeks blush "*Slurp* *Slurp* *Slurp*" ("open_wide_tongue", "happyCl", "shocked", "mid")
         gen "You asked for it!" ("angry", xpos="far_left", ypos="head")
         gen "Take this, foul demon!" ("angry", xpos="far_left", ypos="head") #large text?
         stop background
         play sound "sounds/slick_02.ogg"
-        ton "*mmhf*!" ("open_wide_tongue", "wide", "shocked", "mid", cheeks="blush")
+        ton @ cheeks blush "*mmhf*!" ("open_wide_tongue", "wide", "shocked", "mid")
 
         with hpunch
 
@@ -323,11 +323,11 @@ label suck_and_run:
 
         gen "Quench your lust filled desires!" ("base", xpos="far_left", ypos="head")
         play sound "sounds/slick_02.ogg"
-        ton "*Gulp*...{w=0.4} *Gulp*...{w=0.6} *Gulp*" ("open_wide_tongue", "happyCl", "shocked", "mid", cheeks="blush")
-        ton "*Ah*..." ("open_wide_tongue_cum", "base", "base", "down", cheeks="blush")
+        ton @ cheeks blush "*Gulp*...{w=0.4} *Gulp*...{w=0.6} *Gulp*" ("open_wide_tongue", "happyCl", "shocked", "mid")
+        ton @ cheeks blush "*Ah*..." ("open_wide_tongue_cum", "base", "base", "down")
         play sound "sounds/gulp.ogg"
-        ton "*Gulp*..." ("normal", "closed", "base", "mid", cheeks="blush")
-        ton "Now that hit the--" ("grin", "base", "base", "mid", cheeks="blush")
+        ton @ cheeks blush "*Gulp*..." ("normal", "closed", "base", "mid")
+        ton @ cheeks blush "Now that hit the--" ("grin", "base", "base", "mid")
 
         play sound "sounds/magic3.ogg"
         $ tonks.equip(ton_outfit_default)