diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 4dc6a128..32000afe 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -47,14 +47,16 @@ jobs:
       - name: Build flatpak
         run: |
           git config --global protocol.file.allow always
+          mkdir -vp ${GITHUB_WORKSPACE}/local
+          mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
           flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Create Artifact for flathub
         run: | 
-          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
-          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz))
-          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha
-          mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }}
+          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
+          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz))
+          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha
+          mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }}
         continue-on-error: true
 
       - name: Create Bundle
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index f3b917e1..7c9d2a71 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -44,7 +44,9 @@ jobs:
 
       - name: Build flatpak
         run: |
-          git config --global protocol.allow always
+          git config --global protocol.file.allow always
+          mkdir -vp ${GITHUB_WORKSPACE}/local
+          mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
           flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
 
       - name: Create Artifact for flathub
diff --git a/emu-configs/citra-qt-config.ini b/emu-configs/citra/qt-config.ini
similarity index 67%
rename from emu-configs/citra-qt-config.ini
rename to emu-configs/citra/qt-config.ini
index 1bb879f8..55c0bf80 100644
--- a/emu-configs/citra-qt-config.ini
+++ b/emu-configs/citra/qt-config.ini
@@ -1,10 +1,8 @@
 [Audio]
+audio_emulation=0
+audio_emulation\default=true
 enable_audio_stretching=true
 enable_audio_stretching\default=true
-enable_dsp_lle=false
-enable_dsp_lle\default=true
-enable_dsp_lle_multithread=false
-enable_dsp_lle_multithread\default=true
 mic_input_device=Default
 mic_input_device\default=true
 mic_input_type=0
@@ -39,43 +37,43 @@ camera_outer_right_name\default=true
 [Controls]
 profile=0
 profile\default=true
-profiles\1\button_a="button:0,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_a="button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_a\default=false
-profiles\1\button_b="button:1,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_b="button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_b\default=false
 profiles\1\button_debug="code:79,engine:keyboard"
 profiles\1\button_debug\default=true
-profiles\1\button_down="direction:down,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_down="direction:down,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_down\default=false
 profiles\1\button_gpio14="code:80,engine:keyboard"
 profiles\1\button_gpio14\default=true
-profiles\1\button_home="button:8,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
-profiles\1\button_home\default=false
-profiles\1\button_l="button:4,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_home="code:66,engine:keyboard"
+profiles\1\button_home\default=true
+profiles\1\button_l="button:4,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_l\default=false
-profiles\1\button_left="direction:left,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_left="direction:left,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_left\default=false
-profiles\1\button_r="button:5,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_r="button:5,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_r\default=false
-profiles\1\button_right="direction:right,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_right="direction:right,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_right\default=false
-profiles\1\button_select="button:6,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_select="button:6,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_select\default=false
-profiles\1\button_start="button:7,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_start="button:7,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_start\default=false
-profiles\1\button_up="direction:up,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_up="direction:up,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_up\default=false
-profiles\1\button_x="button:2,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_x="button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_x\default=false
-profiles\1\button_y="button:3,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_y="button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_y\default=false
-profiles\1\button_zl="axis:3,direction:-,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:-0.5"
+profiles\1\button_zl="axis:2,direction:+,engine:sdl,guid:030079f6de280000ff11000001000000,port:0,threshold:0.5"
 profiles\1\button_zl\default=false
-profiles\1\button_zr="axis:5,direction:+,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:0.5"
+profiles\1\button_zr="axis:5,direction:+,engine:sdl,guid:030079f6de280000ff11000001000000,port:0,threshold:0.5"
 profiles\1\button_zr\default=false
-profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\c_stick\default=false
-profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\circle_pad\default=false
 profiles\1\motion_device="engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0"
 profiles\1\motion_device\default=true
@@ -106,10 +104,12 @@ use_cpu_jit=true
 use_cpu_jit\default=true
 
 [Data%20Storage]
-nand_directory=~/retrodeck/saves/n3ds/citra/nand/
+nand_directory=/home/deck/retrodeck/saves/n3ds/citra/nand/
 nand_directory\default=false
-sdmc_directory=~/retrodeck/saves/n3ds/citra/sdmc/
+sdmc_directory=/home/deck/retrodeck/saves/n3ds/citra/sdmc/
 sdmc_directory\default=false
+use_custom_storage=true
+use_custom_storage\default=false
 use_virtual_sd=true
 use_virtual_sd\default=true
 
@@ -178,6 +178,8 @@ LLE\NWM=false
 LLE\NWM\default=true
 LLE\PDN=false
 LLE\PDN\default=true
+LLE\PLGLDR=false
+LLE\PLGLDR\default=true
 LLE\PM=false
 LLE\PM\default=true
 LLE\PS=false
@@ -194,36 +196,43 @@ LLE\SPI=false
 LLE\SPI\default=true
 LLE\SSL=false
 LLE\SSL\default=true
-gdbstub_port=24689
+gdbstub_port=@Variant(\0\0\0\x85`q)
 gdbstub_port\default=true
 record_frame_times=false
 use_gdbstub=false
 use_gdbstub\default=true
 
 [Layout]
-custom_bottom_bottom=480
+custom_bottom_bottom=@Variant(\0\0\0\x85\x1\xe0)
 custom_bottom_bottom\default=true
-custom_bottom_left=40
+custom_bottom_left=@Variant(\0\0\0\x85\0()
 custom_bottom_left\default=true
-custom_bottom_right=360
+custom_bottom_right=@Variant(\0\0\0\x85\x1h)
 custom_bottom_right\default=true
-custom_bottom_top=240
+custom_bottom_top=@Variant(\0\0\0\x85\0\xf0)
 custom_bottom_top\default=true
 custom_layout=false
 custom_layout\default=true
-custom_top_bottom=240
+custom_second_layer_opacity=@Variant(\0\0\0\x85\0\x64)
+custom_second_layer_opacity\default=true
+custom_top_bottom=@Variant(\0\0\0\x85\0\xf0)
 custom_top_bottom\default=true
-custom_top_left=0
+custom_top_left=@Variant(\0\0\0\x85\0\0)
 custom_top_left\default=true
-custom_top_right=400
+custom_top_right=@Variant(\0\0\0\x85\x1\x90)
 custom_top_right\default=true
-custom_top_top=0
+custom_top_top=@Variant(\0\0\0\x85\0\0)
 custom_top_top\default=true
 factor_3d=0
 factor_3d\default=true
 filter_mode=true
 filter_mode\default=true
+large_screen_proportion=@Variant(\0\0\0\x87@\x80\0\0)
+large_screen_proportion\default=true
 layout_option=0
+layout_option\default=true
+mono_render_option=0
+mono_render_option\default=true
 pp_shader_name=none (builtin)
 pp_shader_name\default=true
 render_3d=0
@@ -244,20 +253,16 @@ bg_green=0
 bg_green\default=true
 bg_red=0
 bg_red\default=true
-frame_limit=100
+frame_limit=@Variant(\0\0\0\x85\0\x64)
 frame_limit\default=true
-frame_limit_alternate=200
-frame_limit_alternate\default=true
-resolution_factor=1
+resolution_factor=@Variant(\0\0\0\x85\0\x1)
 resolution_factor\default=true
 shaders_accurate_mul=true
 shaders_accurate_mul\default=true
-texture_filter_name=none
-texture_filter_name\default=true
+texture_filter_name=Linear (Default)
+texture_filter_name\default=false
 use_disk_shader_cache=true
 use_disk_shader_cache\default=true
-use_frame_limit_alternate=false
-use_frame_limit_alternate\default=true
 use_hw_renderer=true
 use_hw_renderer\default=true
 use_hw_shader=true
@@ -268,12 +273,18 @@ use_vsync_new=true
 use_vsync_new\default=true
 
 [System]
+allow_plugin_loader=true
+allow_plugin_loader\default=true
 init_clock=0
 init_clock\default=true
-init_time=946681277
+init_time=@Variant(\0\0\0\x84\0\0\0\0\x38m5\xbd)
 init_time\default=true
+init_time_offset=@Variant(\0\0\0\x81\0\0\0\0\0\0\0\0)
+init_time_offset\default=true
 is_new_3ds=true
 is_new_3ds\default=true
+plugin_loader=false
+plugin_loader\default=true
 region_value=-1
 region_value\default=true
 
@@ -330,16 +341,17 @@ Paths\language=en
 Paths\language\default=false
 Paths\moviePlaybackPath=
 Paths\movieRecordPath=
-Paths\recentFiles=
-Paths\romsPath=/home/deck/retrodeck/roms/n3ds
-Paths\screenshotPath=
+Paths\recentFiles=@Invalid()
+Paths\romsPath=
+Paths\screenshotPath=/home/deck/retrodeck/screenshots
+Paths\screenshotPath\default=false
 Paths\symbolsPath=
 Paths\videoDumpingPath=
-Shortcuts\Main%20Window\Advance%20Frame\Context=2
-Shortcuts\Main%20Window\Advance%20Frame\Context\default=true
-Shortcuts\Main%20Window\Advance%20Frame\KeySeq=\\
+Shortcuts\Main%20Window\Advance%20Frame\Context=1
+Shortcuts\Main%20Window\Advance%20Frame\Context\default=false
+Shortcuts\Main%20Window\Advance%20Frame\KeySeq=
 Shortcuts\Main%20Window\Advance%20Frame\KeySeq\default=true
-Shortcuts\Main%20Window\Capture%20Screenshot\Context=2
+Shortcuts\Main%20Window\Capture%20Screenshot\Context=3
 Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true
 Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P
 Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true
@@ -347,6 +359,10 @@ Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=2
+Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=true
+Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq=Ctrl+-
+Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq\default=true
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=-
@@ -357,21 +373,25 @@ Shortcuts\Main%20Window\Exit%20Citra\KeySeq=T
 Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc
-Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Y
+Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=false
 Shortcuts\Main%20Window\Fullscreen\Context=1
 Shortcuts\Main%20Window\Fullscreen\Context\default=true
 Shortcuts\Main%20Window\Fullscreen\KeySeq=F11
 Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Increase%203D%20Factor\Context=2
+Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=true
+Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq=Ctrl++
+Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq\default=true
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=+
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=true
-Shortcuts\Main%20Window\Load%20Amiibo\Context=2
+Shortcuts\Main%20Window\Load%20Amiibo\Context=3
 Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true
 Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=F2
 Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=true
-Shortcuts\Main%20Window\Load%20File\Context=1
+Shortcuts\Main%20Window\Load%20File\Context=3
 Shortcuts\Main%20Window\Load%20File\Context\default=true
 Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O
 Shortcuts\Main%20Window\Load%20File\KeySeq\default=true
@@ -379,6 +399,10 @@ Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context=1
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=R
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=false
+Shortcuts\Main%20Window\Mute%20Audio\Context=1
+Shortcuts\Main%20Window\Mute%20Audio\Context\default=true
+Shortcuts\Main%20Window\Mute%20Audio\KeySeq=Ctrl+M
+Shortcuts\Main%20Window\Mute%20Audio\KeySeq\default=true
 Shortcuts\Main%20Window\Remove%20Amiibo\Context=2
 Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true
 Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=F3
@@ -401,20 +425,24 @@ Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5
 Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true
 Shortcuts\Main%20Window\Swap%20Screens\Context=1
 Shortcuts\Main%20Window\Swap%20Screens\Context\default=true
-Shortcuts\Main%20Window\Swap%20Screens\KeySeq=Y
-Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context=2
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq=Ctrl+Z
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq\default=true
+Shortcuts\Main%20Window\Swap%20Screens\KeySeq=F9
+Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%203D\Context=2
+Shortcuts\Main%20Window\Toggle%203D\Context\default=true
+Shortcuts\Main%20Window\Toggle%203D\KeySeq=Ctrl+3
+Shortcuts\Main%20Window\Toggle%203D\KeySeq\default=true
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1
-Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=false
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F
-Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2
-Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=false
 Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A
-Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=false
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context=2
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq=Ctrl+Z
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10
@@ -423,17 +451,17 @@ Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true
-Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=2
-Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=Ctrl+D
+Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=1
+Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=false
+Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=
 Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq\default=true
-UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4\x9c\0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xf0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
-UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xd6\0\0\0\x97\0\0\x4*\0\0\x2\x43\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43\0\0\0\0\0\0\0\0\x5\0\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43)
-UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3)
-UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
+UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4 \0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0t\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
+UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f)
+UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31)
+UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
 UILayout\microProfileDialogVisible=false
 UILayout\microProfileDialogVisible\default=true
-UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0n\x1\0\0\x3\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xd2\x1\0\0\x3\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0N\x1\0\0\x3\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xd3\x1\0\0\x3\0\0\x3U\0\0\x1Q\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0h\0\xff\xff\xff\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x87\0\xff\xff\xff\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x87\0\xff\xff\xff\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xaa\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x41\0\xff\xff\xff\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xc3\0\xff\xff\xff\0\0\x4 \0\0\x1^\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
 Updater\check_for_update_on_start=true
 Updater\check_for_update_on_start\default=true
 Updater\update_on_close=false
@@ -448,13 +476,13 @@ enable_discord_presence=true
 enable_discord_presence\default=true
 firstStart=false
 firstStart\default=false
-fullscreen=true
+fullscreen=false
 fullscreen\default=true
 hideInactiveMouse=false
 hideInactiveMouse\default=true
-pauseWhenInBackground=true
+pauseWhenInBackground=false
 pauseWhenInBackground\default=true
-screenshot_resolution_factor=0
+screenshot_resolution_factor=@Variant(\0\0\0\x85\0\0)
 screenshot_resolution_factor\default=true
 showConsole=false
 showConsole\default=true
@@ -494,8 +522,8 @@ video_encoder_options\default=true
 
 [WebService]
 citra_token=
-citra_username=
+citra_username=RetroDECK
 enable_telemetry=false
 enable_telemetry\default=false
 web_api_url=https://api.citra-emu.org
-web_api_url\default=true
+web_api_url\default=true
\ No newline at end of file
diff --git a/emu-configs/yuzu/qt-config.ini b/emu-configs/yuzu/qt-config.ini
index 28d4ca15..bdc3d216 100644
--- a/emu-configs/yuzu/qt-config.ini
+++ b/emu-configs/yuzu/qt-config.ini
@@ -9,7 +9,6 @@ volume=100
 volume\default=true
 
 [Controls]
-="======"
 controller_navigation=true
 controller_navigation\default=true
 debug_pad_button_a="toggle:0,code:67,engine:keyboard"
@@ -64,6 +63,10 @@ enable_accurate_vibrations=false
 enable_accurate_vibrations\default=true
 enable_ir_sensor=false
 enable_ir_sensor\default=true
+enable_joycon_driver=true
+enable_joycon_driver\default=true
+enable_procon_driver=false
+enable_procon_driver\default=true
 enable_raw_input=false
 enable_raw_input\default=true
 enable_ring_controller=true
@@ -74,11 +77,11 @@ ir_sensor_device=auto
 ir_sensor_device\default=true
 keyboard_enabled=false
 keyboard_enabled\default=true
-motion_enabled=false
-motion_enabled\default=false
+motion_enabled=true
+motion_enabled\default=true
 mouse_enabled=false
 mouse_enabled\default=true
-mouse_panning_sensitivity=10
+mouse_panning_sensitivity=50
 mouse_panning_sensitivity\default=true
 pause_tas_on_load=true
 pause_tas_on_load\default=true
@@ -86,59 +89,59 @@ player_0_body_color_left=4278893030
 player_0_body_color_left\default=false
 player_0_body_color_right=4294917160
 player_0_body_color_right\default=false
-player_0_button_a="button:1,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_a="pad:0,button:1,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_a\default=false
-player_0_button_b="button:0,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_b="pad:0,button:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_b\default=false
 player_0_button_color_left=4278197790
 player_0_button_color_left\default=false
 player_0_button_color_right=4280158730
 player_0_button_color_right\default=false
-player_0_button_ddown="hat:0,direction:down,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_ddown="hat:0,pad:0,direction:down,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_ddown\default=false
-player_0_button_dleft="hat:0,direction:left,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_dleft="hat:0,pad:0,direction:left,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_dleft\default=false
-player_0_button_dright="hat:0,direction:right,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_dright="hat:0,pad:0,direction:right,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_dright\default=false
-player_0_button_dup="hat:0,direction:up,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_dup="hat:0,pad:0,direction:up,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_dup\default=false
-player_0_button_home="button:8,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_home="engine:keyboard,port:0,pad:0,code:76"
 player_0_button_home\default=false
-player_0_button_l="button:4,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_l="pad:0,button:4,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_l\default=false
-player_0_button_lstick="button:9,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_lstick="pad:0,button:9,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_lstick\default=false
-player_0_button_minus="button:6,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_minus="pad:0,button:6,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_minus\default=false
-player_0_button_plus="button:7,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_plus="pad:0,button:7,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_plus\default=false
-player_0_button_r="button:5,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_r="pad:0,button:5,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_r\default=false
-player_0_button_rstick="button:10,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_rstick="pad:0,button:10,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_rstick\default=false
-player_0_button_screenshot=[empty]
+player_0_button_screenshot="engine:keyboard,port:0,pad:0,code:82"
 player_0_button_screenshot\default=false
-player_0_button_sl="button:4,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
-player_0_button_sl\default=false
-player_0_button_sr="button:5,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
-player_0_button_sr\default=false
-player_0_button_x="button:3,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_sl="toggle:0,code:81,engine:keyboard"
+player_0_button_sl\default=true
+player_0_button_sr="toggle:0,code:69,engine:keyboard"
+player_0_button_sr\default=true
+player_0_button_x="pad:0,button:3,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_x\default=false
-player_0_button_y="button:2,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_y="pad:0,button:2,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_y\default=false
-player_0_button_zl="threshold:0.500000,axis:2,guid:03000000de280000ff11000001000000,port:0,invert:+,engine:sdl"
+player_0_button_zl="threshold:0.500000,axis:2,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_zl\default=false
-player_0_button_zr="threshold:0.500000,axis:5,guid:03000000de280000ff11000001000000,port:0,invert:+,engine:sdl"
+player_0_button_zr="threshold:0.500000,axis:5,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_button_zr\default=false
 player_0_connected=true
 player_0_connected\default=true
-player_0_lstick="deadzone:0.150000,invert_y:+,invert_x:+,offset_y:0.000000,axis_y:1,offset_x:-0.000000,axis_x:0,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_lstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:1,axis_x:0,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_lstick\default=false
-player_0_motionleft=[empty]
-player_0_motionleft\default=false
-player_0_motionright=[empty]
-player_0_motionright\default=false
-player_0_rstick="deadzone:0.150000,invert_y:+,invert_x:+,offset_y:-0.063723,axis_y:4,offset_x:-0.024476,axis_x:3,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_motionleft="toggle:0,code:55,engine:keyboard"
+player_0_motionleft\default=true
+player_0_motionright="toggle:0,code:56,engine:keyboard"
+player_0_motionright\default=true
+player_0_rstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:4,axis_x:3,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
 player_0_rstick\default=false
 player_0_type=0
 player_0_type\default=true
@@ -150,60 +153,60 @@ player_1_body_color_left=4278893030
 player_1_body_color_left\default=false
 player_1_body_color_right=4294917160
 player_1_body_color_right\default=false
-player_1_button_a="engine:keyboard,code:67,toggle:0"
-player_1_button_a\default=false
-player_1_button_b="engine:keyboard,code:88,toggle:0"
-player_1_button_b\default=false
+player_1_button_a="toggle:0,code:67,engine:keyboard"
+player_1_button_a\default=true
+player_1_button_b="toggle:0,code:88,engine:keyboard"
+player_1_button_b\default=true
 player_1_button_color_left=4278197790
 player_1_button_color_left\default=false
 player_1_button_color_right=4280158730
 player_1_button_color_right\default=false
-player_1_button_ddown="engine:keyboard,code:16777237,toggle:0"
-player_1_button_ddown\default=false
-player_1_button_dleft="engine:keyboard,code:16777234,toggle:0"
-player_1_button_dleft\default=false
-player_1_button_dright="engine:keyboard,code:16777236,toggle:0"
-player_1_button_dright\default=false
-player_1_button_dup="engine:keyboard,code:16777235,toggle:0"
-player_1_button_dup\default=false
-player_1_button_home="engine:keyboard,code:0,toggle:0"
-player_1_button_home\default=false
-player_1_button_l="engine:keyboard,code:81,toggle:0"
-player_1_button_l\default=false
-player_1_button_lstick="engine:keyboard,code:70,toggle:0"
-player_1_button_lstick\default=false
-player_1_button_minus="engine:keyboard,code:78,toggle:0"
-player_1_button_minus\default=false
-player_1_button_plus="engine:keyboard,code:77,toggle:0"
-player_1_button_plus\default=false
-player_1_button_r="engine:keyboard,code:69,toggle:0"
-player_1_button_r\default=false
-player_1_button_rstick="engine:keyboard,code:71,toggle:0"
-player_1_button_rstick\default=false
-player_1_button_screenshot="engine:keyboard,code:0,toggle:0"
-player_1_button_screenshot\default=false
-player_1_button_sl="engine:keyboard,code:81,toggle:0"
-player_1_button_sl\default=false
-player_1_button_sr="engine:keyboard,code:69,toggle:0"
-player_1_button_sr\default=false
-player_1_button_x="engine:keyboard,code:86,toggle:0"
-player_1_button_x\default=false
-player_1_button_y="engine:keyboard,code:90,toggle:0"
-player_1_button_y\default=false
-player_1_button_zl="engine:keyboard,code:82,toggle:0"
-player_1_button_zl\default=false
-player_1_button_zr="engine:keyboard,code:84,toggle:0"
-player_1_button_zr\default=false
+player_1_button_ddown="toggle:0,code:16777237,engine:keyboard"
+player_1_button_ddown\default=true
+player_1_button_dleft="toggle:0,code:16777234,engine:keyboard"
+player_1_button_dleft\default=true
+player_1_button_dright="toggle:0,code:16777236,engine:keyboard"
+player_1_button_dright\default=true
+player_1_button_dup="toggle:0,code:16777235,engine:keyboard"
+player_1_button_dup\default=true
+player_1_button_home="toggle:0,code:0,engine:keyboard"
+player_1_button_home\default=true
+player_1_button_l="toggle:0,code:81,engine:keyboard"
+player_1_button_l\default=true
+player_1_button_lstick="toggle:0,code:70,engine:keyboard"
+player_1_button_lstick\default=true
+player_1_button_minus="toggle:0,code:78,engine:keyboard"
+player_1_button_minus\default=true
+player_1_button_plus="toggle:0,code:77,engine:keyboard"
+player_1_button_plus\default=true
+player_1_button_r="toggle:0,code:69,engine:keyboard"
+player_1_button_r\default=true
+player_1_button_rstick="toggle:0,code:71,engine:keyboard"
+player_1_button_rstick\default=true
+player_1_button_screenshot="toggle:0,code:0,engine:keyboard"
+player_1_button_screenshot\default=true
+player_1_button_sl="toggle:0,code:81,engine:keyboard"
+player_1_button_sl\default=true
+player_1_button_sr="toggle:0,code:69,engine:keyboard"
+player_1_button_sr\default=true
+player_1_button_x="toggle:0,code:86,engine:keyboard"
+player_1_button_x\default=true
+player_1_button_y="toggle:0,code:90,engine:keyboard"
+player_1_button_y\default=true
+player_1_button_zl="toggle:0,code:82,engine:keyboard"
+player_1_button_zl\default=true
+player_1_button_zr="toggle:0,code:84,engine:keyboard"
+player_1_button_zr\default=true
 player_1_connected=false
 player_1_connected\default=true
-player_1_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000"
-player_1_lstick\default=false
-player_1_motionleft="engine:keyboard,code:55,toggle:0"
-player_1_motionleft\default=false
-player_1_motionright="engine:keyboard,code:56,toggle:0"
-player_1_motionright\default=false
-player_1_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000"
-player_1_rstick\default=false
+player_1_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button"
+player_1_lstick\default=true
+player_1_motionleft="toggle:0,code:55,engine:keyboard"
+player_1_motionleft\default=true
+player_1_motionright="toggle:0,code:56,engine:keyboard"
+player_1_motionright\default=true
+player_1_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button"
+player_1_rstick\default=true
 player_1_type=0
 player_1_type\default=true
 player_1_vibration_enabled=true
@@ -214,60 +217,60 @@ player_2_body_color_left=4278893030
 player_2_body_color_left\default=false
 player_2_body_color_right=4294917160
 player_2_body_color_right\default=false
-player_2_button_a="engine:keyboard,code:67,toggle:0"
-player_2_button_a\default=false
-player_2_button_b="engine:keyboard,code:88,toggle:0"
-player_2_button_b\default=false
+player_2_button_a="toggle:0,code:67,engine:keyboard"
+player_2_button_a\default=true
+player_2_button_b="toggle:0,code:88,engine:keyboard"
+player_2_button_b\default=true
 player_2_button_color_left=4278197790
 player_2_button_color_left\default=false
 player_2_button_color_right=4280158730
 player_2_button_color_right\default=false
-player_2_button_ddown="engine:keyboard,code:16777237,toggle:0"
-player_2_button_ddown\default=false
-player_2_button_dleft="engine:keyboard,code:16777234,toggle:0"
-player_2_button_dleft\default=false
-player_2_button_dright="engine:keyboard,code:16777236,toggle:0"
-player_2_button_dright\default=false
-player_2_button_dup="engine:keyboard,code:16777235,toggle:0"
-player_2_button_dup\default=false
-player_2_button_home="engine:keyboard,code:0,toggle:0"
-player_2_button_home\default=false
-player_2_button_l="engine:keyboard,code:81,toggle:0"
-player_2_button_l\default=false
-player_2_button_lstick="engine:keyboard,code:70,toggle:0"
-player_2_button_lstick\default=false
-player_2_button_minus="engine:keyboard,code:78,toggle:0"
-player_2_button_minus\default=false
-player_2_button_plus="engine:keyboard,code:77,toggle:0"
-player_2_button_plus\default=false
-player_2_button_r="engine:keyboard,code:69,toggle:0"
-player_2_button_r\default=false
-player_2_button_rstick="engine:keyboard,code:71,toggle:0"
-player_2_button_rstick\default=false
-player_2_button_screenshot="engine:keyboard,code:0,toggle:0"
-player_2_button_screenshot\default=false
-player_2_button_sl="engine:keyboard,code:81,toggle:0"
-player_2_button_sl\default=false
-player_2_button_sr="engine:keyboard,code:69,toggle:0"
-player_2_button_sr\default=false
-player_2_button_x="engine:keyboard,code:86,toggle:0"
-player_2_button_x\default=false
-player_2_button_y="engine:keyboard,code:90,toggle:0"
-player_2_button_y\default=false
-player_2_button_zl="engine:keyboard,code:82,toggle:0"
-player_2_button_zl\default=false
-player_2_button_zr="engine:keyboard,code:84,toggle:0"
-player_2_button_zr\default=false
+player_2_button_ddown="toggle:0,code:16777237,engine:keyboard"
+player_2_button_ddown\default=true
+player_2_button_dleft="toggle:0,code:16777234,engine:keyboard"
+player_2_button_dleft\default=true
+player_2_button_dright="toggle:0,code:16777236,engine:keyboard"
+player_2_button_dright\default=true
+player_2_button_dup="toggle:0,code:16777235,engine:keyboard"
+player_2_button_dup\default=true
+player_2_button_home="toggle:0,code:0,engine:keyboard"
+player_2_button_home\default=true
+player_2_button_l="toggle:0,code:81,engine:keyboard"
+player_2_button_l\default=true
+player_2_button_lstick="toggle:0,code:70,engine:keyboard"
+player_2_button_lstick\default=true
+player_2_button_minus="toggle:0,code:78,engine:keyboard"
+player_2_button_minus\default=true
+player_2_button_plus="toggle:0,code:77,engine:keyboard"
+player_2_button_plus\default=true
+player_2_button_r="toggle:0,code:69,engine:keyboard"
+player_2_button_r\default=true
+player_2_button_rstick="toggle:0,code:71,engine:keyboard"
+player_2_button_rstick\default=true
+player_2_button_screenshot="toggle:0,code:0,engine:keyboard"
+player_2_button_screenshot\default=true
+player_2_button_sl="toggle:0,code:81,engine:keyboard"
+player_2_button_sl\default=true
+player_2_button_sr="toggle:0,code:69,engine:keyboard"
+player_2_button_sr\default=true
+player_2_button_x="toggle:0,code:86,engine:keyboard"
+player_2_button_x\default=true
+player_2_button_y="toggle:0,code:90,engine:keyboard"
+player_2_button_y\default=true
+player_2_button_zl="toggle:0,code:82,engine:keyboard"
+player_2_button_zl\default=true
+player_2_button_zr="toggle:0,code:84,engine:keyboard"
+player_2_button_zr\default=true
 player_2_connected=false
 player_2_connected\default=true
-player_2_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000"
-player_2_lstick\default=false
-player_2_motionleft="engine:keyboard,code:55,toggle:0"
-player_2_motionleft\default=false
-player_2_motionright="engine:keyboard,code:56,toggle:0"
-player_2_motionright\default=false
-player_2_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000"
-player_2_rstick\default=false
+player_2_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button"
+player_2_lstick\default=true
+player_2_motionleft="toggle:0,code:55,engine:keyboard"
+player_2_motionleft\default=true
+player_2_motionright="toggle:0,code:56,engine:keyboard"
+player_2_motionright\default=true
+player_2_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button"
+player_2_rstick\default=true
 player_2_type=0
 player_2_type\default=true
 player_2_vibration_enabled=true
@@ -278,60 +281,60 @@ player_3_body_color_left=4278893030
 player_3_body_color_left\default=false
 player_3_body_color_right=4294917160
 player_3_body_color_right\default=false
-player_3_button_a="engine:keyboard,code:67,toggle:0"
-player_3_button_a\default=false
-player_3_button_b="engine:keyboard,code:88,toggle:0"
-player_3_button_b\default=false
+player_3_button_a="toggle:0,code:67,engine:keyboard"
+player_3_button_a\default=true
+player_3_button_b="toggle:0,code:88,engine:keyboard"
+player_3_button_b\default=true
 player_3_button_color_left=4278197790
 player_3_button_color_left\default=false
 player_3_button_color_right=4280158730
 player_3_button_color_right\default=false
-player_3_button_ddown="engine:keyboard,code:16777237,toggle:0"
-player_3_button_ddown\default=false
-player_3_button_dleft="engine:keyboard,code:16777234,toggle:0"
-player_3_button_dleft\default=false
-player_3_button_dright="engine:keyboard,code:16777236,toggle:0"
-player_3_button_dright\default=false
-player_3_button_dup="engine:keyboard,code:16777235,toggle:0"
-player_3_button_dup\default=false
-player_3_button_home="engine:keyboard,code:0,toggle:0"
-player_3_button_home\default=false
-player_3_button_l="engine:keyboard,code:81,toggle:0"
-player_3_button_l\default=false
-player_3_button_lstick="engine:keyboard,code:70,toggle:0"
-player_3_button_lstick\default=false
-player_3_button_minus="engine:keyboard,code:78,toggle:0"
-player_3_button_minus\default=false
-player_3_button_plus="engine:keyboard,code:77,toggle:0"
-player_3_button_plus\default=false
-player_3_button_r="engine:keyboard,code:69,toggle:0"
-player_3_button_r\default=false
-player_3_button_rstick="engine:keyboard,code:71,toggle:0"
-player_3_button_rstick\default=false
-player_3_button_screenshot="engine:keyboard,code:0,toggle:0"
-player_3_button_screenshot\default=false
-player_3_button_sl="engine:keyboard,code:81,toggle:0"
-player_3_button_sl\default=false
-player_3_button_sr="engine:keyboard,code:69,toggle:0"
-player_3_button_sr\default=false
-player_3_button_x="engine:keyboard,code:86,toggle:0"
-player_3_button_x\default=false
-player_3_button_y="engine:keyboard,code:90,toggle:0"
-player_3_button_y\default=false
-player_3_button_zl="engine:keyboard,code:82,toggle:0"
-player_3_button_zl\default=false
-player_3_button_zr="engine:keyboard,code:84,toggle:0"
-player_3_button_zr\default=false
+player_3_button_ddown="toggle:0,code:16777237,engine:keyboard"
+player_3_button_ddown\default=true
+player_3_button_dleft="toggle:0,code:16777234,engine:keyboard"
+player_3_button_dleft\default=true
+player_3_button_dright="toggle:0,code:16777236,engine:keyboard"
+player_3_button_dright\default=true
+player_3_button_dup="toggle:0,code:16777235,engine:keyboard"
+player_3_button_dup\default=true
+player_3_button_home="toggle:0,code:0,engine:keyboard"
+player_3_button_home\default=true
+player_3_button_l="toggle:0,code:81,engine:keyboard"
+player_3_button_l\default=true
+player_3_button_lstick="toggle:0,code:70,engine:keyboard"
+player_3_button_lstick\default=true
+player_3_button_minus="toggle:0,code:78,engine:keyboard"
+player_3_button_minus\default=true
+player_3_button_plus="toggle:0,code:77,engine:keyboard"
+player_3_button_plus\default=true
+player_3_button_r="toggle:0,code:69,engine:keyboard"
+player_3_button_r\default=true
+player_3_button_rstick="toggle:0,code:71,engine:keyboard"
+player_3_button_rstick\default=true
+player_3_button_screenshot="toggle:0,code:0,engine:keyboard"
+player_3_button_screenshot\default=true
+player_3_button_sl="toggle:0,code:81,engine:keyboard"
+player_3_button_sl\default=true
+player_3_button_sr="toggle:0,code:69,engine:keyboard"
+player_3_button_sr\default=true
+player_3_button_x="toggle:0,code:86,engine:keyboard"
+player_3_button_x\default=true
+player_3_button_y="toggle:0,code:90,engine:keyboard"
+player_3_button_y\default=true
+player_3_button_zl="toggle:0,code:82,engine:keyboard"
+player_3_button_zl\default=true
+player_3_button_zr="toggle:0,code:84,engine:keyboard"
+player_3_button_zr\default=true
 player_3_connected=false
 player_3_connected\default=true
-player_3_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000"
-player_3_lstick\default=false
-player_3_motionleft="engine:keyboard,code:55,toggle:0"
-player_3_motionleft\default=false
-player_3_motionright="engine:keyboard,code:56,toggle:0"
-player_3_motionright\default=false
-player_3_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000"
-player_3_rstick\default=false
+player_3_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button"
+player_3_lstick\default=true
+player_3_motionleft="toggle:0,code:55,engine:keyboard"
+player_3_motionleft\default=true
+player_3_motionright="toggle:0,code:56,engine:keyboard"
+player_3_motionright\default=true
+player_3_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button"
+player_3_rstick\default=true
 player_3_type=0
 player_3_type\default=true
 player_3_vibration_enabled=true
@@ -342,60 +345,60 @@ player_4_body_color_left=4278893030
 player_4_body_color_left\default=false
 player_4_body_color_right=4294917160
 player_4_body_color_right\default=false
-player_4_button_a="engine:keyboard,code:67,toggle:0"
-player_4_button_a\default=false
-player_4_button_b="engine:keyboard,code:88,toggle:0"
-player_4_button_b\default=false
+player_4_button_a="toggle:0,code:67,engine:keyboard"
+player_4_button_a\default=true
+player_4_button_b="toggle:0,code:88,engine:keyboard"
+player_4_button_b\default=true
 player_4_button_color_left=4278197790
 player_4_button_color_left\default=false
 player_4_button_color_right=4280158730
 player_4_button_color_right\default=false
-player_4_button_ddown="engine:keyboard,code:16777237,toggle:0"
-player_4_button_ddown\default=false
-player_4_button_dleft="engine:keyboard,code:16777234,toggle:0"
-player_4_button_dleft\default=false
-player_4_button_dright="engine:keyboard,code:16777236,toggle:0"
-player_4_button_dright\default=false
-player_4_button_dup="engine:keyboard,code:16777235,toggle:0"
-player_4_button_dup\default=false
-player_4_button_home="engine:keyboard,code:0,toggle:0"
-player_4_button_home\default=false
-player_4_button_l="engine:keyboard,code:81,toggle:0"
-player_4_button_l\default=false
-player_4_button_lstick="engine:keyboard,code:70,toggle:0"
-player_4_button_lstick\default=false
-player_4_button_minus="engine:keyboard,code:78,toggle:0"
-player_4_button_minus\default=false
-player_4_button_plus="engine:keyboard,code:77,toggle:0"
-player_4_button_plus\default=false
-player_4_button_r="engine:keyboard,code:69,toggle:0"
-player_4_button_r\default=false
-player_4_button_rstick="engine:keyboard,code:71,toggle:0"
-player_4_button_rstick\default=false
-player_4_button_screenshot="engine:keyboard,code:0,toggle:0"
-player_4_button_screenshot\default=false
-player_4_button_sl="engine:keyboard,code:81,toggle:0"
-player_4_button_sl\default=false
-player_4_button_sr="engine:keyboard,code:69,toggle:0"
-player_4_button_sr\default=false
-player_4_button_x="engine:keyboard,code:86,toggle:0"
-player_4_button_x\default=false
-player_4_button_y="engine:keyboard,code:90,toggle:0"
-player_4_button_y\default=false
-player_4_button_zl="engine:keyboard,code:82,toggle:0"
-player_4_button_zl\default=false
-player_4_button_zr="engine:keyboard,code:84,toggle:0"
-player_4_button_zr\default=false
+player_4_button_ddown="toggle:0,code:16777237,engine:keyboard"
+player_4_button_ddown\default=true
+player_4_button_dleft="toggle:0,code:16777234,engine:keyboard"
+player_4_button_dleft\default=true
+player_4_button_dright="toggle:0,code:16777236,engine:keyboard"
+player_4_button_dright\default=true
+player_4_button_dup="toggle:0,code:16777235,engine:keyboard"
+player_4_button_dup\default=true
+player_4_button_home="toggle:0,code:0,engine:keyboard"
+player_4_button_home\default=true
+player_4_button_l="toggle:0,code:81,engine:keyboard"
+player_4_button_l\default=true
+player_4_button_lstick="toggle:0,code:70,engine:keyboard"
+player_4_button_lstick\default=true
+player_4_button_minus="toggle:0,code:78,engine:keyboard"
+player_4_button_minus\default=true
+player_4_button_plus="toggle:0,code:77,engine:keyboard"
+player_4_button_plus\default=true
+player_4_button_r="toggle:0,code:69,engine:keyboard"
+player_4_button_r\default=true
+player_4_button_rstick="toggle:0,code:71,engine:keyboard"
+player_4_button_rstick\default=true
+player_4_button_screenshot="toggle:0,code:0,engine:keyboard"
+player_4_button_screenshot\default=true
+player_4_button_sl="toggle:0,code:81,engine:keyboard"
+player_4_button_sl\default=true
+player_4_button_sr="toggle:0,code:69,engine:keyboard"
+player_4_button_sr\default=true
+player_4_button_x="toggle:0,code:86,engine:keyboard"
+player_4_button_x\default=true
+player_4_button_y="toggle:0,code:90,engine:keyboard"
+player_4_button_y\default=true
+player_4_button_zl="toggle:0,code:82,engine:keyboard"
+player_4_button_zl\default=true
+player_4_button_zr="toggle:0,code:84,engine:keyboard"
+player_4_button_zr\default=true
 player_4_connected=false
 player_4_connected\default=true
-player_4_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000"
-player_4_lstick\default=false
-player_4_motionleft="engine:keyboard,code:55,toggle:0"
-player_4_motionleft\default=false
-player_4_motionright="engine:keyboard,code:56,toggle:0"
-player_4_motionright\default=false
-player_4_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000"
-player_4_rstick\default=false
+player_4_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button"
+player_4_lstick\default=true
+player_4_motionleft="toggle:0,code:55,engine:keyboard"
+player_4_motionleft\default=true
+player_4_motionright="toggle:0,code:56,engine:keyboard"
+player_4_motionright\default=true
+player_4_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button"
+player_4_rstick\default=true
 player_4_type=0
 player_4_type\default=true
 player_4_vibration_enabled=true
@@ -406,60 +409,60 @@ player_5_body_color_left=4278893030
 player_5_body_color_left\default=false
 player_5_body_color_right=4294917160
 player_5_body_color_right\default=false
-player_5_button_a="engine:keyboard,code:67,toggle:0"
-player_5_button_a\default=false
-player_5_button_b="engine:keyboard,code:88,toggle:0"
-player_5_button_b\default=false
+player_5_button_a="toggle:0,code:67,engine:keyboard"
+player_5_button_a\default=true
+player_5_button_b="toggle:0,code:88,engine:keyboard"
+player_5_button_b\default=true
 player_5_button_color_left=4278197790
 player_5_button_color_left\default=false
 player_5_button_color_right=4280158730
 player_5_button_color_right\default=false
-player_5_button_ddown="engine:keyboard,code:16777237,toggle:0"
-player_5_button_ddown\default=false
-player_5_button_dleft="engine:keyboard,code:16777234,toggle:0"
-player_5_button_dleft\default=false
-player_5_button_dright="engine:keyboard,code:16777236,toggle:0"
-player_5_button_dright\default=false
-player_5_button_dup="engine:keyboard,code:16777235,toggle:0"
-player_5_button_dup\default=false
-player_5_button_home="engine:keyboard,code:0,toggle:0"
-player_5_button_home\default=false
-player_5_button_l="engine:keyboard,code:81,toggle:0"
-player_5_button_l\default=false
-player_5_button_lstick="engine:keyboard,code:70,toggle:0"
-player_5_button_lstick\default=false
-player_5_button_minus="engine:keyboard,code:78,toggle:0"
-player_5_button_minus\default=false
-player_5_button_plus="engine:keyboard,code:77,toggle:0"
-player_5_button_plus\default=false
-player_5_button_r="engine:keyboard,code:69,toggle:0"
-player_5_button_r\default=false
-player_5_button_rstick="engine:keyboard,code:71,toggle:0"
-player_5_button_rstick\default=false
-player_5_button_screenshot="engine:keyboard,code:0,toggle:0"
-player_5_button_screenshot\default=false
-player_5_button_sl="engine:keyboard,code:81,toggle:0"
-player_5_button_sl\default=false
-player_5_button_sr="engine:keyboard,code:69,toggle:0"
-player_5_button_sr\default=false
-player_5_button_x="engine:keyboard,code:86,toggle:0"
-player_5_button_x\default=false
-player_5_button_y="engine:keyboard,code:90,toggle:0"
-player_5_button_y\default=false
-player_5_button_zl="engine:keyboard,code:82,toggle:0"
-player_5_button_zl\default=false
-player_5_button_zr="engine:keyboard,code:84,toggle:0"
-player_5_button_zr\default=false
+player_5_button_ddown="toggle:0,code:16777237,engine:keyboard"
+player_5_button_ddown\default=true
+player_5_button_dleft="toggle:0,code:16777234,engine:keyboard"
+player_5_button_dleft\default=true
+player_5_button_dright="toggle:0,code:16777236,engine:keyboard"
+player_5_button_dright\default=true
+player_5_button_dup="toggle:0,code:16777235,engine:keyboard"
+player_5_button_dup\default=true
+player_5_button_home="toggle:0,code:0,engine:keyboard"
+player_5_button_home\default=true
+player_5_button_l="toggle:0,code:81,engine:keyboard"
+player_5_button_l\default=true
+player_5_button_lstick="toggle:0,code:70,engine:keyboard"
+player_5_button_lstick\default=true
+player_5_button_minus="toggle:0,code:78,engine:keyboard"
+player_5_button_minus\default=true
+player_5_button_plus="toggle:0,code:77,engine:keyboard"
+player_5_button_plus\default=true
+player_5_button_r="toggle:0,code:69,engine:keyboard"
+player_5_button_r\default=true
+player_5_button_rstick="toggle:0,code:71,engine:keyboard"
+player_5_button_rstick\default=true
+player_5_button_screenshot="toggle:0,code:0,engine:keyboard"
+player_5_button_screenshot\default=true
+player_5_button_sl="toggle:0,code:81,engine:keyboard"
+player_5_button_sl\default=true
+player_5_button_sr="toggle:0,code:69,engine:keyboard"
+player_5_button_sr\default=true
+player_5_button_x="toggle:0,code:86,engine:keyboard"
+player_5_button_x\default=true
+player_5_button_y="toggle:0,code:90,engine:keyboard"
+player_5_button_y\default=true
+player_5_button_zl="toggle:0,code:82,engine:keyboard"
+player_5_button_zl\default=true
+player_5_button_zr="toggle:0,code:84,engine:keyboard"
+player_5_button_zr\default=true
 player_5_connected=false
 player_5_connected\default=true
-player_5_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000"
-player_5_lstick\default=false
-player_5_motionleft="engine:keyboard,code:55,toggle:0"
-player_5_motionleft\default=false
-player_5_motionright="engine:keyboard,code:56,toggle:0"
-player_5_motionright\default=false
-player_5_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000"
-player_5_rstick\default=false
+player_5_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button"
+player_5_lstick\default=true
+player_5_motionleft="toggle:0,code:55,engine:keyboard"
+player_5_motionleft\default=true
+player_5_motionright="toggle:0,code:56,engine:keyboard"
+player_5_motionright\default=true
+player_5_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button"
+player_5_rstick\default=true
 player_5_type=0
 player_5_type\default=true
 player_5_vibration_enabled=true
@@ -470,60 +473,60 @@ player_6_body_color_left=4278893030
 player_6_body_color_left\default=false
 player_6_body_color_right=4294917160
 player_6_body_color_right\default=false
-player_6_button_a="engine:keyboard,code:67,toggle:0"
-player_6_button_a\default=false
-player_6_button_b="engine:keyboard,code:88,toggle:0"
-player_6_button_b\default=false
+player_6_button_a="toggle:0,code:67,engine:keyboard"
+player_6_button_a\default=true
+player_6_button_b="toggle:0,code:88,engine:keyboard"
+player_6_button_b\default=true
 player_6_button_color_left=4278197790
 player_6_button_color_left\default=false
 player_6_button_color_right=4280158730
 player_6_button_color_right\default=false
-player_6_button_ddown="engine:keyboard,code:16777237,toggle:0"
-player_6_button_ddown\default=false
-player_6_button_dleft="engine:keyboard,code:16777234,toggle:0"
-player_6_button_dleft\default=false
-player_6_button_dright="engine:keyboard,code:16777236,toggle:0"
-player_6_button_dright\default=false
-player_6_button_dup="engine:keyboard,code:16777235,toggle:0"
-player_6_button_dup\default=false
-player_6_button_home="engine:keyboard,code:0,toggle:0"
-player_6_button_home\default=false
-player_6_button_l="engine:keyboard,code:81,toggle:0"
-player_6_button_l\default=false
-player_6_button_lstick="engine:keyboard,code:70,toggle:0"
-player_6_button_lstick\default=false
-player_6_button_minus="engine:keyboard,code:78,toggle:0"
-player_6_button_minus\default=false
-player_6_button_plus="engine:keyboard,code:77,toggle:0"
-player_6_button_plus\default=false
-player_6_button_r="engine:keyboard,code:69,toggle:0"
-player_6_button_r\default=false
-player_6_button_rstick="engine:keyboard,code:71,toggle:0"
-player_6_button_rstick\default=false
-player_6_button_screenshot="engine:keyboard,code:0,toggle:0"
-player_6_button_screenshot\default=false
-player_6_button_sl="engine:keyboard,code:81,toggle:0"
-player_6_button_sl\default=false
-player_6_button_sr="engine:keyboard,code:69,toggle:0"
-player_6_button_sr\default=false
-player_6_button_x="engine:keyboard,code:86,toggle:0"
-player_6_button_x\default=false
-player_6_button_y="engine:keyboard,code:90,toggle:0"
-player_6_button_y\default=false
-player_6_button_zl="engine:keyboard,code:82,toggle:0"
-player_6_button_zl\default=false
-player_6_button_zr="engine:keyboard,code:84,toggle:0"
-player_6_button_zr\default=false
+player_6_button_ddown="toggle:0,code:16777237,engine:keyboard"
+player_6_button_ddown\default=true
+player_6_button_dleft="toggle:0,code:16777234,engine:keyboard"
+player_6_button_dleft\default=true
+player_6_button_dright="toggle:0,code:16777236,engine:keyboard"
+player_6_button_dright\default=true
+player_6_button_dup="toggle:0,code:16777235,engine:keyboard"
+player_6_button_dup\default=true
+player_6_button_home="toggle:0,code:0,engine:keyboard"
+player_6_button_home\default=true
+player_6_button_l="toggle:0,code:81,engine:keyboard"
+player_6_button_l\default=true
+player_6_button_lstick="toggle:0,code:70,engine:keyboard"
+player_6_button_lstick\default=true
+player_6_button_minus="toggle:0,code:78,engine:keyboard"
+player_6_button_minus\default=true
+player_6_button_plus="toggle:0,code:77,engine:keyboard"
+player_6_button_plus\default=true
+player_6_button_r="toggle:0,code:69,engine:keyboard"
+player_6_button_r\default=true
+player_6_button_rstick="toggle:0,code:71,engine:keyboard"
+player_6_button_rstick\default=true
+player_6_button_screenshot="toggle:0,code:0,engine:keyboard"
+player_6_button_screenshot\default=true
+player_6_button_sl="toggle:0,code:81,engine:keyboard"
+player_6_button_sl\default=true
+player_6_button_sr="toggle:0,code:69,engine:keyboard"
+player_6_button_sr\default=true
+player_6_button_x="toggle:0,code:86,engine:keyboard"
+player_6_button_x\default=true
+player_6_button_y="toggle:0,code:90,engine:keyboard"
+player_6_button_y\default=true
+player_6_button_zl="toggle:0,code:82,engine:keyboard"
+player_6_button_zl\default=true
+player_6_button_zr="toggle:0,code:84,engine:keyboard"
+player_6_button_zr\default=true
 player_6_connected=false
 player_6_connected\default=true
-player_6_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000"
-player_6_lstick\default=false
-player_6_motionleft="engine:keyboard,code:55,toggle:0"
-player_6_motionleft\default=false
-player_6_motionright="engine:keyboard,code:56,toggle:0"
-player_6_motionright\default=false
-player_6_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000"
-player_6_rstick\default=false
+player_6_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button"
+player_6_lstick\default=true
+player_6_motionleft="toggle:0,code:55,engine:keyboard"
+player_6_motionleft\default=true
+player_6_motionright="toggle:0,code:56,engine:keyboard"
+player_6_motionright\default=true
+player_6_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button"
+player_6_rstick\default=true
 player_6_type=0
 player_6_type\default=true
 player_6_vibration_enabled=true
@@ -534,60 +537,60 @@ player_7_body_color_left=4278893030
 player_7_body_color_left\default=false
 player_7_body_color_right=4294917160
 player_7_body_color_right\default=false
-player_7_button_a="engine:keyboard,code:67,toggle:0"
-player_7_button_a\default=false
-player_7_button_b="engine:keyboard,code:88,toggle:0"
-player_7_button_b\default=false
+player_7_button_a="toggle:0,code:67,engine:keyboard"
+player_7_button_a\default=true
+player_7_button_b="toggle:0,code:88,engine:keyboard"
+player_7_button_b\default=true
 player_7_button_color_left=4278197790
 player_7_button_color_left\default=false
 player_7_button_color_right=4280158730
 player_7_button_color_right\default=false
-player_7_button_ddown="engine:keyboard,code:16777237,toggle:0"
-player_7_button_ddown\default=false
-player_7_button_dleft="engine:keyboard,code:16777234,toggle:0"
-player_7_button_dleft\default=false
-player_7_button_dright="engine:keyboard,code:16777236,toggle:0"
-player_7_button_dright\default=false
-player_7_button_dup="engine:keyboard,code:16777235,toggle:0"
-player_7_button_dup\default=false
-player_7_button_home="engine:keyboard,code:0,toggle:0"
-player_7_button_home\default=false
-player_7_button_l="engine:keyboard,code:81,toggle:0"
-player_7_button_l\default=false
-player_7_button_lstick="engine:keyboard,code:70,toggle:0"
-player_7_button_lstick\default=false
-player_7_button_minus="engine:keyboard,code:78,toggle:0"
-player_7_button_minus\default=false
-player_7_button_plus="engine:keyboard,code:77,toggle:0"
-player_7_button_plus\default=false
-player_7_button_r="engine:keyboard,code:69,toggle:0"
-player_7_button_r\default=false
-player_7_button_rstick="engine:keyboard,code:71,toggle:0"
-player_7_button_rstick\default=false
-player_7_button_screenshot="engine:keyboard,code:0,toggle:0"
-player_7_button_screenshot\default=false
-player_7_button_sl="engine:keyboard,code:81,toggle:0"
-player_7_button_sl\default=false
-player_7_button_sr="engine:keyboard,code:69,toggle:0"
-player_7_button_sr\default=false
-player_7_button_x="engine:keyboard,code:86,toggle:0"
-player_7_button_x\default=false
-player_7_button_y="engine:keyboard,code:90,toggle:0"
-player_7_button_y\default=false
-player_7_button_zl="engine:keyboard,code:82,toggle:0"
-player_7_button_zl\default=false
-player_7_button_zr="engine:keyboard,code:84,toggle:0"
-player_7_button_zr\default=false
+player_7_button_ddown="toggle:0,code:16777237,engine:keyboard"
+player_7_button_ddown\default=true
+player_7_button_dleft="toggle:0,code:16777234,engine:keyboard"
+player_7_button_dleft\default=true
+player_7_button_dright="toggle:0,code:16777236,engine:keyboard"
+player_7_button_dright\default=true
+player_7_button_dup="toggle:0,code:16777235,engine:keyboard"
+player_7_button_dup\default=true
+player_7_button_home="toggle:0,code:0,engine:keyboard"
+player_7_button_home\default=true
+player_7_button_l="toggle:0,code:81,engine:keyboard"
+player_7_button_l\default=true
+player_7_button_lstick="toggle:0,code:70,engine:keyboard"
+player_7_button_lstick\default=true
+player_7_button_minus="toggle:0,code:78,engine:keyboard"
+player_7_button_minus\default=true
+player_7_button_plus="toggle:0,code:77,engine:keyboard"
+player_7_button_plus\default=true
+player_7_button_r="toggle:0,code:69,engine:keyboard"
+player_7_button_r\default=true
+player_7_button_rstick="toggle:0,code:71,engine:keyboard"
+player_7_button_rstick\default=true
+player_7_button_screenshot="toggle:0,code:0,engine:keyboard"
+player_7_button_screenshot\default=true
+player_7_button_sl="toggle:0,code:81,engine:keyboard"
+player_7_button_sl\default=true
+player_7_button_sr="toggle:0,code:69,engine:keyboard"
+player_7_button_sr\default=true
+player_7_button_x="toggle:0,code:86,engine:keyboard"
+player_7_button_x\default=true
+player_7_button_y="toggle:0,code:90,engine:keyboard"
+player_7_button_y\default=true
+player_7_button_zl="toggle:0,code:82,engine:keyboard"
+player_7_button_zl\default=true
+player_7_button_zr="toggle:0,code:84,engine:keyboard"
+player_7_button_zr\default=true
 player_7_connected=false
 player_7_connected\default=true
-player_7_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000"
-player_7_lstick\default=false
-player_7_motionleft="engine:keyboard,code:55,toggle:0"
-player_7_motionleft\default=false
-player_7_motionright="engine:keyboard,code:56,toggle:0"
-player_7_motionright\default=false
-player_7_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000"
-player_7_rstick\default=false
+player_7_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button"
+player_7_lstick\default=true
+player_7_motionleft="toggle:0,code:55,engine:keyboard"
+player_7_motionleft\default=true
+player_7_motionright="toggle:0,code:56,engine:keyboard"
+player_7_motionright\default=true
+player_7_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button"
+player_7_rstick\default=true
 player_7_type=0
 player_7_type\default=true
 player_7_vibration_enabled=true
@@ -746,14 +749,14 @@ touchscreen_enabled=true
 touchscreen_enabled\default=true
 udp_input_servers=127.0.0.1:26760
 udp_input_servers\default=true
-use_docked_mode=false
+use_docked_mode=true
 use_docked_mode\default=true
 vibration_enabled=true
 vibration_enabled\default=true
 
 [Core]
-use_extended_memory_layout=true
-use_extended_memory_layout\default=false
+use_extended_memory_layout=false
+use_extended_memory_layout\default=true
 use_multi_core=true
 use_multi_core\default=true
 
@@ -802,8 +805,7 @@ cpuopt_unsafe_unfuse_fma=true
 cpuopt_unsafe_unfuse_fma\default=true
 
 [Data%20Storage]
-="======"
-dump_directory=/var/data/yuzu/dump
+dump_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/dump
 dump_directory\default=true
 gamecard_current_game=false
 gamecard_current_game\default=true
@@ -811,13 +813,13 @@ gamecard_inserted=false
 gamecard_inserted\default=true
 gamecard_path=
 gamecard_path\default=true
-load_directory=/var/data/yuzu/load
+load_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/load
 load_directory\default=true
-nand_directory=/var/data/yuzu/nand
+nand_directory=/home/deck/retrodeck/saves/switch/yuzu/nand
 nand_directory\default=true
-sdmc_directory=/var/data/yuzu/sdmc
+sdmc_directory=/home/deck/retrodeck/saves/switch/yuzu/sdmc
 sdmc_directory\default=true
-tas_directory=/var/data/yuzu/tas
+tas_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/tas
 tas_directory\default=true
 use_virtual_sd=true
 use_virtual_sd\default=true
@@ -825,6 +827,8 @@ use_virtual_sd\default=true
 [Debugging]
 create_crash_dumps=false
 create_crash_dumps\default=true
+disable_macro_hle=false
+disable_macro_hle\default=true
 disable_macro_jit=false
 disable_macro_jit\default=true
 dump_exefs=false
@@ -861,30 +865,6 @@ log_filter\default=true
 use_dev_keys=false
 use_dev_keys\default=true
 
-[Multiplayer]
-game_id=0
-game_id\default=true
-host_type=0
-host_type\default=true
-ip=
-ip\default=true
-ip_ban_list\size=0
-max_player=8
-max_player\default=true
-nickname=RetroDECK
-nickname\default=true
-port=24872
-port\default=true
-room_description=
-room_description\default=true
-room_name=
-room_name\default=true
-room_nickname=
-room_nickname\default=true
-room_port=24872
-room_port\default=true
-username_ban_list\size=0
-
 [Renderer]
 accelerate_astc=true
 accelerate_astc\default=true
@@ -892,6 +872,8 @@ anti_aliasing=0
 anti_aliasing\default=true
 aspect_ratio=0
 aspect_ratio\default=true
+async_astc=false
+async_astc\default=true
 backend=1
 backend\default=true
 bg_blue=0
@@ -904,24 +886,24 @@ debug=false
 debug\default=true
 disable_shader_loop_safety_checks=false
 disable_shader_loop_safety_checks\default=true
-fps_cap=1000
-fps_cap\default=true
+force_max_clock=false
+force_max_clock\default=true
 fsr_sharpening_slider=25
 fsr_sharpening_slider\default=true
 fullscreen_mode=1
 fullscreen_mode\default=true
-gpu_accuracy=0
-gpu_accuracy\default=false
-max_anisotropy=1
-max_anisotropy\default=false
+gpu_accuracy=1
+gpu_accuracy\default=true
+max_anisotropy=0
+max_anisotropy\default=true
 nsight_aftermath=false
 nsight_aftermath\default=true
 nvdec_emulation=2
 nvdec_emulation\default=true
 resolution_setup=2
 resolution_setup\default=true
-scaling_filter=0
-scaling_filter\default=false
+scaling_filter=1
+scaling_filter\default=true
 shader_backend=0
 shader_backend\default=true
 shader_feedback=false
@@ -930,23 +912,22 @@ speed_limit=100
 speed_limit\default=true
 use_asynchronous_gpu_emulation=true
 use_asynchronous_gpu_emulation\default=true
-use_asynchronous_shaders=true
-use_asynchronous_shaders\default=false
+use_asynchronous_shaders=false
+use_asynchronous_shaders\default=true
 use_disk_shader_cache=true
 use_disk_shader_cache\default=true
 use_fast_gpu_time=true
 use_fast_gpu_time\default=true
 use_pessimistic_flushes=false
 use_pessimistic_flushes\default=true
-use_speed_limit=true
-use_speed_limit\default=true
-use_vsync=false
-use_vsync\default=false
+use_vsync=true
+use_vsync\default=true
+use_vulkan_driver_pipeline_cache=true
+use_vulkan_driver_pipeline_cache\default=true
 vulkan_device=0
 vulkan_device\default=true
 
 [Services]
-="======"
 network_interface=wlan0
 network_interface\default=false
 
@@ -957,8 +938,10 @@ custom_rtc=0
 custom_rtc\default=true
 custom_rtc_enabled=false
 custom_rtc_enabled\default=true
-language_index=1
-language_index\default=true
+device_name=RetroDECK
+device_name\default=false
+language_index=12
+language_index\default=false
 region_index=2
 region_index\default=false
 rng_seed=0
@@ -980,7 +963,7 @@ Multiplayer\ip\default=true
 Multiplayer\ip_ban_list\size=0
 Multiplayer\max_player=8
 Multiplayer\max_player\default=true
-Multiplayer\nickname=RetroDECK
+Multiplayer\nickname=
 Multiplayer\nickname\default=true
 Multiplayer\port=24872
 Multiplayer\port\default=true
@@ -1012,147 +995,192 @@ 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=/home/deck/retrodeck/roms/switch
 Paths\gamedirs\size=4
 Paths\language=en
 Paths\language\default=false
-Paths\romsPath=~/retrodeck/roms/switch
+Paths\recentFiles=@Invalid()
+Paths\romsPath=
 Paths\symbolsPath=
-Screenshots\enable_screenshot_save_as=false
-Screenshots\enable_screenshot_save_as\default=false
-Screenshots\screenshot_path=~/retrodeck/screenshots
+Screenshots\enable_screenshot_save_as=true
+Screenshots\enable_screenshot_save_as\default=true
+Screenshots\screenshot_path=/home/deck/retrodeck/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=
-Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq=Ctrl+M
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Repeat=false
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Repeat\default=true
 Shortcuts\Main%20Window\Audio%20Volume%20Down\Context=2
 Shortcuts\Main%20Window\Audio%20Volume%20Down\Context\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq=
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq=Home+Dpad_Down
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq=-
 Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Repeat=true
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Repeat\default=true
 Shortcuts\Main%20Window\Audio%20Volume%20Up\Context=2
 Shortcuts\Main%20Window\Audio%20Volume%20Up\Context\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq=
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq=Home+Dpad_Up
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq="="
 Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Repeat=true
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Repeat\default=true
 Shortcuts\Main%20Window\Capture%20Screenshot\Context=3
 Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true
-Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq=Home+A
-Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq=Screenshot
+Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P
 Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true
+Shortcuts\Main%20Window\Capture%20Screenshot\Repeat=false
+Shortcuts\Main%20Window\Capture%20Screenshot\Repeat\default=true
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context=2
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context\default=true
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq=Home+L
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq=F8
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq\default=true
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\Repeat=false
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\Repeat\default=true
 Shortcuts\Main%20Window\Change%20Docked%20Mode\Context=2
 Shortcuts\Main%20Window\Change%20Docked%20Mode\Context\default=true
-Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=
-Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=Home+X
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq=F10
 Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq\default=true
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Repeat=false
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Repeat\default=true
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Context=2
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Context\default=true
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq=Home+R
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq=F9
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq\default=true
+Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Repeat=false
+Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Repeat\default=true
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq=Home+B
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq\default=false
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\Repeat=false
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\Repeat\default=true
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq=
-Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq=Home+A
+Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc
 Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20Fullscreen\Repeat=false
+Shortcuts\Main%20Window\Exit%20Fullscreen\Repeat\default=true
 Shortcuts\Main%20Window\Exit%20yuzu\Context=1
 Shortcuts\Main%20Window\Exit%20yuzu\Context\default=true
-Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq=Home+Plus
-Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq\default=false
-Shortcuts\Main%20Window\Exit%20yuzu\KeySeq=
-Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=false
+Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq=Home+Minus
+Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20yuzu\KeySeq=Ctrl+Q
+Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20yuzu\Repeat=false
+Shortcuts\Main%20Window\Exit%20yuzu\Repeat\default=true
 Shortcuts\Main%20Window\Fullscreen\Context=1
 Shortcuts\Main%20Window\Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq=Home+X
+Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq=
 Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq\default=false
 Shortcuts\Main%20Window\Fullscreen\KeySeq=F11
 Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Fullscreen\Repeat=false
+Shortcuts\Main%20Window\Fullscreen\Repeat\default=true
 Shortcuts\Main%20Window\Load%20File\Context=3
 Shortcuts\Main%20Window\Load%20File\Context\default=true
 Shortcuts\Main%20Window\Load%20File\Controller_KeySeq=
 Shortcuts\Main%20Window\Load%20File\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O
 Shortcuts\Main%20Window\Load%20File\KeySeq\default=true
+Shortcuts\Main%20Window\Load%20File\Repeat=false
+Shortcuts\Main%20Window\Load%20File\Repeat\default=true
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context=3
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=Home+Y
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=false
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=F2
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=true
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat=false
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat\default=true
 Shortcuts\Main%20Window\Restart%20Emulation\Context=1
 Shortcuts\Main%20Window\Restart%20Emulation\Context\default=true
 Shortcuts\Main%20Window\Restart%20Emulation\Controller_KeySeq=
 Shortcuts\Main%20Window\Restart%20Emulation\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=F6
 Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Restart%20Emulation\Repeat=false
+Shortcuts\Main%20Window\Restart%20Emulation\Repeat\default=true
 Shortcuts\Main%20Window\Stop%20Emulation\Context=1
 Shortcuts\Main%20Window\Stop%20Emulation\Context\default=true
 Shortcuts\Main%20Window\Stop%20Emulation\Controller_KeySeq=
 Shortcuts\Main%20Window\Stop%20Emulation\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5
 Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Stop%20Emulation\Repeat=false
+Shortcuts\Main%20Window\Stop%20Emulation\Repeat\default=true
 Shortcuts\Main%20Window\TAS%20Record\Context=2
 Shortcuts\Main%20Window\TAS%20Record\Context\default=true
 Shortcuts\Main%20Window\TAS%20Record\Controller_KeySeq=
 Shortcuts\Main%20Window\TAS%20Record\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\TAS%20Record\KeySeq=Ctrl+F7
 Shortcuts\Main%20Window\TAS%20Record\KeySeq\default=true
+Shortcuts\Main%20Window\TAS%20Record\Repeat=false
+Shortcuts\Main%20Window\TAS%20Record\Repeat\default=true
 Shortcuts\Main%20Window\TAS%20Reset\Context=2
 Shortcuts\Main%20Window\TAS%20Reset\Context\default=true
 Shortcuts\Main%20Window\TAS%20Reset\Controller_KeySeq=
 Shortcuts\Main%20Window\TAS%20Reset\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\TAS%20Reset\KeySeq=Ctrl+F6
 Shortcuts\Main%20Window\TAS%20Reset\KeySeq\default=true
+Shortcuts\Main%20Window\TAS%20Reset\Repeat=false
+Shortcuts\Main%20Window\TAS%20Reset\Repeat\default=true
 Shortcuts\Main%20Window\TAS%20Start\Stop\Context=2
 Shortcuts\Main%20Window\TAS%20Start\Stop\Context\default=true
 Shortcuts\Main%20Window\TAS%20Start\Stop\Controller_KeySeq=
 Shortcuts\Main%20Window\TAS%20Start\Stop\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq=Ctrl+F5
 Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq\default=true
+Shortcuts\Main%20Window\TAS%20Start\Stop\Repeat=false
+Shortcuts\Main%20Window\TAS%20Start\Stop\Repeat\default=true
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Repeat=false
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Repeat\default=true
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context=2
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq=Ctrl+U
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Repeat=false
+Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Repeat\default=true
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context=2
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq=Ctrl+F9
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Repeat=false
+Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Repeat\default=true
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq\default=true
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Status%20Bar\Repeat=false
+Shortcuts\Main%20Window\Toggle%20Status%20Bar\Repeat\default=true
 UIGameList\cache_game_list=true
 UIGameList\cache_game_list\default=true
 UIGameList\favorites\size=0
@@ -1168,23 +1196,23 @@ UIGameList\row_2_text_id=2
 UIGameList\row_2_text_id\default=true
 UIGameList\show_add_ons=true
 UIGameList\show_add_ons\default=true
-UIGameList\show_compat=true
-UIGameList\show_compat\default=false
+UIGameList\show_compat=false
+UIGameList\show_compat\default=true
 UIGameList\show_size=true
 UIGameList\show_size\default=true
 UIGameList\show_types=true
 UIGameList\show_types\default=true
-UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4\x10\0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
-UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3T\0\0\x2\x14\0\0\0\0\0\0\0\0\0\0\x3T\0\0\x2\x14\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x3T\0\0\x2\x14)
-UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x4\xff\0\0\x2\xe3\0\0\0\0\0\0\0\x14\0\0\x4\xff\0\0\x2\xe3\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x4\xff\0\0\x2\xe3)
-UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
+UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\x5\x2\0\0\0\x1\0\0\0\x1\0\0\0\x64\0\0\x4X\0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1\x10\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
+UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4W\0\0\x2\x14\0\0\0\0\0\0\0\0\0\0\x4W\0\0\x2\x14\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\0\0\0\x4W\0\0\x2\x14)
+UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31)
+UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
 UILayout\microProfileDialogVisible=false
 UILayout\microProfileDialogVisible\default=true
-UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0Y\0\xff\xff\xff\0\0\x3U\0\0\x1\xeb\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\0\0\x4X\0\0\x1\xeb\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
 calloutFlags=1
 calloutFlags\default=false
-confirmClose=true
-confirmClose\default=true
+confirmClose=false
+confirmClose\default=false
 disable_web_applet=false
 disable_web_applet\default=false
 displayTitleBars=true
@@ -1193,8 +1221,8 @@ enable_discord_presence=true
 enable_discord_presence\default=true
 firstStart=false
 firstStart\default=false
-fullscreen=true
-fullscreen\default=false
+fullscreen=false
+fullscreen\default=true
 hideInactiveMouse=true
 hideInactiveMouse\default=true
 muteWhenInBackground=false
@@ -1211,11 +1239,10 @@ showStatusBar=true
 showStatusBar\default=true
 singleWindowMode=true
 singleWindowMode\default=true
-theme=colorful
-theme\default=true
+theme=colorful_dark
+theme\default=false
 
 [WebService]
-="======"
 enable_telemetry=false
 enable_telemetry\default=false
 web_api_url=https://api.yuzu-emu.org
diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index 63acdcc9..44f85c80 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -824,7 +824,7 @@
         <fullname>Nintendo 3DS</fullname>
         <path>%ROMPATH%/n3ds</path>
         <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
-        <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
+        <command label="Citra (Standalone)">%EMULATOR_CITRA% -f %ROM%</command>
         <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
         <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command>
         <platform>n3ds</platform>
diff --git a/functions.sh b/functions.sh
index 45e637e3..557ebbca 100644
--- a/functions.sh
+++ b/functions.sh
@@ -847,7 +847,7 @@ citra_init() {
   mkdir -pv "$rdhome/saves/n3ds/citra/sdmc/"
   dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
   dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log"
-  cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini
+  cp -fv $emuconfigs/citra/qt-config.ini /var/config/citra-emu/qt-config.ini
   sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
 }
 
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index af12b23c..ce49a6e0 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -88,7 +88,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: main
+        branch: cooker-0.6.3b
 
   - name: xmlstarlet
     config-opts:
@@ -1093,4 +1093,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.3b
+        branch: cooker-0.6.3b
\ No newline at end of file