diff --git a/game/scripts/characters/astoria/events/imperio_training.rpy b/game/scripts/characters/astoria/events/imperio_training.rpy
index 288d3397..dd38d460 100644
--- a/game/scripts/characters/astoria/events/imperio_training.rpy
+++ b/game/scripts/characters/astoria/events/imperio_training.rpy
@@ -1312,7 +1312,7 @@ label ag_st_imperio_E5:
 
     # Strip naked. Removes clothes and stockings.
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ tonks.strip("all")
+    $ tonks.strip("clothes")
     ton "" ("grin", "base", "base", "ahegao", hair="horny", cheeks="blush")
     ast "(She did it...)" ("horny", "narrow", "angry", "L")
     call ctc
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
index ff6e2d9b..51806676 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
@@ -629,7 +629,7 @@ label cc_pf_strip_T2_intro_E2:
     # Cho strips completely.
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
     hide cho_main
-    $ cho.strip("all")
+    $ cho.strip("clothes")
     pause 1.2
     call cho_chibi("stand", "on_desk", "on_desk", flip=True)
     pause .4
@@ -907,7 +907,7 @@ label cc_pf_strip_T2_intro_E3:
     # Remove panties + everything else.
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
     hide cho_main
-    $ cho.strip("all")
+    $ cho.strip("clothes")
     pause 1.2
     $ renpy.sound.play("sounds/cloth_sound4.ogg")
     show screen cho_cloth_pile
@@ -1036,9 +1036,9 @@ label cc_pf_strip_T2_E3_repeat:
 
     # Remove panties + all else.
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ cho.strip("all")
+    $ cho.strip("clothes")
     hide cho_main
-    $ cho.strip("all")
+    $ cho.strip("clothes")
     pause 1.2
     $ renpy.sound.play("sounds/cloth_sound4.ogg")
     show screen cho_cloth_pile
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 7099c938..07d51fd9 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
@@ -113,7 +113,7 @@ label cc_pf_strip_T3_intro_E1:
 
         $ renpy.sound.play("sounds/cloth_sound3.ogg")
         hide cho_main
-        $ cho.strip("all")
+        $ cho.strip("clothes")
         pause 1.2
         call cho_chibi("stand", "on_desk", "on_desk", flip=True)
         pause .4
@@ -136,7 +136,7 @@ label cc_pf_strip_T3_intro_E1:
         pause .8
 
         #Remove any remaining items (no sound since she might be naked)
-        $ cho.strip("all")
+        $ cho.strip("clothes")
         with d3
         pause .5
 
@@ -579,7 +579,7 @@ label cc_pf_strip_T3_intro_E2:
     # Remove all.
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
     hide cho_main
-    $ cho.strip("all")
+    $ cho.strip("clothes")
     pause 1.2
     $ renpy.sound.play("sounds/cloth_sound4.ogg")
     show screen cho_cloth_pile
@@ -692,7 +692,7 @@ label cc_pf_strip_T3_intro_E2:
 
     # Remove other clothes.
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ tonks.strip("all")
+    $ tonks.strip("clothes")
     with d3
     pause .5
 
@@ -1466,7 +1466,7 @@ label cc_pf_strip_T3_intro_E3:
 
     # Tonks removes the rest of her clothes.
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ tonks.strip("all")
+    $ tonks.strip("clothes")
     with hpunch
     pause .2
 
@@ -1546,7 +1546,7 @@ label cc_pf_strip_T3_intro_E3:
 
         # Remove Cho Panties + Everything else.
         $ renpy.sound.play("sounds/cloth_sound3.ogg")
-        $ cho.strip("all")
+        $ cho.strip("clothes")
         with vpunch
         pause .5
 
@@ -1559,7 +1559,7 @@ label cc_pf_strip_T3_intro_E3:
         cho "Glad you're enjoying it, Professor..." ("horny", "narrow", "worried", "L", cheeks="heavy_blush")
 
         #Remove any remaining items (no sound since she might be naked)
-        $ cho.strip("all")
+        $ cho.strip("clothes")
         with d3
         pause .5
 
@@ -2876,7 +2876,7 @@ label cc_pf_strip_T3_intro_E3:
     # Transforms into Hermione
     call play_sound("magic")
     hide tonks_main
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     $ cho_chibi.zorder = 3 # Reset to default.
     $ hermione_chibi.zorder = 2 # behind Cho. Default is 3.
     call ton_chibi("hide")
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 48b9d8d6..13db40c0 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
@@ -230,7 +230,7 @@ label .strip_cho:
         ton "There isn't that much more for me to help her take off, is there?" ("soft", "narrow", "base", "L", hair="horny")
         cho "..." ("base", "narrow", "base", "downR", cheeks="heavy_blush")
         pause .2
-        $ cho.strip("all")
+        $ cho.strip("clothes")
         with d3
 
         call cc_pf_strip_T3_tonks.spank_cho
@@ -302,7 +302,7 @@ label .strip_cho:
 
 
     # Remove all Cho clothes.
-    $ cho.strip("all")
+    $ cho.strip("clothes")
     with d3
     cho "" ("base", "narrow", "base", "mid", cheeks="heavy_blush")
     call ctc
@@ -524,7 +524,7 @@ label .strip_tonks:
         gen "Damn right you are!" ("grin", xpos="far_left", ypos="head")
         cho "..." ("base", "narrow", "base", "downR", cheeks="heavy_blush")
         pause .2
-        $ tonks.strip("all")
+        $ tonks.strip("clothes")
         with d3
 
         call cc_pf_strip_T3_tonks.spank_tonks
@@ -600,7 +600,7 @@ label .strip_tonks:
 
     # Remove all Cho clothes.
     ton "" ("base", "narrow", "base", "mid", hair="horny")
-    $ tonks.strip("all")
+    $ tonks.strip("clothes")
     with d3
     call ctc
 
@@ -1217,7 +1217,7 @@ label .hermione_E1:
     # Transforms into Hermione
     call play_sound("magic")
     hide tonks_main
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     $ cho_chibi.zorder = 3 # Reset to default.
     $ hermione_chibi.zorder = 2 # behind Cho. Default is 3.
     call ton_chibi("hide")
@@ -1341,7 +1341,7 @@ label .hermione_E1:
     $ hermione.set_body_zorder(armright=0)
     $ hermione.set_body(armleft="down", armright="down")
     $ hermione.set_pose(None)
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     with d5
 
     call play_music("tonks")
diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
index 7abbb9c4..b8ef2a28 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
@@ -1777,7 +1777,7 @@ label gryffindor_match_return:
 
     $ cho.set_pose(None)
     $ cho.animation = None
-    $ cho.strip("all")
+    $ cho.strip("clothes")
 
     call play_music("stop")
 
@@ -2155,7 +2155,7 @@ label gryffindor_match_return:
 
         $ cho.set_pose(None)
         $ cho.animation = None
-        $ cho.strip("all")
+        $ cho.strip("clothes")
 
         call play_music("stop")
 
diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
index aa99c58e..cc214546 100644
--- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
@@ -1456,7 +1456,7 @@ label slytherin_match_return:
     $ tonks.equip(ton_outfit_default)
     $ astoria.equip(ast_outfit_default)
 
-    $ tonks.strip("all")
+    $ tonks.strip("clothes")
 
     hide screen blkfade
     with d9
diff --git a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy
index f9bb4a98..ae73206a 100644
--- a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy
+++ b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy
@@ -723,7 +723,7 @@ label cc_pr_manipulate_boys_T3_twins:
 
     # Setup
     $ cho_outfit_last.save() # Save player outfit
-    $ cho.strip("all")
+    $ cho.strip("clothes")
     $ cho.set_body_hue(200)
 
     # Cho enters.
diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy
index a7fe5c64..e48377f7 100644
--- a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy
+++ b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy
@@ -630,7 +630,7 @@ label hg_pf_strip_T3_intro_E2:
 
     gen "*Hmm*... Well I'm not sure we're quite done here yet..." ("base", xpos="far_left", ypos="head")
     her "..." ("upset", "squint", "annoyed", "mid")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     her "" ("angry", "narrow", "base", "down")
 
 
@@ -890,7 +890,7 @@ label hg_pf_strip_T3_watch:
         call nar(">Hermione moves her body in an attempted seductive manner.")
         call nar(">Your gaze on her current state of undress causing her some difficulties in maintaining her concentration.")
 
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     pause 1.0
 
 
@@ -1257,7 +1257,7 @@ label hg_pf_strip_T4_watch:
         call nar(">Hermione moves her body in an attempted seductive manner.")
         call nar(">Trying her best to focus on her task she tries to avoid looking directly at you.")
 
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
 
     call nar(">You can see that she is doing her best to be graceful...","start")
     call nar(">But she looks rather ridiculous in her attempts to act like a professional stripper...","end")
@@ -1362,7 +1362,7 @@ label hg_pf_strip_T4_masturbate:
         call nar(">Hermione moves her body in an attempted seductive manner.")
         call nar(">Trying her best to focus on her task she tries to avoid looking directly at you.")
 
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
 
     call nar(">You can see that she is doing her best to be graceful...","start")
     call nar(">But she looks rather ridiculous in her attempts to act like a professional stripper...","end")
diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy
index 2d97f594..fd5b540b 100644
--- a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy
+++ b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy
@@ -55,7 +55,7 @@ label hg_pf_strip_T4_fingering:
 
     if hermione.is_any_worn("clothes"):
         gen "Now take off the rest." ("base", xpos="far_left", ypos="head")
-        $ hermione.strip("all")
+        $ hermione.strip("clothes")
         pause .5
 
     her "(I never would've imagined... To do this in front of my headmaster of all people...)" ("normal", "happyCl", "worried", "mid")
@@ -261,7 +261,7 @@ label hg_pf_strip_T4_fingering:
             $ hermione.set_body_zorder(armright=0)
             $ hermione.set_body(armleft="down", armright="down")
             $ hermione.set_pose(None)
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
 
             stop bg_sounds
             her "*SOB*!{w=0.3} I can't..." ("angry", "happyCl", "base", "down", cheeks="blush", tears="messy")
@@ -300,7 +300,7 @@ label hg_pf_strip_T4_fingering:
             $ hermione.set_body_zorder(armright=0)
             $ hermione.set_body(armleft="down", armright="down")
             $ hermione.set_pose(None)
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
 
             her "Thank you [genie_name]." ("base", "base", "worried", "mid", cheeks="blush", tears="soft")
             her "I promise to try harder next time." ("base", "happyCl", "worried", "mid", cheeks="blush")
@@ -338,7 +338,7 @@ label hg_pf_strip_T5_fingering:
 
     if hermione.is_any_worn("clothes"):
         gen "Now take off the rest." ("base", xpos="far_left", ypos="head")
-        $ hermione.strip("all")
+        $ hermione.strip("clothes")
 
     her "(Okay then, here I go...)" ("normal", "happyCl", "worried", "mid")
 
@@ -450,7 +450,7 @@ label hg_pf_strip_T6_fingering:
 
     if hermione.is_any_worn("clothes"):
         gen "Now take off the rest." ("base", xpos="far_left", ypos="head")
-        $ hermione.strip("all")
+        $ hermione.strip("clothes")
 
     her "(...)" ("base", "happyCl", "worried", "mid")
 
@@ -577,7 +577,7 @@ label hg_pf_strip_T6_fingering:
     $ hermione.set_body_zorder(armright=0)
     $ hermione.set_body(armleft="down", armright="down")
     $ hermione.set_pose(None)
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
 
     call her_chibi_scene("behind_desk_front")
 
diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
index af082eb0..9549fa5e 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
@@ -1164,7 +1164,7 @@ label hg_sex_3:
 
     # Hermione Setup
     $ hermione.set_pose("CG_lean_back")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     hide hermione_main
 
     # Genie Setup
@@ -1228,7 +1228,7 @@ label hg_sex_3:
 
             $ camera.set(zoom=0.45, pos=(-340, -380), rotate=0, t=2.0, pause=False)
             $ hermione.set_pose("CG_lean_forward")
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
             $ genie_doll = "caress"
             $ genie_doll_armfix = "images/CG/her_sex/caress_armfix.webp"
             with d3
@@ -1284,7 +1284,7 @@ label hg_sex_3:
 
                 $ camera.set(zoom=0.45, pos=(-340, -380), rotate=0, t=2.0, pause=False)
                 $ hermione.set_pose("CG_lean_forward")
-                $ hermione.strip("all")
+                $ hermione.strip("clothes")
                 $ genie_doll = "caress"
                 $ genie_doll_armfix = "images/CG/her_sex/caress_armfix.webp"
                 her "" ("normal", "closed", "base", "R", cheeks="blush")
@@ -1322,7 +1322,7 @@ label hg_sex_3:
 
                 $ camera.set(zoom=0.45, pos=(-340, -380), rotate=0, t=2.0, pause=False)
                 $ hermione.set_pose("CG_lean_forward")
-                $ hermione.strip("all")
+                $ hermione.strip("clothes")
                 $ genie_doll = "caress"
                 $ genie_doll_armfix = "images/CG/her_sex/caress_armfix.webp"
                 with d3
@@ -1352,7 +1352,7 @@ label hg_sex_3:
                 gen "For example..."
 
     $ hermione.set_pose("CG_bent_over")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     $ genie_doll = "grab"
     $ genie_doll_armfix = "images/CG/her_sex/grab_armfix.webp"
     $ camera.set(zoom=0.44, pos=(-305, -650), rotate=0, t=2.0)
diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
index 0838ac30..eeb18913 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
@@ -718,7 +718,7 @@ label hg_anal_sex_2_intro:
     call nar(">You grab Hermione's top and quickly pull it and her bra over her head, revealing her tits...")
 
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     with d3
 
     her "" ("grin", "narrow", "worried", "R", cheeks="blush")
@@ -791,7 +791,7 @@ label hg_anal_sex_2_intro:
     gen "Fine! Have it your way whore!"
 
     $ hermione.set_pose("CG_bent_over")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     $ genie_doll = "grab"
     $ genie_doll_armfix = "images/CG/her_sex/grab_armfix.webp"
     $ camera.set(zoom=0.44, pos=(-305, -650), rotate=0, t=2.0)
@@ -972,7 +972,7 @@ label hg_anal_sex_3:
 
     # Hermione Setup
     $ hermione.set_pose("CG_lean_back")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     hide hermione_main
 
     # Genie Setup
@@ -1145,7 +1145,7 @@ label hg_anal_sex_3:
             gen "Well, you're about to find out!"
 
     $ hermione.set_pose("CG_bent_over")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     $ genie_doll = "grab"
     $ genie_doll_armfix = "images/CG/her_sex/grab_armfix.webp"
     $ camera.set(zoom=0.44, pos=(-305, -650), rotate=0, t=2.0)
diff --git a/game/scripts/characters/hermione/events/items/collars.rpy b/game/scripts/characters/hermione/events/items/collars.rpy
index c4a6df6e..9d8cf0b7 100644
--- a/game/scripts/characters/hermione/events/items/collars.rpy
+++ b/game/scripts/characters/hermione/events/items/collars.rpy
@@ -537,7 +537,7 @@ label whore_scene: #(locked behind public reputation and last sex event)
         $ renpy.sound.play("sounds/cloth_sound3.ogg")
         call nar(">While looking away, she strips down until standing butt naked in front of you, wearing nothing but the collar.")
 
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     #call nar(">Throwing the collar to the floor she quickly walks over to your desk, then bends over and presents herself.")
     $ hermione.wear("neckwear")
 
@@ -757,7 +757,7 @@ label slave_scene:
         $ renpy.sound.play("sounds/cloth_sound3.ogg")
         call nar(">Hermione takes off her clothes and bends over your desk, leaving herself bare.")
 
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     $ hermione.wear("neckwear")
 
     call her_chibi_scene("sex_pause")
@@ -1008,7 +1008,7 @@ label flasher_scene:
         her "Strip me--" ("open", "base", "base", "mid", cheeks="blush")
 
         $ renpy.play("sounds/flashbang.ogg")
-        $ hermione.strip("all")
+        $ hermione.strip("clothes")
         $ hermione.wear("neckwear")
         with flashbulb
 
diff --git a/game/scripts/characters/hermione/events/items/vibrators.rpy b/game/scripts/characters/hermione/events/items/vibrators.rpy
index fbcd01a9..5260be51 100644
--- a/game/scripts/characters/hermione/events/items/vibrators.rpy
+++ b/game/scripts/characters/hermione/events/items/vibrators.rpy
@@ -194,10 +194,10 @@ label hg_vibrators:
             pause 1
 
         if hermione.is_any_worn("bra", "panties"): #Removes eveything except bra or panties if she's wearing them (maybe this could be done differently)
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
             $ hermione.wear("bra", "panties")
         else:
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
 
     # Additional dialogue for lower levels (Optional)
 
diff --git a/game/scripts/characters/hermione/events/potions/ass_expand.rpy b/game/scripts/characters/hermione/events/potions/ass_expand.rpy
index 49e0b67a..44cc0dfa 100644
--- a/game/scripts/characters/hermione/events/potions/ass_expand.rpy
+++ b/game/scripts/characters/hermione/events/potions/ass_expand.rpy
@@ -302,7 +302,7 @@ label her_potion_ass_give:
                     $ renpy.sound.play("sounds/cloth_sound3.ogg")
                     $ hermione.strip("bottom", "panties")
 
-                $ hermione.strip("all")
+                $ hermione.strip("clothes")
 
 
                 gen "Just from a potion that's meant to spank you a little!" ("base", xpos="far_left", ypos="head")
@@ -325,7 +325,7 @@ label her_potion_ass_give:
                     her "{size=+4}OW!!!{/size}" ("angry", "happyCl", "base", "mid", cheeks="blush")
                     her "Where is that coming from??" ("angry", "squint", "base", "mid", cheeks="blush")
 
-                $ hermione.strip("all")
+                $ hermione.strip("clothes")
 
                 gen "It appears the potion is working." ("base", xpos="far_left", ypos="head")
                 her "It-- Hold on, is it--" ("angry", "wide", "base", "mid", cheeks="blush")
@@ -386,7 +386,7 @@ label her_potion_ass_give:
                     $ renpy.sound.play("sounds/cloth_sound3.ogg")
                     $ hermione.strip("bottom", "panties")
 
-                $ hermione.strip("all")
+                $ hermione.strip("clothes")
 
                 her "..." ("grin", "narrow", "base", "down", cheeks="blush")
                 her "So, when will is it supposed to happen?" ("grin", "wink", "base", "mid", cheeks="blush")
@@ -416,7 +416,7 @@ label her_potion_ass_give:
                     her "{size=+4}*Ah*....{/size}" ("open_tongue", "narrow", "base", "up", cheeks="blush")
                     her "What's doing this to me?" ("grin", "narrow", "base", "down", cheeks="blush")
 
-                $ hermione.strip("all")
+                $ hermione.strip("clothes")
 
                 gen "I don't... *Err*.... I brewed it to do that!" ("base", xpos="far_left", ypos="head")
                 her "You brewed it to-- I thought it was meant to make it--" ("disgust", "narrow", "base", "down", cheeks="blush")
@@ -478,7 +478,7 @@ label her_potion_ass_give:
                 $ hermione.strip("bottom", "panties")
                 pause .5
 
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
 
             gen "Now let's wait and see..." ("base", xpos="far_left", ypos="head")
         else: #Not wearing top, bra, bottom or panties
@@ -499,7 +499,7 @@ label her_potion_ass_give:
                     gen "It's that sensitive?" ("base", xpos="far_left", ypos="head")
                     her "*Ehm*... Yes..." ("angry", "narrow", "base", "down", cheeks="blush")
                     gen "Alright then... Go ahead..." ("base", xpos="far_left", ypos="head")
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
         her "This potions sure is taking its time..." ("angry", "narrow", "base", "down", cheeks="blush")
         gen "Patience, [hermione_name]... We'll see the effects kicking in soon enough..." ("base", xpos="far_left", ypos="head")
         gen "..." ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/hermione/events/tutoring.rpy b/game/scripts/characters/hermione/events/tutoring.rpy
index 49369a05..cc3a9ef6 100644
--- a/game/scripts/characters/hermione/events/tutoring.rpy
+++ b/game/scripts/characters/hermione/events/tutoring.rpy
@@ -1054,7 +1054,7 @@ label hg_tutor_E10:
 
     if hermione.is_any_worn("clothes"):
         gen "Get rid off the rest of your silly attire." ("base", xpos="far_left", ypos="head")
-        $ hermione.strip("all")
+        $ hermione.strip("clothes")
 
     ### Milestone ###
     $ hg_masturbated.triggered()
@@ -1803,7 +1803,7 @@ label hg_tutor_E14:
 
     #call set_her_action("naked")
     #call set_her_action("hold_book")
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
 
     call her_chibi_scene("lie_on_desk")
     hide screen bld1
diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
index 14432218..ae6e6ee3 100644
--- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
+++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
@@ -168,7 +168,7 @@ label ll_pf_inspect_T2_E1_intro:
 
     #Luna takes her Bottoms, panties and everything else off
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ luna.strip("all")
+    $ luna.strip("clothes")
     with d3
     pause .5
 
@@ -430,7 +430,7 @@ label ll_pf_inspect_T2_E2_intro:
 
     #Luna takes of Panties and everything else (Panty strip is not possible in wardrobe until next tier)
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ luna.strip("all")
+    $ luna.strip("clothes")
     with d3
     pause .5
 
@@ -752,7 +752,7 @@ label ll_pf_inspect_T2_E3_intro:
         call nar(">You oggle Luna's choice of underwear, before swiftly pulling them down right to her ankles...")
 
     lun "" ("clench", "narrow", "base", "downR", cheeks="blush")
-    $ luna.strip("all")
+    $ luna.strip("clothes")
     pause .2
     hide screen blkfade
 
@@ -990,7 +990,7 @@ label ll_pf_inspect_T2_E4_repeat:
     show screen blkfade
     with d5
 
-    $ luna.strip("all")
+    $ luna.strip("clothes")
 
     #Fades back to Luna in your lap
     call lun_chibi_scene("inspect_idle_naked")
@@ -1147,7 +1147,7 @@ label ll_pf_inspect_T3_E1_repeat:
     show screen blkfade
     with d5
 
-    $ luna.strip("all")
+    $ luna.strip("clothes")
 
     #Fades back to Luna in your lap
     call lun_chibi_scene("inspect_idle_naked")
diff --git a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
index 42e5f03c..769cdbfa 100644
--- a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
+++ b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
@@ -611,7 +611,7 @@ label ll_pf_masturbate_T3_E3_intro:
 
     $ luna.set_pose("masturbate")
     $ luna.set_cum(pussy="wet")
-    $ luna.strip("all")
+    $ luna.strip("clothes")
 
     $ renpy.music.stop(channel="weather", fadeout=4)
 
@@ -893,7 +893,7 @@ label ll_pf_masturbate_T3_E4_repeat:
     lun "Yes, [lun_genie_name]..." ("base", "base", "base", "mid")
 
     $ renpy.sound.play("sounds/cloth_sound3.ogg")
-    $ luna.strip("all")
+    $ luna.strip("clothes")
     with d3
 
     lun "" ("base", "closed", "base", "mid", cheeks="blush")
@@ -980,7 +980,7 @@ label ll_pf_masturbate_T3_E4_repeat:
     $ camera.set_image("CG luna")
     $ camera.set(zoom=0.5, pos=(-270, -150), t=1.5)
     $ luna.set_pose(None)
-    $ luna.strip("all")
+    $ luna.strip("clothes")
     #Luna normal doll pose
 
     lun "*Mmm*..." ("base", "closed", "base", "mid", cheeks="blush")
@@ -1017,7 +1017,7 @@ label ll_pf_masturbate_T3_E4_repeat:
     # End of masturbate section
 
     $ luna.set_pose(None)
-    $ luna.strip("all")
+    $ luna.strip("clothes")
     hide screen blkfade
     with d5
 
diff --git a/game/scripts/characters/tonks/events/clothing.rpy b/game/scripts/characters/tonks/events/clothing.rpy
index 651995ae..d4025c15 100644
--- a/game/scripts/characters/tonks/events/clothing.rpy
+++ b/game/scripts/characters/tonks/events/clothing.rpy
@@ -8,7 +8,7 @@ label tonks_summon_setup:
     if not tonks_strip_happened and cc_pf_strip.is_event_complete(3, 3) and ton_friendship >= 20 and tonks.is_any_worn("top", "bottom", "bra", "panties"):
         $ tonks_strip_happened = True #TODO use to make event not repeat
 
-        $ tonks.strip("all")
+        $ tonks.strip("clothes")
         call ton_walk(action="enter", xpos="mid", ypos="base")
 
         call play_sound("scratch")
diff --git a/game/scripts/characters/tonks/talk.rpy b/game/scripts/characters/tonks/talk.rpy
index 3c65082e..2984746b 100644
--- a/game/scripts/characters/tonks/talk.rpy
+++ b/game/scripts/characters/tonks/talk.rpy
@@ -26,7 +26,7 @@ label tonks_talk:
             hide tonks_main
             with d3
 
-            $ tonks.strip("all")
+            $ tonks.strip("clothes")
             pause.8
 
             ton "Do you like it, [ton_genie_name]?" ("horny", "base", "raised", "mid")
diff --git a/game/scripts/events/final_events.rpy b/game/scripts/events/final_events.rpy
index bfeabd1a..809016f4 100644
--- a/game/scripts/events/final_events.rpy
+++ b/game/scripts/events/final_events.rpy
@@ -52,7 +52,7 @@ label ball_quest_E1:
                 gen "And take off those things you're wearing." ("base", xpos="far_left", ypos="head")
                 her "Alright..." ("open", "squint", "base", "R")
                 $ renpy.sound.play("sounds/cloth_sound3.ogg")
-                $ hermione.strip("all")
+                $ hermione.strip("clothes")
             else:
                 her "Just stand right here?" ("base", "base", "base", "R")
                 gen "Yes, just stand right there for me..." ("base", xpos="far_left", ypos="head")
@@ -178,7 +178,7 @@ label ball_quest_E1:
     if d_flag_01 and d_flag_02:
         if hermione.is_any_worn("clothes"):
             gen "Now take off everything else you're wearing." ("base", xpos="far_left", ypos="head")
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
 
         jump ball_quest_E1.after_strip
 
@@ -421,7 +421,7 @@ label ball_quest_E1:
             $ hermione.set_body_zorder(armright=0)
             $ hermione.set_body(armleft="down", armright="down")
             $ hermione.set_pose(None)
-            $ hermione.strip("all")
+            $ hermione.strip("clothes")
 
             her "As you wish, [genie_name]..." ("annoyed", "narrow", "angry", "R", cheeks="blush", tears="messy")
 
diff --git a/game/scripts/minigames/mirror/events/a_white_christmas.rpy b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
index b30f8c78..c12d2c09 100644
--- a/game/scripts/minigames/mirror/events/a_white_christmas.rpy
+++ b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
@@ -207,7 +207,7 @@ label a_white_christmas:
 
     her "This is a test of will...{w=0.4} Fingers against staff..." ("smile", "narrow", "base", "L", cheeks="blush")
 
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     call ctc
     $ hermione.set_pose("masturbate")
     $ hermione.set_body(armleft="on_pussy")
diff --git a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy
index e24d0418..c4954c94 100644
--- a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy
+++ b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy
@@ -260,7 +260,7 @@ label eating_for_pleasure:
     gen ".........." ("base", xpos="far_left", ypos="head")
     gen "Give me the pizza..." ("base", xpos="far_left", ypos="head")
     her "Of course!"
-    $ hermione.strip("all")
+    $ hermione.strip("clothes")
     pause 1.0
     her "Now, what else would you like to--" ("smile", "wink", "base", "mid")
     gen "Get out..." ("base", xpos="far_left", ypos="head")