diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg
index 98764be4..47b80fe5 100644
--- a/emu-configs/retroarch.cfg
+++ b/emu-configs/retroarch.cfg
@@ -2944,7 +2944,7 @@ notification_show_screenshot_duration = "0"
 notification_show_screenshot_flash = "0"
 notification_show_set_initial_disk = "true"
 notification_show_when_menu_is_alive = "false"
-overlay_directory = "/app/retrodeck/overlays"
+overlay_directory = "/app/retrodeck/overlays/borders"
 ozone_collapse_sidebar = "false"
 ozone_menu_color_theme = "1"
 ozone_scroll_content_metadata = "false"
@@ -3147,7 +3147,7 @@ video_scale = "3.000000"
 video_scale_integer = "false"
 video_scale_integer_overscale = "false"
 video_shader_delay = "0"
-video_shader_dir = "/app/share/libretro/shaders"
+video_shader_dir = "/app/retrodeck/overlays/shaders"
 video_shader_enable = "true"
 video_shader_preset_save_reference_enable = "true"
 video_shader_remember_last_dir = "false"
diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml
index 19a4c294..54703d28 100644
--- a/es-configs/tools-gamelist.xml
+++ b/es-configs/tools-gamelist.xml
@@ -70,4 +70,11 @@
 		<nogamecount>true</nogamecount>
 		<nomultiscrape>true</nomultiscrape>
 	</game>
+	<game>
+		<path>./overlays.sh</path>
+		<name>Overlays configuration</name>
+		<desc>Configure or disable borders and shaders.</desc>
+		<nogamecount>true</nogamecount>
+		<nomultiscrape>true</nomultiscrape>
+	</game>
 </gameList>
diff --git a/tools/overlays.sh b/tools/overlays.sh
new file mode 100644
index 00000000..d483a20e
--- /dev/null
+++ b/tools/overlays.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+border="$(zenity --list \
+--title "RetroDECK" \
+--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+--text="Select the borders type" \
+--hide-header \
+--column=Border \
+"None" \
+"Light" \
+"Dark")"
+
+if [ $border == "None" ]
+then
+    return
+elif [ $border == "Light" ]
+then
+    return
+elif [ $border == "Dark" ]
+then
+    return
+fi
+
+shader="$(zenity --list \
+--title "RetroDECK" \
+--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+--text="Select the shader type" \
+--hide-header \
+--column=Border \
+"None" \
+"Retro")"
+
+if [ $shader == "None" ]
+then
+    return
+elif [ $shader == "Retro" ]
+then
+    return
+fi
\ No newline at end of file