diff --git a/emu-configs/citra/qt-config.ini b/emu-configs/citra/qt-config.ini
index 3efd3d21..62fbaa7c 100644
--- a/emu-configs/citra/qt-config.ini
+++ b/emu-configs/citra/qt-config.ini
@@ -104,9 +104,9 @@ use_cpu_jit=true
 use_cpu_jit\default=true
 
 [Data%20Storage]
-nand_directory=~retrodeck/saves/n3ds/citra/nand/
+nand_directory=RETRODECKHOMEDIR/saves/n3ds/citra/nand/
 nand_directory\default=false
-sdmc_directory=~retrodeck/saves/n3ds/citra/sdmc/
+sdmc_directory=RETRODECKHOMEDIR/saves/n3ds/citra/sdmc/
 sdmc_directory\default=false
 use_custom_storage=true
 use_custom_storage\default=false
@@ -335,7 +335,7 @@ Paths\gamedirs\3\deep_scan=false
 Paths\gamedirs\3\deep_scan\default=true
 Paths\gamedirs\3\expanded=true
 Paths\gamedirs\3\expanded\default=true
-Paths\gamedirs\3\path=~retrodeck/roms/n3ds
+Paths\gamedirs\3\path=RETRODECKHOMEDIR/roms/n3ds
 Paths\gamedirs\size=3
 Paths\language=en
 Paths\language\default=false
@@ -343,7 +343,7 @@ Paths\moviePlaybackPath=
 Paths\movieRecordPath=
 Paths\recentFiles=@Invalid()
 Paths\romsPath=
-Paths\screenshotPath=~retrodeck/screenshots
+Paths\screenshotPath=RETRODECKHOMEDIR/screenshots
 Paths\screenshotPath\default=false
 Paths\symbolsPath=
 Paths\videoDumpingPath=
diff --git a/emu-configs/yuzu/qt-config.ini b/emu-configs/yuzu/qt-config.ini
index 76f79f3c..355cdcf8 100644
--- a/emu-configs/yuzu/qt-config.ini
+++ b/emu-configs/yuzu/qt-config.ini
@@ -815,9 +815,9 @@ gamecard_path=
 gamecard_path\default=true
 load_directory=/var/data/yuzu/load
 load_directory\default=true
-nand_directory=~retrodeck/saves/switch/yuzu/nand
+nand_directory=RETRODECKHOMEDIR/saves/switch/yuzu/nand
 nand_directory\default=true
-sdmc_directory=~retrodeck/saves/switch/yuzu/sdmc
+sdmc_directory=RETRODECKHOMEDIR/saves/switch/yuzu/sdmc
 sdmc_directory\default=true
 tas_directory=/var/data/yuzu/tas
 tas_directory\default=true
@@ -995,7 +995,7 @@ Paths\gamedirs\4\deep_scan=false
 Paths\gamedirs\4\deep_scan\default=true
 Paths\gamedirs\4\expanded=true
 Paths\gamedirs\4\expanded\default=true
-Paths\gamedirs\4\path=~retrodeck/roms/switch
+Paths\gamedirs\4\path=RETRODECKHOMEDIR/roms/switch
 Paths\gamedirs\size=4
 Paths\language=en
 Paths\language\default=false
@@ -1004,7 +1004,7 @@ Paths\romsPath=
 Paths\symbolsPath=
 Screenshots\enable_screenshot_save_as=true
 Screenshots\enable_screenshot_save_as\default=true
-Screenshots\screenshot_path=~retrodeck/screenshots/
+Screenshots\screenshot_path=RETRODECKHOMEDIR/screenshots/
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=1
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context\default=true
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index b0c007cf..67284209 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -66,7 +66,7 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
-      <release version="0.6.3b" date="2023-03-21">
+      <release version="0.6.3b" date="2023-03-22">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
          <description>
             <ul>
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 0b1cfb79..717b7809 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit 717b78093797270877ec416e58082f1c71d435d8