diff --git a/emu-configs/citra/qt-config.ini b/emu-configs/citra/qt-config.ini
index 54f1fa21..55c0bf80 100644
--- a/emu-configs/citra/qt-config.ini
+++ b/emu-configs/citra/qt-config.ini
@@ -373,8 +373,8 @@ 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
@@ -425,8 +425,8 @@ 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\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
@@ -522,7 +522,7 @@ 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
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>