diff --git a/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.cgp b/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.cgp
index 490d5b8..dd8bc45 100644
--- a/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.cgp
+++ b/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.cgp
@@ -1,5 +1,5 @@
 shaders = "3"
-shader0 = "../../handheld/gba-color.cg"
+shader0 = "../../handheld/shaders/color/gba-color.cg"
 shader1 = "../resources/imgborder-gameboy-player.cg"
 shader2 = "../../crt/shaders/crt-easymode.cg"
 
diff --git a/borders/gameboy-player/gameboy-player-gba-color.cgp b/borders/gameboy-player/gameboy-player-gba-color.cgp
index e498d0f..0f40b27 100644
--- a/borders/gameboy-player/gameboy-player-gba-color.cgp
+++ b/borders/gameboy-player/gameboy-player-gba-color.cgp
@@ -1,5 +1,5 @@
 shaders = "2"
-shader0 = "../../handheld/gba-color.cg"
+shader0 = "../../handheld/shaders/color/gba-color.cg"
 shader1 = "../resources/imgborder-gameboy-player.cg"
 
 scale_type0 = "source"
diff --git a/borders/gameboy-player/gameboy-player-tvout-gba-color+interlacing.cgp b/borders/gameboy-player/gameboy-player-tvout-gba-color+interlacing.cgp
index d0a3e97..cccfdd2 100644
--- a/borders/gameboy-player/gameboy-player-tvout-gba-color+interlacing.cgp
+++ b/borders/gameboy-player/gameboy-player-tvout-gba-color+interlacing.cgp
@@ -1,5 +1,5 @@
 shaders = "5"
-shader0 = "../../handheld/gba-color.cg"
+shader0 = "../../handheld/shaders/color/gba-color.cg"
 shader1 = "../resources/imgborder-gameboy-player.cg"
 shader2 = "../../crt/shaders/tvout-tweaks.cg"
 shader3 = "../../misc/image-adjustment.cg"
diff --git a/borders/gameboy-player/gameboy-player-tvout-gba-color.cgp b/borders/gameboy-player/gameboy-player-tvout-gba-color.cgp
index cfa5f5a..6b856e4 100644
--- a/borders/gameboy-player/gameboy-player-tvout-gba-color.cgp
+++ b/borders/gameboy-player/gameboy-player-tvout-gba-color.cgp
@@ -1,5 +1,5 @@
 shaders = "4"
-shader0 = "../../handheld/gba-color.cg"
+shader0 = "../../handheld/shaders/color/gba-color.cg"
 shader1 = "../resources/imgborder-gameboy-player.cg"
 shader2 = "../../crt/shaders/tvout-tweaks.cg"
 shader3 = "../../misc/image-adjustment.cg"
diff --git a/cgp/lowquality-lcd+motionblur.cgp b/cgp/lowquality-lcd+motionblur.cgp
index 7fa54d6..490a1ce 100644
--- a/cgp/lowquality-lcd+motionblur.cgp
+++ b/cgp/lowquality-lcd+motionblur.cgp
@@ -1,7 +1,7 @@
 shaders = "3"
 shader0 = "../motionblur/shaders/motionblur-simple.cg"
 shader1 = "../misc/image-adjustment.cg"
-shader2 = "../handheld/lcd_cgwg/lcd-grid.cg"
+shader2 = "../handheld/shaders/lcd_cgwg/lcd-grid.cg"
 
 scale_type_x0 = "source"
 scale_x0 = "1.000000"
diff --git a/cgp/lowquality-lcd.cgp b/cgp/lowquality-lcd.cgp
index 7f351e3..b1f9e22 100644
--- a/cgp/lowquality-lcd.cgp
+++ b/cgp/lowquality-lcd.cgp
@@ -1,6 +1,6 @@
 shaders = "2"
 shader0 = "../misc/image-adjustment.cg"
-shader1 = "../handheld/lcd_cgwg/lcd-grid.cg"
+shader1 = "../handheld/shaders/lcd_cgwg/lcd-grid.cg"
 
 filter_linear0 = "false"