diff --git a/packages/games/emulators/dolphinsa/package.mk b/packages/games/emulators/dolphinsa/package.mk
index 3b13b1c35..2cbf3ec8a 100755
--- a/packages/games/emulators/dolphinsa/package.mk
+++ b/packages/games/emulators/dolphinsa/package.mk
@@ -10,7 +10,7 @@ case ${DEVICE} in
   RG552|handheld)
     PKG_SITE="https://github.com/dolphin-emu/dolphin"
     PKG_URL="${PKG_SITE}.git"
-    PKG_VERSION="a1c4861ad8666b622f96266a20af6e8e787c9693"
+    PKG_VERSION="d853da3b0b6546650d030daa706ba5a68057ad19"
     PKG_PATCH_DIRS+=" wayland"
   ;;
   *)
diff --git a/packages/games/emulators/duckstationsa/package.mk b/packages/games/emulators/duckstationsa/package.mk
index cfcc8f3dc..f1ba951ff 100644
--- a/packages/games/emulators/duckstationsa/package.mk
+++ b/packages/games/emulators/duckstationsa/package.mk
@@ -10,7 +10,7 @@ PKG_SHORTDESC="Fast PlayStation 1 emulator for x86-64/AArch32/AArch64 "
 
 case ${DEVICE} in
   RG552|handheld)
-    PKG_VERSION="3f5552d6acb429a3e953b40c1734fda2cdac72be"
+    PKG_VERSION="928dd0e6656ef76ea54b380ec356f872e5e92c42"
     PKG_PATCH_DIRS+=" new"
   ;;
   *)
diff --git a/packages/games/emulators/yuzusa/package.mk b/packages/games/emulators/yuzusa/package.mk
index 85de54115..f537bd8de 100644
--- a/packages/games/emulators/yuzusa/package.mk
+++ b/packages/games/emulators/yuzusa/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="yuzusa"
-PKG_VERSION="a4696285af946588dc33b19e49a3baa0f8b2b60d"
+PKG_VERSION="1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/yuzu-emu/yuzu"
diff --git a/packages/games/libretro/dolphin/package.mk b/packages/games/libretro/dolphin/package.mk
index a9ab37186..31177987f 100644
--- a/packages/games/libretro/dolphin/package.mk
+++ b/packages/games/libretro/dolphin/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="dolphin"
-PKG_VERSION="0df1b5be3be8884522ca15de71deaaa8143d0d09"
+PKG_VERSION="2f4b0f7902257d40a054f60b2c670d6e314f2a04"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb"
diff --git a/packages/games/tools/351files/patches/handheld/device.patch b/packages/games/tools/351files/patches/handheld/device.patch
index 861830af0..462e1d28d 100644
--- a/packages/games/tools/351files/patches/handheld/device.patch
+++ b/packages/games/tools/351files/patches/handheld/device.patch
@@ -19,19 +19,19 @@ index 92d1a01..db4fec4 100644
 
 +// Parameters for handheld
 +#elif defined(DEVICE_HANDHELD)
-+   #define SCREEN_WIDTH             1280
-+   #define SCREEN_HEIGHT            720
++   #define SCREEN_WIDTH             1920
++   #define SCREEN_HEIGHT            1080
 +   #define HARDWARE_ACCELERATION    0
 +   #define FULLSCREEN               1
 +   #define FONT_NAME                "NotoSans-Regular.ttf"
 +   #define FONT_NAME_MONO           "NotoSansMono-Regular.ttf"
-+   #define FONT_SIZE                20
-+   #define LINE_HEIGHT              32
-+   #define ICON_SIZE                24
-+   #define MARGIN_X                 10
-+   #define KEYBOARD_MARGIN          8
-+   #define KEYBOARD_KEY_SPACING     4
-+   #define KEYBOARD_SYMBOL_SIZE     24
++   #define FONT_SIZE                48
++   #define LINE_HEIGHT              72
++   #define ICON_SIZE                58
++   #define MARGIN_X                 24
++   #define KEYBOARD_MARGIN          19
++   #define KEYBOARD_KEY_SPACING     10
++   #define KEYBOARD_SYMBOL_SIZE     58
 +
  // Paramaters for desktop PC
  #else
diff --git a/packages/games/tools/control-gen/Makefile b/packages/games/tools/control-gen/Makefile
new file mode 100644
index 000000000..a2f1cecf2
--- /dev/null
+++ b/packages/games/tools/control-gen/Makefile
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
+CXX ?= gcc
+CCFLAGS = -W -Wall -std=c++11 `sdl2-config --cflags`
+
+BINARY = control-gen
+LIBRARIES = -lSDL2
+SOURCES = "control-gen.cpp"
+
+all:
+	$(CXX) $(CFLAGS) $(SOURCES) -o $(BINARY) $(LIBRARIES)
+
+clean:
+	rm -f $(BINARY)
diff --git a/packages/games/tools/control-gen/control-gen.cpp b/packages/games/tools/control-gen/control-gen.cpp
new file mode 100644
index 000000000..675a7a173
--- /dev/null
+++ b/packages/games/tools/control-gen/control-gen.cpp
@@ -0,0 +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
// Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

#include <stdio.h>
#include <SDL.h>

int main()
{
  SDL_Init(SDL_INIT_JOYSTICK);
  atexit(SDL_Quit);

  int num_joysticks = SDL_NumJoysticks();
  int i;
  for(i = 0; i < num_joysticks; ++i)
  {
    SDL_Joystick* js = SDL_JoystickOpen(i);
    if (js)
    {
      SDL_JoystickGUID guid = SDL_JoystickGetGUID(js);
      char guid_str[1024];
      SDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str));
      const char* name = SDL_JoystickName(js);

        printf("controlfolder=\"/storage/.config/gptokeyb\"\nESUDO=\"sudo\"\nESUDOKILL=\"-sudokill\"\nexport SDL_GAMECONTROLLERCONFIG_FILE=\"$controlfolder/gamecontrollerdb.txt\"\nSDLDBFILE=\"${SDL_GAMECONTROLLERCONFIG_FILE}\"\n[ -z \"${SDLDBFILE}\" ] && SDLDBFILE=\"${controlfolder}/gamecontrollerdb.txt\"\nSDLDBUSERFILE=\"/storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt\"\nget_controls() {\nANALOGSTICKS=\"2\"\nDEVICE=\"%s\"\nparam_device=\"%s\"\n}\nGPTOKEYB=\"$controlfolder/gptokeyb $ESUDOKILL\"",
        guid_str, name);

      SDL_JoystickClose(js);
    }
  }

  return 0;
}
\ No newline at end of file
diff --git a/packages/games/tools/control-gen/package.mk b/packages/games/tools/control-gen/package.mk
new file mode 100644
index 000000000..638f3eb7b
--- /dev/null
+++ b/packages/games/tools/control-gen/package.mk
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
+PKG_NAME="control-gen"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_SHORTDESC="Generates control.txt for gptokeyb"
+PKG_TOOLCHAIN="make"
+
+pre_make_target() {
+  cp -f $PKG_DIR/Makefile $PKG_BUILD
+  cp -f $PKG_DIR/control-gen.cpp $PKG_BUILD
+  CFLAGS+=" -I$(get_build_dir SDL2)/include -D_REENTRANT"
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/bin
+  cp ${PKG_BUILD}/control-gen $INSTALL/usr/bin
+  cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin
+  chmod 0755 ${INSTALL}/usr/bin/*
+}
diff --git a/packages/games/tools/control-gen/scripts/control-gen_init.sh b/packages/games/tools/control-gen/scripts/control-gen_init.sh
new file mode 100644
index 000000000..801c91167
--- /dev/null
+++ b/packages/games/tools/control-gen/scripts/control-gen_init.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
+#Check if gptokeyb exists in .config
+if [ ! -d "/storage/.config/gptokeyb" ]; then
+    mkdir -p "/storage/.config/gptokeyb"
+fi
+
+#Link gamecontrollerdb.txt
+ln -sf /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/gptokeyb/gamecontrollerdb.txt
+
+#Link gptokeyb
+ln -sf /usr/bin/gptokeyb /storage/.config/gptokeyb/gptokeyb
+
+#Run control-gen
+/usr/bin/control-gen >  /storage/.config/gptokeyb/control.ini
diff --git a/packages/games/tools/gamecontrollerdb/package.mk b/packages/games/tools/gamecontrollerdb/package.mk
index fde6553bb..8c2e1675e 100644
--- a/packages/games/tools/gamecontrollerdb/package.mk
+++ b/packages/games/tools/gamecontrollerdb/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
 
 PKG_NAME="gamecontrollerdb"
-PKG_VERSION="219df0c837f9390e439a6a8cc550f8b56ae80172"
+PKG_VERSION="b681748d6dbf2f735f94bd798b8e42042f211f56"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_DEPENDS_TARGET="toolchain SDL2"
diff --git a/packages/games/tools/gptokeyb/package.mk b/packages/games/tools/gptokeyb/package.mk
index 69746c0bf..fbd933365 100644
--- a/packages/games/tools/gptokeyb/package.mk
+++ b/packages/games/tools/gptokeyb/package.mk
@@ -2,12 +2,12 @@
 # Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert)
 
 PKG_NAME="gptokeyb"
-PKG_VERSION="0d807e67d9dab1f23b9593467ea5d0c1c1bf2e50"
-PKG_ARCH="aarch64"
+PKG_VERSION="0303b36b5376a9b25cf82a53ed4242509daf14e9"
+PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/EmuELEC/gptokeyb"
 PKG_URL="$PKG_SITE.git"
-PKG_DEPENDS_TARGET="toolchain libevdev SDL2"
+PKG_DEPENDS_TARGET="toolchain libevdev SDL2 control-gen"
 PKG_TOOLCHAIN="make"
 GET_HANDLER_SUPPORT="git"
 
@@ -19,6 +19,5 @@ pre_make_target() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/gptokeyb $INSTALL/usr/bin
+  cp ${PKG_BUILD}/gptokeyb $INSTALL/usr/bin
 }
-
diff --git a/packages/virtual/gamesupport/package.mk b/packages/virtual/gamesupport/package.mk
index b023e6c1e..6ccaacbbd 100644
--- a/packages/virtual/gamesupport/package.mk
+++ b/packages/virtual/gamesupport/package.mk
@@ -7,7 +7,7 @@ PKG_SITE="www.jelos.org"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Game support software metapackage."
 
-PKG_GAMESUPPORT="sixaxis rg351p-js2xbox gptokeyb jstest-sdl gamecontrollerdb sdljoytest doomscan wolfscan"
+PKG_GAMESUPPORT="sixaxis rg351p-js2xbox gptokeyb jstest-sdl gamecontrollerdb sdljoytest doomscan wolfscan control-gen"
 
 PKG_DEPENDS_TARGET="${PKG_GAMESUPPORT}"