diff --git a/handheld/console-border/gbc-2x.slangp b/handheld/console-border/gbc-2x.slangp
index 03303eb..f41deec 100644
--- a/handheld/console-border/gbc-2x.slangp
+++ b/handheld/console-border/gbc-2x.slangp
@@ -4,22 +4,18 @@ shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
 filter_linear0 = "false"
 wrap_mode0 = "clamp_to_border"
 scale_type_x0 = "source"
-scale_x0 = "4.000000"
+scale_x0 = "2.000000"
 scale_type_y0 = "source"
-scale_y0 = "4.000000"
+scale_y0 = "2.000000"
 
-shader1 = "shader-files/border.slang"
+shader1 = "shader-files/gb-pass-5.slang"
 filter_linear1 = "true"
 wrap_mode1 = "clamp_to_border"
 
-parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y"
-GRID_STRENGTH = "0.050000"
-box_scale = "2.0"
-in_res_x = "160.0"
-in_res_y = "144.0"
-border_on_top = "0.000000"
-border_zoom_x = "1.05"
-border_zoom_y = "1.18"
+parameters = "SCALE;OUT_X;OUT_Y"
+SCALE = "1.0"
+OUT_X = "1600.0"
+OUT_Y = "800.0"
 
 textures = "BORDER"
 BORDER = "resources/color-border-square-4x.png"
diff --git a/handheld/console-border/gbc-3x.slangp b/handheld/console-border/gbc-3x.slangp
index f1028b5..c0a7d08 100644
--- a/handheld/console-border/gbc-3x.slangp
+++ b/handheld/console-border/gbc-3x.slangp
@@ -4,22 +4,18 @@ shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
 filter_linear0 = "false"
 wrap_mode0 = "clamp_to_border"
 scale_type_x0 = "source"
-scale_x0 = "4.000000"
+scale_x0 = "3.000000"
 scale_type_y0 = "source"
-scale_y0 = "4.000000"
+scale_y0 = "3.000000"
 
-shader1 = "shader-files/border.slang"
+shader1 = "shader-files/gb-pass-5.slang"
 filter_linear1 = "true"
 wrap_mode1 = "clamp_to_border"
 
-parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y"
-GRID_STRENGTH = "0.050000"
-box_scale = "3.0"
-in_res_x = "160.0"
-in_res_y = "144.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.70"
-border_zoom_y = "0.79"
+parameters = "SCALE;OUT_X;OUT_Y"
+SCALE = "1.0"
+OUT_X = "2400.0"
+OUT_Y = "1200.0"
 
 textures = "BORDER"
 BORDER = "resources/color-border-square-4x.png"
diff --git a/handheld/console-border/gbc-4x.slangp b/handheld/console-border/gbc-4x.slangp
index 6420264..b8db36f 100644
--- a/handheld/console-border/gbc-4x.slangp
+++ b/handheld/console-border/gbc-4x.slangp
@@ -8,18 +8,14 @@ scale_x0 = "4.000000"
 scale_type_y0 = "source"
 scale_y0 = "4.000000"
 
-shader1 = "shader-files/border.slang"
+shader1 = "shader-files/gb-pass-5.slang"
 filter_linear1 = "true"
 wrap_mode1 = "clamp_to_border"
 
-parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y"
-GRID_STRENGTH = "0.050000"
-box_scale = "4.0"
-in_res_x = "160.0"
-in_res_y = "144.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.52"
-border_zoom_y = "0.59"
+parameters = "SCALE;OUT_X;OUT_Y"
+SCALE = "1.0"
+OUT_X = "3200.0"
+OUT_Y = "1600.0"
 
 textures = "BORDER"
 BORDER = "resources/color-border-square-4x.png"
diff --git a/handheld/console-border/gbc-5x.slangp b/handheld/console-border/gbc-5x.slangp
index 1ee5130..928a90e 100644
--- a/handheld/console-border/gbc-5x.slangp
+++ b/handheld/console-border/gbc-5x.slangp
@@ -4,22 +4,18 @@ shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
 filter_linear0 = "false"
 wrap_mode0 = "clamp_to_border"
 scale_type_x0 = "source"
-scale_x0 = "6.000000"
+scale_x0 = "5.000000"
 scale_type_y0 = "source"
-scale_y0 = "6.000000"
+scale_y0 = "5.000000"
 
-shader1 = "shader-files/border.slang"
+shader1 = "shader-files/gb-pass-5.slang"
 filter_linear1 = "true"
 wrap_mode1 = "clamp_to_border"
 
-parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y"
-GRID_STRENGTH = "0.050000"
-box_scale = "5.0"
-in_res_x = "160.0"
-in_res_y = "144.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.42"
-border_zoom_y = "0.47"
+parameters = "SCALE;OUT_X;OUT_Y"
+SCALE = "1.0"
+OUT_X = "4000.0"
+OUT_Y = "2000.0"
 
 textures = "BORDER"
 BORDER = "resources/color-border-square-4x.png"
diff --git a/handheld/console-border/gbc-6x.slangp b/handheld/console-border/gbc-6x.slangp
index 5a68667..b73fcd2 100644
--- a/handheld/console-border/gbc-6x.slangp
+++ b/handheld/console-border/gbc-6x.slangp
@@ -8,18 +8,14 @@ scale_x0 = "6.000000"
 scale_type_y0 = "source"
 scale_y0 = "6.000000"
 
-shader1 = "shader-files/border.slang"
+shader1 = "shader-files/gb-pass-5.slang"
 filter_linear1 = "true"
 wrap_mode1 = "clamp_to_border"
 
-parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y"
-GRID_STRENGTH = "0.050000"
-box_scale = "6.0"
-in_res_x = "160.0"
-in_res_y = "144.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.35"
-border_zoom_y = "0.39"
+parameters = "SCALE;OUT_X;OUT_Y"
+SCALE = "1.0"
+OUT_X = "4800.0"
+OUT_Y = "2400.0"
 
 textures = "BORDER"
 BORDER = "resources/color-border-square-4x.png"