diff --git a/Oracle_main.asm b/Oracle_main.asm
index 47be94a..ac9fe9e 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -81,10 +81,6 @@ Seashells  = $7EF391
 Honeycomb  = $7EF393
 DekuSticks = $7EF395
 
-; TODO: Move to Oracle namespace, free up the bank.
-incsrc "Overworld/custom_gfx.asm"
-print  "End of custom_gfx.asm             ", pc
-
 ; ZSCustomOverworld version
 ; Kept in case of serious issues which impedes progress
 ZS_CUSTOM_OW_V2 = 1
diff --git a/Overworld/ZCustomOverworld2.asm b/Overworld/ZCustomOverworld2.asm
index aa5e0d5..7371ef3 100644
--- a/Overworld/ZCustomOverworld2.asm
+++ b/Overworld/ZCustomOverworld2.asm
@@ -1024,7 +1024,7 @@ PreOverworld_LoadProperties_LoadMain:
     .no_music_load_needed
 
     ; PLACE CUSTOM GFX LOAD HERE!
-    JSL CheckForChangeGraphicsNormalLoadBoat
+    JSL Oracle_CheckForChangeGraphicsNormalLoadBoat
     
     RTS
 }
@@ -2211,7 +2211,7 @@ CheckForChangeGraphicsNormalLoad:
     ;JSL DecompOwAnimatedTiles 
 
     ; PLACE CUSTOM GFX LOAD HERE!
-    JSL CheckForChangeGraphicsNormalLoadBoat
+    JSL Oracle_CheckForChangeGraphicsNormalLoadBoat
         
     PLB
 
@@ -2262,7 +2262,7 @@ Func0AB8F5:
     STX.w $012C
 
     ; PLACE CUSTOM GFX LOAD HERE!
-    JSL CheckForChangeGraphicsNormalLoadBoat
+    JSL Oracle_CheckForChangeGraphicsNormalLoadBoat
         
     RTL
 }
diff --git a/Overworld/custom_gfx.asm b/Overworld/custom_gfx.asm
index dc53a50..0458760 100644
--- a/Overworld/custom_gfx.asm
+++ b/Overworld/custom_gfx.asm
@@ -1,5 +1,4 @@
 
-org $3F8000
 CheckForChangeGraphicsNormalLoadBoat:
 {
     LDA $8A : CMP.b #$30 : BNE .boat_area
@@ -12,8 +11,6 @@ CheckForChangeGraphicsNormalLoadBoat:
     RTL
 }
 
-; ==============================================================================
-
 ApplyGraphics1:
 {
   REP #$20               ; A = 16, XY = 8
@@ -54,8 +51,6 @@ ApplyGraphics2:
   incbin gfx/boat2.bin
 }
 
-; ==============================================================================
-
 ApplyKorokSpriteSheets:
 {
   REP #$20               ; A = 16, XY = 8
diff --git a/Overworld/overworld.asm b/Overworld/overworld.asm
index 55c729e..e06d379 100644
--- a/Overworld/overworld.asm
+++ b/Overworld/overworld.asm
@@ -58,6 +58,9 @@ print  "End of Overworld/time_system.asm  ", pc
 
 incsrc "Overworld/overlays.asm"
 print  "End of Overworld/overlays.asm     ", pc
+
+incsrc "Overworld/custom_gfx.asm"
+print  "End of Overworld/custom_gfx.asm   ", pc
 pushpc
 
 incsrc "Overworld/world_map.asm"