diff --git a/game/images/rooms/main_room/weather/lightning_01.webp b/game/images/rooms/main_room/weather/lightning_01.webp
deleted file mode 100644
index de7e8fb0..00000000
--- a/game/images/rooms/main_room/weather/lightning_01.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7fee759e0b3cdf4c9dc6cda943bddeb6ada45b31e7171326e9e9695528e5b0a
-size 34
diff --git a/game/images/rooms/main_room/weather/lightning_05.webp b/game/images/rooms/main_room/weather/lightning_05.webp
deleted file mode 100644
index de7e8fb0..00000000
--- a/game/images/rooms/main_room/weather/lightning_05.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7fee759e0b3cdf4c9dc6cda943bddeb6ada45b31e7171326e9e9695528e5b0a
-size 34
diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
index 1d3b56ef..dae3653e 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
@@ -1301,7 +1301,7 @@ label gryffindor_match:
     # Cuts to Cho who has taken off Gloves, goggles and leggings. Still wearing top, skirt, bra
     # Cho takes her top off
 
-     # Transition to Cho on her broom
+    # Transition to Cho on her broom
     $ cho.equip(cho_outfit_quidditch_gryffindor)
     $ cho.set_pose("broom")
     $ cho.animation = sprite_fly_idle
diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy
index 73bddc2f..44ac03d3 100644
--- a/game/scripts/rooms/main_room/init.rpy
+++ b/game/scripts/rooms/main_room/init.rpy
@@ -25,13 +25,12 @@ screen main_room():
     sensitive room_menu_active
 
     default objects = sorted(main_room.objects, key=lambda x: x.zorder)
-    default weather = "weather_[game.weather]"
 
     # Hotkeys
     if room_menu_active and game.day > 1 and not renpy.android:
         use hotkeys_main
 
-    add weather pos (430, 218) anchor (0.5, 0.5)
+    add "weather_[game.weather]" xycenter (430, 218)
 
     # Walls
     if game.daytime:
diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy
index 94e77052..3a65ade5 100644
--- a/game/scripts/rooms/main_room/objects/weather.rpy
+++ b/game/scripts/rooms/main_room/objects/weather.rpy
@@ -28,13 +28,13 @@ transform cloud_move:
     pause 7
     repeat
 
-image weather_clear = ConditionSwitch(
+image weather_clear = ConditionSwitch( # final
     "game.daytime", "images/rooms/main_room/weather/sky.webp",
     "game.moon", "images/rooms/main_room/weather/night_sky_moon.webp",
     "True", "images/rooms/main_room/weather/night_sky.webp",
     )
 
-image weather_overcast = ConditionSwitch(
+image weather_overcast = ConditionSwitch( # final
     "game.daytime", "images/rooms/main_room/weather/sky_overcast.webp",
     "game.moon", "images/rooms/main_room/weather/night_sky_moon_overcast.webp",
     "True", "images/rooms/main_room/weather/night_sky_overcast.webp",
@@ -73,7 +73,7 @@ image weather_cloudy_fx:
     pause 2
     repeat
 
-image weather_cloudy = Fixed("weather_clear", "weather_cloudy_fx", fit_first=True)
+image weather_cloudy = Fixed("weather_clear", "weather_cloudy_fx", fit_first=True) # final
 
 image weather_rain_fx:
     animation
@@ -85,7 +85,7 @@ image weather_rain_fx:
     pause.1
     repeat
 
-image weather_rain = Fixed("weather_overcast", "weather_rain_fx", fit_first=True)
+image weather_rain = Fixed("weather_overcast", "weather_rain_fx", fit_first=True) # final
 
 image weather_snow_fx:
     animation
@@ -111,7 +111,7 @@ image weather_snow_fx:
     pause.07
     repeat
 
-image weather_snow = Fixed("weather_overcast", "weather_snow_fx", fit_first=True)
+image weather_snow = Fixed("weather_overcast", "weather_snow_fx", fit_first=True) # final
 
 image weather_blizzard_fx:
     animation
@@ -137,7 +137,7 @@ image weather_blizzard_fx:
     pause.05
     repeat
 
-image weather_blizzard= Fixed("weather_overcast", "weather_blizzard_fx", fit_first=True)
+image weather_blizzard = Fixed("weather_overcast", "weather_blizzard_fx", fit_first=True) # final
 
 image weather_storm_fx:
     animation
@@ -145,7 +145,7 @@ image weather_storm_fx:
     parallel:
         animation
         pause 20
-        "images/rooms/main_room/weather/lightning_01.webp"
+        Null()
         pause.1
         "images/rooms/main_room/weather/lightning_02.webp"
         pause.1
@@ -153,15 +153,15 @@ image weather_storm_fx:
         pause.1
         "images/rooms/main_room/weather/lightning_04.webp"
         pause.1
-        "images/rooms/main_room/weather/lightning_05.webp"
+        Null()
         pause.1
         "images/rooms/main_room/weather/lightning_06.webp"
         pause.1
-        "images/rooms/main_room/weather/lightning_05.webp"
+        Null()
         pause.1
         "images/rooms/main_room/weather/lightning_06.webp"
         pause.1
-        "images/rooms/main_room/weather/lightning_05.webp"
+        Null()
         pause 20
         repeat
 
@@ -175,4 +175,4 @@ image weather_storm_fx:
         pause.1
         repeat
 
-image weather_storm = Fixed("weather_overcast", "weather_storm_fx", fit_first=True)
+image weather_storm = Fixed("weather_overcast", "weather_storm_fx", fit_first=True) # final