diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg
index 72e91636..98764be4 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/share/libretro/overlays"
+overlay_directory = "/app/retrodeck/overlays"
 ozone_collapse_sidebar = "false"
 ozone_menu_color_theme = "1"
 ozone_scroll_content_metadata = "false"
diff --git a/flathub-pr.sh b/flathub-pr.sh
index 1118ec5f..7699fad2 100755
--- a/flathub-pr.sh
+++ b/flathub-pr.sh
@@ -12,6 +12,7 @@ git submodule update
 #sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
 
 sync -rav --progress { \
+'overlays', \
 'rd-submodules', \
 'flathub.json', \
 'LICENSE', \
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 9de54d1e..fab867b5 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -350,6 +350,7 @@ modules:
 
   # Yuzu - START
   # https://github.com/flathub/org.yuzu_emu.yuzu
+  # WHEN UPADTING: remember to update rd-submodules/yuzu contents
 
   - name: libzip
     buildsystem: cmake-ninja
@@ -634,6 +635,7 @@ modules:
 
   # Dolphin - START
   # https://github.com/flathub/org.DolphinEmu.dolphin-emu
+  # WHEN UPADTING: remember to update rd-submodules/yuzu contents
 
   # needed for the emulate bluetooth adapter feature to work
   - name: bluez
@@ -1076,6 +1078,9 @@ modules:
         # RPCS3
         - cp emu-configs/config.yml ${FLATPAK_DEST}/retrodeck/emu-configs/
 
+        # Overlays
+        - cp overlays ${FLATPAK_DEST}/retrodeck/overlays
+
         # Placing appdata
         - mkdir -p ${FLATPAK_DEST}/share/appdata
         - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata
diff --git a/overlays/borders/dark/gb.png b/overlays/borders/dark/gb.png
new file mode 100644
index 00000000..abd707e4
Binary files /dev/null and b/overlays/borders/dark/gb.png differ
diff --git a/overlays/borders/light/gb.png b/overlays/borders/light/gb.png
new file mode 100644
index 00000000..37992d5c
Binary files /dev/null and b/overlays/borders/light/gb.png differ