diff --git a/pkgs/apps/games/polymc/default.nix b/pkgs/apps/games/polymc/default.nix
index 3eb938b..fb377c7 100644
--- a/pkgs/apps/games/polymc/default.nix
+++ b/pkgs/apps/games/polymc/default.nix
@@ -3,125 +3,171 @@
 , fetchFromGitHub
 , cmake
 , ninja
-, jdk8
-, jdk
+, jdk21
 , ghc_filesystem
 , zlib
 , file
 , wrapQtAppsHook
 , xorg
 , libpulseaudio
+, openal
 , qtbase
+, qtwayland
+, qtsvg
+, glfw
+, pciutils
+, udev
+, glxinfo
 , quazip
 , libGL
-, msaClientID ? ""
+, flite
+, addOpenGLRunpath
+, vulkan-loader
+, msaClientID ? null
 , extra-cmake-modules
 , qtcharts
-  # For wrapper
 , makeWrapper
+, gamemode
+, mangohud
+, glfw-wayland-minecraft
+, writeShellScript
 }:
 
 
 
-let polymc = 
 let
+  polymc =
+    let
+      binpath = lib.makeBinPath ([ xorg.xrandr glxinfo pciutils ]);
 
-  libpath = with xorg; lib.makeLibraryPath ([
-    libX11
-    libXext
-    libXcursor
-    libXrandr
-    libXxf86vm
-    libpulseaudio
-    libGL
-  ]);
+      libpath = with xorg; lib.makeLibraryPath ([
+        libX11
+        libXext
+        libXcursor
+        libXrandr
+        libXxf86vm
+        libpulseaudio
+        libGL
+        vulkan-loader
+        glfw
+        openal
+        udev
+        flite
+        stdenv.cc.cc.lib
+      ]);
+
+      gameLibraryPath = libpath + ":${addOpenGLRunpath.driverLink}/lib";
 
 
-  gameLibraryPath = libpath + ":/run/opengl-driver/lib";
-
-
-in
-stdenv.mkDerivation rec {
-  pname = "polymc";
-  version = "6.1";
-
-  src = fetchFromGitHub {
-    owner = "PolyMC";
-    repo = "PolyMC";
-    rev = version;
-    sha256 = "sha256-AOy13zAWQ0CtsX9z1M+fxH7Sh/QSFy7EdQ/fD9yUYc8=";
-    fetchSubmodules = true;
-  };
-  dontWrapQtApps = true;
-  nativeBuildInputs = [ cmake extra-cmake-modules ninja jdk ghc_filesystem file wrapQtAppsHook ];
-  buildInputs = [ qtbase quazip zlib qtcharts ];
-
-
-  cmakeFlags = [
-    "-GNinja"
-    "-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qtbase.version}"
-  ] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
-
-
-  postPatch = ''
-    # hardcode jdk paths
-    substituteInPlace launcher/java/JavaUtils.cpp \
-      --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \
-      --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' \
-  '';
-
-  postFixup = ''
-    # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-    wrapQtApp $out/bin/polymc \
-      --prefix LD_LIBRARY_PATH : "${gameLibraryPath}" \
-      --prefix PATH : "${lib.makeBinPath ([ xorg.xrandr ]) }"
-  '';
-  passthru = {
-
-
-    wrap =
-      { extraJDKs ? [ ]
-      , extraPaths ? [ ]
-      , extraLibs ? [ ]
-      }: stdenv.mkDerivation rec {
-        pname = "polymc-wrapped";
-        version = polymc.version;
-
-        src = polymc;
-        nativeBuildInputs = [ makeWrapper ];
-        phases = [ "installPhase" "fixupPhase" ];
-        installPhase = ''
-          mkdir -p $out/bin
-          ln -s $src/bin/polymc $out/bin/polymc
-          ln -s $src/share $out/share
-        '';
-
-        postFixup = let javaPaths = lib.makeSearchPath "bin/java" (extraJDKs); in
-          ''
-            wrapProgram $out/bin/polymc \
-              --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLibs}" \
-              --prefix POLYMC_JAVA_PATHS : "${javaPaths}" \
-              --prefix PATH : "${lib.makeBinPath extraPaths}"
-          '';
-
-        preferLocalBuild = true;
-        meta = polymc.meta;
+    in
+    stdenv.mkDerivation rec {
+      pname = "polymc" + (lib.optionalString ((lib.versions.major qtbase.version) == "5") "-qt5");
+      version = "6.1";
 
+      src = fetchFromGitHub {
+        owner = "PolyMC";
+        repo = "PolyMC";
+        rev = version;
+        sha256 = "sha256-AOy13zAWQ0CtsX9z1M+fxH7Sh/QSFy7EdQ/fD9yUYc8=";
+        fetchSubmodules = true;
       };
-  };
-  meta = with lib; {
-    homepage = "https://polymc.org/";
-    downloadPage = "https://polymc.org/download/";
-    changelog = "https://github.com/PolyMC/PolyMC/releases";
-    description = "A free, open source launcher for Minecraft";
-    longDescription = ''
-      Allows you to have multiple, separate instances of Minecraft (each with
-      their own mods, texture packs, saves, etc) and helps you manage them and
-      their associated options with a simple interface.
-    '';
-    platforms = [ "x86_64-linux" ];
-    license = licenses.gpl3Only;
-  };
-};
+      dontWrapQtApps = true;
+      nativeBuildInputs = [
+        cmake
+        extra-cmake-modules
+        ninja
+        jdk21
+        wrapQtAppsHook
+        file
+        ghc_filesystem
+      ];
+      buildInputs = [
+        qtbase
+        qtsvg
+        qtcharts
+        qtwayland
+        quazip
+        zlib
+      ];
+
+
+      cmakeFlags = [
+        "-GNinja"
+        "-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qtbase.version}"
+      ]
+      ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
+
+
+      postPatch = ''
+        # hardcode jdk paths
+        substituteInPlace launcher/java/JavaUtils.cpp \
+          --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk21}/lib/openjdk/bin/java")' 
+      '';
+
+      postFixup = ''
+        # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+        wrapQtApp $out/bin/polymc \
+          --suffix LD_LIBRARY_PATH : "${gameLibraryPath}" \
+          --suffix PATH : "${binpath}" \
+          --set-default ALSOFT_DRIVERS "pulse"
+      '';
+      passthru = {
+
+
+        wrap =
+          { extraJDKs ? [ ]
+          , extraPaths ? [ ]
+          , extraLibs ? [ ]
+          , withWaylandGLFW ? false
+          , withMangohud ? true
+          , withGamemode ? true
+          }: stdenv.mkDerivation rec {
+            pname = "${polymc.pname}-wrapped";
+            version = polymc.version;
+            libsPath = (lib.makeLibraryPath (extraLibs ++ lib.optional withGamemode gamemode.lib)) + lib.optionalString withMangohud "${mangohud + "/lib/mangohud"}";
+            binsPath = lib.makeBinPath (extraPaths ++ lib.optional withMangohud mangohud);
+
+            waylandPreExec = writeShellScript "waylandGLFW" ''
+              if [ -n "$WAYLAND_DISPLAY" ]; then
+                export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
+              fi
+            '';
+            src = polymc;
+            nativeBuildInputs = [ makeWrapper ];
+            phases = [ "installPhase" "fixupPhase" ];
+            installPhase = ''
+              mkdir -p $out/bin
+              ln -s $src/bin/polymc $out/bin/polymc
+              ln -s $src/share $out/share
+            '';
+
+            postFixup = let javaPaths = lib.makeSearchPath "bin/java" (extraJDKs); in
+              ''
+                wrapProgram $out/bin/polymc \
+                  --suffix LD_LIBRARY_PATH : "${libsPath}" \
+                  --suffix POLYMC_JAVA_PATHS : "${javaPaths}" \
+                  --suffix PATH : "${binsPath}" ${lib.optionalString withWaylandGLFW ''--run ${waylandPreExec}''}
+                  
+              '';
+
+            preferLocalBuild = true;
+            meta = polymc.meta;
+
+          };
+      };
+      meta = with lib; {
+        homepage = "https://polymc.org/";
+        downloadPage = "https://polymc.org/download/";
+        changelog = "https://github.com/PolyMC/PolyMC/releases";
+        description = "A free, open source launcher for Minecraft";
+        longDescription = ''
+          Allows you to have multiple, separate instances of Minecraft (each with
+          their own mods, texture packs, saves, etc) and helps you manage them and
+          their associated options with a simple interface.
+        '';
+        platforms = [ "x86_64-linux" ];
+        license = licenses.gpl3Only;
+      };
+    };
 in
 polymc
diff --git a/pkgs/default.nix b/pkgs/default.nix
index e297854..3ab6ada 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -22,6 +22,7 @@ rec {
   obs-amf = pkgs.qt6Packages.callPackage ./apps/obs { ffmpeg = ffmpeg6-amf-full; inherit libcef; };
 
   polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc { };
+  polymc-qt5 = pkgs.libsForQt5.callPackage ./apps/games/polymc { };
 
   alvr = pkgs.callPackage ./apps/games/alvr { };