diff --git a/game/scripts/animations/ani_emotes.rpy b/game/scripts/animations/ani_emotes.rpy
index 58db98d8..cab237b9 100644
--- a/game/scripts/animations/ani_emotes.rpy
+++ b/game/scripts/animations/ani_emotes.rpy
@@ -73,6 +73,8 @@ image emo_hearts:
 
 # Not an emote...
 image notes:
+    zoom 2.0
+
     "images/animation/notes_01.webp"
     pause.08
     "images/animation/notes_02.webp"
diff --git a/game/scripts/animations/ani_genie.rpy b/game/scripts/animations/ani_genie.rpy
index 9662d250..165744b2 100644
--- a/game/scripts/animations/ani_genie.rpy
+++ b/game/scripts/animations/ani_genie.rpy
@@ -2,33 +2,21 @@
 # Genie chibi images (one for each action)
 
 image ch_gen stand:
-    zoom 2.0
-
     "characters/genie/chibis/stand.webp"
 
 image ch_gen stand_alt:
-    zoom 2.0
-
     "characters/genie/chibis/stand_alt.webp"
 
 image ch_gen stand_by_desk:
-    zoom 2.0
-
     "characters/genie/chibis/stand_by_desk.webp"
 
 image ch_gen stand_shocked:
-    zoom 2.0
-
     "characters/genie/chibis/shocked/01.webp"
 
 image ch_gen sneeze:
-    zoom 2.0
-
     "characters/genie/chibis/sneeze.webp"
 
 image ch_gen walk:
-    zoom 2.0
-
     "characters/genie/chibis/walk_01.webp"
     pause.18
     "characters/genie/chibis/walk_02.webp"
@@ -40,8 +28,6 @@ image ch_gen walk:
     repeat
 
 image ch_gen rummage:
-    zoom 2.0
-
     "characters/genie/chibis/rummage/rum_01.webp"
     pause.3
     "characters/genie/chibis/rummage/rum_02.webp"
@@ -83,12 +69,12 @@ image ch_gen sit_behind_desk_hover:
     "characters/genie/chibis/idle/desk_hover.webp"
 
 image ch_gen sit_in_chair:
+    zoom 0.5
+
     "characters/genie/chibis/sit.webp"
 
 # Working
 image ch_gen paperwork:
-    zoom 2.0
-
     "characters/genie/chibis/working/01.webp"
     pause.15
     "characters/genie/chibis/working/02.webp"
@@ -140,13 +126,10 @@ image ch_gen paperwork:
     repeat
 
 image ch_gen paperwork_idle:
-    zoom 2.0
-
     "characters/genie/chibis/working/01.webp"
 
 # Reading
 image ch_gen read:
-    zoom 2.0
     xzoom -1
     # Page flip direction matters!
     "characters/genie/chibis/reading/01.webp"
@@ -166,8 +149,6 @@ image ch_gen read:
     repeat
 
 image ch_gen read_near_fire:
-    zoom 2.0
-
     # Page flip direction matters!
     "characters/genie/chibis/reading/01.webp"
     pause 2
@@ -186,18 +167,16 @@ image ch_gen read_near_fire:
     repeat
 
 image ch_gen read_done:
-    zoom 2.0
-
     xzoom -1
     "characters/genie/chibis/reading/07.webp"
 
 image ch_gen read_near_fire_done:
-    zoom 2.0
-
     "characters/genie/chibis/reading/07.webp"
 
 # Drinking
 image ch_gen toast_goblet:
+    zoom 0.5
+
     "characters/genie/chibis/drinking/01.webp"
     pause 2
     "characters/genie/chibis/drinking/02.webp"
@@ -213,6 +192,8 @@ image ch_gen toast_goblet:
     repeat
 
 image ch_gen toast_goblet_daytime:
+    zoom 0.5
+
     "characters/genie/chibis/drinking/01_day.webp"
     pause 2
     "characters/genie/chibis/drinking/02_day.webp"
@@ -229,8 +210,6 @@ image ch_gen toast_goblet_daytime:
 
 # Masturbating behind desk
 image ch_gen jerk_off_behind_desk:
-    zoom 2.0
-
     "characters/genie/chibis/jerk_off_behind_desk/desk_01.webp"
     pause.2
     "characters/genie/chibis/jerk_off_behind_desk/desk_02.webp"
@@ -242,11 +221,11 @@ image ch_gen jerk_off_behind_desk:
     repeat
 
 image ch_gen cum_behind_desk:
-    size (1216,1048)
+    size (608,524)
     contains:
         "ch_gen jerk_off_behind_desk"
     contains:
-        zoom 4
+        zoom 2
         alpha 1
         "characters/genie/chibis/jerk_off_behind_desk/desk_sperm_01.webp"
         pause.1
@@ -275,11 +254,10 @@ image ch_gen cum_behind_desk:
         repeat
 
 image ch_gen jerk_off_behind_desk_pause:
-    zoom 2.0
     "characters/genie/chibis/jerk_off_behind_desk/desk_pause.webp"
 
 image ch_gen cum_behind_desk_done:
-    size (1216,1048)
+    size (608,524)
     contains:
         zoom 2
         "ch_gen sit_behind_desk"
@@ -288,28 +266,20 @@ image ch_gen cum_behind_desk_done:
         "characters/genie/chibis/jerk_off_behind_desk/desk_sperm_11.webp"
 
 image ch_gen dick_out:
-    zoom 2.0
-
     "characters/genie/chibis/jerk_off/dick_out.webp"
 
 image ch_gen dick_out_normal:
-    zoom 2.0
-
     "characters/genie/chibis/jerk_off/dick_out_normal.webp"
 
 image ch_gen dick_out_shocked:
-    zoom 2.0
-
     "characters/genie/chibis/jerk_off/dick_out_shocked.webp"
 
 # Masturbating while standing
 #TODO Genie's standing jerk off chibis don't stand level with the others. Fix this and check/correct relevant events
 image ch_gen hold_dick:
-    zoom 2.0
     "characters/genie/chibis/jerk_off/03.webp"
 
 image ch_gen jerk_off:
-    zoom 2.0
     "characters/genie/chibis/jerk_off/01.webp"
     pause.2
     "characters/genie/chibis/jerk_off/02.webp"
@@ -321,12 +291,12 @@ image ch_gen jerk_off:
     repeat
 
 image ch_gen cum:
-    size (600,1000)
+    size (300,500)
     contains:
         "ch_gen jerk_off"
     contains:
-        offset (-1520, -740)
-        zoom 4
+        offset (-760, -370)
+        zoom 2
         alpha 1
         "characters/genie/chibis/jerk_off/sperm_wide_01.webp"
         pause.1
@@ -369,21 +339,21 @@ image ch_gen cum:
         repeat
 
 image ch_gen cum_done:
-    size (600,1000)
+    size (300,500)
     contains:
         "characters/genie/chibis/jerk_off/02.webp"
     contains:
-        offset (-1520, -740)
-        zoom 4
+        offset (-760, -370)
+        zoom 2
         "characters/genie/chibis/jerk_off/sperm_wide_18.webp"
 
 image ch_gen cum_close:
-    size (600,1000)
+    size (300,500)
     contains:
         "ch_gen jerk_off"
     contains:
-        offset (-1520, -740)
-        zoom 4
+        offset (-760, -370)
+        zoom 2
         alpha 1
         "characters/genie/chibis/jerk_off/sperm_short_01.webp"
         pause.1
@@ -415,12 +385,12 @@ image ch_gen cum_close:
         repeat
 
 image ch_gen cum_close_bottomless:
-    size (600,1000)
+    size (300,500)
     contains:
         "ch_gen jerk_off"
     contains:
-        offset (-1520, -740)
-        zoom 4
+        offset (-760, -370)
+        zoom 2
         alpha 1
         "characters/genie/chibis/jerk_off/sperm_short_bottomless_01.webp"
         pause.1
@@ -452,27 +422,26 @@ image ch_gen cum_close_bottomless:
         repeat
 
 image ch_gen cum_close_done:
-    size (600,1000)
+    size (300,500)
     contains:
         "characters/genie/chibis/jerk_off/02.webp"
     contains:
-        offset (-1520, -740)
-        zoom 4
+        offset (-760, -370)
+        zoom 2
         "characters/genie/chibis/jerk_off/sperm_short_13.webp"
 
 image ch_gen cum_close_bottomless_done:
-    size (600,1000)
+    size (300,500)
     contains:
         "characters/genie/chibis/jerk_off/02.webp"
     contains:
-        offset (-1520, -740)
-        zoom 4
+        offset (-760, -370)
+        zoom 2
         "characters/genie/chibis/jerk_off/sperm_short_bottomless_13.webp"
 
 # Grabbing
 #TODO Fix positions for grab and petting (make consistent with other images and adjust in events)
 image ch_gen grab_mid:
-    zoom 2.0
     anchor (0.5, 0.5) # Workaround for position
     "characters/genie/chibis/grab/grab_01.webp"
     pause.5
@@ -485,7 +454,6 @@ image ch_gen grab_mid:
     "characters/genie/chibis/grab/grab_01.webp"
 
 image ch_gen grab_high:
-    zoom 2.0
     anchor (0.5, 0.5) # Workaround for position (feeding bird)
     "characters/genie/chibis/grab/grab_01.webp"
     pause.5
@@ -504,7 +472,6 @@ image ch_gen grab_high:
     "characters/genie/chibis/grab/grab_01.webp"
 
 image ch_gen petting:
-    zoom 2.0
     anchor (0.5, 0.5) # Workaround for position (petting bird)
     "characters/genie/chibis/petting/petting_01.webp"
     pause 1
@@ -539,7 +506,6 @@ image ch_gen petting:
     repeat
 
 image ch_gen grab_low: # Used in pizza mirror event
-    zoom 2.0
     xzoom -1 # Flip fix
     offset (20, 58) # pos fix
     "characters/genie/chibis/grab/grab_01.webp"
diff --git a/game/scripts/characters/cho/common.rpy b/game/scripts/characters/cho/common.rpy
index a38b14df..818d907e 100644
--- a/game/scripts/characters/cho/common.rpy
+++ b/game/scripts/characters/cho/common.rpy
@@ -82,7 +82,7 @@ init python in character:
             show()
 
         # Figure out nickname
-        if name_cho_genie != "Cho":
+        if renpy.store.name_cho_genie != "Cho":
             name_prefix = "Cho {size=-20}\""
             name_suffix = "\"{/size}"
         else:
diff --git a/game/scripts/chibis/classes.rpy b/game/scripts/chibis/classes.rpy
index 5b183729..a816eb7d 100644
--- a/game/scripts/chibis/classes.rpy
+++ b/game/scripts/chibis/classes.rpy
@@ -265,11 +265,10 @@ init -1 python:
 
         def position(self, x=None, y=None, flip=None):
             """Set the position to be used on next update."""
-            # TODO: TEMPORARY FIX FOR SCALING; TO BE REPLACED BY NEW CHIBI IMPLEMENTATION IN THE FUTURE
             (x,y) = self.resolve_position(x,y)
             if flip is not None:
                 self.flip = flip
-            self.pos = (x*2,y*2)
+            self.pos = (x,y)
 
         def resolve_position(self, x=None, y=None):
             """Compute new position from place keywords (or just ints) for one or both of the coordinates."""
@@ -366,6 +365,7 @@ init -1 python:
         def place(place, position, room=None):
             """Resolve place coordinates in the current room, or a given room (by name)."""
             chibi_room = ChibiRoom.get(room)
-            x = chibi_room.resolve(place[0], position[0], False)
-            y = chibi_room.resolve(place[1], position[1], True)
+            # TODO: TEMPORARY FIX FOR SCALING; TO BE REPLACED BY NEW CHIBI IMPLEMENTATION IN THE FUTURE
+            x = chibi_room.resolve(place[0], position[0], False) * 2
+            y = chibi_room.resolve(place[1], position[1], True) * 2
             return (x,y)
diff --git a/game/scripts/chibis/rooms.rpy b/game/scripts/chibis/rooms.rpy
index 2e4b416c..f00b3202 100644
--- a/game/scripts/chibis/rooms.rpy
+++ b/game/scripts/chibis/rooms.rpy
@@ -1,5 +1,5 @@
 init python:
-    ChibiRoom("main_room",  1.0, {
+    ChibiRoom("main_room",  2.0, {
         "base": (None, 430),
         "back": (None, 400),
         "mid": (540, None),
@@ -19,7 +19,7 @@ init python:
         "desk_close": (425, 435),
     })
 
-    ChibiRoom("quidditch_pitch", 1.4, {
+    ChibiRoom("quidditch_pitch", 2.8, {
         "base": (None, 500),
         "left": (300, None),
         "mid": (450, None),
@@ -28,26 +28,26 @@ init python:
         "stairs_up": (1000, 370),
     })
 
-    ChibiRoom("quidditch_stands", 1.0, {})
-    ChibiRoom("quidditch_stands2", 1.0, {})
+    ChibiRoom("quidditch_stands", 2.0, {})
+    ChibiRoom("quidditch_stands2", 2.0, {})
 
-    ChibiRoom("room_of_requirement", 1.0, {
+    ChibiRoom("room_of_requirement", 2.0, {
         "door": (750, None),
         "left": (200, None),
         "base": (None, 430),
     })
 
-    ChibiRoom("weasley_store", 1.0, {
+    ChibiRoom("weasley_store", 2.0, {
         "left": (100, None),
         "base": (None, 430),
     })
 
-    ChibiRoom("clothing_store", 1.0, {
+    ChibiRoom("clothing_store", 2.0, {
         "left": (100, None),
         "base": (None, 430),
     })
 
-    ChibiRoom("seventh_floor", 1.0, {
+    ChibiRoom("seventh_floor", 2.0, {
         "base": (None, 430),
         "right": (750, None),
         "left_mid": (200, None),
@@ -55,7 +55,7 @@ init python:
         "door": (-100, None),
     })
 
-    ChibiRoom("snape_office",  1.0, {
+    ChibiRoom("snape_office",  2.0, {
         "base": (None, 430),
         "mid": (450, None),
         "desk": (465, None),
@@ -68,7 +68,7 @@ init python:
         "beside_chair": (695, 460)
     })
 
-    ChibiRoom("boxing_ring", 1.0, {
+    ChibiRoom("boxing_ring", 2.0, {
         "base": (None, 445),
         "left": (400, None),
         "right": (550, None),
diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy
index 7ca04fb3..21e73d64 100644
--- a/game/scripts/rooms/main_room/init.rpy
+++ b/game/scripts/rooms/main_room/init.rpy
@@ -94,7 +94,7 @@ screen main_room():
     if room_menu_active and states.env.day > 1 and not renpy.android:
         use hotkeys_main
 
-    add "weather [states.env.weather]" xycenter (430, 218)
+    add "weather [states.env.weather]" xycenter (860, 436) zoom 2.0
 
     # Walls
     if states.env.daytime: