diff --git a/handheld/console-border/ngpc-2x.slangp b/handheld/console-border/ngpc-2x.slangp
deleted file mode 100644
index 494d94e..0000000
--- a/handheld/console-border/ngpc-2x.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = "2"
-
-shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "4.000000"
-
-shader1 = "shader-files/border.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.150000"
-box_scale = "2.0"
-in_res_x = "160.0"
-in_res_y = "152.0"
-border_on_top = "0.000000"
-border_zoom_x = "1.05"
-border_zoom_y = "1.18"
-
-textures = "BORDER"
-BORDER = "resources/ngpc-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/ngpc-3x.slangp b/handheld/console-border/ngpc-3x.slangp
deleted file mode 100644
index 3841ecb..0000000
--- a/handheld/console-border/ngpc-3x.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = "2"
-
-shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "4.000000"
-
-shader1 = "shader-files/border.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.150000"
-box_scale = "3.0"
-in_res_x = "160.0"
-in_res_y = "152.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.70"
-border_zoom_y = "0.79"
-
-textures = "BORDER"
-BORDER = "resources/ngpc-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/ngpc-4x.slangp b/handheld/console-border/ngpc-4x.slangp
deleted file mode 100644
index e43b4f7..0000000
--- a/handheld/console-border/ngpc-4x.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = "2"
-
-shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "4.000000"
-
-shader1 = "shader-files/border.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.150000"
-box_scale = "4.0"
-in_res_x = "160.0"
-in_res_y = "152.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.52"
-border_zoom_y = "0.59"
-
-textures = "BORDER"
-BORDER = "resources/ngpc-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/ngpc-5x.slangp b/handheld/console-border/ngpc-5x.slangp
deleted file mode 100644
index 6e4211f..0000000
--- a/handheld/console-border/ngpc-5x.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = "2"
-
-shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-scale_type_x0 = "source"
-scale_x0 = "6.000000"
-scale_type_y0 = "source"
-scale_y0 = "6.000000"
-
-shader1 = "shader-files/border.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.150000"
-box_scale = "5.0"
-in_res_x = "160.0"
-in_res_y = "152.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.42"
-border_zoom_y = "0.47"
-
-textures = "BORDER"
-BORDER = "resources/ngpc-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/ngpc-6x.slangp b/handheld/console-border/ngpc-6x.slangp
deleted file mode 100644
index c4cb5b0..0000000
--- a/handheld/console-border/ngpc-6x.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = "2"
-
-shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-scale_type_x0 = "source"
-scale_x0 = "6.000000"
-scale_type_y0 = "source"
-scale_y0 = "6.000000"
-
-shader1 = "shader-files/border.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.150000"
-box_scale = "6.0"
-in_res_x = "160.0"
-in_res_y = "152.0"
-border_on_top = "0.000000"
-border_zoom_x = "0.35"
-border_zoom_y = "0.39"
-
-textures = "BORDER"
-BORDER = "resources/ngpc-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/ngpc.slangp b/handheld/console-border/ngpc.slangp
new file mode 100644
index 0000000..6261871
--- /dev/null
+++ b/handheld/console-border/ngpc.slangp
@@ -0,0 +1,17 @@
+shaders = "2"
+
+shader0 = "../shaders/lcd-cgwg/lcd-grid.slang"
+filter_linear0 = "false"
+wrap_mode0 = "clamp_to_border"
+scale_type0 = "source"
+scale0 = "4.0"
+
+shader1 = "shader-files/border-auto-scale.slang"
+filter_linear1 = "true"
+wrap_mode1 = "clamp_to_border"
+
+textures = "BORDER"
+BORDER = "resources/ngpc-border-square-4x.png"
+BORDER_linear = "true"
+BORDER_wrap_mode = "clamp_to_border"
+BORDER_mipmap = "false"