diff --git a/game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_pussy_heavy.webp b/game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_heavy.webp
similarity index 100%
rename from game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_pussy_heavy.webp
rename to game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_heavy.webp
diff --git a/game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_pussy_light.webp b/game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_light.webp
similarity index 100%
rename from game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_pussy_light.webp
rename to game/images/CG/her_sex/personal/bent_over/cum/pussy/her_sex_personal_bent_over_cum_pussy_light.webp
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 d74342fa..9514632e 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
@@ -23,11 +23,13 @@ label hg_pf_sex:
 
     # Setup
     stop music fadeout 1.0
-    call hide_characters
-    hide screen animatedCG
+
     show screen blkfade
     with d3
 
+    hide hermione_main
+    hide cg
+
     call weather_sound
 
     $ hermione.set_cum(None)
@@ -121,7 +123,7 @@ label hg_pf_sex_T6_intro_E1:
         "\"I want you in your school uniform, just how I met you!\"":
             $ _temp_outfit_choice = "uniform"
             her "Okay then." ("open", "narrow", "base", "down")
-            call hide_characters
+            hide hermione_main
             with fade
 
             $ her_outfit_last.save()
@@ -131,7 +133,7 @@ label hg_pf_sex_T6_intro_E1:
         "\"Naked, of course!\"":
             $ _temp_outfit_choice = "naked"
             her "Alright..." ("angry", "base", "base", "mid", cheeks="blush")
-            call hide_characters
+            hide hermione_main
             with fade
 
             if hermione.is_any_worn("clothes"):
@@ -187,7 +189,7 @@ label hg_pf_sex_T6_intro_E2:
             her "You want me to wear my school uniform, I presume?" ("open", "narrow", "base", "mid")
             gen "Yes, please." ("grin", xpos="far_left", ypos="head")
             her "As you wish." ("open", "narrow", "base", "down")
-            call hide_characters
+            hide hermione_main
             with fade
 
             $ her_outfit_last.save()
@@ -197,7 +199,7 @@ label hg_pf_sex_T6_intro_E2:
         "\"... Naked all the way!\"":
             $ _temp_outfit_choice = "naked"
             her "Fine..." ("angry", "base", "base", "mid", cheeks="blush")
-            call hide_characters
+            hide hermione_main
             with fade
 
             if hermione.is_any_worn("clothes"):
@@ -250,7 +252,7 @@ label hg_pf_sex_T6_intro_E3:
         "\"I want you in your school uniform!\"":
             $ _temp_outfit_choice = "uniform"
             her "Sure!" ("open", "narrow", "base", "down")
-            call hide_characters
+            hide hermione_main
             with fade
 
             $ her_outfit_last.save()
@@ -260,7 +262,7 @@ label hg_pf_sex_T6_intro_E3:
         "\"I want you naked!\"":
             $ _temp_outfit_choice = "naked"
             her "That works for me..." ("angry", "base", "base", "mid", cheeks="blush")
-            call hide_characters
+            hide hermione_main
             with fade
 
             if hermione.is_any_worn("clothes"):
@@ -322,7 +324,7 @@ label hg_pf_sex_T6_E3: # repeats
         "\"In your school uniform!\"":
             $ _temp_outfit_choice = "uniform"
             her "Sure!" ("open", "narrow", "base", "down")
-            call hide_characters
+            hide hermione_main
             with fade
 
             $ her_outfit_last.save()
@@ -332,7 +334,7 @@ label hg_pf_sex_T6_E3: # repeats
         "\"Naked!\"":
             $ _temp_outfit_choice = "naked"
             her "That works for me..." ("angry", "base", "base", "mid", cheeks="blush")
-            call hide_characters
+            hide hermione_main
             with fade
 
             if hermione.is_any_worn("clothes"):
@@ -482,7 +484,7 @@ label hg_sex_1:
             her "Fine..."
 
             show her_sex_personal lean_forward caress as cg:
-                easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
             show her_sex_personal mouth_annoyed eyes_narrow eyebrows_worried pupils_mid cheeks_blush as cg
             her "..."
@@ -556,7 +558,7 @@ label hg_sex_1:
             her "Fine..."
 
             show her_sex_personal lean_forward caress as cg:
-                easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
             play bg_sounds "sounds/slickloopfast.ogg" fadeout 2
             pause .4
@@ -630,7 +632,7 @@ label hg_sex_1:
             her "Alright..."
 
             show her_sex_personal lean_forward caress as cg:
-                easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
             play bg_sounds "sounds/slickloopfast.ogg" fadeout 2
             pause .4
@@ -727,7 +729,8 @@ label hg_sex_1:
 
             show her_sex_personal cum_outside as cg
             call cum_block
-            if hermione.is_worn("bottom"):
+
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_light as cg
             else:
                 show her_sex_personal cum_ass_light as cg
@@ -740,7 +743,7 @@ label hg_sex_1:
             show her_sex_personal cum_outside mouth_grin eyes_narrow eyebrows_worried pupils_r cheeks_blush as cg
 
             call cum_block
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_heavy as cg
             else:
                 show her_sex_personal cum_ass_heavy as cg
@@ -808,7 +811,7 @@ label hg_sex_1:
             gen "{size=+7}*Argh*!!!{/size}"
 
             call cum_block
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal mouth_open eyes_narrow eyebrows_worried pupils_mid cheeks_blush as cg
             else:
                 show her_sex_personal mouth_open eyes_narrow eyebrows_worried pupils_r cheeks_blush cum_pussy_light as cg
@@ -818,7 +821,7 @@ label hg_sex_1:
             gen "{size=+15}*ARGH*!!!!!!!!!!!!!!!!{/size}"
 
             call cum_block
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal mouth_angry eyes_wide eyebrows_worried pupils_mid cheeks_blush as cg
             else:
                 show her_sex_personal mouth_angry eyes_wide eyebrows_worried pupils_mid cheeks_blush cum_pussy_heavy as cg
@@ -863,7 +866,7 @@ label hg_sex_1:
 
             $ renpy.sound.play("sounds/slick_02.ogg")
             show her_sex_personal after as cg
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_light as cg
             elif hermione.is_worn("top"):
                 show her_sex_personal cum_ass_shirt_light as cg
@@ -963,7 +966,7 @@ label hg_sex_2:
             gen "How about this?"
 
             show her_sex_personal lean_forward caress as cg:
-                easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
             show her_sex_personal mouth_grin eyes_narrow eyebrows_base pupils_r cheeks_blush as cg
             her "Whoa!"
@@ -1020,7 +1023,7 @@ label hg_sex_2:
             play bg_sounds "sounds/slickloopfast.ogg" fadeout 2
 
             show her_sex_personal lean_forward caress as cg:
-                easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
             pause .4
 
@@ -1201,7 +1204,7 @@ label hg_sex_2:
             $ renpy.sound.play("sounds/slick_01.ogg")
             call cum_block
 
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal mouth_grin eyes_narrow eyebrows_base pupils_mid cheeks_blush as cg
                 her "!!!"
             else:
@@ -1224,7 +1227,7 @@ label hg_sex_2:
             $ renpy.sound.play("sounds/slick_01.ogg")
             call cum_block
 
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal mouth_angry eyes_happycl eyebrows_base pupils_up cheeks_blush as cg
             else:
                 $ hermione.set_cum(pussy="heavy")
@@ -1273,7 +1276,7 @@ label hg_sex_2:
 
             $ renpy.sound.play("sounds/slick_02.ogg")
             show her_sex_personal after as cg
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_light as cg
             elif hermione.is_worn("top"):
                 show her_sex_personal cum_ass_shirt_light as cg
@@ -1305,7 +1308,7 @@ label hg_sex_2:
 
             show her_sex_personal cum_outside as cg
             call cum_block
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_light as cg
             elif hermione.is_worn("top"):
                 show her_sex_personal cum_ass_shirt_light as cg
@@ -1322,7 +1325,7 @@ label hg_sex_2:
             show her_sex_personal cum_outside as cg
 
             call cum_block
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_heavy as cg
             elif hermione.is_worn("top"):
                 show her_sex_personal cum_ass_shirt_heavy as cg
@@ -1335,7 +1338,7 @@ label hg_sex_2:
             show her_sex_personal after mouth_grin eyes_narrow eyebrows_worried pupils_mid cheeks_blush as cg
             call ctc
 
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 gen "*Ah*...{w=0.4} All over your clothes..."
             else:
                 gen "*Ah*...{w=0.4} All over your ass..."
@@ -1479,7 +1482,7 @@ label hg_sex_3:
             her "I..."
 
             show her_sex_personal lean_forward caress as cg:
-                easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
             show her_sex_personal mouth_angry eyes_base eyebrows_base pupils_r cheeks_blush as cg
             her "Whoa!"
@@ -1543,7 +1546,7 @@ label hg_sex_3:
                 call ctc
 
                 show her_sex_personal lean_forward caress mouth_normal eyes_closed eyebrows_base pupils_r cheeks_blush as cg:
-                    easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                    ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
                 show her_sex_personal caress_grin as cg
                 gen "That's much better, don't you think?"
@@ -1586,7 +1589,7 @@ label hg_sex_3:
                 her "[genie_name]!"
 
                 show her_sex_personal lean_forward caress as cg:
-                    easein 3.0 offset (-65, -240) zoom 0.45 rotate -4
+                    ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4
 
                 show her_sex_personal mouth_mad eyes_base eyebrows_base pupils_mid cheeks_blush as cg
                 her "Whoa!"
@@ -1813,7 +1816,7 @@ label hg_sex_3:
             call cum_block
             $ renpy.sound.play("sounds/slick_01.ogg")
 
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal mouth_grin eyes_narrow eyebrows_base pupils_up cheeks_blush as cg
                 her "!!!"
             else:
@@ -1843,7 +1846,7 @@ label hg_sex_3:
             $ renpy.sound.play("sounds/slick_01.ogg")
             call cum_block
 
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal mouth_grin eyes_narrow eyebrows_base pupils_mid cheeks_blush as cg
             else:
                 $ hermione.set_cum(pussy="heavy")
@@ -1859,7 +1862,7 @@ label hg_sex_3:
 
             $ renpy.sound.play("sounds/slick_02.ogg")
             show her_sex_personal after as cg
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_light as cg
             elif hermione.is_worn("top"):
                 show her_sex_personal cum_ass_shirt_light as cg
@@ -1893,7 +1896,7 @@ label hg_sex_3:
 
             show her_sex_personal cum_outside as cg
             call cum_block
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_light as cg
             elif hermione.is_worn("top"):
                 show her_sex_personal cum_ass_shirt_light as cg
@@ -1909,7 +1912,7 @@ label hg_sex_3:
             show her_sex_personal cum_outside as cg
 
             call cum_block
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 show her_sex_personal cum_ass_skirt_heavy as cg
             elif hermione.is_worn("top"):
                 show her_sex_personal cum_ass_shirt_heavy as cg
@@ -1921,7 +1924,7 @@ label hg_sex_3:
             show her_sex_personal mouth_grin eyes_narrow eyebrows_worried pupils_mid cheeks_blush as cg
 
             show her_sex_personal after as cg
-            if hermione.is_worn("bottom"):
+            if not _temp_outfit_choice == "naked":
                 gen "All over your clothes!"
             else:
                 gen "All over your ass!"
diff --git a/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy b/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy
index 1f6892a5..3f3910fc 100644
--- a/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy
+++ b/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy
@@ -63,8 +63,8 @@ label end_hg_pr_flirt_teacher:
     call her_walk(action="leave")
 
     # Unequip lockhart tattoo after the event
-    if hermione.is_equipped("tattoo3") and hermione.get_equipped("tattoo3").id == "lockhart_tattoo":
-        $ hermione.unequip("tattoo3")
+    if hermione.is_equipped_item(her_tattoo_lockhart):
+        $ hermione.unequip(her_tattoo_lockhart)
 
     label .quick_end:
 
@@ -305,7 +305,7 @@ label hg_pr_flirt_teacher_T2_E1: # Slughorn
 
 label hg_pr_flirt_teacher_T2_E2:
 
-    $ hermione.equip(her_tattoo3_lockhart) # Tattoo
+    $ hermione.equip(her_tattoo_lockhart) # Tattoo
 
     call hg_pr_flirt_teacher_intro
 
@@ -424,7 +424,7 @@ label hg_pr_flirt_teacher_T2_E2:
                 her "Thank you for understanding, [genie_name]." ("base", "happyCl", "base", "mid")
 
     $ hermione.wear("all")
-    call unlock_clothing(text=">New tattoo for Hermione has been unlocked!", item=her_tattoo3_lockhart)
+    call unlock_clothing(text=">New tattoo for Hermione has been unlocked!", item=her_tattoo_lockhart)
     jump end_hg_pr_flirt_teacher