diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2163db45b..528b128b1 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -2,3 +2,6 @@
 
 # tabs -> spaces
 bbb3b3e6f6e3c0f95873f22e6d0a4aaf350f49d9
+
+# (nix) alejandra -> nixfmt
+4c81d8c53d09196426568c4a31a4e752ed05397a
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index e5443439d..4146cddf4 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -16,6 +16,7 @@ jobs:
     permissions:
       contents: write # for korthout/backport-action to create branch
       pull-requests: write # for korthout/backport-action to create PR to backport
+      actions: write # for korthout/backport-action to create PR with workflow changes
     name: Backport Pull Request
     if: github.repository_owner == 'PrismLauncher' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
     runs-on: ubuntu-latest
@@ -24,7 +25,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Create backport PRs
-        uses: korthout/backport-action@v2.1.1
+        uses: korthout/backport-action@v3.1.0
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           pull_description: |-
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03c5b5658..cce6e2959 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,6 +39,9 @@ on:
       APPLE_NOTARIZE_PASSWORD:
         description: Password used for notarizing macOS builds
         required: false
+      CACHIX_AUTH_TOKEN:
+        description: Private token for authenticating against Cachix cache
+        required: false
       GPG_PRIVATE_KEY:
         description: Private key for AppImage signing
         required: false
@@ -54,14 +57,17 @@ jobs:
         include:
           - os: ubuntu-20.04
             qt_ver: 5
+            qt_host: linux
+            qt_arch: ""
+            qt_version: "5.12.8"
+            qt_modules: "qtnetworkauth"
 
           - os: ubuntu-20.04
             qt_ver: 6
             qt_host: linux
             qt_arch: ""
             qt_version: "6.2.4"
-            qt_modules: "qt5compat qtimageformats"
-            qt_tools: ""
+            qt_modules: "qt5compat qtimageformats qtnetworkauth"
 
           - os: windows-2022
             name: "Windows-MinGW-w64"
@@ -75,10 +81,11 @@ jobs:
             vcvars_arch: "amd64"
             qt_ver: 6
             qt_host: windows
-            qt_arch: ''
-            qt_version: '6.6.3'
-            qt_modules: 'qt5compat qtimageformats'
-            qt_tools: ''
+            qt_arch: ""
+            qt_version: "6.7.3"
+            qt_modules: "qt5compat qtimageformats qtnetworkauth"
+            nscurl_tag: "v24.9.26.122"
+            nscurl_sha256: "AEE6C4BE3CB6455858E9C1EE4B3AFE0DB9960FA03FE99CCDEDC28390D57CCBB0"
 
           - os: windows-2022
             name: "Windows-MSVC-arm64"
@@ -87,29 +94,28 @@ jobs:
             vcvars_arch: "amd64_arm64"
             qt_ver: 6
             qt_host: windows
-            qt_arch: 'win64_msvc2019_arm64'
-            qt_version: '6.6.3'
-            qt_modules: 'qt5compat qtimageformats'
-            qt_tools: ''
+            qt_arch: "win64_msvc2019_arm64"
+            qt_version: "6.7.3"
+            qt_modules: "qt5compat qtimageformats qtnetworkauth"
+            nscurl_tag: "v24.9.26.122"
+            nscurl_sha256: "AEE6C4BE3CB6455858E9C1EE4B3AFE0DB9960FA03FE99CCDEDC28390D57CCBB0"
 
-          - os: macos-12
+          - os: macos-14
             name: macOS
             macosx_deployment_target: 11.0
             qt_ver: 6
             qt_host: mac
-            qt_arch: ''
-            qt_version: '6.6.3'
-            qt_modules: 'qt5compat qtimageformats'
-            qt_tools: ''
+            qt_arch: ""
+            qt_version: "6.7.3"
+            qt_modules: "qt5compat qtimageformats qtnetworkauth"
 
-          - os: macos-12
+          - os: macos-14
             name: macOS-Legacy
             macosx_deployment_target: 10.13
             qt_ver: 5
             qt_host: mac
             qt_version: "5.15.2"
-            qt_modules: ""
-            qt_tools: ""
+            qt_modules: "qtnetworkauth"
 
     runs-on: ${{ matrix.os }}
 
@@ -151,6 +157,7 @@ jobs:
             quazip-qt6:p
             ccache:p
             qt6-5compat:p
+            qt6-networkauth:p
             cmark:p
 
       - name: Force newer ccache
@@ -160,13 +167,13 @@ jobs:
 
       - name: Setup ccache
         if: (runner.os != 'Windows' || matrix.msystem == '') && inputs.build_type == 'Debug'
-        uses: hendrikmuhs/ccache-action@v1.2.10
+        uses: hendrikmuhs/ccache-action@v1.2.14
         with:
           key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}-${{ matrix.architecture }}
 
       - name: Retrieve ccache cache (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug'
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.1.1
         with:
           path: '${{ github.workspace }}\.ccache'
           key: ${{ matrix.os }}-mingw-w64-ccache-${{ github.run_id }}
@@ -207,11 +214,6 @@ jobs:
           brew update
           brew install ninja extra-cmake-modules
 
-      - name: Install Qt (Linux)
-        if: runner.os == 'Linux' && matrix.qt_ver != 6
-        run: |
-          sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5
-
       - name: Install host Qt (Windows MSVC arm64)
         if: runner.os == 'Windows' && matrix.architecture == 'arm64'
         uses: jurplel/install-qt-action@v3
@@ -223,20 +225,18 @@ jobs:
           target: "desktop"
           arch: ""
           modules: ${{ matrix.qt_modules }}
-          tools: ${{ matrix.qt_tools }}
           cache: ${{ inputs.is_qt_cached }}
           cache-key-prefix: host-qt-arm64-windows
           dir: ${{ github.workspace }}\HostQt
           set-env: false
 
-      - name: Install Qt (macOS, Linux, Qt 6 & Windows MSVC)
-        if: runner.os == 'Linux' && matrix.qt_ver == 6 || runner.os == 'macOS' || (runner.os == 'Windows' && matrix.msystem == '')
+      - name: Install Qt (macOS, Linux & Windows MSVC)
+        if: matrix.msystem == ''
         uses: jurplel/install-qt-action@v3
         with:
           aqtversion: "==3.1.*"
           py7zrversion: ">=0.20.2"
           version: ${{ matrix.qt_version }}
-          host: ${{ matrix.qt_host }}
           target: "desktop"
           arch: ${{ matrix.qt_arch }}
           modules: ${{ matrix.qt_modules }}
@@ -266,6 +266,12 @@ jobs:
         run: |
           echo "QT_HOST_PATH=${{ github.workspace }}\HostQt\Qt\${{ matrix.qt_version }}\msvc2019_64" >> $env:GITHUB_ENV
 
+      - name: Setup java (macOS)
+        if: runner.os == 'macOS'
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
       ##
       # CONFIGURE
       ##
@@ -273,23 +279,23 @@ jobs:
       - name: Configure CMake (macOS)
         if: runner.os == 'macOS' && matrix.qt_ver == 6
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_ENABLE_JAVA_DOWNLOADER=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -G Ninja
 
       - name: Configure CMake (macOS-Legacy)
         if: runner.os == 'macOS' && matrix.qt_ver == 5
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DMACOSX_SPARKLE_UPDATE_PUBLIC_KEY="" -DMACOSX_SPARKLE_UPDATE_FEED_URL="" -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_ENABLE_JAVA_DOWNLOADER=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DMACOSX_SPARKLE_UPDATE_PUBLIC_KEY="" -DMACOSX_SPARKLE_UPDATE_FEED_URL="" -DCMAKE_OSX_ARCHITECTURES="x86_64" -G Ninja
 
       - name: Configure CMake (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != ''
         shell: msys2 {0}
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=6 -DCMAKE_OBJDUMP=/mingw64/bin/objdump.exe -DLauncher_BUILD_ARTIFACT=${{ matrix.name }}-Qt${{ matrix.qt_ver }} -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_ENABLE_JAVA_DOWNLOADER=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=6 -DCMAKE_OBJDUMP=/mingw64/bin/objdump.exe -DLauncher_BUILD_ARTIFACT=${{ matrix.name }}-Qt${{ matrix.qt_ver }} -G Ninja
 
       - name: Configure CMake (Windows MSVC)
         if: runner.os == 'Windows' && matrix.msystem == ''
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" -A${{ matrix.architecture}} -DLauncher_FORCE_BUNDLED_LIBS=ON  -DLauncher_BUILD_ARTIFACT=${{ matrix.name }}-Qt${{ matrix.qt_ver }}
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_ENABLE_JAVA_DOWNLOADER=ON -DLauncher_BUILD_PLATFORM=official -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" -A${{ matrix.architecture}} -DLauncher_FORCE_BUNDLED_LIBS=ON  -DLauncher_BUILD_ARTIFACT=${{ matrix.name }}-Qt${{ matrix.qt_ver }}
           # https://github.com/ccache/ccache/wiki/MS-Visual-Studio (I coudn't figure out the compiler prefix)
           if ("${{ env.CCACHE_VAR }}")
           {
@@ -304,7 +310,7 @@ jobs:
       - name: Configure CMake (Linux)
         if: runner.os == 'Linux'
         run: |
-          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DLauncher_BUILD_ARTIFACT=Linux-Qt${{ matrix.qt_ver }} -G Ninja
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_ENABLE_JAVA_DOWNLOADER=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DLauncher_BUILD_ARTIFACT=Linux-Qt${{ matrix.qt_ver }} -G Ninja
 
       ##
       # BUILD
@@ -404,9 +410,8 @@ jobs:
         if: matrix.name == 'macOS'
         run: |
           if [ '${{ secrets.SPARKLE_ED25519_KEY }}' != '' ]; then
-            brew install openssl@3
             echo '${{ secrets.SPARKLE_ED25519_KEY }}' > ed25519-priv.pem
-            signature=$(/usr/local/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/FjordLauncher.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
+            signature=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/FjordLauncher.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
             rm ed25519-priv.pem
             cat >> $GITHUB_STEP_SUMMARY << EOF
           ### Artifact Information :information_source:
@@ -432,12 +437,6 @@ jobs:
         run: |
           cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build_type }}
 
-          cd ${{ env.INSTALL_DIR }}
-          if ("${{ matrix.qt_ver }}" -eq "5")
-          {
-            Copy-Item ${{ runner.workspace }}/Qt/Tools/OpenSSL/Win_x86/bin/libcrypto-1_1.dll -Destination libcrypto-1_1.dll
-            Copy-Item ${{ runner.workspace }}/Qt/Tools/OpenSSL/Win_x86/bin/libssl-1_1.dll -Destination libssl-1_1.dll
-          }
           cd ${{ github.workspace }}
 
           Get-ChildItem ${{ env.INSTALL_DIR }} -Recurse | ForEach FullName | Resolve-Path -Relative | %{ $_.TrimStart('.\') } | %{ $_.TrimStart('${{ env.INSTALL_DIR }}') } | %{ $_.TrimStart('\') } | Out-File -FilePath ${{ env.INSTALL_DIR }}/manifest.txt
@@ -454,7 +453,7 @@ jobs:
           if (Get-Content ./codesign.pfx){
             cd ${{ env.INSTALL_DIR }}
             # We ship the exact same executable for portable and non-portable editions, so signing just once is fine
-            SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com fjordlauncher.exe fjordlauncher_filelink.exe
+            SignTool sign /fd sha256 /td sha256 /f ../codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com fjordlauncher.exe fjordlauncher_updater.exe fjordlauncher_filelink.exe 
           } else {
             ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
           }
@@ -478,6 +477,16 @@ jobs:
       - name: Package (Windows, installer)
         if: runner.os == 'Windows'
         run: |
+          if ('${{ matrix.nscurl_tag }}') {
+            New-Item -Name NSISPlugins -ItemType Directory
+            Invoke-Webrequest https://github.com/negrutiu/nsis-nscurl/releases/download/${{ matrix.nscurl_tag }}/NScurl.zip -OutFile NSISPlugins\NScurl.zip
+            $nscurl_hash = Get-FileHash NSISPlugins\NScurl.zip -Algorithm Sha256 | Select-Object -ExpandProperty Hash
+            if ( $nscurl_hash -ne "${{ matrix.nscurl_sha256 }}") {
+              echo "::error:: NSCurl.zip sha256 mismatch"
+              exit 1
+            }
+            Expand-Archive -Path NSISPlugins\NScurl.zip -DestinationPath NSISPlugins\NScurl
+          }
           cd ${{ env.INSTALL_DIR }}
           makensis -NOCD "${{ github.workspace }}/${{ env.BUILD_DIR }}/program_info/win_install.nsi"
 
@@ -490,28 +499,6 @@ jobs:
             ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
           }
 
-      - name: Package (Linux)
-        if: runner.os == 'Linux'
-        run: |
-          cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_DIR }}
-          for l in $(find ${{ env.INSTALL_DIR }} -type f); do l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_DIR }}/}; l=${l#./}; echo $l; done > ${{ env.INSTALL_DIR }}/manifest.txt
-          cd ${{ env.INSTALL_DIR }}
-          tar --owner root --group root -czf ../FjordLauncher.tar.gz *
-
-      - name: Package (Linux, portable)
-        if: runner.os == 'Linux'
-        run: |
-          cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }}
-          cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable
-
-          # workaround to make portable installs to work on fedora
-          mkdir  ${{ env.INSTALL_PORTABLE_DIR }}/lib
-          cp /lib/x86_64-linux-gnu/libbz2.so.1.0 ${{ env.INSTALL_PORTABLE_DIR }}/lib
-
-          for l in $(find ${{ env.INSTALL_PORTABLE_DIR }} -type f); do l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_PORTABLE_DIR }}/}; l=${l#./}; echo $l; done > ${{ env.INSTALL_PORTABLE_DIR }}/manifest.txt
-          cd ${{ env.INSTALL_PORTABLE_DIR }}
-          tar -czf ../FjordLauncher-portable.tar.gz *
-
       - name: Package AppImage (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
         shell: bash
@@ -520,7 +507,7 @@ jobs:
         run: |
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
 
-          mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.unmojang.FjordLauncher.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.unmojang.FjordLauncher.appdata.xml
+          mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.unmojang.FjordLauncher.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.fjordlauncher.FjordLauncher.appdata.xml
           export "NO_APPSTREAM=1" # we have to skip appstream checking because appstream on ubuntu 20.04 is outdated
 
           export OUTPUT="FjordLauncher-Linux-x86_64.AppImage"
@@ -558,76 +545,81 @@ jobs:
 
           mv "FjordLauncher-Linux-x86_64.AppImage" "FjordLauncher-Linux-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
 
+      - name: Package (Linux, portable)
+        if: runner.os == 'Linux'
+        run: |
+          cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_PORTABLE_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=official -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DLauncher_BUILD_ARTIFACT=Linux-Qt${{ matrix.qt_ver }} -DINSTALL_BUNDLE=full -G Ninja
+          cmake --install ${{ env.BUILD_DIR }}
+          cmake --install ${{ env.BUILD_DIR }} --component portable
+
+          mkdir  ${{ env.INSTALL_PORTABLE_DIR }}/lib
+          cp /lib/x86_64-linux-gnu/libbz2.so.1.0 ${{ env.INSTALL_PORTABLE_DIR }}/lib
+          cp /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 ${{ env.INSTALL_PORTABLE_DIR }}/lib
+          cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.INSTALL_PORTABLE_DIR }}/lib
+          cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_PORTABLE_DIR }}/lib
+          cp /usr/lib/x86_64-linux-gnu/libffi.so.7 ${{ env.INSTALL_PORTABLE_DIR }}/lib
+          mv ${{ env.INSTALL_PORTABLE_DIR }}/bin/*.so* ${{ env.INSTALL_PORTABLE_DIR }}/lib
+
+          for l in $(find ${{ env.INSTALL_PORTABLE_DIR }} -type f); do l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_PORTABLE_DIR }}/}; l=${l#./}; echo $l; done > ${{ env.INSTALL_PORTABLE_DIR }}/manifest.txt
+          cd ${{ env.INSTALL_PORTABLE_DIR }}
+          tar -czf ../FjordLauncher-portable.tar.gz *
+
       ##
       # UPLOAD BUILDS
       ##
 
       - name: Upload binary tarball (macOS)
         if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
           path: FjordLauncher.zip
 
       - name: Upload binary zip (Windows)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_DIR }}/**
 
       - name: Upload binary zip (Windows, portable)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_PORTABLE_DIR }}/**
 
       - name: Upload installer (Windows)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
           path: FjordLauncher-Setup.exe
 
-      - name: Upload binary tarball (Linux, Qt 5)
-        if: runner.os == 'Linux' && matrix.qt_ver != 6
-        uses: actions/upload-artifact@v3
-        with:
-          name: FjordLauncher-${{ runner.os }}-Qt5-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: FjordLauncher.tar.gz
-
       - name: Upload binary tarball (Linux, portable, Qt 5)
         if: runner.os == 'Linux' && matrix.qt_ver != 6
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ runner.os }}-Qt5-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: FjordLauncher-portable.tar.gz
 
-      - name: Upload binary tarball (Linux, Qt 6)
-        if: runner.os == 'Linux' && matrix.qt_ver !=5
-        uses: actions/upload-artifact@v3
-        with:
-          name: FjordLauncher-${{ runner.os }}-Qt6-${{ env.VERSION }}-${{ inputs.build_type }}
-          path: FjordLauncher.tar.gz
-
       - name: Upload binary tarball (Linux, portable, Qt 6)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ runner.os }}-Qt6-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: FjordLauncher-portable.tar.gz
 
       - name: Upload AppImage (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
           path: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage
 
       - name: Upload AppImage Zsync (Linux)
         if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FjordLauncher-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage.zsync
           path: FjordLauncher-Linux-x86_64.AppImage.zsync
@@ -641,23 +633,67 @@ jobs:
   flatpak:
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08
+      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
       options: --privileged
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        if: inputs.build_type == 'Release'
+        if: inputs.build_type == 'Debug'
         with:
           submodules: "true"
       - name: Build Flatpak (Linux)
-        if: inputs.build_type == 'Release'
+        if: inputs.build_type == 'Debug'
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: "FjordLauncher.flatpak"
+          bundle: "Fjord Launcher.flatpak"
           manifest-path: flatpak/org.unmojang.FjordLauncher.yml
-      - name: Upload Flatpak (Linux)
-        if: runner.os == 'Linux' && matrix.qt_ver != 5
-        uses: actions/upload-artifact@v3
+
+  nix:
+    name: Nix (${{ matrix.system }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            system: x86_64-linux
+
+          - os: macos-13
+            system: x86_64-darwin
+
+          - os: macos-14
+            system: aarch64-darwin
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v30
+
+        # For PRs
+      - name: Setup Nix Magic Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v8
+
+        # For in-tree builds
+      - name: Setup Cachix
+        uses: cachix/cachix-action@v15
         with:
-          name: FjordLauncher-${{ runner.os }}-x86_64.flatpak
-          path: FjordLauncher.flatpak
+          name: unmojang
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+
+      - name: Run flake checks
+        run: |
+          nix flake check --print-build-logs --show-trace
+
+      - name: Build debug package
+        if: ${{ inputs.build_type == 'Debug' }}
+        run: |
+          nix build --print-build-logs .#fjordlauncher-debug
+
+      - name: Build release package
+        if: ${{ inputs.build_type != 'Debug' }}
+        run: |
+          nix build --print-build-logs .#fjordlauncher
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a77b4ae1e..5255f865b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -13,7 +13,7 @@ jobs:
           submodules: 'true'
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           config-file: ./.github/codeql/codeql-config.yml
           queries: security-and-quality
@@ -23,7 +23,7 @@ jobs:
         run:  
           sudo apt-get -y update
 
-          sudo apt-get -y install ninja-build extra-cmake-modules scdoc qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5
+          sudo apt-get -y install ninja-build extra-cmake-modules scdoc qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 libqt5networkauth5 libqt5networkauth5-dev
 
       - name: Configure and Build
         run: |
@@ -32,4 +32,4 @@ jobs:
           cmake --build build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/trigger_builds.yml b/.github/workflows/trigger_builds.yml
index 9efafc8cc..0b8386d69 100644
--- a/.github/workflows/trigger_builds.yml
+++ b/.github/workflows/trigger_builds.yml
@@ -38,5 +38,6 @@ jobs:
       APPLE_NOTARIZE_APPLE_ID: ${{ secrets.APPLE_NOTARIZE_APPLE_ID }}
       APPLE_NOTARIZE_TEAM_ID: ${{ secrets.APPLE_NOTARIZE_TEAM_ID }}
       APPLE_NOTARIZE_PASSWORD: ${{ secrets.APPLE_NOTARIZE_PASSWORD }}
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
       GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}
diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
index c36ea4016..e1edcca13 100644
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@@ -22,6 +22,7 @@ jobs:
       APPLE_NOTARIZE_APPLE_ID: ${{ secrets.APPLE_NOTARIZE_APPLE_ID }}
       APPLE_NOTARIZE_TEAM_ID: ${{ secrets.APPLE_NOTARIZE_TEAM_ID }}
       APPLE_NOTARIZE_PASSWORD: ${{ secrets.APPLE_NOTARIZE_PASSWORD }}
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
       GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}
 
@@ -37,7 +38,7 @@ jobs:
           submodules: "true"
           path: "FjordLauncher-source"
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Grab and store version
         run: |
           tag_name=$(echo ${{ github.ref }} | grep -oE "[^/]+$")
@@ -46,9 +47,7 @@ jobs:
         run: |
           mv ${{ github.workspace }}/FjordLauncher-source FjordLauncher-${{ env.VERSION }}
           mv FjordLauncher-Linux-Qt6-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
-          mv FjordLauncher-Linux-Qt6*/FjordLauncher.tar.gz FjordLauncher-Linux-Qt6-${{ env.VERSION }}.tar.gz
           mv FjordLauncher-Linux-Qt5-Portable*/FjordLauncher-portable.tar.gz FjordLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
-          mv FjordLauncher-Linux-Qt5*/FjordLauncher.tar.gz FjordLauncher-Linux-Qt5-${{ env.VERSION }}.tar.gz
           mv FjordLauncher-*.AppImage/FjordLauncher-*.AppImage FjordLauncher-Linux-x86_64.AppImage
           mv FjordLauncher-*.AppImage.zsync/FjordLauncher-*.AppImage.zsync FjordLauncher-Linux-x86_64.AppImage.zsync
           mv FjordLauncher-macOS-Legacy*/FjordLauncher.zip FjordLauncher-macOS-Legacy-${{ env.VERSION }}.zip
@@ -84,7 +83,7 @@ jobs:
 
       - name: Create release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ github.ref }}
@@ -92,11 +91,9 @@ jobs:
           draft: true
           prerelease: false
           files: |
-            FjordLauncher-Linux-Qt5-${{ env.VERSION }}.tar.gz
             FjordLauncher-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz
             FjordLauncher-Linux-x86_64.AppImage
             FjordLauncher-Linux-x86_64.AppImage.zsync
-            FjordLauncher-Linux-Qt6-${{ env.VERSION }}.tar.gz
             FjordLauncher-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz
             FjordLauncher-Windows-MinGW-w64-${{ env.VERSION }}.zip
             FjordLauncher-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip
diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml
index 1332855b5..3293ea15f 100644
--- a/.github/workflows/update-flake.yml
+++ b/.github/workflows/update-flake.yml
@@ -12,14 +12,14 @@ permissions:
 
 jobs:
   update-flake:
-    if: github.repository == 'unmojang/Fjord Launcher'
+    if: github.repository == 'unmojang/FjordLauncher'
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+      - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
 
-      - uses: DeterminateSystems/update-flake-lock@v20
+      - uses: DeterminateSystems/update-flake-lock@v24
         with:
           commit-msg: "chore(nix): update lockfile"
           pr-title: "chore(nix): update lockfile"
diff --git a/.gitignore b/.gitignore
index c521fba4d..b5523f685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ resources/CMakeFiles
 html/
 
 # Project Files
-*.orig
 *.pro.user
 CMakeLists.txt.user
 CMakeLists.txt.user.*
diff --git a/BUILD.md b/BUILD.md
deleted file mode 100644
index a139039df..000000000
--- a/BUILD.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Build Instructions
-
-Full build instructions are available on [the website](https://prismlauncher.org/wiki/development/build-instructions/).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 343a69a9b..66f8ae5f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebI
     message(STATUS "Address Sanitizer enabled for Debug builds, Turn it off with -DDEBUG_ADDRESS_SANITIZER=off")
     if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-            # using clang with clang-cl front end 
+            # using clang with clang-cl front end
             message(STATUS "Address Sanitizer available on Clang MSVC frontend")
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /Oy-")
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address /Oy-")
@@ -176,11 +176,13 @@ endif()
 set(Launcher_NEWS_RSS_URL "" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.")
 set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'")
 set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help")
+set(Launcher_LOGIN_CALLBACK_URL "https://prismlauncher.org/successful-login" CACHE STRING "URL that gets opened when the user successfully logins.")
+set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE STRING "URL for FML Libraries.")
 
 ######## Set version numbers ########
-set(Launcher_VERSION_MAJOR 8)
-set(Launcher_VERSION_MINOR 4)
-set(Launcher_VERSION_PATCH 3)
+set(Launcher_VERSION_MAJOR 9)
+set(Launcher_VERSION_MINOR 1)
+set(Launcher_VERSION_PATCH 0)
 
 set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}")
 set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}.0")
@@ -206,6 +208,7 @@ set(Launcher_BUG_TRACKER_URL "https://github.com/unmojang/FjordLauncher/issues"
 
 # Translations Platform URL
 set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.")
+set(Launcher_TRANSLATION_FILES_URL "https://i18n.prismlauncher.org/" CACHE STRING "URL for the translations files.")
 
 # Matrix Space
 set(Launcher_MATRIX_URL "" CACHE STRING "URL to the Matrix Space")
@@ -220,6 +223,19 @@ set(Launcher_SUBREDDIT_URL "" CACHE STRING "URL for the subreddit.")
 set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules")
 set(Launcher_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against")
 
+# Java downloader
+set(Launcher_ENABLE_JAVA_DOWNLOADER_DEFAULT ON)
+
+# Although we recommend enabling this, we cannot guarantee binary compatibility on
+# differing Linux/BSD/etc distributions. Downstream packagers should be explicitly opt-ing into this
+# feature if they know it will work with their distribution.
+if(UNIX AND NOT APPLE)
+  set(Launcher_ENABLE_JAVA_DOWNLOADER_DEFAULT OFF)
+endif()
+
+# Java downloader
+option(Launcher_ENABLE_JAVA_DOWNLOADER "Build the java downloader feature" ${Launcher_ENABLE_JAVA_DOWNLOADER_DEFAULT})
+
 # Native libraries
 if(UNIX AND APPLE)
     set(Launcher_GLFW_LIBRARY_NAME "libglfw.dylib" CACHE STRING "Name of native glfw library")
@@ -275,7 +291,7 @@ endif()
 include(QtVersionlessBackport)
 if(Launcher_QT_VERSION_MAJOR EQUAL 5)
     set(QT_VERSION_MAJOR 5)
-    find_package(Qt5 REQUIRED COMPONENTS Core Widgets Concurrent Network Test Xml)
+    find_package(Qt5 REQUIRED COMPONENTS Core Widgets Concurrent Network Test Xml NetworkAuth)
 
     if(NOT Launcher_FORCE_BUNDLED_LIBS)
         find_package(QuaZip-Qt5 1.3 QUIET)
@@ -289,7 +305,7 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 5)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNICODE -D_UNICODE")
 elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
     set(QT_VERSION_MAJOR 6)
-    find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat)
+    find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat NetworkAuth)
     list(APPEND Launcher_QT_LIBS Qt6::Core5Compat)
 
     if(NOT Launcher_FORCE_BUNDLED_LIBS)
@@ -410,7 +426,19 @@ elseif(UNIX)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_mrpack_MIMEInfo} DESTINATION ${KDE_INSTALL_MIMEDIR})
 
     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/launcher/qtlogging.ini" DESTINATION "share/${Launcher_Name}")
-    
+
+    if (INSTALL_BUNDLE STREQUAL full)
+        set(PLUGIN_DEST_DIR "plugins")
+        set(BUNDLE_DEST_DIR ".")
+        set(RESOURCES_DEST_DIR ".")
+
+        # Apps to bundle
+        set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${Launcher_APP_BINARY_NAME}")
+
+        # directories to look for dependencies
+        set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+    endif()
+
     if(Launcher_ManPage)
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_ManPage} DESTINATION "${KDE_INSTALL_MANDIR}/man6")
     endif()
@@ -460,7 +488,7 @@ if(FORCE_BUNDLED_ZLIB)
     set(SKIP_INSTALL_ALL ON)
     add_subdirectory(libraries/zlib EXCLUDE_FROM_ALL)
 
-    # On OS where unistd.h exists, zlib's generated header defines `Z_HAVE_UNISTD_H`, while the included header does not. 
+    # On OS where unistd.h exists, zlib's generated header defines `Z_HAVE_UNISTD_H`, while the included header does not.
     # We cannot safely undo the rename on those systems, and they generally have packages for zlib anyway.
     check_include_file(unistd.h NEED_GENERATED_ZCONF)
     if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib/zconf.h.included" AND NOT NEED_GENERATED_ZCONF)
@@ -497,14 +525,15 @@ else()
 endif()
 if(NOT cmark_FOUND)
     message(STATUS "Using bundled cmark")
+    set(ORIGINAL_BUILD_TESTING ${BUILD_TESTING})
     set(BUILD_TESTING 0)
-    set(BUILD_SHARED_LIBS 0) 
+    set(BUILD_SHARED_LIBS 0)
     add_subdirectory(libraries/cmark EXCLUDE_FROM_ALL) # Markdown parser
     add_library(cmark::cmark ALIAS cmark)
+    set(BUILD_TESTING ${ORIGINAL_BUILD_TESTING})
 else()
     message(STATUS "Using system cmark")
 endif()
-add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too much
 add_subdirectory(libraries/gamemode)
 add_subdirectory(libraries/murmur2) # Hash for usage with the CurseForge API
 if (NOT ghc_filesystem_FOUND)
diff --git a/COPYING.md b/COPYING.md
index ee88639e3..4a4f8fa46 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -401,32 +401,6 @@
     COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
     OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-## O2 (Katabasis fork)
-
-    Copyright (c) 2012, Akos Polster
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ## Gamemode
 
     Copyright (c) 2017-2022, Feral Interactive
diff --git a/README.md b/README.md
index fd3013a98..f185fb8b4 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,12 @@ AppImages are available in the [releases section](https://github.com/unmojang/Fj
 
 ## Building
 
-To build the launcher yourself, follow [the instructions on the Prism Launcher website](https://prismlauncher.org/wiki/development/build-instructions) but clone this repo instead.
+To build the launcher yourself, follow the instructions on the Prism Launcher website, but clone this repo instead:
+
+- [Windows](https://prismlauncher.org/wiki/development/build-instructions/windows/)
+- [Linux](https://prismlauncher.org/wiki/development/build-instructions/linux/)
+- [MacOS](https://prismlauncher.org/wiki/development/build-instructions/macos/)
+- [OpenBSD](https://prismlauncher.org/wiki/development/build-instructions/openbsd/)
 
 ## Notes
 
diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
index c61d6430f..747482b99 100644
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -2,7 +2,6 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -83,6 +82,9 @@ Config::Config()
         UPDATER_ENABLED = true;
     }
 
+    #cmakedefine01 Launcher_ENABLE_JAVA_DOWNLOADER
+    JAVA_DOWNLOADER_ENABLED = Launcher_ENABLE_JAVA_DOWNLOADER;
+
     GIT_COMMIT = "@Launcher_GIT_COMMIT@";
     GIT_TAG = "@Launcher_GIT_TAG@";
     GIT_REFSPEC = "@Launcher_GIT_REFSPEC@";
@@ -115,16 +117,19 @@ Config::Config()
     NEWS_RSS_URL = "@Launcher_NEWS_RSS_URL@";
     NEWS_OPEN_URL = "@Launcher_NEWS_OPEN_URL@";
     HELP_URL = "@Launcher_HELP_URL@";
+    LOGIN_CALLBACK_URL = "@Launcher_LOGIN_CALLBACK_URL@";
     IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@";
     MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@";
     FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
     META_URL = "@Launcher_META_URL@";
+    FMLLIBS_BASE_URL = "@Launcher_FMLLIBS_BASE_URL@";
 
     GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@";
     OPENAL_LIBRARY_NAME = "@Launcher_OPENAL_LIBRARY_NAME@";
 
     BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
     TRANSLATIONS_URL = "@Launcher_TRANSLATIONS_URL@";
+    TRANSLATION_FILES_URL = "@Launcher_TRANSLATION_FILES_URL@";
     MATRIX_URL = "@Launcher_MATRIX_URL@";
     DISCORD_URL = "@Launcher_DISCORD_URL@";
     SUBREDDIT_URL = "@Launcher_SUBREDDIT_URL@";
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index d272404a9..f4f21b031 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -3,7 +3,6 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -70,6 +69,7 @@ class Config {
     QString VERSION_CHANNEL;
 
     bool UPDATER_ENABLED = false;
+    bool JAVA_DOWNLOADER_ENABLED = false;
 
     /// A short string identifying this build's platform or distribution.
     QString BUILD_PLATFORM;
@@ -135,6 +135,11 @@ class Config {
      */
     QString HELP_URL;
 
+    /**
+     * URL that gets opened when the user succesfully logins.
+     */
+    QString LOGIN_CALLBACK_URL;
+
     /**
      * Client ID you can get from Imgur when you register an application
      */
@@ -173,8 +178,8 @@ class Config {
     QString RESOURCE_BASE = "https://resources.download.minecraft.net/";
     QString LIBRARY_BASE = "https://libraries.minecraft.net/";
     QString IMGUR_BASE_URL = "https://api.imgur.com/3/";
-    QString FMLLIBS_BASE_URL = "https://files.prismlauncher.org/fmllibs/";  // FIXME: move into CMakeLists
-    QString TRANSLATIONS_BASE_URL = "https://i18n.prismlauncher.org/";      // FIXME: move into CMakeLists
+    QString FMLLIBS_BASE_URL;
+    QString TRANSLATION_FILES_URL;
 
     QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/";
 
diff --git a/cmake/MacOSXBundleInfo.plist.in b/cmake/MacOSXBundleInfo.plist.in
index c439efe25..aa87abb35 100644
--- a/cmake/MacOSXBundleInfo.plist.in
+++ b/cmake/MacOSXBundleInfo.plist.in
@@ -7,7 +7,7 @@
     <key>NSMicrophoneUsageDescription</key>
     <string>A Minecraft mod wants to access your microphone.</string>
     <key>NSDownloadsFolderUsageDescription</key>
-    <string>Prism uses access to your Downloads folder to help you more quickly add mods that can't be automatically downloaded to your instance. You can change where Prism scans for downloaded mods in Settings or the prompt that appears.</string>
+    <string>Fjord uses access to your Downloads folder to help you more quickly add mods that can't be automatically downloaded to your instance. You can change where Fjord scans for downloaded mods in Settings or the prompt that appears.</string>
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
     <key>NSHighResolutionCapable</key>
@@ -55,7 +55,7 @@
                 <string>mrpack</string>
             </array>
             <key>CFBundleTypeName</key>
-            <string>Prism Launcher instance</string>
+            <string>Fjord Launcher instance</string>
             <key>CFBundleTypeOSTypes</key>
             <array>
                 <string>TEXT</string>
@@ -79,6 +79,14 @@
             <string>curseforge</string>
             </array>
         </dict>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>FjordLauncher</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+            <string>fjordlauncher</string>
+            </array>
+        </dict>
     </array>
 </dict>
 </plist>
diff --git a/default.nix b/default.nix
index c7d0c267d..6466507b7 100644
--- a/default.nix
+++ b/default.nix
@@ -1,14 +1,9 @@
-(
-  import
-  (
-    let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    in
-      fetchTarball {
-        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-        sha256 = lock.nodes.flake-compat.locked.narHash;
-      }
-  )
-  {src = ./.;}
-)
-.defaultNix
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
+  fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }
+) { src = ./.; }).defaultNix
diff --git a/flake.lock b/flake.lock
index a28cff47c..a82e6f65f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,47 +16,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719877454,
-        "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "libnbtplusplus": {
       "flake": false,
       "locked": {
@@ -90,55 +49,26 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719826879,
-        "narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=",
-        "owner": "nixos",
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719259945,
-        "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
         "libnbtplusplus": "libnbtplusplus",
         "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs",
-        "pre-commit-hooks": "pre-commit-hooks"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 1582400f1..e256d7ef8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,54 +1,143 @@
 {
-  description = "A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once (Fork of MultiMC)";
+  description = "Prism Launcher fork with support for alternative auth servers";
 
   nixConfig = {
-    extra-substituters = ["https://cache.garnix.io"];
-    extra-trusted-public-keys = ["cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="];
+    extra-substituters = [ "https://unmojang.cachix.org" ];
+    extra-trusted-public-keys = [
+      "unmojang.cachix.org-1:OfHnbBNduZ6Smx9oNbLFbYyvOWSoxb2uPcnXPj4EDQY="
+    ];
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+    libnbtplusplus = {
+      url = "github:PrismLauncher/libnbtplusplus";
+      flake = false;
     };
+
     nix-filter.url = "github:numtide/nix-filter";
-    pre-commit-hooks = {
-      url = "github:cachix/pre-commit-hooks.nix";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        nixpkgs-stable.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-      };
-    };
+
+    /*
+      Inputs below this are optional and can be removed
+
+      ```
+      {
+        inputs.fjordlauncher = {
+          url = "github:unmojang/FjordLauncher";
+          inputs = {
+            flake-compat.follows = "";
+          };
+        };
+      }
+      ```
+    */
+
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
     };
-    libnbtplusplus = {
-      url = "github:PrismLauncher/libnbtplusplus";
-      flake = false;
-    };
   };
 
-  outputs = {
-    flake-parts,
-    pre-commit-hooks,
-    ...
-  } @ inputs:
-    flake-parts.lib.mkFlake {inherit inputs;} {
-      imports = [
-        pre-commit-hooks.flakeModule
-
-        ./nix/dev.nix
-        ./nix/distribution.nix
-      ];
-
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
+  outputs =
+    {
+      self,
+      nixpkgs,
+      libnbtplusplus,
+      nix-filter,
+      ...
+    }:
+    let
+      inherit (nixpkgs) lib;
+
+      # While we only officially support aarch and x86_64 on Linux and MacOS,
+      # we expose a reasonable amount of other systems for users who want to
+      # build for most exotic platforms
+      systems = lib.systems.flakeExposed;
+
+      forAllSystems = lib.genAttrs systems;
+      nixpkgsFor = forAllSystems (system: nixpkgs.legacyPackages.${system});
+    in
+    {
+      checks = forAllSystems (
+        system:
+        let
+          checks' = nixpkgsFor.${system}.callPackage ./nix/checks.nix { inherit self; };
+        in
+        lib.filterAttrs (_: lib.isDerivation) checks'
+      );
+
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = nixpkgsFor.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            inputsFrom = [ self.packages.${system}.fjordlauncher-unwrapped ];
+            buildInputs = with pkgs; [
+              ccache
+              ninja
+            ];
+          };
+        }
+      );
+
+      formatter = forAllSystems (system: nixpkgsFor.${system}.nixfmt-rfc-style);
+
+      overlays.default =
+        final: prev:
+        let
+          version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
+        in
+        {
+          fjordlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
+            inherit
+              libnbtplusplus
+              nix-filter
+              self
+              version
+              ;
+          };
+
+          fjordlauncher = final.callPackage ./nix/wrapper.nix { };
+        };
+
+      packages = forAllSystems (
+        system:
+        let
+          pkgs = nixpkgsFor.${system};
+
+          # Build a scope from our overlay
+          fjordPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs);
+
+          # Grab our packages from it and set the default
+          packages = {
+            inherit (fjordPackages) fjordlauncher-unwrapped fjordlauncher;
+            default = fjordPackages.fjordlauncher;
+          };
+        in
+        # Only output them if they're available on the current system
+        lib.filterAttrs (_: lib.meta.availableOn pkgs.stdenv.hostPlatform) packages
+      );
+
+      # We put these under legacyPackages as they are meant for CI, not end user consumption
+      legacyPackages = forAllSystems (
+        system:
+        let
+          fjordPackages = self.packages.${system};
+          legacyPackages = self.legacyPackages.${system};
+        in
+        {
+          fjordlauncher-debug = fjordPackages.fjordlauncher.override {
+            fjordlauncher-unwrapped = legacyPackages.fjordlauncher-unwrapped-debug;
+          };
+
+          fjordlauncher-unwrapped-debug = fjordPackages.fjordlauncher-unwrapped.overrideAttrs {
+            cmakeBuildType = "Debug";
+            dontStrip = true;
+          };
+        }
+      );
     };
 }
diff --git a/flatpak/org.unmojang.FjordLauncher.yml b/flatpak/org.unmojang.FjordLauncher.yml
index e2a7b31a0..d1c418151 100644
--- a/flatpak/org.unmojang.FjordLauncher.yml
+++ b/flatpak/org.unmojang.FjordLauncher.yml
@@ -1,17 +1,9 @@
 id: org.unmojang.FjordLauncher
 runtime: org.kde.Platform
-runtime-version: 5.15-23.08
+runtime-version: 6.7
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.openjdk17
-  - org.freedesktop.Sdk.Extension.openjdk8
-add-extensions:
-  com.valvesoftware.Steam.Utility.gamescope:
-    version: stable
-    add-ld-path: lib
-    no-autodownload: true
-    autodelete: false
-    directory: utils/gamescope
 
 command: fjordlauncher
 finish-args:
@@ -25,9 +17,8 @@ finish-args:
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
     # Mod drag&drop
   - --filesystem=xdg-download:ro
-
-cleanup:
-  - /lib/libGLU*
+    # FTBApp import
+  - --filesystem=~/.ftba:ro
 
 modules:
   # Might be needed by some Controller mods (see https://github.com/isXander/Controlify/issues/31)
@@ -41,31 +32,20 @@ modules:
     builddir: true
     config-opts:
       - -DLauncher_BUILD_PLATFORM=flatpak
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DLauncher_QT_VERSION_MAJOR=5
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
     build-options:
       env:
         JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17
         JAVA_COMPILER: /usr/lib/sdk/openjdk17/jvm/openjdk-17/bin/javac
+    run-tests: true
     sources:
       - type: dir
         path: ../
 
-  - name: openjdk
-    buildsystem: simple
-    build-commands:
-      - mkdir -p /app/jdk/
-      - /usr/lib/sdk/openjdk17/install.sh
-      - mv /app/jre /app/jdk/17
-      - /usr/lib/sdk/openjdk8/install.sh
-      - mv /app/jre /app/jdk/8
-    cleanup:
-      - /jre
-
   - name: glfw
     buildsystem: cmake-ninja
     config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
       - -DBUILD_SHARED_LIBS:BOOL=ON
       - -DGLFW_USE_WAYLAND:BOOL=ON
       - -DGLFW_BUILD_DOCS:BOOL=OFF
diff --git a/garnix.yaml b/garnix.yaml
deleted file mode 100644
index 6cf8f7214..000000000
--- a/garnix.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-builds:
-  exclude:
-    - "*.x86_64-darwin.*"
-  include:
-    - "checks.x86_64-linux.*"
-    - "devShells.*.*"
-    - "packages.*.*"
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 60aa79076..9aa613589 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -44,10 +44,11 @@
 #include "BuildConfig.h"
 
 #include "DataMigrationTask.h"
+#include "java/JavaInstallList.h"
 #include "net/PasteUpload.h"
 #include "pathmatcher/MultiMatcher.h"
 #include "pathmatcher/SimplePrefixMatcher.h"
-#include "settings/INIFile.h"
+#include "tools/GenericProfiler.h"
 #include "ui/InstanceWindow.h"
 #include "ui/MainWindow.h"
 
@@ -66,8 +67,10 @@
 #include "ui/pages/global/MinecraftPage.h"
 #include "ui/pages/global/ProxyPage.h"
 
+#include "ui/setupwizard/AutoJavaWizardPage.h"
 #include "ui/setupwizard/JavaWizardPage.h"
 #include "ui/setupwizard/LanguageWizardPage.h"
+#include "ui/setupwizard/LoginWizardPage.h"
 #include "ui/setupwizard/PasteWizardPage.h"
 #include "ui/setupwizard/SetupWizard.h"
 #include "ui/setupwizard/ThemeWizardPage.h"
@@ -108,7 +111,7 @@
 
 #include "ui/GuiUtil.h"
 
-#include "java/JavaUtils.h"
+#include "java/JavaInstallList.h"
 
 #include "updater/ExternalUpdater.h"
 
@@ -129,6 +132,7 @@
 
 #include <stdlib.h>
 #include <sys.h>
+#include "SysInfo.h"
 
 #ifdef Q_OS_LINUX
 #include <dlfcn.h>
@@ -154,6 +158,7 @@
 #endif
 
 #if defined Q_OS_WIN32
+#include <windows.h>
 #include "WindowsConsole.h"
 #endif
 
@@ -239,6 +244,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         { { { "d", "dir" }, "Use a custom path as application root (use '.' for current directory)", "directory" },
           { { "l", "launch" }, "Launch the specified instance (by instance ID)", "instance" },
           { { "s", "server" }, "Join the specified server on launch (only valid in combination with --launch)", "address" },
+          { { "w", "world" }, "Join the specified world on launch (only valid in combination with --launch)", "world" },
           { { "a", "profile" }, "Use the account specified by its profile name (only valid in combination with --launch)", "profile" },
           { "alive", "Write a small '" + liveCheckFile + "' file after the launcher starts" },
           { { "I", "import" }, "Import instance or resource from specified local path or URL", "url" },
@@ -253,6 +259,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
     m_instanceIdToLaunch = parser.value("launch");
     m_serverToJoin = parser.value("server");
+    m_worldToJoin = parser.value("world");
     m_profileToUse = parser.value("profile");
     m_liveCheck = parser.isSet("alive");
 
@@ -268,7 +275,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     }
 
     // error if --launch is missing with --server or --profile
-    if ((!m_serverToJoin.isEmpty() || !m_profileToUse.isEmpty()) && m_instanceIdToLaunch.isEmpty()) {
+    if (((!m_serverToJoin.isEmpty() || !m_worldToJoin.isEmpty()) || !m_profileToUse.isEmpty()) && m_instanceIdToLaunch.isEmpty()) {
         std::cerr << "--server and --profile can only be used in combination with --launch!" << std::endl;
         m_status = Application::Failed;
         return;
@@ -295,12 +302,17 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     QString adjustedBy;
     QString dataPath;
     // change folder
+    QString dataDirEnv;
     QString dirParam = parser.value("dir");
     if (!dirParam.isEmpty()) {
         // the dir param. it makes multimc data path point to whatever the user specified
         // on command line
         adjustedBy = "Command line";
         dataPath = dirParam;
+    } else if (dataDirEnv = QProcessEnvironment::systemEnvironment().value(QString("%1_DATA_DIR").arg(BuildConfig.LAUNCHER_NAME.toUpper()));
+               !dataDirEnv.isEmpty()) {
+        adjustedBy = "System environment";
+        dataPath = dataDirEnv;
     } else {
         QDir foo;
         if (DesktopServices::isSnap()) {
@@ -313,7 +325,11 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         adjustedBy = "Persistent data path";
 
 #ifndef Q_OS_MACOS
-        if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) {
+        if (auto portableUserData = FS::PathCombine(m_rootPath, "UserData"); QDir(portableUserData).exists()) {
+            dataPath = portableUserData;
+            adjustedBy = "Portable user data path";
+            m_portable = true;
+        } else if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) {
             dataPath = m_rootPath;
             adjustedBy = "Portable data path";
             m_portable = true;
@@ -379,6 +395,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
                 if (!m_serverToJoin.isEmpty()) {
                     launch.args["server"] = m_serverToJoin;
+                } else if (!m_worldToJoin.isEmpty()) {
+                    launch.args["world"] = m_worldToJoin;
                 }
                 if (!m_profileToUse.isEmpty()) {
                     launch.args["profile"] = m_profileToUse;
@@ -394,20 +412,15 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     {
         static const QString baseLogFile = BuildConfig.LAUNCHER_NAME + "-%0.log";
         static const QString logBase = FS::PathCombine("logs", baseLogFile);
-        auto moveFile = [](const QString& oldName, const QString& newName) {
-            QFile::remove(newName);
-            QFile::copy(oldName, newName);
-            QFile::remove(oldName);
-        };
         if (FS::ensureFolderPathExists("logs")) {  // if this did not fail
             for (auto i = 0; i <= 4; i++)
                 if (auto oldName = baseLogFile.arg(i);
                     QFile::exists(oldName))  // do not pointlessly delete new files if the old ones are not there
-                    moveFile(oldName, logBase.arg(i));
+                    FS::move(oldName, logBase.arg(i));
         }
 
         for (auto i = 4; i > 0; i--)
-            moveFile(logBase.arg(i - 1), logBase.arg(i));
+            FS::move(logBase.arg(i - 1), logBase.arg(i));
 
         logFile = std::unique_ptr<QFile>(new QFile(logBase.arg(0)));
         if (!logFile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
@@ -447,7 +460,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
         // search the dataPath()
         // seach app data standard path
-        if (!foundLoggingRules && !isPortable() && dirParam.isEmpty()) {
+        if (!foundLoggingRules && !isPortable() && dirParam.isEmpty() && dataDirEnv.isEmpty()) {
             logRulesPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, FS::PathCombine("..", logRulesFile));
             if (!logRulesPath.isEmpty()) {
                 qDebug() << "Found" << logRulesPath << "...";
@@ -530,6 +543,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         }
         if (!m_serverToJoin.isEmpty()) {
             qDebug() << "Address of server to join  :" << m_serverToJoin;
+        } else if (!m_worldToJoin.isEmpty()) {
+            qDebug() << "Name of the world to join  :" << m_worldToJoin;
         }
         qDebug() << "<> Paths set.";
     }
@@ -571,6 +586,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
         m_settings->registerSetting("NumberOfConcurrentTasks", 10);
         m_settings->registerSetting("NumberOfConcurrentDownloads", 6);
+        m_settings->registerSetting("NumberOfManualRetries", 1);
+        m_settings->registerSetting("RequestTimeout", 60);
 
         QString defaultMonospace;
         int defaultSize = 11;
@@ -605,6 +622,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("IconsDir", "icons");
         m_settings->registerSetting("DownloadsDir", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
         m_settings->registerSetting("DownloadsDirWatchRecursive", false);
+        m_settings->registerSetting("SkinsDir", "skins");
+        m_settings->registerSetting("JavaDir", "java");
 
         // Editors
         m_settings->registerSetting("JsonEditor", QString());
@@ -633,7 +652,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
         // Memory
         m_settings->registerSetting({ "MinMemAlloc", "MinMemoryAlloc" }, 512);
-        m_settings->registerSetting({ "MaxMemAlloc", "MaxMemoryAlloc" }, suitableMaxMem());
+        m_settings->registerSetting({ "MaxMemAlloc", "MaxMemoryAlloc" }, SysInfo::suitableMaxMem());
         m_settings->registerSetting("PermGen", 128);
 
         // Java Settings
@@ -647,6 +666,10 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("JvmArgs", "");
         m_settings->registerSetting("IgnoreJavaCompatibility", false);
         m_settings->registerSetting("IgnoreJavaWizard", false);
+        auto defaultEnableAutoJava = m_settings->get("JavaPath").toString().isEmpty();
+        m_settings->registerSetting("AutomaticJavaSwitch", defaultEnableAutoJava);
+        m_settings->registerSetting("AutomaticJavaDownload", defaultEnableAutoJava);
+        m_settings->registerSetting("UserAskedAboutAutomaticJavaDownload", false);
 
         // Legacy settings
         m_settings->registerSetting("OnlineFixes", true);
@@ -657,10 +680,11 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("UseNativeGLFW", false);
         m_settings->registerSetting("CustomGLFWPath", "");
 
-        // Peformance related options
+        // Performance related options
         m_settings->registerSetting("EnableFeralGamemode", false);
         m_settings->registerSetting("EnableMangoHud", false);
         m_settings->registerSetting("UseDiscreteGpu", false);
+        m_settings->registerSetting("UseZink", false);
 
         // Game time
         m_settings->registerSetting("ShowGameTime", true);
@@ -671,6 +695,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         // Minecraft mods
         m_settings->registerSetting("ModMetadataDisabled", false);
         m_settings->registerSetting("ModDependenciesDisabled", false);
+        m_settings->registerSetting("SkipModpackUpdatePrompt", false);
 
         // Missing authlib-injector behavior
         m_settings->registerSetting("MissingAuthlibInjectorBehavior", MissingAuthlibInjectorBehavior::Ask);
@@ -687,6 +712,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
         // The cat
         m_settings->registerSetting("TheCat", false);
+        m_settings->registerSetting("CatOpacity", 100);
+
+        m_settings->registerSetting("StatusBarVisible", true);
 
         m_settings->registerSetting("ToolbarsLocked", false);
 
@@ -773,6 +801,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         // FTBApp instances
         m_settings->registerSetting("FTBAppInstancesPath", "");
 
+        // Custom Technic Client ID
+        m_settings->registerSetting("TechnicClientID", "");
+
         // Init page provider
         {
             m_globalSettingsProvider = std::make_shared<GenericPageProvider>(tr("Settings"));
@@ -826,7 +857,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_icons.reset(new IconList(instFolders, setting->get().toString()));
         connect(setting.get(), &Setting::SettingChanged,
                 [&](const Setting&, QVariant value) { m_icons->directoryChanged(value.toString()); });
-        qDebug() << "<> Instance icons intialized.";
+        qDebug() << "<> Instance icons initialized.";
     }
 
     // Themes
@@ -863,25 +894,19 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     {
         m_metacache.reset(new HttpMetaCache("metacache"));
         m_metacache->addBase("asset_indexes", QDir("assets/indexes").absolutePath());
-        m_metacache->addBase("asset_objects", QDir("assets/objects").absolutePath());
-        m_metacache->addBase("versions", QDir("versions").absolutePath());
         m_metacache->addBase("libraries", QDir("libraries").absolutePath());
-        m_metacache->addBase("minecraftforge", QDir("mods/minecraftforge").absolutePath());
         m_metacache->addBase("fmllibs", QDir("mods/minecraftforge/libs").absolutePath());
-        m_metacache->addBase("liteloader", QDir("mods/liteloader").absolutePath());
         m_metacache->addBase("general", QDir("cache").absolutePath());
         m_metacache->addBase("ATLauncherPacks", QDir("cache/ATLauncherPacks").absolutePath());
         m_metacache->addBase("FTBPacks", QDir("cache/FTBPacks").absolutePath());
-        m_metacache->addBase("ModpacksCHPacks", QDir("cache/ModpacksCHPacks").absolutePath());
         m_metacache->addBase("TechnicPacks", QDir("cache/TechnicPacks").absolutePath());
         m_metacache->addBase("FlamePacks", QDir("cache/FlamePacks").absolutePath());
         m_metacache->addBase("FlameMods", QDir("cache/FlameMods").absolutePath());
         m_metacache->addBase("ModrinthPacks", QDir("cache/ModrinthPacks").absolutePath());
         m_metacache->addBase("ModrinthModpacks", QDir("cache/ModrinthModpacks").absolutePath());
-        m_metacache->addBase("root", QDir::currentPath());
         m_metacache->addBase("translations", QDir("translations").absolutePath());
-        m_metacache->addBase("icons", QDir("cache/icons").absolutePath());
         m_metacache->addBase("meta", QDir("meta").absolutePath());
+        m_metacache->addBase("java", QDir("cache/java").absolutePath());
         m_metacache->Load();
         qDebug() << "<> Cache initialized.";
     }
@@ -892,6 +917,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     // FIXME: what to do with these?
     m_profilers.insert("jprofiler", std::shared_ptr<BaseProfilerFactory>(new JProfilerFactory()));
     m_profilers.insert("jvisualvm", std::shared_ptr<BaseProfilerFactory>(new JVisualVMFactory()));
+    m_profilers.insert("generic", std::shared_ptr<BaseProfilerFactory>(new GenericProfilerFactory()));
     for (auto profiler : m_profilers.values()) {
         profiler->registerSettings(m_settings);
     }
@@ -1004,7 +1030,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
                               "\n"
                               "You are now running %1 .\n"
                               "Check the Fjord Launcher updater log at: \n"
-                              "%1\n"
+                              "%2\n"
                               "for details.")
                                .arg(BuildConfig.printableVersionString())
                                .arg(update_log_path);
@@ -1020,7 +1046,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     }
 
     // notify user if /tmp is mounted with `noexec` (#1693)
-    {
+    QString jvmArgs = m_settings->get("JvmArgs").toString();
+    if (jvmArgs.indexOf("java.io.tmpdir") == -1) { /* java.io.tmpdir is a valid workaround, so don't annoy */
         bool is_tmp_noexec = false;
 
 #if defined(Q_OS_LINUX)
@@ -1040,7 +1067,11 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         if (is_tmp_noexec) {
             auto infoMsg =
                 tr("Your /tmp directory is currently mounted with the 'noexec' flag enabled.\n"
-                   "Some versions of Minecraft may not launch.\n");
+                   "Some versions of Minecraft may not launch.\n"
+                   "\n"
+                   "You may solve this issue by remounting /tmp as 'exec' or setting "
+                   "the java.io.tmpdir JVM argument to a writeable directory in a "
+                   "filesystem where the 'exec' flag is set (e.g., /home/user/.local/tmp)\n");
             auto msgBox = new QMessageBox(QMessageBox::Information, tr("Incompatible system configuration"), infoMsg, QMessageBox::Ok);
             msgBox->setDefaultButton(QMessageBox::Ok);
             msgBox->setAttribute(Qt::WA_DeleteOnClose);
@@ -1078,13 +1109,15 @@ bool Application::createSetupWizard()
         }
         return false;
     }();
+    bool askjava = BuildConfig.JAVA_DOWNLOADER_ENABLED && !javaRequired && !m_settings->get("AutomaticJavaDownload").toBool() &&
+                   !m_settings->get("AutomaticJavaSwitch").toBool() && !m_settings->get("UserAskedAboutAutomaticJavaDownload").toBool();
     bool languageRequired = settings()->get("Language").toString().isEmpty();
     bool pasteInterventionRequired = settings()->get("PastebinURL") != "";
     bool validWidgets = m_themeManager->isValidApplicationTheme(settings()->get("ApplicationTheme").toString());
     bool validIcons = m_themeManager->isValidIconTheme(settings()->get("IconTheme").toString());
+    bool login = !m_accounts->anyAccountIsValid() && capabilities() & Application::SupportsMSA;
     bool themeInterventionRequired = !validWidgets || !validIcons;
-    bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired;
-
+    bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired || askjava || login;
     if (wizardRequired) {
         // set default theme after going into theme wizard
         if (!validIcons)
@@ -1101,6 +1134,8 @@ bool Application::createSetupWizard()
 
         if (javaRequired) {
             m_setupWizard->addPage(new JavaWizardPage(m_setupWizard));
+        } else if (askjava) {
+            m_setupWizard->addPage(new AutoJavaWizardPage(m_setupWizard));
         }
 
         if (pasteInterventionRequired) {
@@ -1111,11 +1146,14 @@ bool Application::createSetupWizard()
             m_setupWizard->addPage(new ThemeWizardPage(m_setupWizard));
         }
 
+        if (login) {
+            m_setupWizard->addPage(new LoginWizardPage(m_setupWizard));
+        }
         connect(m_setupWizard, &QDialog::finished, this, &Application::setupWizardFinished);
         m_setupWizard->show();
-        return true;
     }
-    return false;
+
+    return wizardRequired || login;
 }
 
 bool Application::updaterEnabled()
@@ -1171,14 +1209,17 @@ void Application::performMainStartupAction()
     if (!m_instanceIdToLaunch.isEmpty()) {
         auto inst = instances()->getInstanceById(m_instanceIdToLaunch);
         if (inst) {
-            MinecraftServerTargetPtr serverToJoin = nullptr;
+            MinecraftTarget::Ptr targetToJoin = nullptr;
             MinecraftAccountPtr accountToUse = nullptr;
 
             qDebug() << "<> Instance" << m_instanceIdToLaunch << "launching";
             if (!m_serverToJoin.isEmpty()) {
                 // FIXME: validate the server string
-                serverToJoin.reset(new MinecraftServerTarget(MinecraftServerTarget::parse(m_serverToJoin)));
+                targetToJoin.reset(new MinecraftTarget(MinecraftTarget::parse(m_serverToJoin, false)));
                 qDebug() << "   Launching with server" << m_serverToJoin;
+            } else if (!m_worldToJoin.isEmpty()) {
+                targetToJoin.reset(new MinecraftTarget(MinecraftTarget::parse(m_worldToJoin, true)));
+                qDebug() << "   Launching with world" << m_worldToJoin;
             }
 
             if (!m_profileToUse.isEmpty()) {
@@ -1189,7 +1230,7 @@ void Application::performMainStartupAction()
                 qDebug() << "   Launching with account" << m_profileToUse;
             }
 
-            launch(inst, true, false, serverToJoin, accountToUse);
+            launch(inst, true, false, targetToJoin, accountToUse);
             return;
         }
     }
@@ -1245,6 +1286,12 @@ void Application::performMainStartupAction()
         qDebug() << "<> Updater started.";
     }
 
+    {  // delete instances tmp dirctory
+        auto instDir = m_settings->get("InstanceDir").toString();
+        const QString tempRoot = FS::PathCombine(instDir, ".tmp");
+        FS::deletePath(tempRoot);
+    }
+
     if (!m_urlsToImport.isEmpty()) {
         qDebug() << "<> Importing from url:" << m_urlsToImport;
         m_mainWindow->processURLs(m_urlsToImport);
@@ -1276,16 +1323,23 @@ Application::~Application()
 
 void Application::messageReceived(const QByteArray& message)
 {
-    if (status() != Initialized) {
-        qDebug() << "Received message" << message << "while still initializing. It will be ignored.";
-        return;
-    }
-
     ApplicationMessage received;
     received.parse(message);
 
     auto& command = received.command;
 
+    if (status() != Initialized) {
+        bool isLoginAtempt = false;
+        if (command == "import") {
+            QString url = received.args["url"];
+            isLoginAtempt = !url.isEmpty() && normalizeImportUrl(url).scheme() == BuildConfig.LAUNCHER_APP_BINARY_NAME;
+        }
+        if (!isLoginAtempt) {
+            qDebug() << "Received message" << message << "while still initializing. It will be ignored.";
+            return;
+        }
+    }
+
     if (command == "activate") {
         showMainWindow();
     } else if (command == "import") {
@@ -1298,6 +1352,7 @@ void Application::messageReceived(const QByteArray& message)
     } else if (command == "launch") {
         QString id = received.args["id"];
         QString server = received.args["server"];
+        QString world = received.args["world"];
         QString profile = received.args["profile"];
 
         InstancePtr instance;
@@ -1312,11 +1367,12 @@ void Application::messageReceived(const QByteArray& message)
             return;
         }
 
-        MinecraftServerTargetPtr serverObject = nullptr;
+        MinecraftTarget::Ptr serverObject = nullptr;
         if (!server.isEmpty()) {
-            serverObject = std::make_shared<MinecraftServerTarget>(MinecraftServerTarget::parse(server));
+            serverObject = std::make_shared<MinecraftTarget>(MinecraftTarget::parse(server, false));
+        } else if (!world.isEmpty()) {
+            serverObject = std::make_shared<MinecraftTarget>(MinecraftTarget::parse(world, true));
         }
-
         MinecraftAccountPtr accountObject;
         if (!profile.isEmpty()) {
             accountObject = accounts()->getAccountByProfileName(profile);
@@ -1365,11 +1421,7 @@ bool Application::openJsonEditor(const QString& filename)
     }
 }
 
-bool Application::launch(InstancePtr instance,
-                         bool online,
-                         bool demo,
-                         MinecraftServerTargetPtr serverToJoin,
-                         MinecraftAccountPtr accountToUse)
+bool Application::launch(InstancePtr instance, bool online, bool demo, MinecraftTarget::Ptr targetToJoin, MinecraftAccountPtr accountToUse)
 {
     if (m_updateRunning) {
         qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed.";
@@ -1387,7 +1439,7 @@ bool Application::launch(InstancePtr instance,
         controller->setOnline(online);
         controller->setDemo(demo);
         controller->setProfiler(profilers().value(instance->settings()->get("Profiler").toString(), nullptr).get());
-        controller->setServerToJoin(serverToJoin);
+        controller->setTargetToJoin(targetToJoin);
         controller->setAccountToUse(accountToUse);
         if (window) {
             controller->setParentWidget(window);
@@ -1766,20 +1818,6 @@ QString Application::getUserAgentUncached()
     return BuildConfig.USER_AGENT_UNCACHED;
 }
 
-int Application::suitableMaxMem()
-{
-    float totalRAM = (float)Sys::getSystemRam() / (float)Sys::mebibyte;
-    int maxMemoryAlloc;
-
-    // If totalRAM < 6GB, use (totalRAM / 1.5), else 4GB
-    if (totalRAM < (4096 * 1.5))
-        maxMemoryAlloc = (int)(totalRAM / 1.5);
-    else
-        maxMemoryAlloc = 4096;
-
-    return maxMemoryAlloc;
-}
-
 bool Application::handleDataMigration(const QString& currentData,
                                       const QString& oldData,
                                       const QString& name,
@@ -1886,3 +1924,8 @@ QUrl Application::normalizeImportUrl(QString const& url)
         return QUrl::fromUserInput(url);
     }
 }
+
+const QString Application::javaPath()
+{
+    return m_settings->get("JavaDir").toString();
+}
diff --git a/launcher/Application.h b/launcher/Application.h
index 7669e08ec..bd1cb2dea 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -47,8 +47,7 @@
 
 #include <BaseInstance.h>
 
-#include "minecraft/launch/MinecraftServerTarget.h"
-#include "ui/themes/CatPack.h"
+#include "minecraft/launch/MinecraftTarget.h"
 
 class LaunchController;
 class LocalPeer;
@@ -82,6 +81,12 @@ class Index;
 #endif
 #define APPLICATION (static_cast<Application*>(QCoreApplication::instance()))
 
+// Used for checking if is a test
+#if defined(APPLICATION_DYN)
+#undef APPLICATION_DYN
+#endif
+#define APPLICATION_DYN (dynamic_cast<Application*>(QCoreApplication::instance()))
+
 class Application : public QApplication {
     // friends for the purpose of limiting access to deprecated stuff
     Q_OBJECT
@@ -162,6 +167,9 @@ class Application : public QApplication {
     /// the data path the application is using
     const QString& dataRoot() { return m_dataPath; }
 
+    /// the java installed path the application is using
+    const QString javaPath();
+
     bool isPortable() { return m_portable; }
 
     const Capabilities capabilities() { return m_capabilities; }
@@ -180,8 +188,6 @@ class Application : public QApplication {
 
     void ShowGlobalSettings(class QWidget* parent, QString open_page = QString());
 
-    int suitableMaxMem();
-
     bool updaterEnabled();
     QString updaterBinaryName();
 
@@ -193,6 +199,8 @@ class Application : public QApplication {
     void globalSettingsClosed();
     int currentCatChanged(int index);
 
+    void oauthReplyRecieved(QVariantMap);
+
 #ifdef Q_OS_MACOS
     void clickedOnDock();
 #endif
@@ -201,7 +209,7 @@ class Application : public QApplication {
     bool launch(InstancePtr instance,
                 bool online = true,
                 bool demo = false,
-                MinecraftServerTargetPtr serverToJoin = nullptr,
+                MinecraftTarget::Ptr targetToJoin = nullptr,
                 MinecraftAccountPtr accountToUse = nullptr);
     bool kill(InstancePtr instance);
     void closeCurrentWindow();
@@ -289,6 +297,7 @@ class Application : public QApplication {
     QString m_detectedOpenALPath;
     QString m_instanceIdToLaunch;
     QString m_serverToJoin;
+    QString m_worldToJoin;
     QString m_profileToUse;
     bool m_liveCheck = false;
     QList<QUrl> m_urlsToImport;
diff --git a/launcher/BaseInstaller.cpp b/launcher/BaseInstaller.cpp
index 1ff86ed40..96a3b5ebe 100644
--- a/launcher/BaseInstaller.cpp
+++ b/launcher/BaseInstaller.cpp
@@ -16,6 +16,7 @@
 #include <QFile>
 
 #include "BaseInstaller.h"
+#include "FileSystem.h"
 #include "minecraft/MinecraftInstance.h"
 
 BaseInstaller::BaseInstaller() {}
@@ -42,7 +43,7 @@ bool BaseInstaller::add(MinecraftInstance* to)
 
 bool BaseInstaller::remove(MinecraftInstance* from)
 {
-    return QFile::remove(filename(from->instanceRoot()));
+    return FS::deletePath(filename(from->instanceRoot()));
 }
 
 QString BaseInstaller::filename(const QString& root) const
diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp
index cda44b454..69cf95e3c 100644
--- a/launcher/BaseInstance.cpp
+++ b/launcher/BaseInstance.cpp
@@ -269,13 +269,18 @@ void BaseInstance::setRunning(bool running)
 
     m_isRunning = running;
 
-    if (!m_settings->get("RecordGameTime").toBool()) {
-        emit runningStatusChanged(running);
+    emit runningStatusChanged(running);
+}
+
+void BaseInstance::setMinecraftRunning(bool running)
+{
+    if (!settings()->get("RecordGameTime").toBool()) {
         return;
     }
 
     if (running) {
         m_timeStarted = QDateTime::currentDateTime();
+        setLastLaunch(m_timeStarted.toMSecsSinceEpoch());
     } else {
         QDateTime timeEnded = QDateTime::currentDateTime();
 
@@ -285,8 +290,6 @@ void BaseInstance::setRunning(bool running)
 
         emit propertiesChanged(this);
     }
-
-    emit runningStatusChanged(running);
 }
 
 int64_t BaseInstance::totalTimePlayed() const
diff --git a/launcher/BaseInstance.h b/launcher/BaseInstance.h
index f4ed9113c..2be28d1ec 100644
--- a/launcher/BaseInstance.h
+++ b/launcher/BaseInstance.h
@@ -56,7 +56,7 @@
 #include "net/Mode.h"
 
 #include "RuntimeContext.h"
-#include "minecraft/launch/MinecraftServerTarget.h"
+#include "minecraft/launch/MinecraftTarget.h"
 
 class QDir;
 class Task;
@@ -104,6 +104,7 @@ class BaseInstance : public QObject, public std::enable_shared_from_this<BaseIns
     /// be unique.
     virtual QString id() const;
 
+    void setMinecraftRunning(bool running);
     void setRunning(bool running);
     bool isRunning() const;
     int64_t totalTimePlayed() const;
@@ -180,10 +181,10 @@ class BaseInstance : public QObject, public std::enable_shared_from_this<BaseIns
     virtual void loadSpecificSettings() = 0;
 
     /// returns a valid update task
-    virtual Task::Ptr createUpdateTask(Net::Mode mode) = 0;
+    virtual QList<Task::Ptr> createUpdateTask() = 0;
 
     /// returns a valid launcher (task container)
-    virtual shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) = 0;
+    virtual shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftTarget::Ptr targetToJoin) = 0;
 
     /// returns the current launch task (if any)
     shared_qobject_ptr<LaunchTask> getLaunchTask();
@@ -214,7 +215,7 @@ class BaseInstance : public QObject, public std::enable_shared_from_this<BaseIns
 
     virtual QString typeName() const = 0;
 
-    void updateRuntimeContext();
+    virtual void updateRuntimeContext();
     RuntimeContext runtimeContext() const { return m_runtimeContext; }
 
     bool hasVersionBroken() const { return m_hasBrokenVersion; }
@@ -255,7 +256,7 @@ class BaseInstance : public QObject, public std::enable_shared_from_this<BaseIns
     /**
      * 'print' a verbose description of the instance into a QStringList
      */
-    virtual QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) = 0;
+    virtual QStringList verboseDescription(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin) = 0;
 
     Status currentStatus() const;
 
diff --git a/launcher/BaseVersionList.cpp b/launcher/BaseVersionList.cpp
index e11560d5e..22077c962 100644
--- a/launcher/BaseVersionList.cpp
+++ b/launcher/BaseVersionList.cpp
@@ -78,6 +78,14 @@ QVariant BaseVersionList::data(const QModelIndex& index, int role) const
         case TypeRole:
             return version->typeString();
 
+        case JavaMajorRole: {
+            auto major = version->name();
+            if (major.startsWith("java")) {
+                major = "Java " + major.mid(4);
+            }
+            return major;
+        }
+
         default:
             return QVariant();
     }
@@ -110,6 +118,8 @@ QHash<int, QByteArray> BaseVersionList::roleNames() const
     roles.insert(TypeRole, "type");
     roles.insert(BranchRole, "branch");
     roles.insert(PathRole, "path");
-    roles.insert(ArchitectureRole, "architecture");
+    roles.insert(JavaNameRole, "javaName");
+    roles.insert(CPUArchitectureRole, "architecture");
+    roles.insert(JavaMajorRole, "javaMajor");
     return roles;
 }
diff --git a/launcher/BaseVersionList.h b/launcher/BaseVersionList.h
index 231887c4e..673d13562 100644
--- a/launcher/BaseVersionList.h
+++ b/launcher/BaseVersionList.h
@@ -48,7 +48,9 @@ class BaseVersionList : public QAbstractListModel {
         TypeRole,
         BranchRole,
         PathRole,
-        ArchitectureRole,
+        JavaNameRole,
+        JavaMajorRole,
+        CPUArchitectureRole,
         SortRole
     };
     using RoleList = QList<int>;
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 28bf407d4..f6d328402 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -24,6 +24,8 @@ set(CORE_SOURCES
     NullInstance.h
     MMCZip.h
     MMCZip.cpp
+    Untar.h
+    Untar.cpp
     StringUtils.h
     StringUtils.cpp
     QVariantUtils.h
@@ -43,8 +45,8 @@ set(CORE_SOURCES
     ResourceDownloadTask.h
     ResourceDownloadTask.cpp
 
-    CreateAuthlibInjectorAccount.cpp
-    CreateAuthlibInjectorAccount.h
+    GetAuthlibInjectorApiLocation.cpp
+    GetAuthlibInjectorApiLocation.h
 
     # Use tracking separate from memory management
     Usable.h
@@ -135,7 +137,6 @@ set(NET_SOURCES
     net/MetaCacheSink.h
     net/Logging.h
     net/Logging.cpp
-    net/NetAction.h
     net/NetJob.cpp
     net/NetJob.h
     net/NetUtils.h
@@ -148,7 +149,6 @@ set(NET_SOURCES
     net/HeaderProxy.h
     net/RawHeaderProxy.h
     net/ApiHeaderProxy.h
-    net/StaticHeaderProxy.h
     net/ApiDownload.h
     net/ApiDownload.cpp
     net/ApiUpload.cpp
@@ -169,16 +169,18 @@ set(LAUNCH_SOURCES
     launch/steps/PreLaunchCommand.h
     launch/steps/TextPrint.cpp
     launch/steps/TextPrint.h
-    launch/steps/Update.cpp
-    launch/steps/Update.h
     launch/steps/QuitAfterGameStop.cpp
     launch/steps/QuitAfterGameStop.h
+    launch/steps/PrintServers.cpp
+    launch/steps/PrintServers.h
     launch/LaunchStep.cpp
     launch/LaunchStep.h
     launch/LaunchTask.cpp
     launch/LaunchTask.h
     launch/LogModel.cpp
     launch/LogModel.h
+    launch/TaskStepWrapper.cpp
+    launch/TaskStepWrapper.h
 )
 
 # Old update system
@@ -214,61 +216,47 @@ set(ICONS_SOURCES
 
 # Support for Minecraft instances and launch
 set(MINECRAFT_SOURCES
+
+    # Logging
+    minecraft/Logging.h
+    minecraft/Logging.cpp
+
     # Minecraft support
     minecraft/auth/AccountData.cpp
     minecraft/auth/AccountData.h
     minecraft/auth/AccountList.cpp
     minecraft/auth/AccountList.h
-    minecraft/auth/AccountTask.cpp
-    minecraft/auth/AccountTask.h
-    minecraft/auth/AuthRequest.cpp
-    minecraft/auth/AuthRequest.h
     minecraft/auth/AuthSession.cpp
     minecraft/auth/AuthSession.h
-    minecraft/auth/AuthStep.cpp
     minecraft/auth/AuthStep.h
     minecraft/auth/MinecraftAccount.cpp
     minecraft/auth/MinecraftAccount.h
     minecraft/auth/Parsers.cpp
     minecraft/auth/Parsers.h
-    minecraft/auth/Yggdrasil.cpp
-    minecraft/auth/Yggdrasil.h
-
-    minecraft/auth/flows/AuthFlow.cpp
-    minecraft/auth/flows/AuthFlow.h
-    minecraft/auth/flows/AuthlibInjector.cpp
-    minecraft/auth/flows/AuthlibInjector.h
-    minecraft/auth/flows/Mojang.cpp
-    minecraft/auth/flows/Mojang.h
-    minecraft/auth/flows/MSA.cpp
-    minecraft/auth/flows/MSA.h
-    minecraft/auth/flows/Offline.cpp
-    minecraft/auth/flows/Offline.h
-
-    minecraft/auth/steps/AuthlibInjectorMetadataStep.cpp
-    minecraft/auth/steps/AuthlibInjectorMetadataStep.h
+
+    minecraft/auth/AuthFlow.cpp
+    minecraft/auth/AuthFlow.h
+
     minecraft/auth/steps/EntitlementsStep.cpp
     minecraft/auth/steps/EntitlementsStep.h
     minecraft/auth/steps/GetSkinStep.cpp
     minecraft/auth/steps/GetSkinStep.h
     minecraft/auth/steps/LauncherLoginStep.cpp
     minecraft/auth/steps/LauncherLoginStep.h
-    minecraft/auth/steps/MigrationEligibilityStep.cpp
-    minecraft/auth/steps/MigrationEligibilityStep.h
     minecraft/auth/steps/MinecraftProfileStep.cpp
     minecraft/auth/steps/MinecraftProfileStep.h
-    minecraft/auth/steps/MinecraftProfileStepMojang.cpp
-    minecraft/auth/steps/MinecraftProfileStepMojang.h
+    minecraft/auth/steps/MSADeviceCodeStep.cpp
+    minecraft/auth/steps/MSADeviceCodeStep.h
     minecraft/auth/steps/MSAStep.cpp
     minecraft/auth/steps/MSAStep.h
-    minecraft/auth/steps/OfflineStep.cpp
-    minecraft/auth/steps/OfflineStep.h
     minecraft/auth/steps/XboxAuthorizationStep.cpp
     minecraft/auth/steps/XboxAuthorizationStep.h
     minecraft/auth/steps/XboxProfileStep.cpp
     minecraft/auth/steps/XboxProfileStep.h
     minecraft/auth/steps/XboxUserStep.cpp
     minecraft/auth/steps/XboxUserStep.h
+    minecraft/auth/steps/YggdrasilMinecraftProfileStep.cpp
+    minecraft/auth/steps/YggdrasilMinecraftProfileStep.h
     minecraft/auth/steps/YggdrasilStep.cpp
     minecraft/auth/steps/YggdrasilStep.h
 
@@ -294,8 +282,8 @@ set(MINECRAFT_SOURCES
     minecraft/launch/ExtractNatives.h
     minecraft/launch/LauncherPartLaunch.cpp
     minecraft/launch/LauncherPartLaunch.h
-    minecraft/launch/MinecraftServerTarget.cpp
-    minecraft/launch/MinecraftServerTarget.h
+    minecraft/launch/MinecraftTarget.cpp
+    minecraft/launch/MinecraftTarget.h
     minecraft/launch/PrintInstanceInfo.cpp
     minecraft/launch/PrintInstanceInfo.h
     minecraft/launch/ReconstructAssets.cpp
@@ -304,6 +292,8 @@ set(MINECRAFT_SOURCES
     minecraft/launch/ScanModFolders.h
     minecraft/launch/VerifyJavaInstall.cpp
     minecraft/launch/VerifyJavaInstall.h
+    minecraft/launch/AutoInstallJava.cpp
+    minecraft/launch/AutoInstallJava.h
 
     minecraft/GradleSpecifier.h
     minecraft/MinecraftInstance.cpp
@@ -318,8 +308,6 @@ set(MINECRAFT_SOURCES
     minecraft/ComponentUpdateTask.h
     minecraft/MinecraftLoadAndCheck.h
     minecraft/MinecraftLoadAndCheck.cpp
-    minecraft/MinecraftUpdate.h
-    minecraft/MinecraftUpdate.cpp
     minecraft/MojangVersionFormat.cpp
     minecraft/MojangVersionFormat.h
     minecraft/Rule.cpp
@@ -395,13 +383,17 @@ set(MINECRAFT_SOURCES
     minecraft/AssetsUtils.h
     minecraft/AssetsUtils.cpp
 
-    # Minecraft services
-    minecraft/services/CapeChange.cpp
-    minecraft/services/CapeChange.h
-    minecraft/services/SkinUpload.cpp
-    minecraft/services/SkinUpload.h
-    minecraft/services/SkinDelete.cpp
-    minecraft/services/SkinDelete.h
+    # Minecraft skins
+    minecraft/skins/CapeChange.cpp
+    minecraft/skins/CapeChange.h
+    minecraft/skins/SkinUpload.cpp
+    minecraft/skins/SkinUpload.h
+    minecraft/skins/SkinDelete.cpp
+    minecraft/skins/SkinDelete.h
+    minecraft/skins/SkinModel.cpp
+    minecraft/skins/SkinModel.h
+    minecraft/skins/SkinList.cpp
+    minecraft/skins/SkinList.h
 
     minecraft/Agent.h)
 
@@ -446,8 +438,6 @@ set(SETTINGS_SOURCES
 set(JAVA_SOURCES
     java/JavaChecker.h
     java/JavaChecker.cpp
-    java/JavaCheckerJob.h
-    java/JavaCheckerJob.cpp
     java/JavaInstall.h
     java/JavaInstall.cpp
     java/JavaInstallList.h
@@ -456,6 +446,20 @@ set(JAVA_SOURCES
     java/JavaUtils.cpp
     java/JavaVersion.h
     java/JavaVersion.cpp
+
+    java/JavaMetadata.h
+    java/JavaMetadata.cpp
+    java/download/ArchiveDownloadTask.cpp
+    java/download/ArchiveDownloadTask.h
+    java/download/ManifestDownloadTask.cpp
+    java/download/ManifestDownloadTask.h
+    java/download/SymlinkTask.cpp
+    java/download/SymlinkTask.h
+
+    ui/java/InstallJavaDialog.h
+    ui/java/InstallJavaDialog.cpp
+    ui/java/VersionList.h
+    ui/java/VersionList.cpp
 )
 
 set(TRANSLATIONS_SOURCES
@@ -477,6 +481,8 @@ set(TOOLS_SOURCES
     tools/JVisualVM.h
     tools/MCEditTool.cpp
     tools/MCEditTool.h
+    tools/GenericProfiler.cpp
+    tools/GenericProfiler.h
 )
 
 set(META_SOURCES
@@ -623,7 +629,7 @@ set(PRISMUPDATER_SOURCES
     updater/prismupdater/UpdaterDialogs.cpp
     updater/prismupdater/GitHubRelease.h
     updater/prismupdater/GitHubRelease.cpp
-   
+
     Json.h
     Json.cpp
     FileSystem.h
@@ -640,7 +646,7 @@ set(PRISMUPDATER_SOURCES
     # Zip
     MMCZip.h
     MMCZip.cpp
-    
+
     # Time
     MMCTime.h
     MMCTime.cpp
@@ -655,7 +661,6 @@ set(PRISMUPDATER_SOURCES
     net/HttpMetaCache.h
     net/Logging.h
     net/Logging.cpp
-    net/NetAction.h
     net/NetRequest.cpp
     net/NetRequest.h
     net/NetJob.cpp
@@ -684,6 +689,22 @@ ecm_qt_declare_logging_category(CORE_SOURCES
     EXPORT "${Launcher_Name}"
 )
 
+ecm_qt_export_logging_category(
+    IDENTIFIER instanceProfileC
+    CATEGORY_NAME "launcher.instance.profile"
+    DEFAULT_SEVERITY Debug
+    DESCRIPTION "Profile actions"
+    EXPORT "${Launcher_Name}"
+)
+
+ecm_qt_export_logging_category(
+    IDENTIFIER instanceProfileResolveC
+    CATEGORY_NAME "launcher.instance.profile.resolve"
+    DEFAULT_SEVERITY Debug
+    DESCRIPTION "Profile component resolusion actions"
+    EXPORT "${Launcher_Name}"
+)
+
 ecm_qt_export_logging_category(
     IDENTIFIER taskLogC
     CATEGORY_NAME "launcher.task"
@@ -696,7 +717,7 @@ ecm_qt_export_logging_category(
     IDENTIFIER taskNetLogC
     CATEGORY_NAME "launcher.task.net"
     DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network action"
+    DESCRIPTION "Task network action"
     EXPORT "${Launcher_Name}"
 )
 
@@ -704,14 +725,14 @@ ecm_qt_export_logging_category(
     IDENTIFIER taskDownloadLogC
     CATEGORY_NAME "launcher.task.net.download"
     DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network download actions"
+    DESCRIPTION "Task network download actions"
     EXPORT "${Launcher_Name}"
 )
 ecm_qt_export_logging_category(
     IDENTIFIER taskUploadLogC
     CATEGORY_NAME "launcher.task.net.upload"
     DEFAULT_SEVERITY Debug
-    DESCRIPTION "task network upload actions"
+    DESCRIPTION "Task network upload actions"
     EXPORT "${Launcher_Name}"
 )
 
@@ -782,6 +803,8 @@ SET(LAUNCHER_SOURCES
     DataMigrationTask.cpp
     ApplicationMessage.h
     ApplicationMessage.cpp
+    SysInfo.h
+    SysInfo.cpp
 
     # GUI - general utilities
     DesktopServices.h
@@ -820,16 +843,12 @@ SET(LAUNCHER_SOURCES
     # GUI - windows
     ui/GuiUtil.h
     ui/GuiUtil.cpp
-    ui/ColorCache.h
-    ui/ColorCache.cpp
     ui/MainWindow.h
     ui/MainWindow.cpp
     ui/InstanceWindow.h
     ui/InstanceWindow.cpp
 
     # FIXME: maybe find a better home for this.
-    SkinUtils.cpp
-    SkinUtils.h
     FileIgnoreProxy.cpp
     FileIgnoreProxy.h
     FastFileIconProvider.cpp
@@ -847,6 +866,10 @@ SET(LAUNCHER_SOURCES
     ui/setupwizard/PasteWizardPage.h
     ui/setupwizard/ThemeWizardPage.cpp
     ui/setupwizard/ThemeWizardPage.h
+    ui/setupwizard/AutoJavaWizardPage.cpp
+    ui/setupwizard/AutoJavaWizardPage.h
+    ui/setupwizard/LoginWizardPage.cpp
+    ui/setupwizard/LoginWizardPage.h
 
     # GUI - themes
     ui/themes/FusionTheme.cpp
@@ -964,6 +987,9 @@ SET(LAUNCHER_SOURCES
     ui/pages/modplatform/ShaderPackPage.cpp
     ui/pages/modplatform/ShaderPackModel.cpp
 
+
+    ui/pages/modplatform/ModpackProviderBasePage.h
+
     ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
     ui/pages/modplatform/atlauncher/AtlFilterModel.h
     ui/pages/modplatform/atlauncher/AtlListModel.cpp
@@ -1045,8 +1071,6 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/IconPickerDialog.h
     ui/dialogs/ImportResourceDialog.cpp
     ui/dialogs/ImportResourceDialog.h
-    ui/dialogs/LoginDialog.cpp
-    ui/dialogs/LoginDialog.h
     ui/dialogs/AuthlibInjectorLoginDialog.cpp
     ui/dialogs/AuthlibInjectorLoginDialog.h
     ui/dialogs/MSALoginDialog.cpp
@@ -1067,8 +1091,6 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/ReviewMessageBox.h
     ui/dialogs/VersionSelectDialog.cpp
     ui/dialogs/VersionSelectDialog.h
-    ui/dialogs/SkinUploadDialog.cpp
-    ui/dialogs/SkinUploadDialog.h
     ui/dialogs/ResourceDownloadDialog.cpp
     ui/dialogs/ResourceDownloadDialog.h
     ui/dialogs/ScrollMessageBox.cpp
@@ -1082,7 +1104,12 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/InstallLoaderDialog.cpp
     ui/dialogs/InstallLoaderDialog.h
 
+    ui/dialogs/skins/SkinManageDialog.cpp
+    ui/dialogs/skins/SkinManageDialog.h
+
     # GUI - widgets
+    ui/widgets/CheckComboBox.cpp
+    ui/widgets/CheckComboBox.h
     ui/widgets/Common.cpp
     ui/widgets/Common.h
     ui/widgets/CustomCommands.cpp
@@ -1167,6 +1194,8 @@ endif()
 qt_wrap_ui(LAUNCHER_UI
     ui/MainWindow.ui
     ui/setupwizard/PasteWizardPage.ui
+    ui/setupwizard/AutoJavaWizardPage.ui
+    ui/setupwizard/LoginWizardPage.ui
     ui/setupwizard/ThemeWizardPage.ui
     ui/pages/global/AccountListPage.ui
     ui/pages/global/JavaPage.ui
@@ -1212,7 +1241,6 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/NewComponentDialog.ui
     ui/dialogs/NewsDialog.ui
     ui/dialogs/ProfileSelectDialog.ui
-    ui/dialogs/SkinUploadDialog.ui
     ui/dialogs/ExportInstanceDialog.ui
     ui/dialogs/ExportPackDialog.ui
     ui/dialogs/ExportToModListDialog.ui
@@ -1220,14 +1248,15 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/ImportResourceDialog.ui
     ui/dialogs/MSALoginDialog.ui
     ui/dialogs/OfflineLoginDialog.ui
-    ui/dialogs/AboutDialog.ui
-    ui/dialogs/LoginDialog.ui
     ui/dialogs/AuthlibInjectorLoginDialog.ui
+    ui/dialogs/AboutDialog.ui
     ui/dialogs/EditAccountDialog.ui
     ui/dialogs/ReviewMessageBox.ui
     ui/dialogs/ScrollMessageBox.ui
     ui/dialogs/BlockedModsDialog.ui
     ui/dialogs/ChooseProviderDialog.ui
+
+    ui/dialogs/skins/SkinManageDialog.ui
 )
 
 qt_wrap_ui(PRISM_UPDATE_UI
@@ -1269,14 +1298,10 @@ include(CompilerWarnings)
 
 # Add executable
 add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
-if(BUILD_TESTING)
-target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_TEST)
-endif()
 set_project_warnings(Launcher_logic
     "${Launcher_MSVC_WARNINGS}"
     "${Launcher_CLANG_WARNINGS}"
     "${Launcher_GCC_WARNINGS}")
-target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_APPLICATION)
 target_include_directories(Launcher_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_APPLICATION)
 target_link_libraries(Launcher_logic
@@ -1287,7 +1312,6 @@ target_link_libraries(Launcher_logic
     tomlplusplus::tomlplusplus
     qdcss
     BuildConfig
-    Katabasis
     Qt${QT_VERSION_MAJOR}::Widgets
     ghcFilesystem::ghc_filesystem
 )
@@ -1305,6 +1329,7 @@ target_link_libraries(Launcher_logic
     Qt${QT_VERSION_MAJOR}::Concurrent
     Qt${QT_VERSION_MAJOR}::Gui
     Qt${QT_VERSION_MAJOR}::Widgets
+    Qt${QT_VERSION_MAJOR}::NetworkAuth
     ${Launcher_QT_LIBS}
 )
 target_link_libraries(Launcher_logic
@@ -1375,13 +1400,12 @@ if(Launcher_BUILD_UPDATER)
         Qt${QT_VERSION_MAJOR}::Network
         ${Launcher_QT_LIBS}
         cmark::cmark
-        Katabasis
     )
 
     add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp)
     target_sources("${Launcher_Name}_updater" PRIVATE updater/prismupdater/updater.exe.manifest)
     target_link_libraries("${Launcher_Name}_updater" prism_updater_logic)
-    
+
     if(DEFINED Launcher_APP_BINARY_NAME)
         set_target_properties("${Launcher_Name}_updater" PROPERTIES OUTPUT_NAME "${Launcher_APP_BINARY_NAME}_updater")
     endif()
@@ -1540,7 +1564,6 @@ if(INSTALL_BUNDLE STREQUAL "full")
             CONFIGURATIONS Debug RelWithDebInfo ""
             DESTINATION ${PLUGIN_DEST_DIR}
             COMPONENT Runtime
-            PATTERN "*qopensslbackend*" EXCLUDE
             PATTERN "*qcertonlybackend*" EXCLUDE
         )
         install(
@@ -1551,10 +1574,78 @@ if(INSTALL_BUNDLE STREQUAL "full")
             REGEX "dd\\." EXCLUDE
             REGEX "_debug\\." EXCLUDE
             REGEX "\\.dSYM" EXCLUDE
-            PATTERN "*qopensslbackend*" EXCLUDE
             PATTERN "*qcertonlybackend*" EXCLUDE
         )
     endif()
+    # Wayland support
+    if(EXISTS "${QT_PLUGINS_DIR}/wayland-graphics-integration-client")
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-graphics-integration-client"
+            CONFIGURATIONS Debug RelWithDebInfo ""
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+        )
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-graphics-integration-client"
+            CONFIGURATIONS Release MinSizeRel
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "dd\\." EXCLUDE
+            REGEX "_debug\\." EXCLUDE
+            REGEX "\\.dSYM" EXCLUDE
+        )
+    endif()
+    if(EXISTS "${QT_PLUGINS_DIR}/wayland-graphics-integration-server")
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-graphics-integration-server"
+            CONFIGURATIONS Debug RelWithDebInfo ""
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+        )
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-graphics-integration-server"
+            CONFIGURATIONS Release MinSizeRel
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "dd\\." EXCLUDE
+            REGEX "_debug\\." EXCLUDE
+            REGEX "\\.dSYM" EXCLUDE
+        )
+    endif()
+    if(EXISTS "${QT_PLUGINS_DIR}/wayland-decoration-client")
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-decoration-client"
+            CONFIGURATIONS Debug RelWithDebInfo ""
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+        )
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-decoration-client"
+            CONFIGURATIONS Release MinSizeRel
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "dd\\." EXCLUDE
+            REGEX "_debug\\." EXCLUDE
+            REGEX "\\.dSYM" EXCLUDE
+        )
+    endif()
+    if(EXISTS "${QT_PLUGINS_DIR}/wayland-shell-integration")
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-shell-integration"
+            CONFIGURATIONS Debug RelWithDebInfo ""
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+        )
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/wayland-shell-integration"
+            CONFIGURATIONS Release MinSizeRel
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "dd\\." EXCLUDE
+            REGEX "_debug\\." EXCLUDE
+            REGEX "\\.dSYM" EXCLUDE
+        )
+    endif()
     configure_file(
         "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
         "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
diff --git a/launcher/CreateAuthlibInjectorAccount.cpp b/launcher/CreateAuthlibInjectorAccount.cpp
deleted file mode 100644
index 8f27d36c1..000000000
--- a/launcher/CreateAuthlibInjectorAccount.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 Evan Goode <mail@evangoo.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "CreateAuthlibInjectorAccount.h"
-
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkRequest>
-#include <QStringList>
-#include <QUrl>
-
-#include "Application.h"
-#include "BuildConfig.h"
-
-CreateAuthlibInjectorAccount::CreateAuthlibInjectorAccount(QUrl url, MinecraftAccountPtr account, QString username)
-    : NetAction(), m_url(url), m_account(account), m_username(username)
-{}
-
-void CreateAuthlibInjectorAccount::executeTask()
-{
-    m_state = State::Running;
-    QNetworkRequest request(m_url);
-    QNetworkReply* rep = APPLICATION->network()->get(request);
-
-    m_reply.reset(rep);
-    connect(rep, &QNetworkReply::finished, this, &CreateAuthlibInjectorAccount::downloadFinished);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &CreateAuthlibInjectorAccount::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &CreateAuthlibInjectorAccount::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &CreateAuthlibInjectorAccount::sslErrors);
-}
-
-void CreateAuthlibInjectorAccount::downloadError(QNetworkReply::NetworkError error)
-{
-    qDebug() << m_reply->errorString();
-    m_state = State::Failed;
-}
-
-void CreateAuthlibInjectorAccount::downloadFinished()
-{
-    if (m_state != State::Failed) {
-        QVariant header = m_reply->rawHeader("X-Authlib-Injector-API-Location");
-        if (header.isValid()) {
-            auto location = header.toString();
-            m_url = m_url.resolved(location);
-        } else {
-            qDebug() << "X-Authlib-Injector-API-Location header not found!";
-        }
-        m_account.reset(MinecraftAccount::createFromUsernameAuthlibInjector(m_username, m_url.toString()));
-        m_state = State::Succeeded;
-        emit succeeded();
-        return;
-    } else {
-        qDebug() << m_reply->readAll();
-        m_reply.reset();
-        emitFailed();
-        return;
-    }
-}
-
-MinecraftAccountPtr CreateAuthlibInjectorAccount::getAccount()
-{
-    return m_account;
-}
diff --git a/launcher/CreateAuthlibInjectorAccount.h b/launcher/CreateAuthlibInjectorAccount.h
deleted file mode 100644
index 4908ed0e6..000000000
--- a/launcher/CreateAuthlibInjectorAccount.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 Evan Goode <mail@evangoo.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "minecraft/auth/MinecraftAccount.h"
-#include "net/NetAction.h"
-
-typedef shared_qobject_ptr<class CreateAuthlibInjectorAccount> CreateAuthlibInjectorAccountPtr;
-class CreateAuthlibInjectorAccount : public NetAction {
-   public:
-    explicit CreateAuthlibInjectorAccount(QUrl url, MinecraftAccountPtr account, QString username);
-    static CreateAuthlibInjectorAccountPtr make(QUrl url, MinecraftAccountPtr account, QString username)
-    {
-        return CreateAuthlibInjectorAccountPtr(new CreateAuthlibInjectorAccount(url, account, username));
-    }
-    MinecraftAccountPtr getAccount();
-
-    void init() override {};
-
-   protected slots:
-    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override {}
-    void downloadError(QNetworkReply::NetworkError error) override;
-    void downloadFinished() override;
-    void downloadReadyRead() override {}
-
-   public slots:
-    void executeTask() override;
-
-   private:
-    QUrl m_url;
-    MinecraftAccountPtr m_account;
-    QString m_username;
-};
diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index ff9c90cf7..7f38cff04 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -276,6 +276,9 @@ bool ensureFolderPathExists(const QFileInfo folderPath)
 {
     QDir dir;
     QString ensuredPath = folderPath.filePath();
+    if (folderPath.exists())
+        return true;
+
     bool success = dir.mkpath(ensuredPath);
     return success;
 }
@@ -647,6 +650,19 @@ void ExternalLinkFileProcess::runLinkFile()
     qDebug() << "Process exited";
 }
 
+bool moveByCopy(const QString& source, const QString& dest)
+{
+    if (!copy(source, dest)()) {  // copy
+        qDebug() << "Copy of" << source << "to" << dest << "failed!";
+        return false;
+    }
+    if (!deletePath(source)) {  // remove original
+        qDebug() << "Deletion of" << source << "failed!";
+        return false;
+    };
+    return true;
+}
+
 bool move(const QString& source, const QString& dest)
 {
     std::error_code err;
@@ -654,13 +670,14 @@ bool move(const QString& source, const QString& dest)
     ensureFilePathExists(dest);
     fs::rename(StringUtils::toStdString(source), StringUtils::toStdString(dest), err);
 
-    if (err) {
-        qWarning() << "Failed to move file:" << QString::fromStdString(err.message());
-        qDebug() << "Source file:" << source;
-        qDebug() << "Destination file:" << dest;
+    if (err.value() != 0) {
+        if (moveByCopy(source, dest))
+            return true;
+        qDebug() << "Move of" << source << "to" << dest << "failed!";
+        qWarning() << "Failed to move file:" << QString::fromStdString(err.message()) << QString::number(err.value());
+        return false;
     }
-
-    return err.value() == 0;
+    return true;
 }
 
 bool deletePath(QString path)
@@ -904,6 +921,10 @@ bool createShortcut(QString destination, QString target, QStringList args, QStri
     if (destination.isEmpty()) {
         destination = PathCombine(getDesktopDir(), RemoveInvalidFilenameChars(name));
     }
+    if (!ensureFilePathExists(destination)) {
+        qWarning() << "Destination path can't be created!";
+        return false;
+    }
 #if defined(Q_OS_MACOS)
     // Create the Application
     QDir applicationDirectory =
@@ -1677,4 +1698,30 @@ QString getPathNameInLocal8bit(const QString& file)
 }
 #endif
 
+QString getUniqueResourceName(const QString& filePath)
+{
+    auto newFileName = filePath;
+    if (!newFileName.endsWith(".disabled")) {
+        return newFileName;  // prioritize enabled mods
+    }
+    newFileName.chop(9);
+    if (!QFile::exists(newFileName)) {
+        return filePath;
+    }
+    QFileInfo fileInfo(filePath);
+    auto baseName = fileInfo.completeBaseName();
+    auto path = fileInfo.absolutePath();
+
+    int counter = 1;
+    do {
+        if (counter == 1) {
+            newFileName = FS::PathCombine(path, baseName + ".duplicate");
+        } else {
+            newFileName = FS::PathCombine(path, baseName + ".duplicate" + QString::number(counter));
+        }
+        counter++;
+    } while (QFile::exists(newFileName));
+
+    return newFileName;
+}
 }  // namespace FS
diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h
index ea4bb9674..c5beef7bd 100644
--- a/launcher/FileSystem.h
+++ b/launcher/FileSystem.h
@@ -72,7 +72,7 @@ void appendSafe(const QString& filename, const QByteArray& data);
 void append(const QString& filename, const QByteArray& data);
 
 /**
- * read data from a file safely\
+ * read data from a file safely
  */
 QByteArray read(const QString& filename);
 
@@ -240,6 +240,7 @@ class create_link : public QObject {
     bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
 
     int totalLinked() { return m_linked; }
+    int totalToLink() { return static_cast<int>(m_links_to_make.size()); }
 
     void runPrivileged() { runPrivileged(QString()); }
     void runPrivileged(const QString& offset);
@@ -559,4 +560,6 @@ uintmax_t hardLinkCount(const QString& path);
 QString getPathNameInLocal8bit(const QString& file);
 #endif
 
+QString getUniqueResourceName(const QString& filePath);
+
 }  // namespace FS
diff --git a/launcher/Filter.cpp b/launcher/Filter.cpp
index fc1c42344..adeb2209e 100644
--- a/launcher/Filter.cpp
+++ b/launcher/Filter.cpp
@@ -1,16 +1,12 @@
 #include "Filter.h"
 
-Filter::~Filter() {}
-
 ContainsFilter::ContainsFilter(const QString& pattern) : pattern(pattern) {}
-ContainsFilter::~ContainsFilter() {}
 bool ContainsFilter::accepts(const QString& value)
 {
     return value.contains(pattern);
 }
 
 ExactFilter::ExactFilter(const QString& pattern) : pattern(pattern) {}
-ExactFilter::~ExactFilter() {}
 bool ExactFilter::accepts(const QString& value)
 {
     return value == pattern;
@@ -27,10 +23,15 @@ RegexpFilter::RegexpFilter(const QString& regexp, bool invert) : invert(invert)
     pattern.setPattern(regexp);
     pattern.optimize();
 }
-RegexpFilter::~RegexpFilter() {}
 bool RegexpFilter::accepts(const QString& value)
 {
     auto match = pattern.match(value);
     bool matched = match.hasMatch();
     return invert ? (!matched) : (matched);
 }
+
+ExactListFilter::ExactListFilter(const QStringList& pattern) : m_pattern(pattern) {}
+bool ExactListFilter::accepts(const QString& value)
+{
+    return m_pattern.isEmpty() || m_pattern.contains(value);
+}
\ No newline at end of file
diff --git a/launcher/Filter.h b/launcher/Filter.h
index 089c844d4..ae835e724 100644
--- a/launcher/Filter.h
+++ b/launcher/Filter.h
@@ -5,14 +5,14 @@
 
 class Filter {
    public:
-    virtual ~Filter();
+    virtual ~Filter() = default;
     virtual bool accepts(const QString& value) = 0;
 };
 
 class ContainsFilter : public Filter {
    public:
     ContainsFilter(const QString& pattern);
-    virtual ~ContainsFilter();
+    virtual ~ContainsFilter() = default;
     bool accepts(const QString& value) override;
 
    private:
@@ -22,7 +22,7 @@ class ContainsFilter : public Filter {
 class ExactFilter : public Filter {
    public:
     ExactFilter(const QString& pattern);
-    virtual ~ExactFilter();
+    virtual ~ExactFilter() = default;
     bool accepts(const QString& value) override;
 
    private:
@@ -32,7 +32,7 @@ class ExactFilter : public Filter {
 class ExactIfPresentFilter : public Filter {
    public:
     ExactIfPresentFilter(const QString& pattern);
-    ~ExactIfPresentFilter() override = default;
+    virtual ~ExactIfPresentFilter() override = default;
     bool accepts(const QString& value) override;
 
    private:
@@ -42,10 +42,20 @@ class ExactIfPresentFilter : public Filter {
 class RegexpFilter : public Filter {
    public:
     RegexpFilter(const QString& regexp, bool invert);
-    virtual ~RegexpFilter();
+    virtual ~RegexpFilter() = default;
     bool accepts(const QString& value) override;
 
    private:
     QRegularExpression pattern;
     bool invert = false;
 };
+
+class ExactListFilter : public Filter {
+   public:
+    ExactListFilter(const QStringList& pattern = {});
+    virtual ~ExactListFilter() = default;
+    bool accepts(const QString& value) override;
+
+   private:
+    QStringList m_pattern;
+};
diff --git a/launcher/GetAuthlibInjectorApiLocation.cpp b/launcher/GetAuthlibInjectorApiLocation.cpp
new file mode 100644
index 000000000..235e8c9e5
--- /dev/null
+++ b/launcher/GetAuthlibInjectorApiLocation.cpp
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Evan Goode <mail@evangoo.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "GetAuthlibInjectorApiLocation.h"
+
+#include <QDebug>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkRequest>
+#include <QStringList>
+#include <QUrl>
+#include "net/ByteArraySink.h"
+
+#include "Application.h"
+
+GetAuthlibInjectorApiLocation::GetAuthlibInjectorApiLocation(QUrl url, MinecraftAccountPtr account, QString username)
+    : NetRequest(), m_account(account), m_username(username)
+{
+    m_url = url;
+    m_sink.reset(new Sink(*this));
+}
+
+QNetworkReply* GetAuthlibInjectorApiLocation::getReply(QNetworkRequest& request)
+{
+    setStatus(tr("Getting authlib-injector server details"));
+    return m_network->get(request);
+}
+
+GetAuthlibInjectorApiLocation::Ptr GetAuthlibInjectorApiLocation::make(QUrl url, MinecraftAccountPtr account, QString username)
+{
+    return GetAuthlibInjectorApiLocation::Ptr(new GetAuthlibInjectorApiLocation(url, account, username));
+}
+
+auto GetAuthlibInjectorApiLocation::Sink::init(QNetworkRequest& request) -> Task::State
+{
+    return Task::State::Running;
+}
+
+auto GetAuthlibInjectorApiLocation::Sink::write(QByteArray& data) -> Task::State
+{
+    return Task::State::Running;
+}
+
+auto GetAuthlibInjectorApiLocation::Sink::abort() -> Task::State
+{
+    return Task::State::Failed;
+}
+
+auto GetAuthlibInjectorApiLocation::Sink::finalize(QNetworkReply& reply) -> Task::State
+{
+    QVariant header = reply.rawHeader("X-Authlib-Injector-API-Location");
+    QUrl url = m_outer.m_url;
+    if (header.isValid()) {
+        auto location = header.toString();
+        url = url.resolved(location);
+    } else {
+        qDebug() << "X-Authlib-Injector-API-Location header not found!";
+    }
+
+    m_outer.m_account.reset(MinecraftAccount::createFromUsernameAuthlibInjector(m_outer.m_username, url.toString()));
+    return Task::State::Succeeded;
+}
+
+MinecraftAccountPtr GetAuthlibInjectorApiLocation::getAccount()
+{
+    return m_account;
+}
diff --git a/launcher/GetAuthlibInjectorApiLocation.h b/launcher/GetAuthlibInjectorApiLocation.h
new file mode 100644
index 000000000..f35e22f40
--- /dev/null
+++ b/launcher/GetAuthlibInjectorApiLocation.h
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Evan Goode <mail@evangoo.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "minecraft/auth/MinecraftAccount.h"
+#include "net/NetRequest.h"
+
+class GetAuthlibInjectorApiLocation : public Net::NetRequest {
+    Q_OBJECT
+   public:
+    using Ptr = shared_qobject_ptr<GetAuthlibInjectorApiLocation>;
+    GetAuthlibInjectorApiLocation(QUrl url, MinecraftAccountPtr account, QString username);
+    virtual ~GetAuthlibInjectorApiLocation() = default;
+
+    static GetAuthlibInjectorApiLocation::Ptr make(QUrl url, MinecraftAccountPtr account, QString username);
+
+    MinecraftAccountPtr getAccount();
+
+    class Sink : public Net::Sink {
+       public:
+        Sink(GetAuthlibInjectorApiLocation& outer) : m_outer(outer) {}
+        virtual ~Sink() = default;
+
+       public:
+        auto init(QNetworkRequest& request) -> Task::State override;
+        auto write(QByteArray& data) -> Task::State override;
+        auto abort() -> Task::State override;
+        auto finalize(QNetworkReply& reply) -> Task::State override;
+        auto hasLocalData() -> bool override { return false; }
+
+       private:
+        GetAuthlibInjectorApiLocation& m_outer;
+    };
+
+   protected slots:
+    virtual QNetworkReply* getReply(QNetworkRequest&) override;
+
+   private:
+    MinecraftAccountPtr m_account;
+    QString m_username;
+};
diff --git a/launcher/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp
index cdcd61ba6..0220a4144 100644
--- a/launcher/InstanceCopyTask.cpp
+++ b/launcher/InstanceCopyTask.cpp
@@ -1,10 +1,12 @@
 #include "InstanceCopyTask.h"
 #include <QDebug>
 #include <QtConcurrentRun>
+#include <memory>
 #include "FileSystem.h"
 #include "NullInstance.h"
 #include "pathmatcher/RegexpMatcher.h"
 #include "settings/INISettingsObject.h"
+#include "tasks/Task.h"
 
 InstanceCopyTask::InstanceCopyTask(InstancePtr origInstance, const InstanceCopyPrefs& prefs)
 {
@@ -38,38 +40,50 @@ void InstanceCopyTask::executeTask()
 {
     setStatus(tr("Copying instance %1").arg(m_origInstance->name()));
 
-    auto copySaves = [&]() {
-        QFileInfo mcDir(FS::PathCombine(m_stagingPath, "minecraft"));
-        QFileInfo dotMCDir(FS::PathCombine(m_stagingPath, ".minecraft"));
-
-        QString staging_mc_dir;
-        if (mcDir.exists() && !dotMCDir.exists())
-            staging_mc_dir = mcDir.filePath();
-        else
-            staging_mc_dir = dotMCDir.filePath();
-
-        FS::copy savesCopy(FS::PathCombine(m_origInstance->gameRoot(), "saves"), FS::PathCombine(staging_mc_dir, "saves"));
-        savesCopy.followSymlinks(true);
-
-        return savesCopy();
-    };
-
-    m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this, copySaves] {
+    m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this] {
         if (m_useClone) {
             FS::clone folderClone(m_origInstance->instanceRoot(), m_stagingPath);
             folderClone.matcher(m_matcher.get());
 
+            folderClone(true);
+            setProgress(0, folderClone.totalCloned());
+            connect(&folderClone, &FS::clone::fileCloned,
+                    [this](QString src, QString dst) { setProgress(m_progress + 1, m_progressTotal); });
             return folderClone();
-        } else if (m_useLinks || m_useHardLinks) {
+        }
+        if (m_useLinks || m_useHardLinks) {
+            std::unique_ptr<FS::copy> savesCopy;
+            if (m_copySaves) {
+                QFileInfo mcDir(FS::PathCombine(m_stagingPath, "minecraft"));
+                QFileInfo dotMCDir(FS::PathCombine(m_stagingPath, ".minecraft"));
+
+                QString staging_mc_dir;
+                if (dotMCDir.exists() && !mcDir.exists())
+                    staging_mc_dir = dotMCDir.filePath();
+                else
+                    staging_mc_dir = mcDir.filePath();
+
+                savesCopy = std::make_unique<FS::copy>(FS::PathCombine(m_origInstance->gameRoot(), "saves"),
+                                                       FS::PathCombine(staging_mc_dir, "saves"));
+                savesCopy->followSymlinks(true);
+                (*savesCopy)(true);
+                setProgress(0, savesCopy->totalCopied());
+                connect(savesCopy.get(), &FS::copy::fileCopied, [this](QString src) { setProgress(m_progress + 1, m_progressTotal); });
+            }
             FS::create_link folderLink(m_origInstance->instanceRoot(), m_stagingPath);
             int depth = m_linkRecursively ? -1 : 0;  // we need to at least link the top level instead of the instance folder
             folderLink.linkRecursively(true).setMaxDepth(depth).useHardLinks(m_useHardLinks).matcher(m_matcher.get());
 
+            folderLink(true);
+            setProgress(0, m_progressTotal + folderLink.totalToLink());
+            connect(&folderLink, &FS::create_link::fileLinked,
+                    [this](QString src, QString dst) { setProgress(m_progress + 1, m_progressTotal); });
             bool there_were_errors = false;
 
             if (!folderLink()) {
 #if defined Q_OS_WIN32
                 if (!m_useHardLinks) {
+                    setProgress(0, m_progressTotal);
                     qDebug() << "EXPECTED: Link failure, Windows requires permissions for symlinks";
 
                     qDebug() << "attempting to run with privelage";
@@ -94,13 +108,11 @@ void InstanceCopyTask::executeTask()
                         }
                     }
 
-                    if (m_copySaves) {
-                        there_were_errors |= !copySaves();
+                    if (savesCopy) {
+                        there_were_errors |= !(*savesCopy)();
                     }
 
                     return got_priv_results && !there_were_errors;
-                } else {
-                    qDebug() << "Link Failed!" << folderLink.getOSError().value() << folderLink.getOSError().message().c_str();
                 }
 #else
                 qDebug() << "Link Failed!" << folderLink.getOSError().value() << folderLink.getOSError().message().c_str();
@@ -108,17 +120,19 @@ void InstanceCopyTask::executeTask()
                 return false;
             }
 
-            if (m_copySaves) {
-                there_were_errors |= !copySaves();
+            if (savesCopy) {
+                there_were_errors |= !(*savesCopy)();
             }
 
             return !there_were_errors;
-        } else {
-            FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
-            folderCopy.followSymlinks(false).matcher(m_matcher.get());
-
-            return folderCopy();
         }
+        FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
+        folderCopy.followSymlinks(false).matcher(m_matcher.get());
+
+        folderCopy(true);
+        setProgress(0, folderCopy.totalCopied());
+        connect(&folderCopy, &FS::copy::fileCopied, [this](QString src) { setProgress(m_progress + 1, m_progressTotal); });
+        return folderCopy();
     });
     connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &InstanceCopyTask::copyFinished);
     connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &InstanceCopyTask::copyAborted);
@@ -159,7 +173,11 @@ void InstanceCopyTask::copyFinished()
                 allowed_symlinks_file
                     .filePath());  // we dont want to modify the original. also make sure the resulting file is not itself a link.
 
-        FS::write(allowed_symlinks_file.filePath(), allowed_symlinks);
+        try {
+            FS::write(allowed_symlinks_file.filePath(), allowed_symlinks);
+        } catch (const FS::FileSystemException& e) {
+            qCritical() << "Failed to write symlink :" << e.cause();
+        }
     }
 
     emitSucceeded();
@@ -170,3 +188,14 @@ void InstanceCopyTask::copyAborted()
     emitFailed(tr("Instance folder copy has been aborted."));
     return;
 }
+
+bool InstanceCopyTask::abort()
+{
+    if (m_copyFutureWatcher.isRunning()) {
+        m_copyFutureWatcher.cancel();
+        // NOTE: Here we don't do `emitAborted()` because it will be done when `m_copyFutureWatcher` actually cancels, which may not occur
+        // immediately.
+        return true;
+    }
+    return false;
+}
\ No newline at end of file
diff --git a/launcher/InstanceCopyTask.h b/launcher/InstanceCopyTask.h
index 357c6df0b..0f7f1020d 100644
--- a/launcher/InstanceCopyTask.h
+++ b/launcher/InstanceCopyTask.h
@@ -19,6 +19,7 @@ class InstanceCopyTask : public InstanceTask {
    protected:
     //! Entry point for tasks.
     virtual void executeTask() override;
+    bool abort() override;
     void copyFinished();
     void copyAborted();
 
diff --git a/launcher/InstanceCreationTask.cpp b/launcher/InstanceCreationTask.cpp
index 73dc17891..3e7b3142f 100644
--- a/launcher/InstanceCreationTask.cpp
+++ b/launcher/InstanceCreationTask.cpp
@@ -2,8 +2,7 @@
 
 #include <QDebug>
 #include <QFile>
-
-InstanceCreationTask::InstanceCreationTask() = default;
+#include "FileSystem.h"
 
 void InstanceCreationTask::executeTask()
 {
@@ -39,22 +38,29 @@ void InstanceCreationTask::executeTask()
     // files scheduled to, and we'd better not let the user abort in the middle of it, since it'd
     // put the instance in an invalid state.
     if (shouldOverride()) {
+        bool deleteFailed = false;
+
         setAbortable(false);
         setStatus(tr("Removing old conflicting files..."));
         qDebug() << "Removing old files";
 
-        for (auto path : m_files_to_remove) {
+        for (const QString& path : m_files_to_remove) {
             if (!QFile::exists(path))
                 continue;
+
             qDebug() << "Removing" << path;
+
             if (!QFile::remove(path)) {
-                qCritical() << "Couldn't remove the old conflicting files.";
-                emitFailed(tr("Failed to remove old conflicting files."));
-                return;
+                qCritical() << "Could not remove" << path;
+                deleteFailed = true;
             }
         }
+
+        if (deleteFailed) {
+            emitFailed(tr("Failed to remove old conflicting files."));
+            return;
+        }
     }
 
     emitSucceeded();
-    return;
 }
diff --git a/launcher/InstanceCreationTask.h b/launcher/InstanceCreationTask.h
index 380fdf8a4..84fb2a145 100644
--- a/launcher/InstanceCreationTask.h
+++ b/launcher/InstanceCreationTask.h
@@ -6,7 +6,7 @@
 class InstanceCreationTask : public InstanceTask {
     Q_OBJECT
    public:
-    InstanceCreationTask();
+    InstanceCreationTask() = default;
     virtual ~InstanceCreationTask() = default;
 
    protected:
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 9f0cf7460..57cc77527 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -56,6 +56,7 @@
 
 #include <QtConcurrentRun>
 #include <algorithm>
+#include <memory>
 
 #include <quazip/quazipdir.h>
 
@@ -68,15 +69,8 @@ bool InstanceImportTask::abort()
     if (!canAbort())
         return false;
 
-    if (m_filesNetJob)
-        m_filesNetJob->abort();
-    if (m_extractFuture.isRunning()) {
-        // NOTE: The tasks created by QtConcurrent::run() can't actually get cancelled,
-        // but we can use this call to check the state when the extraction finishes.
-        m_extractFuture.cancel();
-        m_extractFuture.waitForFinished();
-    }
-
+    if (task)
+        task->abort();
     return Task::abort();
 }
 
@@ -89,7 +83,6 @@ void InstanceImportTask::executeTask()
         processZipPack();
     } else {
         setStatus(tr("Downloading modpack:\n%1").arg(m_sourceUrl.toString()));
-        m_downloadRequired = true;
 
         downloadFromUrl();
     }
@@ -97,115 +90,132 @@ void InstanceImportTask::executeTask()
 
 void InstanceImportTask::downloadFromUrl()
 {
-    const QString path = m_sourceUrl.host() + '/' + m_sourceUrl.path();
+    const QString path(m_sourceUrl.host() + '/' + m_sourceUrl.path());
+
     auto entry = APPLICATION->metacache()->resolveEntry("general", path);
     entry->setStale(true);
-    m_filesNetJob.reset(new NetJob(tr("Modpack download"), APPLICATION->network()));
-    m_filesNetJob->addNetAction(Net::ApiDownload::makeCached(m_sourceUrl, entry));
     m_archivePath = entry->getFullPath();
 
-    connect(m_filesNetJob.get(), &NetJob::succeeded, this, &InstanceImportTask::downloadSucceeded);
-    connect(m_filesNetJob.get(), &NetJob::progress, this, &InstanceImportTask::downloadProgressChanged);
-    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &InstanceImportTask::propagateStepProgress);
-    connect(m_filesNetJob.get(), &NetJob::failed, this, &InstanceImportTask::downloadFailed);
-    connect(m_filesNetJob.get(), &NetJob::aborted, this, &InstanceImportTask::downloadAborted);
-    m_filesNetJob->start();
-}
+    auto filesNetJob = makeShared<NetJob>(tr("Modpack download"), APPLICATION->network());
+    filesNetJob->addNetAction(Net::ApiDownload::makeCached(m_sourceUrl, entry));
 
-void InstanceImportTask::downloadSucceeded()
-{
-    processZipPack();
-    m_filesNetJob.reset();
+    connect(filesNetJob.get(), &NetJob::succeeded, this, &InstanceImportTask::processZipPack);
+    connect(filesNetJob.get(), &NetJob::progress, this, &InstanceImportTask::setProgress);
+    connect(filesNetJob.get(), &NetJob::stepProgress, this, &InstanceImportTask::propagateStepProgress);
+    connect(filesNetJob.get(), &NetJob::failed, this, &InstanceImportTask::emitFailed);
+    connect(filesNetJob.get(), &NetJob::aborted, this, &InstanceImportTask::emitAborted);
+    task.reset(filesNetJob);
+    filesNetJob->start();
 }
 
-void InstanceImportTask::downloadFailed(QString reason)
+QString InstanceImportTask::getRootFromZip(QuaZip* zip, const QString& root)
 {
-    emitFailed(reason);
-    m_filesNetJob.reset();
-}
+    if (!isRunning()) {
+        return {};
+    }
+    QuaZipDir rootDir(zip, root);
+    for (auto&& fileName : rootDir.entryList(QDir::Files)) {
+        setDetails(fileName);
+        if (fileName == "instance.cfg") {
+            qDebug() << "MultiMC:" << true;
+            m_modpackType = ModpackType::MultiMC;
+            return root;
+        }
+        if (fileName == "manifest.json") {
+            qDebug() << "Flame:" << true;
+            m_modpackType = ModpackType::Flame;
+            return root;
+        }
 
-void InstanceImportTask::downloadProgressChanged(qint64 current, qint64 total)
-{
-    setProgress(current, total);
-}
+        QCoreApplication::processEvents();
+    }
 
-void InstanceImportTask::downloadAborted()
-{
-    emitAborted();
-    m_filesNetJob.reset();
+    // Recurse the search to non-ignored subfolders
+    for (auto&& fileName : rootDir.entryList(QDir::Dirs)) {
+        if ("overrides/" == fileName)
+            continue;
+
+        QString result = getRootFromZip(zip, root + fileName);
+        if (!result.isEmpty())
+            return result;
+    }
+
+    return {};
 }
 
 void InstanceImportTask::processZipPack()
 {
-    setStatus(tr("Extracting modpack"));
+    setStatus(tr("Attempting to determine instance type"));
     QDir extractDir(m_stagingPath);
     qDebug() << "Attempting to create instance from" << m_archivePath;
 
     // open the zip and find relevant files in it
-    m_packZip.reset(new QuaZip(m_archivePath));
-    if (!m_packZip->open(QuaZip::mdUnzip)) {
+    auto packZip = std::make_shared<QuaZip>(m_archivePath);
+    if (!packZip->open(QuaZip::mdUnzip)) {
         emitFailed(tr("Unable to open supplied modpack zip file."));
         return;
     }
 
-    QuaZipDir packZipDir(m_packZip.get());
+    QuaZipDir packZipDir(packZip.get());
+    qDebug() << "Attempting to determine instance type";
 
-    // https://docs.modrinth.com/docs/modpacks/format_definition/#storage
-    bool modrinthFound = packZipDir.exists("/modrinth.index.json");
-    bool technicFound = packZipDir.exists("/bin/modpack.jar") || packZipDir.exists("/bin/version.json");
     QString root;
 
     // NOTE: Prioritize modpack platforms that aren't searched for recursively.
     // Especially Flame has a very common filename for its manifest, which may appear inside overrides for example
-    if (modrinthFound) {
+    // https://docs.modrinth.com/docs/modpacks/format_definition/#storage
+    if (packZipDir.exists("/modrinth.index.json")) {
         // process as Modrinth pack
-        qDebug() << "Modrinth:" << modrinthFound;
+        qDebug() << "Modrinth:" << true;
         m_modpackType = ModpackType::Modrinth;
-    } else if (technicFound) {
+    } else if (packZipDir.exists("/bin/modpack.jar") || packZipDir.exists("/bin/version.json")) {
         // process as Technic pack
-        qDebug() << "Technic:" << technicFound;
-        extractDir.mkpath(".minecraft");
-        extractDir.cd(".minecraft");
+        qDebug() << "Technic:" << true;
+        extractDir.mkpath("minecraft");
+        extractDir.cd("minecraft");
         m_modpackType = ModpackType::Technic;
     } else {
-        QStringList paths_to_ignore{ "overrides/" };
-
-        if (QString mmcRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "instance.cfg", paths_to_ignore); !mmcRoot.isNull()) {
-            // process as MultiMC instance/pack
-            qDebug() << "MultiMC:" << mmcRoot;
-            root = mmcRoot;
-            m_modpackType = ModpackType::MultiMC;
-        } else if (QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json", paths_to_ignore);
-                   !flameRoot.isNull()) {
-            // process as Flame pack
-            qDebug() << "Flame:" << flameRoot;
-            root = flameRoot;
-            m_modpackType = ModpackType::Flame;
-        }
+        root = getRootFromZip(packZip.get());
+        setDetails("");
     }
     if (m_modpackType == ModpackType::Unknown) {
         emitFailed(tr("Archive does not contain a recognized modpack type."));
         return;
     }
+    setStatus(tr("Extracting modpack"));
 
     // make sure we extract just the pack
-    m_extractFuture =
-        QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractSubDir, m_packZip.get(), root, extractDir.absolutePath());
-    connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &InstanceImportTask::extractFinished);
-    m_extractFutureWatcher.setFuture(m_extractFuture);
+    auto zipTask = makeShared<MMCZip::ExtractZipTask>(packZip, extractDir, root);
+
+    auto progressStep = std::make_shared<TaskStepProgress>();
+    connect(zipTask.get(), &Task::finished, this, [this, progressStep] {
+        progressStep->state = TaskStepState::Succeeded;
+        stepProgress(*progressStep);
+    });
+
+    connect(zipTask.get(), &Task::succeeded, this, &InstanceImportTask::extractFinished);
+    connect(zipTask.get(), &Task::aborted, this, &InstanceImportTask::emitAborted);
+    connect(zipTask.get(), &Task::failed, this, [this, progressStep](QString reason) {
+        progressStep->state = TaskStepState::Failed;
+        stepProgress(*progressStep);
+        emitFailed(reason);
+    });
+    connect(zipTask.get(), &Task::stepProgress, this, &InstanceImportTask::propagateStepProgress);
+
+    connect(zipTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
+        progressStep->update(current, total);
+        stepProgress(*progressStep);
+    });
+    connect(zipTask.get(), &Task::status, this, [this, progressStep](QString status) {
+        progressStep->status = status;
+        stepProgress(*progressStep);
+    });
+    task.reset(zipTask);
+    zipTask->start();
 }
 
 void InstanceImportTask::extractFinished()
 {
-    m_packZip.reset();
-
-    if (m_extractFuture.isCanceled())
-        return;
-    if (!m_extractFuture.result().has_value()) {
-        emitFailed(tr("Failed to extract modpack"));
-        return;
-    }
-
     QDir extractDir(m_stagingPath);
 
     qDebug() << "Fixing permissions for extracted pack files...";
@@ -324,13 +334,15 @@ void InstanceImportTask::processMultiMC()
         m_instIcon = instance.iconKey();
 
         auto importIconPath = IconUtils::findBestIconIn(instance.instanceRoot(), m_instIcon);
+        if (importIconPath.isNull() || !QFile::exists(importIconPath))
+            importIconPath = IconUtils::findBestIconIn(instance.instanceRoot(), "icon.png");
         if (!importIconPath.isNull() && QFile::exists(importIconPath)) {
             // import icon
             auto iconList = APPLICATION->icons();
             if (iconList->iconFileExists(m_instIcon)) {
                 iconList->deleteIcon(m_instIcon);
             }
-            iconList->installIcons({ importIconPath });
+            iconList->installIcon(importIconPath, m_instIcon);
         }
     }
     emitSucceeded();
diff --git a/launcher/InstanceImportTask.h b/launcher/InstanceImportTask.h
index 28efd7ec5..cf86af4ea 100644
--- a/launcher/InstanceImportTask.h
+++ b/launcher/InstanceImportTask.h
@@ -39,11 +39,8 @@
 #include <QFutureWatcher>
 #include <QUrl>
 #include "InstanceTask.h"
-#include "QObjectPtr.h"
-#include "modplatform/flame/PackManifest.h"
-#include "net/NetJob.h"
-#include "settings/SettingsObject.h"
 
+#include <memory>
 #include <optional>
 
 class QuaZip;
@@ -54,35 +51,26 @@ class InstanceImportTask : public InstanceTask {
     explicit InstanceImportTask(const QUrl& sourceUrl, QWidget* parent = nullptr, QMap<QString, QString>&& extra_info = {});
 
     bool abort() override;
-    const QVector<Flame::File>& getBlockedFiles() const { return m_blockedMods; }
 
    protected:
     //! Entry point for tasks.
     virtual void executeTask() override;
 
    private:
-    void processZipPack();
     void processMultiMC();
     void processTechnic();
     void processFlame();
     void processModrinth();
+    QString getRootFromZip(QuaZip* zip, const QString& root = "");
 
    private slots:
-    void downloadSucceeded();
-    void downloadFailed(QString reason);
-    void downloadProgressChanged(qint64 current, qint64 total);
-    void downloadAborted();
+    void processZipPack();
     void extractFinished();
 
    private: /* data */
-    NetJob::Ptr m_filesNetJob;
     QUrl m_sourceUrl;
     QString m_archivePath;
-    bool m_downloadRequired = false;
-    std::unique_ptr<QuaZip> m_packZip;
-    QFuture<std::optional<QStringList>> m_extractFuture;
-    QFutureWatcher<std::optional<QStringList>> m_extractFutureWatcher;
-    QVector<Flame::File> m_blockedMods;
+    Task::Ptr task;
     enum class ModpackType {
         Unknown,
         MultiMC,
diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp
index 5e4abf020..e1fa755dd 100644
--- a/launcher/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
@@ -372,13 +372,13 @@ void InstanceList::undoTrashInstance()
 
     auto top = m_trashHistory.pop();
 
-    while (QDir(top.polyPath).exists()) {
+    while (QDir(top.path).exists()) {
         top.id += "1";
-        top.polyPath += "1";
+        top.path += "1";
     }
 
-    qDebug() << "Moving" << top.trashPath << "back to" << top.polyPath;
-    QFile(top.trashPath).rename(top.polyPath);
+    qDebug() << "Moving" << top.trashPath << "back to" << top.path;
+    QFile(top.trashPath).rename(top.path);
 
     m_instanceGroupIndex[top.id] = top.groupName;
     increaseGroupCount(top.groupName);
@@ -635,8 +635,8 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id)
 
     QString inst_type = instanceSettings->get("InstanceType").toString();
 
-    // NOTE: Some PolyMC versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a OneSix
-    // instance
+    // NOTE: Some launcher versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a
+    // OneSix instance
     if (inst_type == "OneSix" || inst_type.isEmpty()) {
         inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot));
     } else {
@@ -710,6 +710,12 @@ void InstanceList::saveGroupList()
         groupsArr.insert(name, groupObj);
     }
     toplevel.insert("groups", groupsArr);
+    // empty string represents ungrouped "group"
+    if (m_collapsedGroups.contains("")) {
+        QJsonObject ungrouped;
+        ungrouped.insert("hidden", QJsonValue(true));
+        toplevel.insert("ungrouped", ungrouped);
+    }
     QJsonDocument doc(toplevel);
     try {
         FS::write(groupFileName, doc.toJson());
@@ -805,6 +811,16 @@ void InstanceList::loadGroupList()
             increaseGroupCount(groupName);
         }
     }
+
+    bool ungroupedHidden = false;
+    if (rootObj.value("ungrouped").isObject()) {
+        QJsonObject ungrouped = rootObj.value("ungrouped").toObject();
+        ungroupedHidden = ungrouped.value("hidden").toBool(false);
+    }
+    if (ungroupedHidden) {
+        // empty string represents ungrouped "group"
+        m_collapsedGroups.insert("");
+    }
     m_groupsLoaded = true;
     qDebug() << "Group list loaded.";
 }
@@ -972,7 +988,6 @@ bool InstanceList::commitStagedInstance(const QString& path,
     if (groupName.isEmpty() && !groupName.isNull())
         groupName = QString();
 
-    QDir dir;
     QString instID;
     InstancePtr inst;
 
@@ -996,7 +1011,7 @@ bool InstanceList::commitStagedInstance(const QString& path,
                 return false;
             }
         } else {
-            if (!dir.rename(path, destination)) {
+            if (!FS::move(path, destination)) {
                 qWarning() << "Failed to move" << path << "to" << destination;
                 return false;
             }
diff --git a/launcher/InstanceList.h b/launcher/InstanceList.h
index 5ddddee95..c85fe55c7 100644
--- a/launcher/InstanceList.h
+++ b/launcher/InstanceList.h
@@ -58,7 +58,7 @@ enum class GroupsState { NotLoaded, Steady, Dirty };
 
 struct TrashHistoryItem {
     QString id;
-    QString polyPath;
+    QString path;
     QString trashPath;
     QString groupName;
 };
diff --git a/launcher/InstancePageProvider.h b/launcher/InstancePageProvider.h
index 52399e912..174041f89 100644
--- a/launcher/InstancePageProvider.h
+++ b/launcher/InstancePageProvider.h
@@ -22,7 +22,7 @@ class InstancePageProvider : protected QObject, public BasePageProvider {
    public:
     explicit InstancePageProvider(InstancePtr parent) { inst = parent; }
 
-    virtual ~InstancePageProvider() {};
+    virtual ~InstancePageProvider() = default;
     virtual QList<BasePage*> getPages() override
     {
         QList<BasePage*> values;
@@ -39,7 +39,7 @@ class InstancePageProvider : protected QObject, public BasePageProvider {
         values.append(new TexturePackPage(onesix.get(), onesix->texturePackList()));
         values.append(new ShaderPackPage(onesix.get(), onesix->shaderPackList()));
         values.append(new NotesPage(onesix.get()));
-        values.append(new WorldListPage(onesix.get(), onesix->worldList()));
+        values.append(new WorldListPage(onesix, onesix->worldList()));
         values.append(new ServersPage(onesix));
         // values.append(new GameOptionsPage(onesix.get()));
         values.append(new ScreenshotsPage(FS::PathCombine(onesix->gameRoot(), "screenshots")));
diff --git a/launcher/InstanceTask.cpp b/launcher/InstanceTask.cpp
index 53476897c..be10bbe07 100644
--- a/launcher/InstanceTask.cpp
+++ b/launcher/InstanceTask.cpp
@@ -1,5 +1,7 @@
 #include "InstanceTask.h"
 
+#include "Application.h"
+#include "settings/SettingsObject.h"
 #include "ui/dialogs/CustomMessageBox.h"
 
 #include <QPushButton>
@@ -22,6 +24,9 @@ InstanceNameChange askForChangingInstanceName(QWidget* parent, const QString& ol
 
 ShouldUpdate askIfShouldUpdate(QWidget* parent, QString original_version_name)
 {
+    if (APPLICATION->settings()->get("SkipModpackUpdatePrompt").toBool())
+        return ShouldUpdate::SkipUpdating;
+
     auto info = CustomMessageBox::selectable(
         parent, QObject::tr("Similar modpack was found!"),
         QObject::tr(
diff --git a/launcher/JavaCommon.cpp b/launcher/JavaCommon.cpp
index e16ac9255..3cbf9f9d5 100644
--- a/launcher/JavaCommon.cpp
+++ b/launcher/JavaCommon.cpp
@@ -63,7 +63,7 @@ bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget* parent)
     return true;
 }
 
-void JavaCommon::javaWasOk(QWidget* parent, const JavaCheckResult& result)
+void JavaCommon::javaWasOk(QWidget* parent, const JavaChecker::Result& result)
 {
     QString text;
     text += QObject::tr(
@@ -79,7 +79,7 @@ void JavaCommon::javaWasOk(QWidget* parent, const JavaCheckResult& result)
     CustomMessageBox::selectable(parent, QObject::tr("Java test success"), text, QMessageBox::Information)->show();
 }
 
-void JavaCommon::javaArgsWereBad(QWidget* parent, const JavaCheckResult& result)
+void JavaCommon::javaArgsWereBad(QWidget* parent, const JavaChecker::Result& result)
 {
     auto htmlError = result.errorLog;
     QString text;
@@ -89,7 +89,7 @@ void JavaCommon::javaArgsWereBad(QWidget* parent, const JavaCheckResult& result)
     CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
 }
 
-void JavaCommon::javaBinaryWasBad(QWidget* parent, const JavaCheckResult& result)
+void JavaCommon::javaBinaryWasBad(QWidget* parent, const JavaChecker::Result& result)
 {
     QString text;
     text += QObject::tr(
@@ -116,34 +116,26 @@ void JavaCommon::TestCheck::run()
         emit finished();
         return;
     }
-    checker.reset(new JavaChecker());
+    checker.reset(new JavaChecker(m_path, "", 0, 0, 0, 0, this));
     connect(checker.get(), &JavaChecker::checkFinished, this, &JavaCommon::TestCheck::checkFinished);
-    checker->m_path = m_path;
-    checker->performCheck();
+    checker->start();
 }
 
-void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
+void JavaCommon::TestCheck::checkFinished(const JavaChecker::Result& result)
 {
-    if (result.validity != JavaCheckResult::Validity::Valid) {
+    if (result.validity != JavaChecker::Result::Validity::Valid) {
         javaBinaryWasBad(m_parent, result);
         emit finished();
         return;
     }
-    checker.reset(new JavaChecker());
+    checker.reset(new JavaChecker(m_path, m_args, m_maxMem, m_maxMem, result.javaVersion.requiresPermGen() ? m_permGen : 0, 0, this));
     connect(checker.get(), &JavaChecker::checkFinished, this, &JavaCommon::TestCheck::checkFinishedWithArgs);
-    checker->m_path = m_path;
-    checker->m_args = m_args;
-    checker->m_minMem = m_minMem;
-    checker->m_maxMem = m_maxMem;
-    if (result.javaVersion.requiresPermGen()) {
-        checker->m_permGen = m_permGen;
-    }
-    checker->performCheck();
+    checker->start();
 }
 
-void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
+void JavaCommon::TestCheck::checkFinishedWithArgs(const JavaChecker::Result& result)
 {
-    if (result.validity == JavaCheckResult::Validity::Valid) {
+    if (result.validity == JavaChecker::Result::Validity::Valid) {
         javaWasOk(m_parent, result);
         emit finished();
         return;
diff --git a/launcher/JavaCommon.h b/launcher/JavaCommon.h
index cf3b75c9c..a21b5a494 100644
--- a/launcher/JavaCommon.h
+++ b/launcher/JavaCommon.h
@@ -10,11 +10,11 @@ namespace JavaCommon {
 bool checkJVMArgs(QString args, QWidget* parent);
 
 // Show a dialog saying that the Java binary was usable
-void javaWasOk(QWidget* parent, const JavaCheckResult& result);
+void javaWasOk(QWidget* parent, const JavaChecker::Result& result);
 // Show a dialog saying that the Java binary was not usable because of bad options
-void javaArgsWereBad(QWidget* parent, const JavaCheckResult& result);
+void javaArgsWereBad(QWidget* parent, const JavaChecker::Result& result);
 // Show a dialog saying that the Java binary was not usable
-void javaBinaryWasBad(QWidget* parent, const JavaCheckResult& result);
+void javaBinaryWasBad(QWidget* parent, const JavaChecker::Result& result);
 // Show a dialog if we couldn't find Java Checker
 void javaCheckNotFound(QWidget* parent);
 
@@ -32,11 +32,11 @@ class TestCheck : public QObject {
     void finished();
 
    private slots:
-    void checkFinished(JavaCheckResult result);
-    void checkFinishedWithArgs(JavaCheckResult result);
+    void checkFinished(const JavaChecker::Result& result);
+    void checkFinishedWithArgs(const JavaChecker::Result& result);
 
    private:
-    std::shared_ptr<JavaChecker> checker;
+    JavaChecker::Ptr checker;
     QWidget* m_parent = nullptr;
     QString m_path;
     QString m_args;
diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp
index c1610e078..419f89b63 100644
--- a/launcher/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
@@ -35,11 +35,12 @@
  */
 
 #include "LaunchController.h"
+#include <meta/Index.h>
 #include "Application.h"
+#include "launch/steps/PrintServers.h"
 #include "minecraft/auth/AccountData.h"
 #include "minecraft/auth/AccountList.h"
 #include "settings/MissingAuthlibInjectorBehavior.h"
-#include "ui/pages/instance/VersionPage.h"
 
 #include "ui/InstanceWindow.h"
 #include "ui/MainWindow.h"
@@ -55,14 +56,12 @@
 #include <QLineEdit>
 #include <QList>
 #include <QPushButton>
+#include <QRegularExpression>
 #include <QStringList>
 
 #include "BuildConfig.h"
 #include "JavaCommon.h"
 #include "launch/steps/TextPrint.h"
-#include "meta/Index.h"
-#include "meta/VersionList.h"
-#include "minecraft/auth/AccountTask.h"
 #include "tasks/Task.h"
 
 LaunchController::LaunchController(QObject* parent) : Task(parent) {}
@@ -90,11 +89,12 @@ void LaunchController::decideAccount()
 
     // Find an account to use.
     auto accounts = APPLICATION->accounts();
-    if (accounts->count() <= 0) {
+    if (accounts->count() <= 0 || !accounts->anyAccountIsValid()) {
         // Tell the user they need to log in at least one account in order to play.
         auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
-                                                  tr("In order to play Minecraft, you must pick your username or log in to an account "
-                                                     "Would you like to open the account manager to do this now?"),
+                                                  tr("In order to play Minecraft, you must have at least one Microsoft "
+                                                     "account which owns Minecraft logged in. "
+                                                     "Would you like to open the account manager to add an account now?"),
                                                   QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
                          ->exec();
 
@@ -133,12 +133,63 @@ void LaunchController::decideAccount()
     }
 }
 
+bool LaunchController::askPlayDemo()
+{
+    QMessageBox box(m_parentWidget);
+    box.setWindowTitle(tr("Play demo?"));
+    box.setText(
+        tr("This account does not own Minecraft.\nYou need to purchase the game first to play it.\n\nDo you want to play "
+           "the demo?"));
+    box.setIcon(QMessageBox::Warning);
+    auto demoButton = box.addButton(tr("Play Demo"), QMessageBox::ButtonRole::YesRole);
+    auto cancelButton = box.addButton(tr("Cancel"), QMessageBox::ButtonRole::NoRole);
+    box.setDefaultButton(cancelButton);
+
+    box.exec();
+    return box.clickedButton() == demoButton;
+}
+
+QString LaunchController::askOfflineName(QString playerName, bool demo, bool& ok)
+{
+    // we ask the user for a player name
+    QString message = tr("Choose your offline mode player name.");
+    if (demo) {
+        message = tr("Choose your demo mode player name.");
+    }
+
+    QString lastOfflinePlayerName = APPLICATION->settings()->get("LastOfflinePlayerName").toString();
+    QString usedname = lastOfflinePlayerName.isEmpty() ? playerName : lastOfflinePlayerName;
+    QString name = QInputDialog::getText(m_parentWidget, tr("Player name"), message, QLineEdit::Normal, usedname, &ok);
+    if (!ok)
+        return {};
+    if (name.length()) {
+        usedname = name;
+        APPLICATION->settings()->set("LastOfflinePlayerName", usedname);
+    }
+    return usedname;
+}
+
 void LaunchController::login()
 {
     decideAccount();
 
-    // if no account is selected, we bail
     if (!m_accountToUse) {
+        // if no account is selected, ask about demo
+        if (!m_demo) {
+            m_demo = askPlayDemo();
+        }
+        if (m_demo) {
+            // we ask the user for a player name
+            bool ok = false;
+            auto name = askOfflineName("Player", m_demo, ok);
+            if (ok) {
+                m_session = std::make_shared<AuthSession>();
+                m_session->MakeDemo(name, MinecraftAccount::uuidFromUsername(name).toString().remove(QRegularExpression("[{}-]")));
+                launchInstance();
+                return;
+            }
+        }
+        // if no account is selected, we bail
         emitFailed(tr("No account selected for launch."));
         return;
     }
@@ -237,7 +288,8 @@ void LaunchController::login()
     bool tryagain = true;
     unsigned int tries = 0;
 
-    if (m_accountToUse->accountType() != AccountType::Offline && m_accountToUse->accountState() == AccountState::Offline) {
+    if ((m_accountToUse->accountType() != AccountType::Offline && m_accountToUse->accountState() == AccountState::Offline) ||
+        m_accountToUse->shouldRefresh()) {
         // Force account refresh on the account used to launch the instance updating the AccountState
         //  only on first try and if it is not meant to be offline
         auto accounts = APPLICATION->accounts();
@@ -275,24 +327,12 @@ void LaunchController::login()
                 if (!m_session->wants_online) {
                     // we ask the user for a player name
                     bool ok = false;
-
-                    QString message = tr("Choose your offline mode player name.");
-                    if (m_session->demo) {
-                        message = tr("Choose your demo mode player name.");
-                    }
-
-                    QString lastOfflinePlayerName = APPLICATION->settings()->get("LastOfflinePlayerName").toString();
-                    QString usedname = lastOfflinePlayerName.isEmpty() ? m_session->player_name : lastOfflinePlayerName;
-                    QString name = QInputDialog::getText(m_parentWidget, tr("Player name"), message, QLineEdit::Normal, usedname, &ok);
+                    auto name = askOfflineName(m_session->player_name, m_session->demo, ok);
                     if (!ok) {
                         tryagain = false;
                         break;
                     }
-                    if (name.length()) {
-                        usedname = name;
-                        APPLICATION->settings()->set("LastOfflinePlayerName", usedname);
-                    }
-                    m_session->MakeOffline(usedname);
+                    m_session->MakeOffline(name);
                     // offline flavored game from here :3
                 }
                 if (m_accountToUse->ownsMinecraft()) {
@@ -312,20 +352,10 @@ void LaunchController::login()
                     return;
                 } else {
                     // play demo ?
-                    QMessageBox box(m_parentWidget);
-                    box.setWindowTitle(tr("Play demo?"));
-                    box.setText(
-                        tr("This account does not own Minecraft.\nYou need to purchase the game first to play it.\n\nDo you want to play "
-                           "the demo?"));
-                    box.setIcon(QMessageBox::Warning);
-                    auto demoButton = box.addButton(tr("Play Demo"), QMessageBox::ButtonRole::YesRole);
-                    auto cancelButton = box.addButton(tr("Cancel"), QMessageBox::ButtonRole::NoRole);
-                    box.setDefaultButton(cancelButton);
-
-                    box.exec();
-                    if (box.clickedButton() == demoButton) {
-                        // play demo here
-                        m_session->MakeDemo();
+                    if (!m_session->demo) {
+                        m_session->demo = askPlayDemo();
+                    }
+                    if (m_session->demo) {  // play demo here
                         launchInstance();
                     } else {
                         emitFailed(tr("Launch cancelled - account does not own Minecraft."));
@@ -388,7 +418,7 @@ void LaunchController::launchInstance()
         return;
     }
 
-    m_launcher = m_instance->createLaunchTask(m_session, m_serverToJoin);
+    m_launcher = m_instance->createLaunchTask(m_session, m_targetToJoin);
     if (!m_launcher) {
         emitFailed(tr("Couldn't instantiate a launcher."));
         return;
@@ -411,25 +441,8 @@ void LaunchController::launchInstance()
 
         // Prepend Server Status
         QStringList servers = { "login.live.com", "session.minecraft.net", "textures.minecraft.net", "api.mojang.com" };
-        QString resolved_servers = "";
-        QHostInfo host_info;
-
-        for (QString server : servers) {
-            host_info = QHostInfo::fromName(server);
-            resolved_servers = resolved_servers + server + " resolves to:\n    [";
-            if (!host_info.addresses().isEmpty()) {
-                for (QHostAddress address : host_info.addresses()) {
-                    resolved_servers = resolved_servers + address.toString();
-                    if (!host_info.addresses().endsWith(address)) {
-                        resolved_servers = resolved_servers + ", ";
-                    }
-                }
-            } else {
-                resolved_servers = resolved_servers + "N/A";
-            }
-            resolved_servers = resolved_servers + "]\n\n";
-        }
-        m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), resolved_servers, MessageLevel::Launcher));
+
+        m_launcher->prependStep(makeShared<PrintServers>(m_launcher.get(), servers));
     } else {
         online_mode = m_demo ? "demo" : "offline";
     }
diff --git a/launcher/LaunchController.h b/launcher/LaunchController.h
index 0ef02edd3..95ccd1fe3 100644
--- a/launcher/LaunchController.h
+++ b/launcher/LaunchController.h
@@ -41,7 +41,7 @@
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
 #include "minecraft/auth/MinecraftAccount.h"
-#include "minecraft/launch/MinecraftServerTarget.h"
+#include "minecraft/launch/MinecraftTarget.h"
 
 class InstanceWindow;
 class LaunchController : public Task {
@@ -50,7 +50,7 @@ class LaunchController : public Task {
     void executeTask() override;
 
     LaunchController(QObject* parent = nullptr);
-    virtual ~LaunchController() {};
+    virtual ~LaunchController() = default;
 
     void setInstance(InstancePtr instance) { m_instance = instance; }
 
@@ -64,7 +64,7 @@ class LaunchController : public Task {
 
     void setParentWidget(QWidget* widget) { m_parentWidget = widget; }
 
-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin) { m_serverToJoin = std::move(serverToJoin); }
+    void setTargetToJoin(MinecraftTarget::Ptr targetToJoin) { m_targetToJoin = std::move(targetToJoin); }
 
     void setAccountToUse(MinecraftAccountPtr accountToUse) { m_accountToUse = std::move(accountToUse); }
 
@@ -76,6 +76,8 @@ class LaunchController : public Task {
     void login();
     void launchInstance();
     void decideAccount();
+    bool askPlayDemo();
+    QString askOfflineName(QString playerName, bool demo, bool& ok);
 
    private slots:
     void readyForLaunch();
@@ -94,5 +96,5 @@ class LaunchController : public Task {
     MinecraftAccountPtr m_accountToUse = nullptr;
     AuthSessionPtr m_session;
     shared_qobject_ptr<LaunchTask> m_launcher;
-    MinecraftServerTargetPtr m_serverToJoin;
+    MinecraftTarget::Ptr m_targetToJoin;
 };
diff --git a/launcher/LoggedProcess.cpp b/launcher/LoggedProcess.cpp
index fadd64e68..35ce4e0e5 100644
--- a/launcher/LoggedProcess.cpp
+++ b/launcher/LoggedProcess.cpp
@@ -39,7 +39,8 @@
 #include <QTextDecoder>
 #include "MessageLevel.h"
 
-LoggedProcess::LoggedProcess(QObject* parent) : QProcess(parent)
+LoggedProcess::LoggedProcess(const QTextCodec* output_codec, QObject* parent)
+    : QProcess(parent), m_err_decoder(output_codec), m_out_decoder(output_codec)
 {
     // QProcess has a strange interface... let's map a lot of those into a few.
     connect(this, &QProcess::readyReadStandardOutput, this, &LoggedProcess::on_stdOut);
diff --git a/launcher/LoggedProcess.h b/launcher/LoggedProcess.h
index 46bdaa830..75ba15dfd 100644
--- a/launcher/LoggedProcess.h
+++ b/launcher/LoggedProcess.h
@@ -49,7 +49,7 @@ class LoggedProcess : public QProcess {
     enum State { NotRunning, Starting, FailedToStart, Running, Finished, Crashed, Aborted };
 
    public:
-    explicit LoggedProcess(QObject* parent = 0);
+    explicit LoggedProcess(const QTextCodec* output_codec = QTextCodec::codecForLocale(), QObject* parent = 0);
     virtual ~LoggedProcess();
 
     State state() const;
@@ -80,8 +80,8 @@ class LoggedProcess : public QProcess {
     QStringList reprocess(const QByteArray& data, QTextDecoder& decoder);
 
    private:
-    QTextDecoder m_err_decoder = QTextDecoder(QTextCodec::codecForLocale());
-    QTextDecoder m_out_decoder = QTextDecoder(QTextCodec::codecForLocale());
+    QTextDecoder m_err_decoder;
+    QTextDecoder m_out_decoder;
     QString m_leftover_line;
     bool m_killed = false;
     State m_state = NotRunning;
diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index 5acdbce9c..dcf3d566f 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -2,7 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@
 
 #include <QCoreApplication>
 #include <QDebug>
+#include <QFileInfo>
 #include <QUrl>
 
 #if defined(LAUNCHER_APPLICATION)
@@ -122,7 +123,7 @@ bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files,
     zip.setUtf8Enabled(true);
     QDir().mkpath(QFileInfo(fileCompressed).absolutePath());
     if (!zip.open(QuaZip::mdCreate)) {
-        QFile::remove(fileCompressed);
+        FS::deletePath(fileCompressed);
         return false;
     }
 
@@ -130,7 +131,7 @@ bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files,
 
     zip.close();
     if (zip.getZipError() != 0) {
-        QFile::remove(fileCompressed);
+        FS::deletePath(fileCompressed);
         return false;
     }
 
@@ -144,7 +145,7 @@ bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<M
     QuaZip zipOut(targetJarPath);
     zipOut.setUtf8Enabled(true);
     if (!zipOut.open(QuaZip::mdCreate)) {
-        QFile::remove(targetJarPath);
+        FS::deletePath(targetJarPath);
         qCritical() << "Failed to open the minecraft.jar for modding";
         return false;
     }
@@ -162,7 +163,7 @@ bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<M
         if (mod->type() == ResourceType::ZIPFILE) {
             if (!mergeZipFiles(&zipOut, mod->fileinfo(), addedFiles)) {
                 zipOut.close();
-                QFile::remove(targetJarPath);
+                FS::deletePath(targetJarPath);
                 qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
                 return false;
             }
@@ -171,7 +172,7 @@ bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<M
             auto filename = mod->fileinfo();
             if (!JlCompress::compressFile(&zipOut, filename.absoluteFilePath(), filename.fileName())) {
                 zipOut.close();
-                QFile::remove(targetJarPath);
+                FS::deletePath(targetJarPath);
                 qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
                 return false;
             }
@@ -194,7 +195,7 @@ bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<M
 
             if (!compressDirFiles(&zipOut, parent_dir, files)) {
                 zipOut.close();
-                QFile::remove(targetJarPath);
+                FS::deletePath(targetJarPath);
                 qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
                 return false;
             }
@@ -202,7 +203,7 @@ bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<M
         } else {
             // Make sure we do not continue launching when something is missing or undefined...
             zipOut.close();
-            QFile::remove(targetJarPath);
+            FS::deletePath(targetJarPath);
             qCritical() << "Failed to add unknown mod type" << mod->fileinfo().fileName() << "to the jar.";
             return false;
         }
@@ -210,7 +211,7 @@ bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<M
 
     if (!mergeZipFiles(&zipOut, QFileInfo(sourceJarPath), addedFiles, [](const QString key) { return !key.contains("META-INF"); })) {
         zipOut.close();
-        QFile::remove(targetJarPath);
+        FS::deletePath(targetJarPath);
         qCritical() << "Failed to insert minecraft.jar contents.";
         return false;
     }
@@ -218,7 +219,7 @@ bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<M
     // Recompress the jar
     zipOut.close();
     if (zipOut.getZipError() != 0) {
-        QFile::remove(targetJarPath);
+        FS::deletePath(targetJarPath);
         qCritical() << "Failed to finalize minecraft.jar!";
         return false;
     }
@@ -330,9 +331,31 @@ std::optional<QStringList> extractSubDir(QuaZip* zip, const QString& subdir, con
         }
 
         extracted.append(target_file_path);
-        QFile::setPermissions(target_file_path,
-                              QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser);
-
+        auto fileInfo = QFileInfo(target_file_path);
+        if (fileInfo.isFile()) {
+            auto permissions = fileInfo.permissions();
+            auto maxPermisions = QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser |
+                                 QFileDevice::Permission::ReadGroup | QFileDevice::Permission::ReadOther;
+            auto minPermisions = QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser;
+
+            auto newPermisions = (permissions & maxPermisions) | minPermisions;
+            if (newPermisions != permissions) {
+                if (!QFile::setPermissions(target_file_path, newPermisions)) {
+                    qWarning() << (QObject::tr("Could not fix permissions for %1").arg(target_file_path));
+                }
+            }
+        } else if (fileInfo.isDir()) {
+            // Ensure the folder has the minimal required permissions
+            QFile::Permissions minimalPermissions = QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner | QFile::ReadGroup |
+                                                    QFile::ExeGroup | QFile::ReadOther | QFile::ExeOther;
+
+            QFile::Permissions currentPermissions = fileInfo.permissions();
+            if ((currentPermissions & minimalPermissions) != minimalPermissions) {
+                if (!QFile::setPermissions(target_file_path, minimalPermissions)) {
+                    qWarning() << (QObject::tr("Could not fix permissions for %1").arg(target_file_path));
+                }
+            }
+        }
         qDebug() << "Extracted file" << relative_file_name << "to" << target_file_path;
     } while (zip->goToNextFile());
 
@@ -466,7 +489,7 @@ auto ExportToZipTask::exportZip() -> ZipResult
 
         auto absolute = file.absoluteFilePath();
         auto relative = m_dir.relativeFilePath(absolute);
-        setStatus("Compresing: " + relative);
+        setStatus("Compressing: " + relative);
         setProgress(m_progress + 1, m_progressTotal);
         if (m_follow_symlinks) {
             if (file.isSymLink())
@@ -490,10 +513,10 @@ auto ExportToZipTask::exportZip() -> ZipResult
 void ExportToZipTask::finish()
 {
     if (m_build_zip_future.isCanceled()) {
-        QFile::remove(m_output_path);
+        FS::deletePath(m_output_path);
         emitAborted();
     } else if (auto result = m_build_zip_future.result(); result.has_value()) {
-        QFile::remove(m_output_path);
+        FS::deletePath(m_output_path);
         emitFailed(result.value());
     } else {
         emitSucceeded();
@@ -510,6 +533,138 @@ bool ExportToZipTask::abort()
     }
     return false;
 }
-#endif
 
+void ExtractZipTask::executeTask()
+{
+    if (!m_input->isOpen() && !m_input->open(QuaZip::mdUnzip)) {
+        emitFailed(tr("Unable to open supplied zip file."));
+        return;
+    }
+    m_zip_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return extractZip(); });
+    connect(&m_zip_watcher, &QFutureWatcher<ZipResult>::finished, this, &ExtractZipTask::finish);
+    m_zip_watcher.setFuture(m_zip_future);
+}
+
+auto ExtractZipTask::extractZip() -> ZipResult
+{
+    auto target = m_output_dir.absolutePath();
+    auto target_top_dir = QUrl::fromLocalFile(target);
+
+    QStringList extracted;
+
+    qDebug() << "Extracting subdir" << m_subdirectory << "from" << m_input->getZipName() << "to" << target;
+    auto numEntries = m_input->getEntriesCount();
+    if (numEntries < 0) {
+        return ZipResult(tr("Failed to enumerate files in archive"));
+    }
+    if (numEntries == 0) {
+        logWarning(tr("Extracting empty archives seems odd..."));
+        return ZipResult();
+    }
+    if (!m_input->goToFirstFile()) {
+        return ZipResult(tr("Failed to seek to first file in zip"));
+    }
+
+    setStatus("Extracting files...");
+    setProgress(0, numEntries);
+    do {
+        if (m_zip_future.isCanceled())
+            return ZipResult();
+        setProgress(m_progress + 1, m_progressTotal);
+        QString file_name = m_input->getCurrentFileName();
+        if (!file_name.startsWith(m_subdirectory))
+            continue;
+
+        auto relative_file_name = QDir::fromNativeSeparators(file_name.mid(m_subdirectory.size()));
+        auto original_name = relative_file_name;
+        setStatus("Unziping: " + relative_file_name);
+
+        // Fix subdirs/files ending with a / getting transformed into absolute paths
+        if (relative_file_name.startsWith('/'))
+            relative_file_name = relative_file_name.mid(1);
+
+        // Fix weird "folders with a single file get squashed" thing
+        QString sub_path;
+        if (relative_file_name.contains('/') && !relative_file_name.endsWith('/')) {
+            sub_path = relative_file_name.section('/', 0, -2) + '/';
+            FS::ensureFolderPathExists(FS::PathCombine(target, sub_path));
+
+            relative_file_name = relative_file_name.split('/').last();
+        }
+
+        QString target_file_path;
+        if (relative_file_name.isEmpty()) {
+            target_file_path = target + '/';
+        } else {
+            target_file_path = FS::PathCombine(target_top_dir.toLocalFile(), sub_path, relative_file_name);
+            if (relative_file_name.endsWith('/') && !target_file_path.endsWith('/'))
+                target_file_path += '/';
+        }
+
+        if (!target_top_dir.isParentOf(QUrl::fromLocalFile(target_file_path))) {
+            return ZipResult(tr("Extracting %1 was cancelled, because it was effectively outside of the target path %2")
+                                 .arg(relative_file_name, target));
+        }
+
+        if (!JlCompress::extractFile(m_input.get(), "", target_file_path)) {
+            JlCompress::removeFile(extracted);
+            return ZipResult(tr("Failed to extract file %1 to %2").arg(original_name, target_file_path));
+        }
+
+        extracted.append(target_file_path);
+        auto fileInfo = QFileInfo(target_file_path);
+        if (fileInfo.isFile()) {
+            auto permissions = fileInfo.permissions();
+            auto maxPermisions = QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser |
+                                 QFileDevice::Permission::ReadGroup | QFileDevice::Permission::ReadOther;
+            auto minPermisions = QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser;
+
+            auto newPermisions = (permissions & maxPermisions) | minPermisions;
+            if (newPermisions != permissions) {
+                if (!QFile::setPermissions(target_file_path, newPermisions)) {
+                    logWarning(tr("Could not fix permissions for %1").arg(target_file_path));
+                }
+            }
+        } else if (fileInfo.isDir()) {
+            // Ensure the folder has the minimal required permissions
+            QFile::Permissions minimalPermissions = QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner | QFile::ReadGroup |
+                                                    QFile::ExeGroup | QFile::ReadOther | QFile::ExeOther;
+
+            QFile::Permissions currentPermissions = fileInfo.permissions();
+            if ((currentPermissions & minimalPermissions) != minimalPermissions) {
+                if (!QFile::setPermissions(target_file_path, minimalPermissions)) {
+                    logWarning(tr("Could not fix permissions for %1").arg(target_file_path));
+                }
+            }
+        }
+
+        qDebug() << "Extracted file" << relative_file_name << "to" << target_file_path;
+    } while (m_input->goToNextFile());
+
+    return ZipResult();
+}
+
+void ExtractZipTask::finish()
+{
+    if (m_zip_future.isCanceled()) {
+        emitAborted();
+    } else if (auto result = m_zip_future.result(); result.has_value()) {
+        emitFailed(result.value());
+    } else {
+        emitSucceeded();
+    }
+}
+
+bool ExtractZipTask::abort()
+{
+    if (m_zip_future.isRunning()) {
+        m_zip_future.cancel();
+        // NOTE: Here we don't do `emitAborted()` because it will be done when `m_build_zip_future` actually cancels, which may not occur
+        // immediately.
+        return true;
+    }
+    return false;
+}
+
+#endif
 }  // namespace MMCZip
diff --git a/launcher/MMCZip.h b/launcher/MMCZip.h
index c45ef5f01..d81df9d81 100644
--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -2,7 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -153,6 +153,7 @@ bool collectFileListRecursively(const QString& rootDir, const QString& subDir, Q
 
 #if defined(LAUNCHER_APPLICATION)
 class ExportToZipTask : public Task {
+    Q_OBJECT
    public:
     ExportToZipTask(QString outputPath,
                     QDir dir,
@@ -205,5 +206,34 @@ class ExportToZipTask : public Task {
     QFuture<ZipResult> m_build_zip_future;
     QFutureWatcher<ZipResult> m_build_zip_watcher;
 };
+
+class ExtractZipTask : public Task {
+    Q_OBJECT
+   public:
+    ExtractZipTask(QString input, QDir outputDir, QString subdirectory = "")
+        : ExtractZipTask(std::make_shared<QuaZip>(input), outputDir, subdirectory)
+    {}
+    ExtractZipTask(std::shared_ptr<QuaZip> input, QDir outputDir, QString subdirectory = "")
+        : m_input(input), m_output_dir(outputDir), m_subdirectory(subdirectory)
+    {}
+    virtual ~ExtractZipTask() = default;
+
+    using ZipResult = std::optional<QString>;
+
+   protected:
+    virtual void executeTask() override;
+    bool abort() override;
+
+    ZipResult extractZip();
+    void finish();
+
+   private:
+    std::shared_ptr<QuaZip> m_input;
+    QDir m_output_dir;
+    QString m_subdirectory;
+
+    QFuture<ZipResult> m_zip_future;
+    QFutureWatcher<ZipResult> m_zip_watcher;
+};
 #endif
 }  // namespace MMCZip
diff --git a/launcher/MTPixmapCache.h b/launcher/MTPixmapCache.h
index b6bd13045..0ba9c5ac8 100644
--- a/launcher/MTPixmapCache.h
+++ b/launcher/MTPixmapCache.h
@@ -101,7 +101,7 @@ class PixmapCache final : public QObject {
      */
     bool _markCacheMissByEviciton()
     {
-        static constexpr uint maxInt = static_cast<uint>(std::numeric_limits<int>::max());
+        static constexpr uint maxCache = static_cast<uint>(std::numeric_limits<int>::max()) / 4;
         static constexpr uint step = 10240;
         static constexpr int oneSecond = 1000;
 
@@ -118,8 +118,8 @@ class PixmapCache final : public QObject {
         if (m_consecutive_fast_evicitons >= m_consecutive_fast_evicitons_threshold) {
             // increase the cache size
             uint newSize = _cacheLimit() + step;
-            if (newSize >= maxInt) {  // increase it until you overflow :D
-                newSize = maxInt;
+            if (newSize >= maxCache) {  // increase it until you overflow :D
+                newSize = maxCache;
                 qDebug() << m_consecutive_fast_evicitons
                          << tr("pixmap cache misses by eviction happened too fast, doing nothing as the cache size reached it's limit");
             } else {
diff --git a/launcher/MangoHud.cpp b/launcher/MangoHud.cpp
index ab79f418b..29a7c63d9 100644
--- a/launcher/MangoHud.cpp
+++ b/launcher/MangoHud.cpp
@@ -40,8 +40,8 @@ namespace MangoHud {
 
 QString getLibraryString()
 {
-    /*
-     * Check for vulkan layers in this order:
+    /**
+     * Guess MangoHud install location by searching for vulkan layers in this order:
      *
      * $VK_LAYER_PATH
      * $XDG_DATA_DIRS (/usr/local/share/:/usr/share/)
@@ -49,8 +49,9 @@ QString getLibraryString()
      * /etc
      * $XDG_CONFIG_DIRS (/etc/xdg)
      * $XDG_CONFIG_HOME (~/.config)
+     *
+     * @returns Absolute path of libMangoHud.so if found and empty QString otherwise.
      */
-
     QStringList vkLayerList;
     {
         QString home = QDir::homePath();
@@ -85,7 +86,7 @@ QString getLibraryString()
         vkLayerList << FS::PathCombine(xdgConfigHome, "vulkan", "implicit_layer.d");
     }
 
-    for (QString vkLayer : vkLayerList) {
+    for (const QString& vkLayer : vkLayerList) {
         // prefer to use architecture specific vulkan layers
         QString currentArch = QSysInfo::currentCpuArchitecture();
 
@@ -95,8 +96,8 @@ QString getLibraryString()
 
         QStringList manifestNames = { QString("MangoHud.%1.json").arg(currentArch), "MangoHud.json" };
 
-        QString filePath = "";
-        for (QString manifestName : manifestNames) {
+        QString filePath{};
+        for (const QString& manifestName : manifestNames) {
             QString tryPath = FS::PathCombine(vkLayer, manifestName);
             if (QFile::exists(tryPath)) {
                 filePath = tryPath;
@@ -107,14 +108,34 @@ QString getLibraryString()
         if (filePath.isEmpty()) {
             continue;
         }
+        try {
+            auto conf = Json::requireDocument(filePath, vkLayer);
+            auto confObject = Json::requireObject(conf, vkLayer);
+            auto layer = Json::ensureObject(confObject, "layer");
+            QString libraryName = Json::ensureString(layer, "library_path");
+
+            if (libraryName.isEmpty()) {
+                continue;
+            }
+            if (QFileInfo(libraryName).isAbsolute()) {
+                return libraryName;
+            }
 
-        auto conf = Json::requireDocument(filePath, vkLayer);
-        auto confObject = Json::requireObject(conf, vkLayer);
-        auto layer = Json::ensureObject(confObject, "layer");
-        return Json::ensureString(layer, "library_path");
+#ifdef __GLIBC__
+            // Check whether mangohud is usable on a glibc based system
+            QString libraryPath = findLibrary(libraryName);
+            if (!libraryPath.isEmpty()) {
+                return libraryPath;
+            }
+#else
+            // Without glibc return recorded shared library as-is.
+            return libraryName;
+#endif
+        } catch (const Exception& e) {
+        }
     }
 
-    return QString();
+    return {};
 }
 
 QString findLibrary(QString libName)
diff --git a/launcher/NullInstance.h b/launcher/NullInstance.h
index b6a9478a8..3d01c9d33 100644
--- a/launcher/NullInstance.h
+++ b/launcher/NullInstance.h
@@ -46,14 +46,14 @@ class NullInstance : public BaseInstance {
     {
         setVersionBroken(true);
     }
-    virtual ~NullInstance() {};
+    virtual ~NullInstance() = default;
     void saveNow() override {}
     void loadSpecificSettings() override { setSpecificSettingsLoaded(true); }
     QString getStatusbarDescription() override { return tr("Unknown instance type"); };
     QSet<QString> traits() const override { return {}; };
     QString instanceConfigFolder() const override { return instanceRoot(); };
-    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftServerTargetPtr) override { return nullptr; }
-    shared_qobject_ptr<Task> createUpdateTask([[maybe_unused]] Net::Mode mode) override { return nullptr; }
+    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftTarget::Ptr) override { return nullptr; }
+    QList<Task::Ptr> createUpdateTask() override { return {}; }
     QProcessEnvironment createEnvironment() override { return QProcessEnvironment(); }
     QProcessEnvironment createLaunchEnvironment() override { return QProcessEnvironment(); }
     QMap<QString, QString> getVariables() override { return QMap<QString, QString>(); }
@@ -64,7 +64,7 @@ class NullInstance : public BaseInstance {
     bool canEdit() const override { return false; }
     bool canLaunch() const override { return false; }
     void populateLaunchMenu(QMenu* menu) override {}
-    QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override
+    QStringList verboseDescription(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin) override
     {
         QStringList out;
         out << "Null instance - placeholder.";
diff --git a/launcher/ResourceDownloadTask.cpp b/launcher/ResourceDownloadTask.cpp
index a02151ca1..6f5b9a189 100644
--- a/launcher/ResourceDownloadTask.cpp
+++ b/launcher/ResourceDownloadTask.cpp
@@ -24,7 +24,9 @@
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourceFolderModel.h"
 
+#include "modplatform/helpers/HashUtils.h"
 #include "net/ApiDownload.h"
+#include "net/ChecksumValidator.h"
 
 ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
                                            ModPlatform::IndexedVersion version,
@@ -53,7 +55,29 @@ ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
         }
     }
 
-    m_filesNetJob->addNetAction(Net::ApiDownload::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename())));
+    auto action = Net::ApiDownload::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename()));
+    if (!m_pack_version.hash_type.isEmpty() && !m_pack_version.hash.isEmpty()) {
+        switch (Hashing::algorithmFromString(m_pack_version.hash_type)) {
+            case Hashing::Algorithm::Md4:
+                action->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Md4, m_pack_version.hash));
+                break;
+            case Hashing::Algorithm::Md5:
+                action->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Md5, m_pack_version.hash));
+                break;
+            case Hashing::Algorithm::Sha1:
+                action->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Sha1, m_pack_version.hash));
+                break;
+            case Hashing::Algorithm::Sha256:
+                action->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Sha256, m_pack_version.hash));
+                break;
+            case Hashing::Algorithm::Sha512:
+                action->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Sha512, m_pack_version.hash));
+                break;
+            default:
+                break;
+        }
+    }
+    m_filesNetJob->addNetAction(action);
     connect(m_filesNetJob.get(), &NetJob::succeeded, this, &ResourceDownloadTask::downloadSucceeded);
     connect(m_filesNetJob.get(), &NetJob::progress, this, &ResourceDownloadTask::downloadProgressChanged);
     connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &ResourceDownloadTask::propagateStepProgress);
diff --git a/launcher/RuntimeContext.h b/launcher/RuntimeContext.h
index c57140d28..85304a5bc 100644
--- a/launcher/RuntimeContext.h
+++ b/launcher/RuntimeContext.h
@@ -20,13 +20,13 @@
 
 #include <QSet>
 #include <QString>
+#include "SysInfo.h"
 #include "settings/SettingsObject.h"
 
 struct RuntimeContext {
     QString javaArchitecture;
     QString javaRealArchitecture;
-    QString javaPath;
-    QString system;
+    QString system = SysInfo::currentSystem();
 
     QString mappedJavaRealArchitecture() const
     {
@@ -45,8 +45,6 @@ struct RuntimeContext {
     {
         javaArchitecture = instanceSettings->get("JavaArchitecture").toString();
         javaRealArchitecture = instanceSettings->get("JavaRealArchitecture").toString();
-        javaPath = instanceSettings->get("JavaPath").toString();
-        system = currentSystem();
     }
 
     QString getClassifier() const { return system + "-" + mappedJavaRealArchitecture(); }
@@ -68,21 +66,4 @@ struct RuntimeContext {
 
         return x;
     }
-
-    static QString currentSystem()
-    {
-#if defined(Q_OS_LINUX)
-        return "linux";
-#elif defined(Q_OS_MACOS)
-        return "osx";
-#elif defined(Q_OS_WINDOWS)
-        return "windows";
-#elif defined(Q_OS_FREEBSD)
-        return "freebsd";
-#elif defined(Q_OS_OPENBSD)
-        return "openbsd";
-#else
-        return "unknown";
-#endif
-    }
 };
diff --git a/launcher/SkinUtils.cpp b/launcher/SkinUtils.cpp
deleted file mode 100644
index 989114ad5..000000000
--- a/launcher/SkinUtils.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SkinUtils.h"
-#include "Application.h"
-#include "net/HttpMetaCache.h"
-
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPainter>
-
-namespace SkinUtils {
-/*
- * Given a username, return a pixmap of the cached skin (if it exists), QPixmap() otherwise
- */
-QPixmap getFaceFromCache(QString username, int height, int width)
-{
-    QFile fskin(APPLICATION->metacache()->resolveEntry("skins", username + ".png")->getFullPath());
-
-    if (fskin.exists()) {
-        QPixmap skinTexture(fskin.fileName());
-        if (!skinTexture.isNull()) {
-            QPixmap skin = QPixmap(8, 8);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-            skin.fill(QColorConstants::Transparent);
-#else
-            skin.fill(QColor(0, 0, 0, 0));
-#endif
-            QPainter painter(&skin);
-            painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8));
-            painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8));
-            return skin.scaled(height, width, Qt::KeepAspectRatio);
-        }
-    }
-
-    return QPixmap();
-}
-}  // namespace SkinUtils
diff --git a/launcher/SkinUtils.h b/launcher/SkinUtils.h
deleted file mode 100644
index 11bc8bc6f..000000000
--- a/launcher/SkinUtils.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QPixmap>
-
-namespace SkinUtils {
-QPixmap getFaceFromCache(QString id, int height = 64, int width = 64);
-}
diff --git a/launcher/SysInfo.cpp b/launcher/SysInfo.cpp
new file mode 100644
index 000000000..0dfa74de7
--- /dev/null
+++ b/launcher/SysInfo.cpp
@@ -0,0 +1,99 @@
+#include <QDebug>
+#include <QString>
+#include "sys.h"
+#ifdef Q_OS_MACOS
+#include <sys/sysctl.h>
+#endif
+#include <QFile>
+#include <QMap>
+#include <QProcess>
+#include <QStandardPaths>
+
+#ifdef Q_OS_MACOS
+bool rosettaDetect()
+{
+    int ret = 0;
+    size_t size = sizeof(ret);
+    if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) == -1) {
+        return false;
+    }
+    return ret == 1;
+}
+#endif
+
+namespace SysInfo {
+QString currentSystem()
+{
+#if defined(Q_OS_LINUX)
+    return "linux";
+#elif defined(Q_OS_MACOS)
+    return "osx";
+#elif defined(Q_OS_WINDOWS)
+    return "windows";
+#elif defined(Q_OS_FREEBSD)
+    return "freebsd";
+#elif defined(Q_OS_OPENBSD)
+    return "openbsd";
+#else
+    return "unknown";
+#endif
+}
+
+QString useQTForArch()
+{
+#if defined(Q_OS_MACOS) && !defined(Q_PROCESSOR_ARM)
+    if (rosettaDetect()) {
+        return "arm64";
+    } else {
+        return "x86_64";
+    }
+#endif
+    return QSysInfo::currentCpuArchitecture();
+}
+
+int suitableMaxMem()
+{
+    float totalRAM = (float)Sys::getSystemRam() / (float)Sys::mebibyte;
+    int maxMemoryAlloc;
+
+    // If totalRAM < 6GB, use (totalRAM / 1.5), else 4GB
+    if (totalRAM < (4096 * 1.5))
+        maxMemoryAlloc = (int)(totalRAM / 1.5);
+    else
+        maxMemoryAlloc = 4096;
+
+    return maxMemoryAlloc;
+}
+
+QString getSupportedJavaArchitecture()
+{
+    auto sys = currentSystem();
+    auto arch = useQTForArch();
+    if (sys == "windows") {
+        if (arch == "x86_64")
+            return "windows-x64";
+        if (arch == "i386")
+            return "windows-x86";
+        // Unknown, maybe arm, appending arch
+        return "windows-" + arch;
+    }
+    if (sys == "osx") {
+        if (arch == "arm64")
+            return "mac-os-arm64";
+        if (arch.contains("64"))
+            return "mac-os-64";
+        if (arch.contains("86"))
+            return "mac-os-86";
+        // Unknown, maybe something new, appending arch
+        return "mac-os-" + arch;
+    } else if (sys == "linux") {
+        if (arch == "x86_64")
+            return "linux-x64";
+        if (arch == "i386")
+            return "linux-x86";
+        // will work for arm32 arm(64)
+        return "linux-" + arch;
+    }
+    return {};
+}
+}  // namespace SysInfo
diff --git a/launcher/SysInfo.h b/launcher/SysInfo.h
new file mode 100644
index 000000000..f3688d60d
--- /dev/null
+++ b/launcher/SysInfo.h
@@ -0,0 +1,8 @@
+#include <QString>
+
+namespace SysInfo {
+QString currentSystem();
+QString useQTForArch();
+QString getSupportedJavaArchitecture();
+int suitableMaxMem();
+}  // namespace SysInfo
diff --git a/launcher/Untar.cpp b/launcher/Untar.cpp
new file mode 100644
index 000000000..f1963e7aa
--- /dev/null
+++ b/launcher/Untar.cpp
@@ -0,0 +1,260 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+#include "Untar.h"
+#include <quagzipfile.h>
+#include <QByteArray>
+#include <QFileInfo>
+#include <QIODevice>
+#include <QString>
+#include "FileSystem.h"
+
+// adaptation of the:
+// - https://github.com/madler/zlib/blob/develop/contrib/untgz/untgz.c
+// - https://en.wikipedia.org/wiki/Tar_(computing)
+// - https://github.com/euroelessar/cutereader/blob/master/karchive/src/ktar.cpp
+
+#define BLOCKSIZE 512
+#define SHORTNAMESIZE 100
+
+enum class TypeFlag : char {
+    Regular = '0',     // regular file
+    ARegular = 0,      // regular file
+    Link = '1',        // link
+    Symlink = '2',     // reserved
+    Character = '3',   // character special
+    Block = '4',       // block special
+    Directory = '5',   // directory
+    FIFO = '6',        // FIFO special
+    Contiguous = '7',  // reserved
+    // Posix stuff
+    GlobalPosixHeader = 'g',
+    ExtendedPosixHeader = 'x',
+    // 'A'– 'Z' Vendor specific extensions(POSIX .1 - 1988)
+    // GNU
+    GNULongLink = 'K', /* long link name */
+    GNULongName = 'L', /* long file name */
+};
+
+// struct Header {         /* byte offset */
+//     char name[100];     /*   0 */
+//     char mode[8];       /* 100 */
+//     char uid[8];        /* 108 */
+//     char gid[8];        /* 116 */
+//     char size[12];      /* 124 */
+//     char mtime[12];     /* 136 */
+//     char chksum[8];     /* 148 */
+//     TypeFlag typeflag;  /* 156 */
+//     char linkname[100]; /* 157 */
+//     char magic[6];      /* 257 */
+//     char version[2];    /* 263 */
+//     char uname[32];     /* 265 */
+//     char gname[32];     /* 297 */
+//     char devmajor[8];   /* 329 */
+//     char devminor[8];   /* 337 */
+//     char prefix[155];   /* 345 */
+//                         /* 500 */
+// };
+
+bool readLonglink(QIODevice* in, qint64 size, QByteArray& longlink)
+{
+    qint64 n = 0;
+    size--;  // ignore trailing null
+    if (size < 0) {
+        qCritical() << "The filename size is negative";
+        return false;
+    }
+    longlink.resize(size + (BLOCKSIZE - size % BLOCKSIZE));  // make the size divisible by BLOCKSIZE
+    for (qint64 offset = 0; offset < longlink.size(); offset += BLOCKSIZE) {
+        n = in->read(longlink.data() + offset, BLOCKSIZE);
+        if (n != BLOCKSIZE) {
+            qCritical() << "The expected blocksize was not respected for the name";
+            return false;
+        }
+    }
+    longlink.truncate(qstrlen(longlink.constData()));
+    return true;
+}
+
+int getOctal(char* buffer, int maxlenght, bool* ok)
+{
+    return QByteArray(buffer, qstrnlen(buffer, maxlenght)).toInt(ok, 8);
+}
+
+QString decodeName(char* name)
+{
+    return QFile::decodeName(QByteArray(name, qstrnlen(name, 100)));
+}
+bool Tar::extract(QIODevice* in, QString dst)
+{
+    char buffer[BLOCKSIZE];
+    QString name, symlink, firstFolderName;
+    bool doNotReset = false, ok;
+    while (true) {
+        auto n = in->read(buffer, BLOCKSIZE);
+        if (n != BLOCKSIZE) {  // allways expect complete blocks
+            qCritical() << "The expected blocksize was not respected";
+            return false;
+        }
+        if (buffer[0] == 0) {  // end of archive
+            return true;
+        }
+        int mode = getOctal(buffer + 100, 8, &ok) | QFile::ReadUser | QFile::WriteUser;  // hack to ensure write and read permisions
+        if (!ok) {
+            qCritical() << "The file mode can't be read";
+            return false;
+        }
+        // there are names that are exactly 100 bytes long
+        // and neither longlink nor \0 terminated (bug:101472)
+
+        if (name.isEmpty()) {
+            name = decodeName(buffer);
+            if (!firstFolderName.isEmpty() && name.startsWith(firstFolderName)) {
+                name = name.mid(firstFolderName.size());
+            }
+        }
+        if (symlink.isEmpty())
+            symlink = decodeName(buffer);
+        qint64 size = getOctal(buffer + 124, 12, &ok);
+        if (!ok) {
+            qCritical() << "The file size can't be read";
+            return false;
+        }
+        switch (TypeFlag(buffer[156])) {
+            case TypeFlag::Regular:
+                /* fallthrough */
+            case TypeFlag::ARegular: {
+                auto fileName = FS::PathCombine(dst, name);
+                if (!FS::ensureFilePathExists(fileName)) {
+                    qCritical() << "Can't ensure the file path to exist: " << fileName;
+                    return false;
+                }
+                QFile out(fileName);
+                if (!out.open(QFile::WriteOnly)) {
+                    qCritical() << "Can't open file:" << fileName;
+                    return false;
+                }
+                out.setPermissions(QFile::Permissions(mode));
+                while (size > 0) {
+                    QByteArray tmp(BLOCKSIZE, 0);
+                    n = in->read(tmp.data(), BLOCKSIZE);
+                    if (n != BLOCKSIZE) {
+                        qCritical() << "The expected blocksize was not respected when reading file";
+                        return false;
+                    }
+                    tmp.truncate(qMin(qint64(BLOCKSIZE), size));
+                    out.write(tmp);
+                    size -= BLOCKSIZE;
+                }
+                break;
+            }
+            case TypeFlag::Directory: {
+                if (firstFolderName.isEmpty()) {
+                    firstFolderName = name;
+                    break;
+                }
+                auto folderPath = FS::PathCombine(dst, name);
+                if (!FS::ensureFolderPathExists(folderPath)) {
+                    qCritical() << "Can't ensure that folder exists: " << folderPath;
+                    return false;
+                }
+                break;
+            }
+            case TypeFlag::GNULongLink: {
+                doNotReset = true;
+                QByteArray longlink;
+                if (readLonglink(in, size, longlink)) {
+                    symlink = QFile::decodeName(longlink.constData());
+                } else {
+                    qCritical() << "Failed to read long link";
+                    return false;
+                }
+                break;
+            }
+            case TypeFlag::GNULongName: {
+                doNotReset = true;
+                QByteArray longlink;
+                if (readLonglink(in, size, longlink)) {
+                    name = QFile::decodeName(longlink.constData());
+                } else {
+                    qCritical() << "Failed to read long name";
+                    return false;
+                }
+                break;
+            }
+            case TypeFlag::Link:
+                /* fallthrough */
+            case TypeFlag::Symlink: {
+                auto fileName = FS::PathCombine(dst, name);
+                if (!FS::create_link(FS::PathCombine(QFileInfo(fileName).path(), symlink), fileName)()) {  // do not use symlinks
+                    qCritical() << "Can't create link for:" << fileName << " to:" << FS::PathCombine(QFileInfo(fileName).path(), symlink);
+                    return false;
+                }
+                FS::ensureFilePathExists(fileName);
+                QFile::setPermissions(fileName, QFile::Permissions(mode));
+                break;
+            }
+            case TypeFlag::Character:
+                /* fallthrough */
+            case TypeFlag::Block:
+                /* fallthrough */
+            case TypeFlag::FIFO:
+                /* fallthrough */
+            case TypeFlag::Contiguous:
+                /* fallthrough */
+            case TypeFlag::GlobalPosixHeader:
+                /* fallthrough */
+            case TypeFlag::ExtendedPosixHeader:
+                /* fallthrough */
+            default:
+                break;
+        }
+        if (!doNotReset) {
+            name.truncate(0);
+            symlink.truncate(0);
+        }
+        doNotReset = false;
+    }
+    return true;
+}
+
+bool GZTar::extract(QString src, QString dst)
+{
+    QuaGzipFile a(src);
+    if (!a.open(QIODevice::ReadOnly)) {
+        qCritical() << "Can't open tar file:" << src;
+        return false;
+    }
+    return Tar::extract(&a, dst);
+}
\ No newline at end of file
diff --git a/launcher/Untar.h b/launcher/Untar.h
new file mode 100644
index 000000000..50e3a16e3
--- /dev/null
+++ b/launcher/Untar.h
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+#pragma once
+#include <QIODevice>
+
+// this is a hack used for the java downloader (feel free to remove it in favor of a library)
+// both extract functions will extract the first folder inside dest(disregarding the prefix)
+namespace Tar {
+bool extract(QIODevice* in, QString dst);
+}
+
+namespace GZTar {
+bool extract(QString src, QString dst);
+}
\ No newline at end of file
diff --git a/launcher/Version.cpp b/launcher/Version.cpp
index 511aa9c35..2edb17e72 100644
--- a/launcher/Version.cpp
+++ b/launcher/Version.cpp
@@ -123,8 +123,7 @@ QDebug operator<<(QDebug debug, const Version& v)
         first = false;
     }
 
-    debug.nospace() << " ]"
-                    << " }";
+    debug.nospace() << " ]" << " }";
 
     return debug;
 }
diff --git a/launcher/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp
index 0ab9ae2c3..12a82f73d 100644
--- a/launcher/VersionProxyModel.cpp
+++ b/launcher/VersionProxyModel.cpp
@@ -114,10 +114,14 @@ QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation,
                 return tr("Branch");
             case Type:
                 return tr("Type");
-            case Architecture:
+            case CPUArchitecture:
                 return tr("Architecture");
             case Path:
                 return tr("Path");
+            case JavaName:
+                return tr("Java Name");
+            case JavaMajor:
+                return tr("Major Version");
             case Time:
                 return tr("Released");
         }
@@ -131,10 +135,14 @@ QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation,
                 return tr("The version's branch");
             case Type:
                 return tr("The version's type");
-            case Architecture:
+            case CPUArchitecture:
                 return tr("CPU Architecture");
             case Path:
                 return tr("Filesystem path to this version");
+            case JavaName:
+                return tr("The alternative name of the Java version");
+            case JavaMajor:
+                return tr("The Java major version");
             case Time:
                 return tr("Release date of this version");
         }
@@ -165,10 +173,14 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
                     return sourceModel()->data(parentIndex, BaseVersionList::BranchRole);
                 case Type:
                     return sourceModel()->data(parentIndex, BaseVersionList::TypeRole);
-                case Architecture:
-                    return sourceModel()->data(parentIndex, BaseVersionList::ArchitectureRole);
+                case CPUArchitecture:
+                    return sourceModel()->data(parentIndex, BaseVersionList::CPUArchitectureRole);
                 case Path:
                     return sourceModel()->data(parentIndex, BaseVersionList::PathRole);
+                case JavaName:
+                    return sourceModel()->data(parentIndex, BaseVersionList::JavaNameRole);
+                case JavaMajor:
+                    return sourceModel()->data(parentIndex, BaseVersionList::JavaMajorRole);
                 case Time:
                     return sourceModel()->data(parentIndex, Meta::VersionList::TimeRole).toDate();
                 default:
@@ -308,12 +320,18 @@ void VersionProxyModel::setSourceModel(QAbstractItemModel* replacingRaw)
         m_columns.push_back(ParentVersion);
     }
     */
-    if (roles.contains(BaseVersionList::ArchitectureRole)) {
-        m_columns.push_back(Architecture);
+    if (roles.contains(BaseVersionList::CPUArchitectureRole)) {
+        m_columns.push_back(CPUArchitecture);
     }
     if (roles.contains(BaseVersionList::PathRole)) {
         m_columns.push_back(Path);
     }
+    if (roles.contains(BaseVersionList::JavaNameRole)) {
+        m_columns.push_back(JavaName);
+    }
+    if (roles.contains(BaseVersionList::JavaMajorRole)) {
+        m_columns.push_back(JavaMajor);
+    }
     if (roles.contains(Meta::VersionList::TimeRole)) {
         m_columns.push_back(Time);
     }
diff --git a/launcher/VersionProxyModel.h b/launcher/VersionProxyModel.h
index efea1a0bb..7965af0ad 100644
--- a/launcher/VersionProxyModel.h
+++ b/launcher/VersionProxyModel.h
@@ -9,7 +9,7 @@ class VersionFilterModel;
 class VersionProxyModel : public QAbstractProxyModel {
     Q_OBJECT
    public:
-    enum Column { Name, ParentVersion, Branch, Type, Architecture, Path, Time };
+    enum Column { Name, ParentVersion, Branch, Type, CPUArchitecture, Path, Time, JavaName, JavaMajor };
     using FilterMap = QHash<BaseVersionList::ModelRoles, std::shared_ptr<Filter>>;
 
    public:
diff --git a/launcher/filelink/FileLink.cpp b/launcher/filelink/FileLink.cpp
index bdf173ebc..9d8ed6f31 100644
--- a/launcher/filelink/FileLink.cpp
+++ b/launcher/filelink/FileLink.cpp
@@ -74,7 +74,7 @@ FileLinkApp::FileLinkApp(int& argc, char** argv) : QCoreApplication(argc, argv),
 
     // Commandline parsing
     QCommandLineParser parser;
-    parser.setApplicationDescription(QObject::tr("a batch MKLINK program for windows to be used with prismlauncher"));
+    parser.setApplicationDescription(QObject::tr("a batch MKLINK program for windows to be used with fjordlauncher"));
 
     parser.addOptions({ { { "s", "server" }, "Join the specified server on launch", "pipe name" },
                         { { "H", "hard" }, "use hard links instead of symbolic", "true/false" } });
diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp
index 5576b9745..e4157ea2d 100644
--- a/launcher/icons/IconList.cpp
+++ b/launcher/icons/IconList.cpp
@@ -322,7 +322,7 @@ const MMCIcon* IconList::icon(const QString& key) const
 
 bool IconList::deleteIcon(const QString& key)
 {
-    return iconFileExists(key) && QFile::remove(icon(key)->getFilePath());
+    return iconFileExists(key) && FS::deletePath(icon(key)->getFilePath());
 }
 
 bool IconList::trashIcon(const QString& key)
diff --git a/launcher/icons/IconUtils.cpp b/launcher/icons/IconUtils.cpp
index 99c38f47a..87e948729 100644
--- a/launcher/icons/IconUtils.cpp
+++ b/launcher/icons/IconUtils.cpp
@@ -39,7 +39,7 @@
 #include "FileSystem.h"
 
 namespace {
-static const QStringList validIconExtensions = { { "svg", "png", "ico", "gif", "jpg", "jpeg" } };
+static const QStringList validIconExtensions = { { "svg", "png", "ico", "gif", "jpg", "jpeg", "webp" } };
 }
 
 namespace IconUtils {
@@ -52,8 +52,7 @@ QString findBestIconIn(const QString& folder, const QString& iconKey)
     while (it.hasNext()) {
         it.next();
         auto fileInfo = it.fileInfo();
-
-        if (fileInfo.completeBaseName() == iconKey && isIconSuffix(fileInfo.suffix()))
+        if ((fileInfo.completeBaseName() == iconKey || fileInfo.fileName() == iconKey) && isIconSuffix(fileInfo.suffix()))
             return fileInfo.absoluteFilePath();
     }
     return {};
diff --git a/launcher/install_prereqs.cmake.in b/launcher/install_prereqs.cmake.in
index e4408d161..acbce9650 100644
--- a/launcher/install_prereqs.cmake.in
+++ b/launcher/install_prereqs.cmake.in
@@ -1,5 +1,4 @@
 set(CMAKE_MODULE_PATH "@CMAKE_MODULE_PATH@")
-
 file(GLOB_RECURSE    QTPLUGINS "${CMAKE_INSTALL_PREFIX}/@PLUGIN_DEST_DIR@/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
 function(gp_resolved_file_type_override resolved_file type_var)
     if(resolved_file MATCHES "^/(usr/)?lib/libQt")
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index fc8da55c2..c54a5b04b 100644
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
@@ -40,14 +40,15 @@
 #include <QMap>
 #include <QProcess>
 
-#include "Application.h"
 #include "Commandline.h"
 #include "FileSystem.h"
-#include "JavaUtils.h"
+#include "java/JavaUtils.h"
 
-JavaChecker::JavaChecker(QObject* parent) : QObject(parent) {}
+JavaChecker::JavaChecker(QString path, QString args, int minMem, int maxMem, int permGen, int id, QObject* parent)
+    : Task(parent), m_path(path), m_args(args), m_minMem(minMem), m_maxMem(maxMem), m_permGen(permGen), m_id(id)
+{}
 
-void JavaChecker::performCheck()
+void JavaChecker::executeTask()
 {
     QString checkerJar = JavaUtils::getJavaCheckPath();
 
@@ -72,7 +73,7 @@ void JavaChecker::performCheck()
     if (m_maxMem != 0) {
         args << QString("-Xmx%1m").arg(m_maxMem);
     }
-    if (m_permGen != 64) {
+    if (m_permGen != 64 && m_permGen != 0) {
         args << QString("-XX:PermSize=%1m").arg(m_permGen);
     }
 
@@ -115,11 +116,10 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     QProcessPtr _process = process;
     process.reset();
 
-    JavaCheckResult result;
-    {
-        result.path = m_path;
-        result.id = m_id;
-    }
+    Result result = {
+        m_path,
+        m_id,
+    };
     result.errorLog = m_stderr;
     result.outLog = m_stdout;
     qDebug() << "STDOUT" << m_stdout;
@@ -127,8 +127,9 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     qDebug() << "Java checker finished with status" << status << "exit code" << exitcode;
 
     if (status == QProcess::CrashExit || exitcode == 1) {
-        result.validity = JavaCheckResult::Validity::Errored;
+        result.validity = Result::Validity::Errored;
         emit checkFinished(result);
+        emitSucceeded();
         return;
     }
 
@@ -161,8 +162,9 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     }
 
     if (!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor") || !success) {
-        result.validity = JavaCheckResult::Validity::ReturnedInvalidData;
+        result.validity = Result::Validity::ReturnedInvalidData;
         emit checkFinished(result);
+        emitSucceeded();
         return;
     }
 
@@ -171,7 +173,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     auto java_vendor = results["java.vendor"];
     bool is_64 = os_arch == "x86_64" || os_arch == "amd64" || os_arch == "aarch64" || os_arch == "arm64";
 
-    result.validity = JavaCheckResult::Validity::Valid;
+    result.validity = Result::Validity::Valid;
     result.is_64bit = is_64;
     result.mojangPlatform = is_64 ? "64" : "32";
     result.realPlatform = os_arch;
@@ -179,6 +181,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     result.javaVendor = java_vendor;
     qDebug() << "Java checker succeeded.";
     emit checkFinished(result);
+    emitSucceeded();
 }
 
 void JavaChecker::error(QProcess::ProcessError err)
@@ -190,15 +193,9 @@ void JavaChecker::error(QProcess::ProcessError err)
         qDebug() << "Native environment:";
         qDebug() << QProcessEnvironment::systemEnvironment().toStringList();
         killTimer.stop();
-        JavaCheckResult result;
-        {
-            result.path = m_path;
-            result.id = m_id;
-        }
-
-        emit checkFinished(result);
-        return;
+        emit checkFinished({ m_path, m_id });
     }
+    emitSucceeded();
 }
 
 void JavaChecker::timeout()
diff --git a/launcher/java/JavaChecker.h b/launcher/java/JavaChecker.h
index 7111f8522..171a18b76 100644
--- a/launcher/java/JavaChecker.h
+++ b/launcher/java/JavaChecker.h
@@ -3,49 +3,51 @@
 #include <QTimer>
 #include <memory>
 
-#include "QObjectPtr.h"
-
 #include "JavaVersion.h"
+#include "QObjectPtr.h"
+#include "tasks/Task.h"
 
-class JavaChecker;
-
-struct JavaCheckResult {
-    QString path;
-    QString mojangPlatform;
-    QString realPlatform;
-    JavaVersion javaVersion;
-    QString javaVendor;
-    QString outLog;
-    QString errorLog;
-    bool is_64bit = false;
-    int id;
-    enum class Validity { Errored, ReturnedInvalidData, Valid } validity = Validity::Errored;
-};
-
-using QProcessPtr = shared_qobject_ptr<QProcess>;
-using JavaCheckerPtr = shared_qobject_ptr<JavaChecker>;
-class JavaChecker : public QObject {
+class JavaChecker : public Task {
     Q_OBJECT
    public:
-    explicit JavaChecker(QObject* parent = 0);
-    void performCheck();
-
-    QString m_path;
-    QString m_args;
-    int m_id = 0;
-    int m_minMem = 0;
-    int m_maxMem = 0;
-    int m_permGen = 64;
+    using QProcessPtr = shared_qobject_ptr<QProcess>;
+    using Ptr = shared_qobject_ptr<JavaChecker>;
+
+    struct Result {
+        QString path;
+        int id;
+        QString mojangPlatform;
+        QString realPlatform;
+        JavaVersion javaVersion;
+        QString javaVendor;
+        QString outLog;
+        QString errorLog;
+        bool is_64bit = false;
+        enum class Validity { Errored, ReturnedInvalidData, Valid } validity = Validity::Errored;
+    };
+
+    explicit JavaChecker(QString path, QString args, int minMem = 0, int maxMem = 0, int permGen = 0, int id = 0, QObject* parent = 0);
 
    signals:
-    void checkFinished(JavaCheckResult result);
+    void checkFinished(const Result& result);
+
+   protected:
+    virtual void executeTask() override;
 
    private:
     QProcessPtr process;
     QTimer killTimer;
     QString m_stdout;
     QString m_stderr;
-   public slots:
+
+    QString m_path;
+    QString m_args;
+    int m_minMem = 0;
+    int m_maxMem = 0;
+    int m_permGen = 64;
+    int m_id = 0;
+
+   private slots:
     void timeout();
     void finished(int exitcode, QProcess::ExitStatus);
     void error(QProcess::ProcessError);
diff --git a/launcher/java/JavaCheckerJob.cpp b/launcher/java/JavaCheckerJob.cpp
deleted file mode 100644
index 870e2a09a..000000000
--- a/launcher/java/JavaCheckerJob.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "JavaCheckerJob.h"
-
-#include <QDebug>
-
-void JavaCheckerJob::partFinished(JavaCheckResult result)
-{
-    num_finished++;
-    qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/" << javacheckers.size();
-    setProgress(num_finished, javacheckers.size());
-
-    javaresults.replace(result.id, result);
-
-    if (num_finished == javacheckers.size()) {
-        emitSucceeded();
-    }
-}
-
-void JavaCheckerJob::executeTask()
-{
-    qDebug() << m_job_name.toLocal8Bit() << " started.";
-    for (auto iter : javacheckers) {
-        javaresults.append(JavaCheckResult());
-        connect(iter.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
-        iter->performCheck();
-    }
-}
diff --git a/launcher/java/JavaCheckerJob.h b/launcher/java/JavaCheckerJob.h
deleted file mode 100644
index 16b572632..000000000
--- a/launcher/java/JavaCheckerJob.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QtNetwork>
-#include "JavaChecker.h"
-#include "tasks/Task.h"
-
-class JavaCheckerJob;
-using JavaCheckerJobPtr = shared_qobject_ptr<JavaCheckerJob>;
-
-// FIXME: this just seems horribly redundant
-class JavaCheckerJob : public Task {
-    Q_OBJECT
-   public:
-    explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name) {};
-    virtual ~JavaCheckerJob() {};
-
-    bool addJavaCheckerAction(JavaCheckerPtr base)
-    {
-        javacheckers.append(base);
-        // if this is already running, the action needs to be started right away!
-        if (isRunning()) {
-            setProgress(num_finished, javacheckers.size());
-            connect(base.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
-            base->performCheck();
-        }
-        return true;
-    }
-    QList<JavaCheckResult> getResults() { return javaresults; }
-
-   private slots:
-    void partFinished(JavaCheckResult result);
-
-   protected:
-    virtual void executeTask() override;
-
-   private:
-    QString m_job_name;
-    QList<JavaCheckerPtr> javacheckers;
-    QList<JavaCheckResult> javaresults;
-    int num_finished = 0;
-};
diff --git a/launcher/java/JavaInstall.cpp b/launcher/java/JavaInstall.cpp
index cfa471402..8e97e0e14 100644
--- a/launcher/java/JavaInstall.cpp
+++ b/launcher/java/JavaInstall.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/launcher/java/JavaInstall.h b/launcher/java/JavaInstall.h
index 8c2743a00..7d8d392fa 100644
--- a/launcher/java/JavaInstall.h
+++ b/launcher/java/JavaInstall.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ struct JavaInstall : public BaseVersion {
     QString arch;
     QString path;
     bool recommended = false;
+    bool is_64bit = false;
 };
 
 using JavaInstallPtr = std::shared_ptr<JavaInstall>;
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
index d8be4963f..569fda306 100644
--- a/launcher/java/JavaInstallList.cpp
+++ b/launcher/java/JavaInstallList.cpp
@@ -38,13 +38,17 @@
 #include <QtXml>
 
 #include <QDebug>
+#include <algorithm>
 
-#include "java/JavaCheckerJob.h"
+#include "Application.h"
+#include "java/JavaChecker.h"
 #include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
-#include "minecraft/VersionFilterData.h"
+#include "tasks/ConcurrentTask.h"
 
-JavaInstallList::JavaInstallList(QObject* parent) : BaseVersionList(parent) {}
+JavaInstallList::JavaInstallList(QObject* parent, bool onlyManagedVersions)
+    : BaseVersionList(parent), m_only_managed_versions(onlyManagedVersions)
+{}
 
 Task::Ptr JavaInstallList::getLoadTask()
 {
@@ -55,7 +59,7 @@ Task::Ptr JavaInstallList::getLoadTask()
 Task::Ptr JavaInstallList::getCurrentTask()
 {
     if (m_status == Status::InProgress) {
-        return m_loadTask;
+        return m_load_task;
     }
     return nullptr;
 }
@@ -64,8 +68,8 @@ void JavaInstallList::load()
 {
     if (m_status != Status::InProgress) {
         m_status = Status::InProgress;
-        m_loadTask.reset(new JavaListLoadTask(this));
-        m_loadTask->start();
+        m_load_task.reset(new JavaListLoadTask(this, m_only_managed_versions));
+        m_load_task->start();
     }
 }
 
@@ -106,7 +110,7 @@ QVariant JavaInstallList::data(const QModelIndex& index, int role) const
             return version->recommended;
         case PathRole:
             return version->path;
-        case ArchitectureRole:
+        case CPUArchitectureRole:
             return version->arch;
         default:
             return QVariant();
@@ -115,7 +119,7 @@ QVariant JavaInstallList::data(const QModelIndex& index, int role) const
 
 BaseVersionList::RoleList JavaInstallList::providesRoles() const
 {
-    return { VersionPointerRole, VersionIdRole, VersionRole, RecommendedRole, PathRole, ArchitectureRole };
+    return { VersionPointerRole, VersionIdRole, VersionRole, RecommendedRole, PathRole, CPUArchitectureRole };
 }
 
 void JavaInstallList::updateListData(QList<BaseVersion::Ptr> versions)
@@ -129,7 +133,7 @@ void JavaInstallList::updateListData(QList<BaseVersion::Ptr> versions)
     }
     endResetModel();
     m_status = Status::Done;
-    m_loadTask.reset();
+    m_load_task.reset();
 }
 
 bool sortJavas(BaseVersion::Ptr left, BaseVersion::Ptr right)
@@ -146,35 +150,30 @@ void JavaInstallList::sortVersions()
     endResetModel();
 }
 
-JavaListLoadTask::JavaListLoadTask(JavaInstallList* vlist) : Task()
+JavaListLoadTask::JavaListLoadTask(JavaInstallList* vlist, bool onlyManagedVersions) : Task(), m_only_managed_versions(onlyManagedVersions)
 {
     m_list = vlist;
-    m_currentRecommended = NULL;
+    m_current_recommended = NULL;
 }
 
-JavaListLoadTask::~JavaListLoadTask() {}
-
 void JavaListLoadTask::executeTask()
 {
     setStatus(tr("Detecting Java installations..."));
 
     JavaUtils ju;
-    QList<QString> candidate_paths = ju.FindJavaPaths();
+    QList<QString> candidate_paths = m_only_managed_versions ? getPrismJavaBundle() : ju.FindJavaPaths();
 
-    m_job.reset(new JavaCheckerJob("Java detection"));
+    ConcurrentTask::Ptr job(new ConcurrentTask(this, "Java detection", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt()));
+    m_job.reset(job);
     connect(m_job.get(), &Task::finished, this, &JavaListLoadTask::javaCheckerFinished);
     connect(m_job.get(), &Task::progress, this, &Task::setProgress);
 
     qDebug() << "Probing the following Java paths: ";
     int id = 0;
     for (QString candidate : candidate_paths) {
-        qDebug() << " " << candidate;
-
-        auto candidate_checker = new JavaChecker();
-        candidate_checker->m_path = candidate;
-        candidate_checker->m_id = id;
-        m_job->addJavaCheckerAction(JavaCheckerPtr(candidate_checker));
-
+        auto checker = new JavaChecker(candidate, "", 0, 0, 0, id, this);
+        connect(checker, &JavaChecker::checkFinished, [this](const JavaChecker::Result& result) { m_results << result; });
+        job->addTask(Task::Ptr(checker));
         id++;
     }
 
@@ -184,16 +183,17 @@ void JavaListLoadTask::executeTask()
 void JavaListLoadTask::javaCheckerFinished()
 {
     QList<JavaInstallPtr> candidates;
-    auto results = m_job->getResults();
+    std::sort(m_results.begin(), m_results.end(), [](const JavaChecker::Result& a, const JavaChecker::Result& b) { return a.id < b.id; });
 
     qDebug() << "Found the following valid Java installations:";
-    for (JavaCheckResult result : results) {
-        if (result.validity == JavaCheckResult::Validity::Valid) {
+    for (auto result : m_results) {
+        if (result.validity == JavaChecker::Result::Validity::Valid) {
             JavaInstallPtr javaVersion(new JavaInstall());
 
             javaVersion->id = result.javaVersion;
             javaVersion->arch = result.realPlatform;
             javaVersion->path = result.path;
+            javaVersion->is_64bit = result.is_64bit;
             candidates.append(javaVersion);
 
             qDebug() << " " << javaVersion->id.toString() << javaVersion->arch << javaVersion->path;
diff --git a/launcher/java/JavaInstallList.h b/launcher/java/JavaInstallList.h
index 1eebadf23..b77f17b28 100644
--- a/launcher/java/JavaInstallList.h
+++ b/launcher/java/JavaInstallList.h
@@ -19,9 +19,9 @@
 #include <QObject>
 
 #include "BaseVersionList.h"
+#include "java/JavaChecker.h"
 #include "tasks/Task.h"
 
-#include "JavaCheckerJob.h"
 #include "JavaInstall.h"
 
 #include "QObjectPtr.h"
@@ -33,9 +33,9 @@ class JavaInstallList : public BaseVersionList {
     enum class Status { NotDone, InProgress, Done };
 
    public:
-    explicit JavaInstallList(QObject* parent = 0);
+    explicit JavaInstallList(QObject* parent = 0, bool onlyManagedVersions = false);
 
-    Task::Ptr getLoadTask() override;
+    [[nodiscard]] Task::Ptr getLoadTask() override;
     bool isLoaded() override;
     const BaseVersion::Ptr at(int i) const override;
     int count() const override;
@@ -53,23 +53,27 @@ class JavaInstallList : public BaseVersionList {
 
    protected:
     Status m_status = Status::NotDone;
-    shared_qobject_ptr<JavaListLoadTask> m_loadTask;
+    shared_qobject_ptr<JavaListLoadTask> m_load_task;
     QList<BaseVersion::Ptr> m_vlist;
+    bool m_only_managed_versions;
 };
 
 class JavaListLoadTask : public Task {
     Q_OBJECT
 
    public:
-    explicit JavaListLoadTask(JavaInstallList* vlist);
-    virtual ~JavaListLoadTask();
+    explicit JavaListLoadTask(JavaInstallList* vlist, bool onlyManagedVersions = false);
+    virtual ~JavaListLoadTask() = default;
 
+   protected:
     void executeTask() override;
    public slots:
     void javaCheckerFinished();
 
    protected:
-    shared_qobject_ptr<JavaCheckerJob> m_job;
+    Task::Ptr m_job;
     JavaInstallList* m_list;
-    JavaInstall* m_currentRecommended;
+    JavaInstall* m_current_recommended;
+    QList<JavaChecker::Result> m_results;
+    bool m_only_managed_versions;
 };
diff --git a/launcher/java/JavaMetadata.cpp b/launcher/java/JavaMetadata.cpp
new file mode 100644
index 000000000..2d68f55c8
--- /dev/null
+++ b/launcher/java/JavaMetadata.cpp
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "java/JavaMetadata.h"
+
+#include <memory>
+
+#include "Json.h"
+#include "StringUtils.h"
+#include "java/JavaVersion.h"
+#include "minecraft/ParseUtils.h"
+
+namespace Java {
+
+DownloadType parseDownloadType(QString javaDownload)
+{
+    if (javaDownload == "manifest")
+        return DownloadType::Manifest;
+    else if (javaDownload == "archive")
+        return DownloadType::Archive;
+    else
+        return DownloadType::Unknown;
+}
+QString downloadTypeToString(DownloadType javaDownload)
+{
+    switch (javaDownload) {
+        case DownloadType::Manifest:
+            return "manifest";
+        case DownloadType::Archive:
+            return "archive";
+        case DownloadType::Unknown:
+            break;
+    }
+    return "unknown";
+}
+MetadataPtr parseJavaMeta(const QJsonObject& in)
+{
+    auto meta = std::make_shared<Metadata>();
+
+    meta->m_name = Json::ensureString(in, "name", "");
+    meta->vendor = Json::ensureString(in, "vendor", "");
+    meta->url = Json::ensureString(in, "url", "");
+    meta->releaseTime = timeFromS3Time(Json::ensureString(in, "releaseTime", ""));
+    meta->downloadType = parseDownloadType(Json::ensureString(in, "downloadType", ""));
+    meta->packageType = Json::ensureString(in, "packageType", "");
+    meta->runtimeOS = Json::ensureString(in, "runtimeOS", "unknown");
+
+    if (in.contains("checksum")) {
+        auto obj = Json::requireObject(in, "checksum");
+        meta->checksumHash = Json::ensureString(obj, "hash", "");
+        meta->checksumType = Json::ensureString(obj, "type", "");
+    }
+
+    if (in.contains("version")) {
+        auto obj = Json::requireObject(in, "version");
+        auto name = Json::ensureString(obj, "name", "");
+        auto major = Json::ensureInteger(obj, "major", 0);
+        auto minor = Json::ensureInteger(obj, "minor", 0);
+        auto security = Json::ensureInteger(obj, "security", 0);
+        auto build = Json::ensureInteger(obj, "build", 0);
+        meta->version = JavaVersion(major, minor, security, build, name);
+    }
+    return meta;
+}
+
+bool Metadata::operator<(const Metadata& rhs)
+{
+    auto id = version;
+    if (id < rhs.version) {
+        return true;
+    }
+    if (id > rhs.version) {
+        return false;
+    }
+    auto date = releaseTime;
+    if (date < rhs.releaseTime) {
+        return true;
+    }
+    if (date > rhs.releaseTime) {
+        return false;
+    }
+    return StringUtils::naturalCompare(m_name, rhs.m_name, Qt::CaseInsensitive) < 0;
+}
+
+bool Metadata::operator==(const Metadata& rhs)
+{
+    return version == rhs.version && m_name == rhs.m_name;
+}
+
+bool Metadata::operator>(const Metadata& rhs)
+{
+    return (!operator<(rhs)) && (!operator==(rhs));
+}
+
+bool Metadata::operator<(BaseVersion& a)
+{
+    try {
+        return operator<(dynamic_cast<Metadata&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator<(a);
+    }
+}
+
+bool Metadata::operator>(BaseVersion& a)
+{
+    try {
+        return operator>(dynamic_cast<Metadata&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator>(a);
+    }
+}
+
+}  // namespace Java
diff --git a/launcher/java/JavaMetadata.h b/launcher/java/JavaMetadata.h
new file mode 100644
index 000000000..77a42fd78
--- /dev/null
+++ b/launcher/java/JavaMetadata.h
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <QDateTime>
+#include <QJsonObject>
+#include <QString>
+
+#include <memory>
+
+#include "BaseVersion.h"
+#include "java/JavaVersion.h"
+
+namespace Java {
+
+enum class DownloadType { Manifest, Archive, Unknown };
+
+class Metadata : public BaseVersion {
+   public:
+    virtual QString descriptor() override { return version.toString(); }
+
+    virtual QString name() override { return m_name; }
+
+    virtual QString typeString() const override { return vendor; }
+
+    virtual bool operator<(BaseVersion& a) override;
+    virtual bool operator>(BaseVersion& a) override;
+    bool operator<(const Metadata& rhs);
+    bool operator==(const Metadata& rhs);
+    bool operator>(const Metadata& rhs);
+
+    QString m_name;
+    QString vendor;
+    QString url;
+    QDateTime releaseTime;
+    QString checksumType;
+    QString checksumHash;
+    DownloadType downloadType;
+    QString packageType;
+    JavaVersion version;
+    QString runtimeOS;
+};
+using MetadataPtr = std::shared_ptr<Metadata>;
+
+DownloadType parseDownloadType(QString javaDownload);
+QString downloadTypeToString(DownloadType javaDownload);
+MetadataPtr parseJavaMeta(const QJsonObject& libObj);
+
+}  // namespace Java
\ No newline at end of file
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 361cdef6b..beb54b003 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -182,56 +182,58 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
     else if (keyType == KEY_WOW64_32KEY)
         archType = "32";
 
-    HKEY jreKey;
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.toStdWString().c_str(), 0, KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) ==
-        ERROR_SUCCESS) {
-        // Read the current type version from the registry.
-        // This will be used to find any key that contains the JavaHome value.
-
-        WCHAR subKeyName[255];
-        DWORD subKeyNameSize, numSubKeys, retCode;
-
-        // Get the number of subkeys
-        RegQueryInfoKeyW(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
-        // Iterate until RegEnumKeyEx fails
-        if (numSubKeys > 0) {
-            for (DWORD i = 0; i < numSubKeys; i++) {
-                subKeyNameSize = 255;
-                retCode = RegEnumKeyExW(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL, NULL);
-                QString newSubkeyName = QString::fromWCharArray(subKeyName);
-                if (retCode == ERROR_SUCCESS) {
-                    // Now open the registry key for the version that we just got.
-                    QString newKeyName = keyName + "\\" + newSubkeyName + subkeySuffix;
-
-                    HKEY newKey;
-                    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, newKeyName.toStdWString().c_str(), 0, KEY_READ | keyType, &newKey) ==
-                        ERROR_SUCCESS) {
-                        // Read the JavaHome value to find where Java is installed.
-                        DWORD valueSz = 0;
-                        if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL, &valueSz) == ERROR_SUCCESS) {
-                            WCHAR* value = new WCHAR[valueSz];
-                            RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE*)value, &valueSz);
-
-                            QString newValue = QString::fromWCharArray(value);
-                            delete[] value;
-
-                            // Now, we construct the version object and add it to the list.
-                            JavaInstallPtr javaVersion(new JavaInstall());
-
-                            javaVersion->id = newSubkeyName;
-                            javaVersion->arch = archType;
-                            javaVersion->path = QDir(FS::PathCombine(newValue, "bin")).absoluteFilePath("javaw.exe");
-                            javas.append(javaVersion);
+    for (HKEY baseRegistry : { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }) {
+        HKEY jreKey;
+        if (RegOpenKeyExW(baseRegistry, keyName.toStdWString().c_str(), 0, KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) ==
+            ERROR_SUCCESS) {
+            // Read the current type version from the registry.
+            // This will be used to find any key that contains the JavaHome value.
+
+            WCHAR subKeyName[255];
+            DWORD subKeyNameSize, numSubKeys, retCode;
+
+            // Get the number of subkeys
+            RegQueryInfoKeyW(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+            // Iterate until RegEnumKeyEx fails
+            if (numSubKeys > 0) {
+                for (DWORD i = 0; i < numSubKeys; i++) {
+                    subKeyNameSize = 255;
+                    retCode = RegEnumKeyExW(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL, NULL);
+                    QString newSubkeyName = QString::fromWCharArray(subKeyName);
+                    if (retCode == ERROR_SUCCESS) {
+                        // Now open the registry key for the version that we just got.
+                        QString newKeyName = keyName + "\\" + newSubkeyName + subkeySuffix;
+
+                        HKEY newKey;
+                        if (RegOpenKeyExW(baseRegistry, newKeyName.toStdWString().c_str(), 0, KEY_READ | keyType, &newKey) ==
+                            ERROR_SUCCESS) {
+                            // Read the JavaHome value to find where Java is installed.
+                            DWORD valueSz = 0;
+                            if (RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, NULL, &valueSz) == ERROR_SUCCESS) {
+                                WCHAR* value = new WCHAR[valueSz];
+                                RegQueryValueExW(newKey, keyJavaDir.toStdWString().c_str(), NULL, NULL, (BYTE*)value, &valueSz);
+
+                                QString newValue = QString::fromWCharArray(value);
+                                delete[] value;
+
+                                // Now, we construct the version object and add it to the list.
+                                JavaInstallPtr javaVersion(new JavaInstall());
+
+                                javaVersion->id = newSubkeyName;
+                                javaVersion->arch = archType;
+                                javaVersion->path = QDir(FS::PathCombine(newValue, "bin")).absoluteFilePath("javaw.exe");
+                                javas.append(javaVersion);
+                            }
+
+                            RegCloseKey(newKey);
                         }
-
-                        RegCloseKey(newKey);
                     }
                 }
             }
-        }
 
-        RegCloseKey(jreKey);
+            RegCloseKey(jreKey);
+        }
     }
 
     return javas;
@@ -345,6 +347,7 @@ QList<QString> JavaUtils::FindJavaPaths()
     }
 
     candidates.append(getMinecraftJavaBundle());
+    candidates.append(getPrismJavaBundle());
     candidates = addJavasFromEnv(candidates);
     candidates.removeDuplicates();
     return candidates;
@@ -374,25 +377,43 @@ QList<QString> JavaUtils::FindJavaPaths()
     auto home = qEnvironmentVariable("HOME");
 
     // javas downloaded by sdkman
-    javas.append(FS::PathCombine(home, ".sdkman/candidates/java"));
+    QDir sdkmanDir(FS::PathCombine(home, ".sdkman/candidates/java"));
+    QStringList sdkmanJavas = sdkmanDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    foreach (const QString& java, sdkmanJavas) {
+        javas.append(sdkmanDir.absolutePath() + "/" + java + "/bin/java");
+    }
+
+    // java in user library folder (like from intellij downloads)
+    QDir userLibraryJVMDir(FS::PathCombine(home, "Library/Java/JavaVirtualMachines/"));
+    QStringList userLibraryJVMJavas = userLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    foreach (const QString& java, userLibraryJVMJavas) {
+        javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
+        javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
+    }
 
     javas.append(getMinecraftJavaBundle());
+    javas.append(getPrismJavaBundle());
     javas = addJavasFromEnv(javas);
     javas.removeDuplicates();
     return javas;
 }
 
-#elif defined(Q_OS_LINUX)
+#elif defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD)
 QList<QString> JavaUtils::FindJavaPaths()
 {
     QList<QString> javas;
     javas.append(this->GetDefaultJava()->path);
-    auto scanJavaDir = [&](const QString& dirPath) {
+    auto scanJavaDir = [&](
+                           const QString& dirPath,
+                           const std::function<bool(const QFileInfo&)>& filter = [](const QFileInfo&) { return true; }) {
         QDir dir(dirPath);
         if (!dir.exists())
             return;
         auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
         for (auto& entry : entries) {
+            if (!filter(entry))
+                continue;
+
             QString prefix;
             prefix = entry.canonicalFilePath();
             javas.append(FS::PathCombine(prefix, "jre/bin/java"));
@@ -407,12 +428,21 @@ QList<QString> JavaUtils::FindJavaPaths()
             scanJavaDir(snap + dirPath);
         }
     };
+#if defined(Q_OS_LINUX)
     // oracle RPMs
     scanJavaDirs("/usr/java");
     // general locations used by distro packaging
     scanJavaDirs("/usr/lib/jvm");
     scanJavaDirs("/usr/lib64/jvm");
     scanJavaDirs("/usr/lib32/jvm");
+    // Gentoo's locations for openjdk and openjdk-bin respectively
+    auto gentooFilter = [](const QFileInfo& info) {
+        QString fileName = info.fileName();
+        return fileName.startsWith("openjdk-") || fileName.startsWith("openj9-");
+    };
+    scanJavaDir("/usr/lib64", gentooFilter);
+    scanJavaDir("/usr/lib", gentooFilter);
+    scanJavaDir("/opt", gentooFilter);
     // javas stored in Prism Launcher's folder
     scanJavaDirs("java");
     // manually installed JDKs in /opt
@@ -421,7 +451,10 @@ QList<QString> JavaUtils::FindJavaPaths()
     scanJavaDirs("/opt/ibm");  // IBM Semeru Certified Edition
     // flatpak
     scanJavaDirs("/app/jdk");
-
+#elif defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD)
+    // ports install to /usr/local on OpenBSD & FreeBSD
+    scanJavaDirs("/usr/local");
+#endif
     auto home = qEnvironmentVariable("HOME");
 
     // javas downloaded by IntelliJ
@@ -432,6 +465,7 @@ QList<QString> JavaUtils::FindJavaPaths()
     scanJavaDirs(FS::PathCombine(home, ".gradle/jdks"));
 
     javas.append(getMinecraftJavaBundle());
+    javas.append(getPrismJavaBundle());
     javas = addJavasFromEnv(javas);
     javas.removeDuplicates();
     return javas;
@@ -445,6 +479,8 @@ QList<QString> JavaUtils::FindJavaPaths()
     javas.append(this->GetDefaultJava()->path);
 
     javas.append(getMinecraftJavaBundle());
+    javas.append(getPrismJavaBundle());
+    javas.removeDuplicates();
     return addJavasFromEnv(javas);
 }
 #endif
@@ -456,12 +492,10 @@ QString JavaUtils::getJavaCheckPath()
 
 QStringList getMinecraftJavaBundle()
 {
-    QString executable = "java";
     QStringList processpaths;
 #if defined(Q_OS_OSX)
     processpaths << FS::PathCombine(QDir::homePath(), FS::PathCombine("Library", "Application Support", "minecraft", "runtime"));
 #elif defined(Q_OS_WIN32)
-    executable += "w.exe";
 
     auto appDataPath = QProcessEnvironment::systemEnvironment().value("APPDATA", "");
     processpaths << FS::PathCombine(QFileInfo(appDataPath).absoluteFilePath(), ".minecraft", "runtime");
@@ -486,7 +520,7 @@ QStringList getMinecraftJavaBundle()
         auto binFound = false;
         for (auto& entry : entries) {
             if (entry.baseName() == "bin") {
-                javas.append(FS::PathCombine(entry.canonicalFilePath(), executable));
+                javas.append(FS::PathCombine(entry.canonicalFilePath(), JavaUtils::javaExecutable));
                 binFound = true;
                 break;
             }
@@ -499,3 +533,33 @@ QStringList getMinecraftJavaBundle()
     }
     return javas;
 }
+
+#if defined(Q_OS_WIN32)
+const QString JavaUtils::javaExecutable = "javaw.exe";
+#else
+const QString JavaUtils::javaExecutable = "java";
+#endif
+
+QStringList getPrismJavaBundle()
+{
+    QList<QString> javas;
+
+    auto scanDir = [&](QString prefix) {
+        javas.append(FS::PathCombine(prefix, "jre", "bin", JavaUtils::javaExecutable));
+        javas.append(FS::PathCombine(prefix, "bin", JavaUtils::javaExecutable));
+        javas.append(FS::PathCombine(prefix, JavaUtils::javaExecutable));
+    };
+    auto scanJavaDir = [&](const QString& dirPath) {
+        QDir dir(dirPath);
+        if (!dir.exists())
+            return;
+        auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+        for (auto& entry : entries) {
+            scanDir(entry.canonicalFilePath());
+        }
+    };
+
+    scanJavaDir(APPLICATION->javaPath());
+
+    return javas;
+}
diff --git a/launcher/java/JavaUtils.h b/launcher/java/JavaUtils.h
index 2fb03af7a..eb3a17316 100644
--- a/launcher/java/JavaUtils.h
+++ b/launcher/java/JavaUtils.h
@@ -15,10 +15,9 @@
 
 #pragma once
 
+#include <QProcess>
 #include <QStringList>
-
-#include "JavaChecker.h"
-#include "JavaInstallList.h"
+#include "java/JavaInstall.h"
 
 #ifdef Q_OS_WIN
 #include <windows.h>
@@ -27,6 +26,7 @@
 QString stripVariableEntries(QString name, QString target, QString remove);
 QProcessEnvironment CleanEnviroment();
 QStringList getMinecraftJavaBundle();
+QStringList getPrismJavaBundle();
 
 class JavaUtils : public QObject {
     Q_OBJECT
@@ -42,4 +42,5 @@ class JavaUtils : public QObject {
 #endif
 
     static QString getJavaCheckPath();
+    static const QString javaExecutable;
 };
diff --git a/launcher/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp
index b77bf2adf..bca50f2c9 100644
--- a/launcher/java/JavaVersion.cpp
+++ b/launcher/java/JavaVersion.cpp
@@ -43,12 +43,18 @@ QString JavaVersion::toString() const
     return m_string;
 }
 
-bool JavaVersion::requiresPermGen()
+bool JavaVersion::requiresPermGen() const
 {
     return !m_parseable || m_major < 8;
 }
 
-bool JavaVersion::isModular()
+bool JavaVersion::defaultsToUtf8() const
+{
+    // starting from Java 18, UTF-8 is the default charset: https://openjdk.org/jeps/400
+    return m_parseable && m_major >= 18;
+}
+
+bool JavaVersion::isModular() const
 {
     return m_parseable && m_major >= 9;
 }
@@ -59,12 +65,6 @@ bool JavaVersion::operator<(const JavaVersion& rhs)
         auto major = m_major;
         auto rmajor = rhs.m_major;
 
-        // HACK: discourage using java 9
-        if (major > 8)
-            major = -major;
-        if (rmajor > 8)
-            rmajor = -rmajor;
-
         if (major < rmajor)
             return true;
         if (major > rmajor)
@@ -109,3 +109,24 @@ bool JavaVersion::operator>(const JavaVersion& rhs)
 {
     return (!operator<(rhs)) && (!operator==(rhs));
 }
+
+JavaVersion::JavaVersion(int major, int minor, int security, int build, QString name)
+    : m_major(major), m_minor(minor), m_security(security), m_name(name), m_parseable(true)
+{
+    QStringList versions;
+    if (build != 0) {
+        m_prerelease = QString::number(build);
+        versions.push_front(m_prerelease);
+    }
+    if (m_security != 0)
+        versions.push_front(QString::number(m_security));
+    else if (!versions.isEmpty())
+        versions.push_front("0");
+
+    if (m_minor != 0)
+        versions.push_front(QString::number(m_minor));
+    else if (!versions.isEmpty())
+        versions.push_front("0");
+    versions.push_front(QString::number(m_major));
+    m_string = versions.join(".");
+}
diff --git a/launcher/java/JavaVersion.h b/launcher/java/JavaVersion.h
index 421578ea1..c070bdeec 100644
--- a/launcher/java/JavaVersion.h
+++ b/launcher/java/JavaVersion.h
@@ -16,6 +16,7 @@ class JavaVersion {
    public:
     JavaVersion() {}
     JavaVersion(const QString& rhs);
+    JavaVersion(int major, int minor, int security, int build = 0, QString name = "");
 
     JavaVersion& operator=(const QString& rhs);
 
@@ -23,21 +24,24 @@ class JavaVersion {
     bool operator==(const JavaVersion& rhs);
     bool operator>(const JavaVersion& rhs);
 
-    bool requiresPermGen();
-
-    bool isModular();
+    bool requiresPermGen() const;
+    bool defaultsToUtf8() const;
+    bool isModular() const;
 
     QString toString() const;
 
-    int major() { return m_major; }
-    int minor() { return m_minor; }
-    int security() { return m_security; }
+    int major() const { return m_major; }
+    int minor() const { return m_minor; }
+    int security() const { return m_security; }
+    QString build() const { return m_prerelease; }
+    QString name() const { return m_name; }
 
    private:
     QString m_string;
     int m_major = 0;
     int m_minor = 0;
     int m_security = 0;
+    QString m_name = "";
     bool m_parseable = false;
     QString m_prerelease;
 };
diff --git a/launcher/java/download/ArchiveDownloadTask.cpp b/launcher/java/download/ArchiveDownloadTask.cpp
new file mode 100644
index 000000000..bb7cc568d
--- /dev/null
+++ b/launcher/java/download/ArchiveDownloadTask.cpp
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "java/download/ArchiveDownloadTask.h"
+#include <quazip.h>
+#include <memory>
+#include "MMCZip.h"
+
+#include "Application.h"
+#include "Untar.h"
+#include "net/ChecksumValidator.h"
+#include "net/NetJob.h"
+#include "tasks/Task.h"
+
+namespace Java {
+ArchiveDownloadTask::ArchiveDownloadTask(QUrl url, QString final_path, QString checksumType, QString checksumHash)
+    : m_url(url), m_final_path(final_path), m_checksum_type(checksumType), m_checksum_hash(checksumHash)
+{}
+
+void ArchiveDownloadTask::executeTask()
+{
+    // JRE found ! download the zip
+    setStatus(tr("Downloading Java"));
+
+    MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("java", m_url.fileName());
+
+    auto download = makeShared<NetJob>(QString("JRE::DownloadJava"), APPLICATION->network());
+    auto action = Net::Download::makeCached(m_url, entry);
+    if (!m_checksum_hash.isEmpty() && !m_checksum_type.isEmpty()) {
+        auto hashType = QCryptographicHash::Algorithm::Sha1;
+        if (m_checksum_type == "sha256") {
+            hashType = QCryptographicHash::Algorithm::Sha256;
+        }
+        action->addValidator(new Net::ChecksumValidator(hashType, QByteArray::fromHex(m_checksum_hash.toUtf8())));
+    }
+    download->addNetAction(action);
+    auto fullPath = entry->getFullPath();
+
+    connect(download.get(), &Task::failed, this, &ArchiveDownloadTask::emitFailed);
+    connect(download.get(), &Task::progress, this, &ArchiveDownloadTask::setProgress);
+    connect(download.get(), &Task::stepProgress, this, &ArchiveDownloadTask::propagateStepProgress);
+    connect(download.get(), &Task::status, this, &ArchiveDownloadTask::setStatus);
+    connect(download.get(), &Task::details, this, &ArchiveDownloadTask::setDetails);
+    connect(download.get(), &Task::succeeded, [this, fullPath] {
+        // This should do all of the extracting and creating folders
+        extractJava(fullPath);
+    });
+    m_task = download;
+    m_task->start();
+}
+
+void ArchiveDownloadTask::extractJava(QString input)
+{
+    setStatus(tr("Extracting Java"));
+    if (input.endsWith("tar")) {
+        setStatus(tr("Extracting Java (Progress is not reported for tar archives)"));
+        QFile in(input);
+        if (!in.open(QFile::ReadOnly)) {
+            emitFailed(tr("Unable to open supplied tar file."));
+            return;
+        }
+        if (!Tar::extract(&in, QDir(m_final_path).absolutePath())) {
+            emitFailed(tr("Unable to extract supplied tar file."));
+            return;
+        }
+        emitSucceeded();
+        return;
+    } else if (input.endsWith("tar.gz") || input.endsWith("taz") || input.endsWith("tgz")) {
+        setStatus(tr("Extracting Java (Progress is not reported for tar archives)"));
+        if (!GZTar::extract(input, QDir(m_final_path).absolutePath())) {
+            emitFailed(tr("Unable to extract supplied tar file."));
+            return;
+        }
+        emitSucceeded();
+        return;
+    } else if (input.endsWith("zip")) {
+        auto zip = std::make_shared<QuaZip>(input);
+        if (!zip->open(QuaZip::mdUnzip)) {
+            emitFailed(tr("Unable to open supplied zip file."));
+            return;
+        }
+        auto files = zip->getFileNameList();
+        if (files.isEmpty()) {
+            emitFailed(tr("No files were found in the supplied zip file."));
+            return;
+        }
+        m_task = makeShared<MMCZip::ExtractZipTask>(zip, m_final_path, files[0]);
+
+        auto progressStep = std::make_shared<TaskStepProgress>();
+        connect(m_task.get(), &Task::finished, this, [this, progressStep] {
+            progressStep->state = TaskStepState::Succeeded;
+            stepProgress(*progressStep);
+        });
+
+        connect(m_task.get(), &Task::succeeded, this, &ArchiveDownloadTask::emitSucceeded);
+        connect(m_task.get(), &Task::aborted, this, &ArchiveDownloadTask::emitAborted);
+        connect(m_task.get(), &Task::failed, this, [this, progressStep](QString reason) {
+            progressStep->state = TaskStepState::Failed;
+            stepProgress(*progressStep);
+            emitFailed(reason);
+        });
+        connect(m_task.get(), &Task::stepProgress, this, &ArchiveDownloadTask::propagateStepProgress);
+
+        connect(m_task.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
+            progressStep->update(current, total);
+            stepProgress(*progressStep);
+        });
+        connect(m_task.get(), &Task::status, this, [this, progressStep](QString status) {
+            progressStep->status = status;
+            stepProgress(*progressStep);
+        });
+        m_task->start();
+        return;
+    }
+
+    emitFailed(tr("Could not determine archive type!"));
+}
+
+bool ArchiveDownloadTask::abort()
+{
+    auto aborted = canAbort();
+    if (m_task)
+        aborted = m_task->abort();
+    emitAborted();
+    return aborted;
+};
+}  // namespace Java
\ No newline at end of file
diff --git a/launcher/java/download/ArchiveDownloadTask.h b/launcher/java/download/ArchiveDownloadTask.h
new file mode 100644
index 000000000..1db33763a
--- /dev/null
+++ b/launcher/java/download/ArchiveDownloadTask.h
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QUrl>
+#include "tasks/Task.h"
+
+namespace Java {
+class ArchiveDownloadTask : public Task {
+    Q_OBJECT
+   public:
+    ArchiveDownloadTask(QUrl url, QString final_path, QString checksumType = "", QString checksumHash = "");
+    virtual ~ArchiveDownloadTask() = default;
+
+    [[nodiscard]] bool canAbort() const override { return true; }
+    void executeTask() override;
+    virtual bool abort() override;
+
+   private slots:
+    void extractJava(QString input);
+
+   protected:
+    QUrl m_url;
+    QString m_final_path;
+    QString m_checksum_type;
+    QString m_checksum_hash;
+    Task::Ptr m_task;
+};
+}  // namespace Java
\ No newline at end of file
diff --git a/launcher/java/download/ManifestDownloadTask.cpp b/launcher/java/download/ManifestDownloadTask.cpp
new file mode 100644
index 000000000..836afeaac
--- /dev/null
+++ b/launcher/java/download/ManifestDownloadTask.cpp
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "java/download/ManifestDownloadTask.h"
+
+#include "Application.h"
+#include "FileSystem.h"
+#include "Json.h"
+#include "net/ChecksumValidator.h"
+#include "net/NetJob.h"
+
+struct File {
+    QString path;
+    QString url;
+    QByteArray hash;
+    bool isExec;
+};
+
+namespace Java {
+ManifestDownloadTask::ManifestDownloadTask(QUrl url, QString final_path, QString checksumType, QString checksumHash)
+    : m_url(url), m_final_path(final_path), m_checksum_type(checksumType), m_checksum_hash(checksumHash)
+{}
+
+void ManifestDownloadTask::executeTask()
+{
+    setStatus(tr("Downloading Java"));
+    auto download = makeShared<NetJob>(QString("JRE::DownloadJava"), APPLICATION->network());
+    auto files = std::make_shared<QByteArray>();
+
+    auto action = Net::Download::makeByteArray(m_url, files);
+    if (!m_checksum_hash.isEmpty() && !m_checksum_type.isEmpty()) {
+        auto hashType = QCryptographicHash::Algorithm::Sha1;
+        if (m_checksum_type == "sha256") {
+            hashType = QCryptographicHash::Algorithm::Sha256;
+        }
+        action->addValidator(new Net::ChecksumValidator(hashType, QByteArray::fromHex(m_checksum_hash.toUtf8())));
+    }
+    download->addNetAction(action);
+
+    connect(download.get(), &Task::failed, this, &ManifestDownloadTask::emitFailed);
+    connect(download.get(), &Task::progress, this, &ManifestDownloadTask::setProgress);
+    connect(download.get(), &Task::stepProgress, this, &ManifestDownloadTask::propagateStepProgress);
+    connect(download.get(), &Task::status, this, &ManifestDownloadTask::setStatus);
+    connect(download.get(), &Task::details, this, &ManifestDownloadTask::setDetails);
+
+    connect(download.get(), &Task::succeeded, [files, this] {
+        QJsonParseError parse_error{};
+        QJsonDocument doc = QJsonDocument::fromJson(*files, &parse_error);
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response at " << parse_error.offset << ". Reason: " << parse_error.errorString();
+            qWarning() << *files;
+            emitFailed(parse_error.errorString());
+            return;
+        }
+        downloadJava(doc);
+    });
+    m_task = download;
+    m_task->start();
+}
+
+void ManifestDownloadTask::downloadJava(const QJsonDocument& doc)
+{
+    // valid json doc, begin making jre spot
+    FS::ensureFolderPathExists(m_final_path);
+    std::vector<File> toDownload;
+    auto list = Json::ensureObject(Json::ensureObject(doc.object()), "files");
+    for (const auto& paths : list.keys()) {
+        auto file = FS::PathCombine(m_final_path, paths);
+
+        const QJsonObject& meta = Json::ensureObject(list, paths);
+        auto type = Json::ensureString(meta, "type");
+        if (type == "directory") {
+            FS::ensureFolderPathExists(file);
+        } else if (type == "link") {
+            // this is linux only !
+            auto path = Json::ensureString(meta, "target");
+            if (!path.isEmpty()) {
+                auto target = FS::PathCombine(file, "../" + path);
+                QFile(target).link(file);
+            }
+        } else if (type == "file") {
+            // TODO download compressed version if it exists ?
+            auto raw = Json::ensureObject(Json::ensureObject(meta, "downloads"), "raw");
+            auto isExec = Json::ensureBoolean(meta, "executable", false);
+            auto url = Json::ensureString(raw, "url");
+            if (!url.isEmpty() && QUrl(url).isValid()) {
+                auto f = File{ file, url, QByteArray::fromHex(Json::ensureString(raw, "sha1").toLatin1()), isExec };
+                toDownload.push_back(f);
+            }
+        }
+    }
+    auto elementDownload = makeShared<NetJob>("JRE::FileDownload", APPLICATION->network());
+    for (const auto& file : toDownload) {
+        auto dl = Net::Download::makeFile(file.url, file.path);
+        if (!file.hash.isEmpty()) {
+            dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, file.hash));
+        }
+        if (file.isExec) {
+            connect(dl.get(), &Net::Download::succeeded,
+                    [file] { QFile(file.path).setPermissions(QFile(file.path).permissions() | QFileDevice::Permissions(0x1111)); });
+        }
+        elementDownload->addNetAction(dl);
+    }
+
+    connect(elementDownload.get(), &Task::failed, this, &ManifestDownloadTask::emitFailed);
+    connect(elementDownload.get(), &Task::progress, this, &ManifestDownloadTask::setProgress);
+    connect(elementDownload.get(), &Task::stepProgress, this, &ManifestDownloadTask::propagateStepProgress);
+    connect(elementDownload.get(), &Task::status, this, &ManifestDownloadTask::setStatus);
+    connect(elementDownload.get(), &Task::details, this, &ManifestDownloadTask::setDetails);
+
+    connect(elementDownload.get(), &Task::succeeded, this, &ManifestDownloadTask::emitSucceeded);
+    m_task = elementDownload;
+    m_task->start();
+}
+
+bool ManifestDownloadTask::abort()
+{
+    auto aborted = canAbort();
+    if (m_task)
+        aborted = m_task->abort();
+    emitAborted();
+    return aborted;
+};
+}  // namespace Java
\ No newline at end of file
diff --git a/launcher/java/download/ManifestDownloadTask.h b/launcher/java/download/ManifestDownloadTask.h
new file mode 100644
index 000000000..ae9e0d0ed
--- /dev/null
+++ b/launcher/java/download/ManifestDownloadTask.h
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QUrl>
+#include "tasks/Task.h"
+
+namespace Java {
+
+class ManifestDownloadTask : public Task {
+    Q_OBJECT
+   public:
+    ManifestDownloadTask(QUrl url, QString final_path, QString checksumType = "", QString checksumHash = "");
+    virtual ~ManifestDownloadTask() = default;
+
+    [[nodiscard]] bool canAbort() const override { return true; }
+    void executeTask() override;
+    virtual bool abort() override;
+
+   private slots:
+    void downloadJava(const QJsonDocument& doc);
+
+   protected:
+    QUrl m_url;
+    QString m_final_path;
+    QString m_checksum_type;
+    QString m_checksum_hash;
+    Task::Ptr m_task;
+};
+}  // namespace Java
\ No newline at end of file
diff --git a/launcher/java/download/SymlinkTask.cpp b/launcher/java/download/SymlinkTask.cpp
new file mode 100644
index 000000000..843c7caa9
--- /dev/null
+++ b/launcher/java/download/SymlinkTask.cpp
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "java/download/SymlinkTask.h"
+#include <QFileInfo>
+
+#include "FileSystem.h"
+
+namespace Java {
+SymlinkTask::SymlinkTask(QString final_path) : m_path(final_path) {}
+
+QString findBinPath(QString root, QString pattern)
+{
+    auto path = FS::PathCombine(root, pattern);
+    if (QFileInfo::exists(path)) {
+        return path;
+    }
+
+    auto entries = QDir(root).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+    for (auto& entry : entries) {
+        path = FS::PathCombine(entry.absoluteFilePath(), pattern);
+        if (QFileInfo::exists(path)) {
+            return path;
+        }
+    }
+
+    return {};
+}
+
+void SymlinkTask::executeTask()
+{
+    setStatus(tr("Checking for Java binary path"));
+    const auto binPath = FS::PathCombine("bin", "java");
+    const auto wantedPath = FS::PathCombine(m_path, binPath);
+    if (QFileInfo::exists(wantedPath)) {
+        emitSucceeded();
+        return;
+    }
+
+    setStatus(tr("Searching for Java binary path"));
+    const auto contentsPartialPath = FS::PathCombine("Contents", "Home", binPath);
+    const auto relativePathToBin = findBinPath(m_path, contentsPartialPath);
+    if (relativePathToBin.isEmpty()) {
+        emitFailed(tr("Failed to find Java binary path"));
+        return;
+    }
+    const auto folderToLink = relativePathToBin.chopped(binPath.length());
+
+    setStatus(tr("Collecting folders to symlink"));
+    auto entries = QDir(folderToLink).entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries);
+    QList<FS::LinkPair> files;
+    setProgress(0, entries.length());
+    for (auto& entry : entries) {
+        files.append({ entry.absoluteFilePath(), FS::PathCombine(m_path, entry.fileName()) });
+    }
+
+    setStatus(tr("Symlinking Java binary path"));
+    FS::create_link folderLink(files);
+    connect(&folderLink, &FS::create_link::fileLinked, [this](QString src, QString dst) { setProgress(m_progress + 1, m_progressTotal); });
+    if (!folderLink()) {
+        emitFailed(folderLink.getOSError().message().c_str());
+    } else {
+        emitSucceeded();
+    }
+}
+
+}  // namespace Java
\ No newline at end of file
diff --git a/launcher/java/download/SymlinkTask.h b/launcher/java/download/SymlinkTask.h
new file mode 100644
index 000000000..88cb20dd7
--- /dev/null
+++ b/launcher/java/download/SymlinkTask.h
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "tasks/Task.h"
+namespace Java {
+
+class SymlinkTask : public Task {
+    Q_OBJECT
+   public:
+    SymlinkTask(QString final_path);
+    virtual ~SymlinkTask() = default;
+
+    void executeTask() override;
+
+   protected:
+    QString m_path;
+    Task::Ptr m_task;
+};
+}  // namespace Java
\ No newline at end of file
diff --git a/launcher/launch/LaunchStep.cpp b/launcher/launch/LaunchStep.cpp
index ebc534617..f3e9dfce0 100644
--- a/launcher/launch/LaunchStep.cpp
+++ b/launcher/launch/LaunchStep.cpp
@@ -16,9 +16,8 @@
 #include "LaunchStep.h"
 #include "LaunchTask.h"
 
-void LaunchStep::bind(LaunchTask* parent)
+LaunchStep::LaunchStep(LaunchTask* parent) : Task(parent), m_parent(parent)
 {
-    m_parent = parent;
     connect(this, &LaunchStep::readyForLaunch, parent, &LaunchTask::onReadyForLaunch);
     connect(this, &LaunchStep::logLine, parent, &LaunchTask::onLogLine);
     connect(this, &LaunchStep::logLines, parent, &LaunchTask::onLogLines);
diff --git a/launcher/launch/LaunchStep.h b/launcher/launch/LaunchStep.h
index 6a28afb1f..d49d7545b 100644
--- a/launcher/launch/LaunchStep.h
+++ b/launcher/launch/LaunchStep.h
@@ -24,11 +24,8 @@ class LaunchTask;
 class LaunchStep : public Task {
     Q_OBJECT
    public: /* methods */
-    explicit LaunchStep(LaunchTask* parent) : Task(nullptr), m_parent(parent) { bind(parent); };
-    virtual ~LaunchStep() {};
-
-   private: /* methods */
-    void bind(LaunchTask* parent);
+    explicit LaunchStep(LaunchTask* parent);
+    virtual ~LaunchStep() = default;
 
    signals:
     void logLines(QStringList lines, MessageLevel::Enum level);
diff --git a/launcher/launch/LaunchTask.cpp b/launcher/launch/LaunchTask.cpp
index 06a32bd28..0251b302d 100644
--- a/launcher/launch/LaunchTask.cpp
+++ b/launcher/launch/LaunchTask.cpp
@@ -44,7 +44,6 @@
 #include <QRegularExpression>
 #include <QStandardPaths>
 #include "MessageLevel.h"
-#include "java/JavaChecker.h"
 #include "tasks/Task.h"
 
 void LaunchTask::init()
@@ -52,14 +51,14 @@ void LaunchTask::init()
     m_instance->setRunning(true);
 }
 
-shared_qobject_ptr<LaunchTask> LaunchTask::create(InstancePtr inst)
+shared_qobject_ptr<LaunchTask> LaunchTask::create(MinecraftInstancePtr inst)
 {
     shared_qobject_ptr<LaunchTask> proc(new LaunchTask(inst));
     proc->init();
     return proc;
 }
 
-LaunchTask::LaunchTask(InstancePtr instance) : m_instance(instance) {}
+LaunchTask::LaunchTask(MinecraftInstancePtr instance) : m_instance(instance) {}
 
 void LaunchTask::appendStep(shared_qobject_ptr<LaunchStep> step)
 {
diff --git a/launcher/launch/LaunchTask.h b/launcher/launch/LaunchTask.h
index ae24b9a26..56065af5b 100644
--- a/launcher/launch/LaunchTask.h
+++ b/launcher/launch/LaunchTask.h
@@ -37,31 +37,31 @@
 
 #pragma once
 #include <QObjectPtr.h>
+#include <minecraft/MinecraftInstance.h>
 #include <QProcess>
 #include "BaseInstance.h"
 #include "LaunchStep.h"
 #include "LogModel.h"
-#include "LoggedProcess.h"
 #include "MessageLevel.h"
 
 class LaunchTask : public Task {
     Q_OBJECT
    protected:
-    explicit LaunchTask(InstancePtr instance);
+    explicit LaunchTask(MinecraftInstancePtr instance);
     void init();
 
    public:
     enum State { NotStarted, Running, Waiting, Failed, Aborted, Finished };
 
    public: /* methods */
-    static shared_qobject_ptr<LaunchTask> create(InstancePtr inst);
-    virtual ~LaunchTask() {};
+    static shared_qobject_ptr<LaunchTask> create(MinecraftInstancePtr inst);
+    virtual ~LaunchTask() = default;
 
     void appendStep(shared_qobject_ptr<LaunchStep> step);
     void prependStep(shared_qobject_ptr<LaunchStep> step);
     void setCensorFilter(QMap<QString, QString> filter);
 
-    InstancePtr instance() { return m_instance; }
+    MinecraftInstancePtr instance() { return m_instance; }
 
     void setPid(qint64 pid) { m_pid = pid; }
 
@@ -116,7 +116,7 @@ class LaunchTask : public Task {
     void finalizeSteps(bool successful, const QString& error);
 
    protected: /* data */
-    InstancePtr m_instance;
+    MinecraftInstancePtr m_instance;
     shared_qobject_ptr<LogModel> m_logModel;
     QList<shared_qobject_ptr<LaunchStep>> m_steps;
     QMap<QString, QString> m_censorFilter;
diff --git a/launcher/launch/TaskStepWrapper.cpp b/launcher/launch/TaskStepWrapper.cpp
new file mode 100644
index 000000000..db9e8fad2
--- /dev/null
+++ b/launcher/launch/TaskStepWrapper.cpp
@@ -0,0 +1,67 @@
+/* Copyright 2013-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "TaskStepWrapper.h"
+#include "tasks/Task.h"
+
+void TaskStepWrapper::executeTask()
+{
+    if (m_state == Task::State::AbortedByUser) {
+        emitFailed(tr("Task aborted."));
+        return;
+    }
+    connect(m_task.get(), &Task::finished, this, &TaskStepWrapper::updateFinished);
+    connect(m_task.get(), &Task::progress, this, &TaskStepWrapper::setProgress);
+    connect(m_task.get(), &Task::stepProgress, this, &TaskStepWrapper::propagateStepProgress);
+    connect(m_task.get(), &Task::status, this, &TaskStepWrapper::setStatus);
+    connect(m_task.get(), &Task::details, this, &TaskStepWrapper::setDetails);
+    emit progressReportingRequest();
+}
+
+void TaskStepWrapper::proceed()
+{
+    m_task->start();
+}
+
+void TaskStepWrapper::updateFinished()
+{
+    if (m_task->wasSuccessful()) {
+        m_task.reset();
+        emitSucceeded();
+    } else {
+        QString reason = tr("Instance update failed because: %1\n\n").arg(m_task->failReason());
+        m_task.reset();
+        emit logLine(reason, MessageLevel::Fatal);
+        emitFailed(reason);
+    }
+}
+
+bool TaskStepWrapper::canAbort() const
+{
+    if (m_task) {
+        return m_task->canAbort();
+    }
+    return true;
+}
+
+bool TaskStepWrapper::abort()
+{
+    if (m_task && m_task->canAbort()) {
+        auto status = m_task->abort();
+        emitFailed("Aborted.");
+        return status;
+    }
+    return Task::abort();
+}
diff --git a/launcher/launch/steps/Update.h b/launcher/launch/TaskStepWrapper.h
similarity index 73%
rename from launcher/launch/steps/Update.h
rename to launcher/launch/TaskStepWrapper.h
index 878a43e7e..aec1b7037 100644
--- a/launcher/launch/steps/Update.h
+++ b/launcher/launch/TaskStepWrapper.h
@@ -21,12 +21,11 @@
 #include <launch/LaunchStep.h>
 #include <net/Mode.h>
 
-// FIXME: stupid. should be defined by the instance type? or even completely abstracted away...
-class Update : public LaunchStep {
+class TaskStepWrapper : public LaunchStep {
     Q_OBJECT
    public:
-    explicit Update(LaunchTask* parent, Net::Mode mode) : LaunchStep(parent), m_mode(mode) {};
-    virtual ~Update() {};
+    explicit TaskStepWrapper(LaunchTask* parent, Task::Ptr task) : LaunchStep(parent), m_task(task) {};
+    virtual ~TaskStepWrapper() = default;
 
     void executeTask() override;
     bool canAbort() const override;
@@ -38,7 +37,5 @@ class Update : public LaunchStep {
     void updateFinished();
 
    private:
-    Task::Ptr m_updateTask;
-    bool m_aborted = false;
-    Net::Mode m_mode = Net::Mode::Offline;
+    Task::Ptr m_task;
 };
diff --git a/launcher/launch/steps/CheckJava.cpp b/launcher/launch/steps/CheckJava.cpp
index 81337a88e..55d13b58c 100644
--- a/launcher/launch/steps/CheckJava.cpp
+++ b/launcher/launch/steps/CheckJava.cpp
@@ -37,6 +37,7 @@
 #include <FileSystem.h>
 #include <launch/LaunchTask.h>
 #include <sys.h>
+#include <QCryptographicHash>
 #include <QFileInfo>
 #include <QStandardPaths>
 #include "java/JavaUtils.h"
@@ -45,20 +46,23 @@ void CheckJava::executeTask()
 {
     auto instance = m_parent->instance();
     auto settings = instance->settings();
-    m_javaPath = FS::ResolveExecutable(settings->get("JavaPath").toString());
+
+    QString javaPathSetting = settings->get("JavaPath").toString();
+    m_javaPath = FS::ResolveExecutable(javaPathSetting);
+
     bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool();
 
     auto realJavaPath = QStandardPaths::findExecutable(m_javaPath);
     if (realJavaPath.isEmpty()) {
         if (perInstance) {
-            emit logLine(QString("The java binary \"%1\" couldn't be found. Please fix the java path "
+            emit logLine(QString("The Java binary \"%1\" couldn't be found. Please fix the Java path "
                                  "override in the instance's settings or disable it.")
-                             .arg(m_javaPath),
+                             .arg(javaPathSetting),
                          MessageLevel::Warning);
         } else {
-            emit logLine(QString("The java binary \"%1\" couldn't be found. Please set up java in "
+            emit logLine(QString("The Java binary \"%1\" couldn't be found. Please set up Java in "
                                  "the settings.")
-                             .arg(m_javaPath),
+                             .arg(javaPathSetting),
                          MessageLevel::Warning);
         }
         emitFailed(QString("Java path is not valid."));
@@ -90,11 +94,10 @@ void CheckJava::executeTask()
     // if timestamps are not the same, or something is missing, check!
     if (m_javaSignature != storedSignature || storedVersion.size() == 0 || storedArchitecture.size() == 0 ||
         storedRealArchitecture.size() == 0 || storedVendor.size() == 0) {
-        m_JavaChecker.reset(new JavaChecker);
+        m_JavaChecker.reset(new JavaChecker(realJavaPath, "", 0, 0, 0, 0, this));
         emit logLine(QString("Checking Java version..."), MessageLevel::Launcher);
         connect(m_JavaChecker.get(), &JavaChecker::checkFinished, this, &CheckJava::checkJavaFinished);
-        m_JavaChecker->m_path = realJavaPath;
-        m_JavaChecker->performCheck();
+        m_JavaChecker->start();
         return;
     } else {
         auto verString = instance->settings()->get("JavaVersion").toString();
@@ -103,13 +106,14 @@ void CheckJava::executeTask()
         auto vendorString = instance->settings()->get("JavaVendor").toString();
         printJavaInfo(verString, archString, realArchString, vendorString);
     }
+    m_parent->instance()->updateRuntimeContext();
     emitSucceeded();
 }
 
-void CheckJava::checkJavaFinished(JavaCheckResult result)
+void CheckJava::checkJavaFinished(const JavaChecker::Result& result)
 {
     switch (result.validity) {
-        case JavaCheckResult::Validity::Errored: {
+        case JavaChecker::Result::Validity::Errored: {
             // Error message displayed if java can't start
             emit logLine(QString("Could not start java:"), MessageLevel::Error);
             emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
@@ -117,14 +121,15 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
             emitFailed(QString("Could not start java!"));
             return;
         }
-        case JavaCheckResult::Validity::ReturnedInvalidData: {
+        case JavaChecker::Result::Validity::ReturnedInvalidData: {
             emit logLine(QString("Java checker returned some invalid data we don't understand:"), MessageLevel::Error);
             emit logLines(result.outLog.split('\n'), MessageLevel::Warning);
             emit logLine("\nMinecraft might not start properly.", MessageLevel::Launcher);
+            m_parent->instance()->updateRuntimeContext();
             emitSucceeded();
             return;
         }
-        case JavaCheckResult::Validity::Valid: {
+        case JavaChecker::Result::Validity::Valid: {
             auto instance = m_parent->instance();
             printJavaInfo(result.javaVersion.toString(), result.mojangPlatform, result.realPlatform, result.javaVendor);
             instance->settings()->set("JavaVersion", result.javaVersion.toString());
@@ -132,6 +137,7 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
             instance->settings()->set("JavaRealArchitecture", result.realPlatform);
             instance->settings()->set("JavaVendor", result.javaVendor);
             instance->settings()->set("JavaSignature", m_javaSignature);
+            m_parent->instance()->updateRuntimeContext();
             emitSucceeded();
             return;
         }
diff --git a/launcher/launch/steps/CheckJava.h b/launcher/launch/steps/CheckJava.h
index ac9c36244..1c59b0053 100644
--- a/launcher/launch/steps/CheckJava.h
+++ b/launcher/launch/steps/CheckJava.h
@@ -23,12 +23,12 @@ class CheckJava : public LaunchStep {
     Q_OBJECT
    public:
     explicit CheckJava(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~CheckJava() {};
+    virtual ~CheckJava() = default;
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }
    private slots:
-    void checkJavaFinished(JavaCheckResult result);
+    void checkJavaFinished(const JavaChecker::Result& result);
 
    private:
     void printJavaInfo(const QString& version, const QString& architecture, const QString& realArchitecture, const QString& vendor);
@@ -37,5 +37,5 @@ class CheckJava : public LaunchStep {
    private:
     QString m_javaPath;
     QString m_javaSignature;
-    JavaCheckerPtr m_JavaChecker;
+    JavaChecker::Ptr m_JavaChecker;
 };
diff --git a/launcher/launch/steps/LookupServerAddress.cpp b/launcher/launch/steps/LookupServerAddress.cpp
index 9bdac203b..4b67b3092 100644
--- a/launcher/launch/steps/LookupServerAddress.cpp
+++ b/launcher/launch/steps/LookupServerAddress.cpp
@@ -30,7 +30,7 @@ void LookupServerAddress::setLookupAddress(const QString& lookupAddress)
     m_dnsLookup->setName(QString("_minecraft._tcp.%1").arg(lookupAddress));
 }
 
-void LookupServerAddress::setOutputAddressPtr(MinecraftServerTargetPtr output)
+void LookupServerAddress::setOutputAddressPtr(MinecraftTarget::Ptr output)
 {
     m_output = std::move(output);
 }
diff --git a/launcher/launch/steps/LookupServerAddress.h b/launcher/launch/steps/LookupServerAddress.h
index acbd74309..506314ee8 100644
--- a/launcher/launch/steps/LookupServerAddress.h
+++ b/launcher/launch/steps/LookupServerAddress.h
@@ -19,20 +19,20 @@
 #include <launch/LaunchStep.h>
 #include <QDnsLookup>
 
-#include "minecraft/launch/MinecraftServerTarget.h"
+#include "minecraft/launch/MinecraftTarget.h"
 
 class LookupServerAddress : public LaunchStep {
     Q_OBJECT
    public:
     explicit LookupServerAddress(LaunchTask* parent);
-    virtual ~LookupServerAddress() {};
+    virtual ~LookupServerAddress() = default;
 
     virtual void executeTask();
     virtual bool abort();
     virtual bool canAbort() const { return true; }
 
     void setLookupAddress(const QString& lookupAddress);
-    void setOutputAddressPtr(MinecraftServerTargetPtr output);
+    void setOutputAddressPtr(MinecraftTarget::Ptr output);
 
    private slots:
     void on_dnsLookupFinished();
@@ -42,5 +42,5 @@ class LookupServerAddress : public LaunchStep {
 
     QDnsLookup* m_dnsLookup;
     QString m_lookupAddress;
-    MinecraftServerTargetPtr m_output;
+    MinecraftTarget::Ptr m_output;
 };
diff --git a/launcher/launch/steps/PrintServers.cpp b/launcher/launch/steps/PrintServers.cpp
new file mode 100644
index 000000000..ba96d37b9
--- /dev/null
+++ b/launcher/launch/steps/PrintServers.cpp
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Leia uwu <leia@tutamail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "PrintServers.h"
+#include "QHostInfo"
+
+PrintServers::PrintServers(LaunchTask* parent, const QStringList& servers) : LaunchStep(parent)
+{
+    m_servers = servers;
+}
+
+void PrintServers::executeTask()
+{
+    for (QString server : m_servers) {
+        QHostInfo::lookupHost(server, this, &PrintServers::resolveServer);
+    }
+}
+
+void PrintServers::resolveServer(const QHostInfo& host_info)
+{
+    QString server = host_info.hostName();
+    QString addresses = server + " resolves to:\n    [";
+
+    if (!host_info.addresses().isEmpty()) {
+        for (QHostAddress address : host_info.addresses()) {
+            addresses += address.toString();
+            if (!host_info.addresses().endsWith(address)) {
+                addresses += ", ";
+            }
+        }
+    } else {
+        addresses += "N/A";
+    }
+    addresses += "]\n\n";
+
+    m_server_to_address.insert(server, addresses);
+
+    // print server info in order once all servers are resolved
+    if (m_server_to_address.size() >= m_servers.size()) {
+        for (QString serv : m_servers) {
+            emit logLine(m_server_to_address.value(serv), MessageLevel::Launcher);
+        }
+        emitSucceeded();
+    }
+}
+
+bool PrintServers::canAbort() const
+{
+    return true;
+}
diff --git a/launcher/launch/steps/PrintServers.h b/launcher/launch/steps/PrintServers.h
new file mode 100644
index 000000000..7d2f1b194
--- /dev/null
+++ b/launcher/launch/steps/PrintServers.h
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Leia uwu <leia@tutamail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <LoggedProcess.h>
+#include <java/JavaChecker.h>
+#include <launch/LaunchStep.h>
+#include <QHostInfo>
+
+class PrintServers : public LaunchStep {
+    Q_OBJECT
+   public:
+    PrintServers(LaunchTask* parent, const QStringList& servers);
+
+    virtual void executeTask();
+    virtual bool canAbort() const;
+
+   private:
+    void resolveServer(const QHostInfo& host_info);
+    QMap<QString, QString> m_server_to_address;
+    QStringList m_servers;
+};
diff --git a/launcher/launch/steps/QuitAfterGameStop.h b/launcher/launch/steps/QuitAfterGameStop.h
index d4324cce6..19ca59632 100644
--- a/launcher/launch/steps/QuitAfterGameStop.h
+++ b/launcher/launch/steps/QuitAfterGameStop.h
@@ -24,7 +24,7 @@ class QuitAfterGameStop : public LaunchStep {
     Q_OBJECT
    public:
     explicit QuitAfterGameStop(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~QuitAfterGameStop() {};
+    virtual ~QuitAfterGameStop() = default;
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }
diff --git a/launcher/launch/steps/Update.cpp b/launcher/launch/steps/Update.cpp
deleted file mode 100644
index f23c0bb4b..000000000
--- a/launcher/launch/steps/Update.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Update.h"
-#include <launch/LaunchTask.h>
-
-void Update::executeTask()
-{
-    if (m_aborted) {
-        emitFailed(tr("Task aborted."));
-        return;
-    }
-    m_updateTask.reset(m_parent->instance()->createUpdateTask(m_mode));
-    if (m_updateTask) {
-        connect(m_updateTask.get(), &Task::finished, this, &Update::updateFinished);
-        connect(m_updateTask.get(), &Task::progress, this, &Update::setProgress);
-        connect(m_updateTask.get(), &Task::stepProgress, this, &Update::propagateStepProgress);
-        connect(m_updateTask.get(), &Task::status, this, &Update::setStatus);
-        connect(m_updateTask.get(), &Task::details, this, &Update::setDetails);
-        emit progressReportingRequest();
-        return;
-    }
-    emitSucceeded();
-}
-
-void Update::proceed()
-{
-    m_updateTask->start();
-}
-
-void Update::updateFinished()
-{
-    if (m_updateTask->wasSuccessful()) {
-        m_updateTask.reset();
-        emitSucceeded();
-    } else {
-        QString reason = tr("Instance update failed because: %1\n\n").arg(m_updateTask->failReason());
-        m_updateTask.reset();
-        emit logLine(reason, MessageLevel::Fatal);
-        emitFailed(reason);
-    }
-}
-
-bool Update::canAbort() const
-{
-    if (m_updateTask) {
-        return m_updateTask->canAbort();
-    }
-    return true;
-}
-
-bool Update::abort()
-{
-    m_aborted = true;
-    if (m_updateTask) {
-        if (m_updateTask->canAbort()) {
-            return m_updateTask->abort();
-        }
-    }
-    return true;
-}
diff --git a/launcher/main.cpp b/launcher/main.cpp
index 35f545f52..dce75b5fb 100644
--- a/launcher/main.cpp
+++ b/launcher/main.cpp
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
             Q_INIT_RESOURCE(multimc);
             Q_INIT_RESOURCE(backgrounds);
             Q_INIT_RESOURCE(documents);
-            Q_INIT_RESOURCE(prismlauncher);
+            Q_INIT_RESOURCE(fjordlauncher);
 
             Q_INIT_RESOURCE(pe_dark);
             Q_INIT_RESOURCE(pe_light);
diff --git a/launcher/meta/BaseEntity.cpp b/launcher/meta/BaseEntity.cpp
index c152d097a..b0e754ada 100644
--- a/launcher/meta/BaseEntity.cpp
+++ b/launcher/meta/BaseEntity.cpp
@@ -15,27 +15,43 @@
 
 #include "BaseEntity.h"
 
+#include "Exception.h"
+#include "FileSystem.h"
 #include "Json.h"
+#include "modplatform/helpers/HashUtils.h"
 #include "net/ApiDownload.h"
+#include "net/ChecksumValidator.h"
 #include "net/HttpMetaCache.h"
+#include "net/Mode.h"
 #include "net/NetJob.h"
 
 #include "Application.h"
 #include "BuildConfig.h"
+#include "tasks/Task.h"
+
+namespace Meta {
 
 class ParsingValidator : public Net::Validator {
    public: /* con/des */
-    ParsingValidator(Meta::BaseEntity* entity) : m_entity(entity) {};
-    virtual ~ParsingValidator() {};
+    ParsingValidator(BaseEntity* entity) : m_entity(entity) {};
+    virtual ~ParsingValidator() = default;
 
    public: /* methods */
-    bool init(QNetworkRequest&) override { return true; }
+    bool init(QNetworkRequest&) override
+    {
+        m_data.clear();
+        return true;
+    }
     bool write(QByteArray& data) override
     {
         this->m_data.append(data);
         return true;
     }
-    bool abort() override { return true; }
+    bool abort() override
+    {
+        m_data.clear();
+        return true;
+    }
     bool validate(QNetworkReply&) override
     {
         auto fname = m_entity->localFilename();
@@ -52,93 +68,131 @@ class ParsingValidator : public Net::Validator {
 
    private: /* data */
     QByteArray m_data;
-    Meta::BaseEntity* m_entity;
+    BaseEntity* m_entity;
 };
 
-Meta::BaseEntity::~BaseEntity() {}
-
-QUrl Meta::BaseEntity::url() const
+QUrl BaseEntity::url() const
 {
     auto s = APPLICATION->settings();
     QString metaOverride = s->get("MetaURLOverride").toString();
     if (metaOverride.isEmpty()) {
         return QUrl(BuildConfig.META_URL).resolved(localFilename());
-    } else {
-        return QUrl(metaOverride).resolved(localFilename());
     }
+    return QUrl(metaOverride).resolved(localFilename());
 }
 
-bool Meta::BaseEntity::loadLocalFile()
+Task::Ptr BaseEntity::loadTask(Net::Mode mode)
 {
-    const QString fname = QDir("meta").absoluteFilePath(localFilename());
-    if (!QFile::exists(fname)) {
-        return false;
-    }
-    // TODO: check if the file has the expected checksum
-    try {
-        auto doc = Json::requireDocument(fname, fname);
-        auto obj = Json::requireObject(doc, fname);
-        parse(obj);
-        return true;
-    } catch (const Exception& e) {
-        qDebug() << QString("Unable to parse file %1: %2").arg(fname, e.cause());
-        // just make sure it's gone and we never consider it again.
-        QFile::remove(fname);
-        return false;
+    if (m_task && m_task->isRunning()) {
+        return m_task;
     }
+    m_task.reset(new BaseEntityLoadTask(this, mode));
+    return m_task;
+}
+
+bool BaseEntity::isLoaded() const
+{
+    // consider it loaded only if the main hash is either empty and was remote loadded or the hashes match and was loaded
+    return m_sha256.isEmpty() ? m_load_status == LoadStatus::Remote : m_load_status != LoadStatus::NotLoaded && m_sha256 == m_file_sha256;
+}
+
+void BaseEntity::setSha256(QString sha256)
+{
+    m_sha256 = sha256;
+}
+
+BaseEntity::LoadStatus BaseEntity::status() const
+{
+    return m_load_status;
 }
 
-void Meta::BaseEntity::load(Net::Mode loadType)
+BaseEntityLoadTask::BaseEntityLoadTask(BaseEntity* parent, Net::Mode mode) : m_entity(parent), m_mode(mode) {}
+
+void BaseEntityLoadTask::executeTask()
 {
-    // load local file if nothing is loaded yet
-    if (!isLoaded()) {
-        if (loadLocalFile()) {
-            m_loadStatus = LoadStatus::Local;
+    const QString fname = QDir("meta").absoluteFilePath(m_entity->localFilename());
+    auto hashMatches = false;
+    // the file exists on disk try to load it
+    if (QFile::exists(fname)) {
+        try {
+            QByteArray fileData;
+            // read local file if nothing is loaded yet
+            if (m_entity->m_load_status == BaseEntity::LoadStatus::NotLoaded || m_entity->m_file_sha256.isEmpty()) {
+                setStatus(tr("Loading local file"));
+                fileData = FS::read(fname);
+                m_entity->m_file_sha256 = Hashing::hash(fileData, Hashing::Algorithm::Sha256);
+            }
+
+            // on online the hash needs to match
+            hashMatches = m_entity->m_sha256 == m_entity->m_file_sha256;
+            if (m_mode == Net::Mode::Online && !m_entity->m_sha256.isEmpty() && !hashMatches) {
+                throw Exception("mismatched checksum");
+            }
+
+            // load local file
+            if (m_entity->m_load_status == BaseEntity::LoadStatus::NotLoaded) {
+                auto doc = Json::requireDocument(fileData, fname);
+                auto obj = Json::requireObject(doc, fname);
+                m_entity->parse(obj);
+                m_entity->m_load_status = BaseEntity::LoadStatus::Local;
+            }
+
+        } catch (const Exception& e) {
+            qDebug() << QString("Unable to parse file %1: %2").arg(fname, e.cause());
+            // just make sure it's gone and we never consider it again.
+            FS::deletePath(fname);
+            m_entity->m_load_status = BaseEntity::LoadStatus::NotLoaded;
         }
     }
     // if we need remote update, run the update task
-    if (loadType == Net::Mode::Offline || !shouldStartRemoteUpdate()) {
+    auto wasLoadedOffline = m_entity->m_load_status != BaseEntity::LoadStatus::NotLoaded && m_mode == Net::Mode::Offline;
+    // if has is not present allways fetch from remote(e.g. the main index file), else only fetch if hash doesn't match
+    auto wasLoadedRemote = m_entity->m_sha256.isEmpty() ? m_entity->m_load_status == BaseEntity::LoadStatus::Remote : hashMatches;
+    if (wasLoadedOffline || wasLoadedRemote) {
+        emitSucceeded();
         return;
     }
-    m_updateTask.reset(new NetJob(QObject::tr("Download of meta file %1").arg(localFilename()), APPLICATION->network()));
-    auto url = this->url();
-    auto entry = APPLICATION->metacache()->resolveEntry("meta", localFilename());
+    m_task.reset(new NetJob(QObject::tr("Download of meta file %1").arg(m_entity->localFilename()), APPLICATION->network()));
+    auto url = m_entity->url();
+    auto entry = APPLICATION->metacache()->resolveEntry("meta", m_entity->localFilename());
     entry->setStale(true);
     auto dl = Net::ApiDownload::makeCached(url, entry);
     /*
      * The validator parses the file and loads it into the object.
      * If that fails, the file is not written to storage.
      */
-    dl->addValidator(new ParsingValidator(this));
-    m_updateTask->addNetAction(dl);
-    m_updateStatus = UpdateStatus::InProgress;
-    QObject::connect(m_updateTask.get(), &NetJob::succeeded, [&]() {
-        m_loadStatus = LoadStatus::Remote;
-        m_updateStatus = UpdateStatus::Succeeded;
-        m_updateTask.reset();
+    if (!m_entity->m_sha256.isEmpty())
+        dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Sha256, m_entity->m_sha256));
+    dl->addValidator(new ParsingValidator(m_entity));
+    m_task->addNetAction(dl);
+    m_task->setAskRetry(false);
+    connect(m_task.get(), &Task::failed, this, &BaseEntityLoadTask::emitFailed);
+    connect(m_task.get(), &Task::succeeded, this, &BaseEntityLoadTask::emitSucceeded);
+    connect(m_task.get(), &Task::succeeded, this, [this]() {
+        m_entity->m_load_status = BaseEntity::LoadStatus::Remote;
+        m_entity->m_file_sha256 = m_entity->m_sha256;
     });
-    QObject::connect(m_updateTask.get(), &NetJob::failed, [&]() {
-        m_updateStatus = UpdateStatus::Failed;
-        m_updateTask.reset();
-    });
-    m_updateTask->start();
-}
 
-bool Meta::BaseEntity::isLoaded() const
-{
-    return m_loadStatus > LoadStatus::NotLoaded;
+    connect(m_task.get(), &Task::progress, this, &Task::setProgress);
+    connect(m_task.get(), &Task::stepProgress, this, &BaseEntityLoadTask::propagateStepProgress);
+    connect(m_task.get(), &Task::status, this, &Task::setStatus);
+    connect(m_task.get(), &Task::details, this, &Task::setDetails);
+
+    m_task->start();
 }
 
-bool Meta::BaseEntity::shouldStartRemoteUpdate() const
+bool BaseEntityLoadTask::canAbort() const
 {
-    // TODO: version-locks and offline mode?
-    return m_updateStatus != UpdateStatus::InProgress;
+    return m_task ? m_task->canAbort() : false;
 }
 
-Task::Ptr Meta::BaseEntity::getCurrentTask()
+bool BaseEntityLoadTask::abort()
 {
-    if (m_updateStatus == UpdateStatus::InProgress) {
-        return m_updateTask;
+    if (m_task) {
+        Task::abort();
+        return m_task->abort();
     }
-    return nullptr;
+    return Task::abort();
 }
+
+}  // namespace Meta
diff --git a/launcher/meta/BaseEntity.h b/launcher/meta/BaseEntity.h
index 1336a5217..17aa0cb87 100644
--- a/launcher/meta/BaseEntity.h
+++ b/launcher/meta/BaseEntity.h
@@ -17,38 +17,57 @@
 
 #include <QJsonObject>
 #include <QObject>
-#include "QObjectPtr.h"
 
 #include "net/Mode.h"
 #include "net/NetJob.h"
+#include "tasks/Task.h"
 
 namespace Meta {
+class BaseEntityLoadTask;
 class BaseEntity {
+    friend BaseEntityLoadTask;
+
    public: /* types */
     using Ptr = std::shared_ptr<BaseEntity>;
     enum class LoadStatus { NotLoaded, Local, Remote };
-    enum class UpdateStatus { NotDone, InProgress, Failed, Succeeded };
 
    public:
-    virtual ~BaseEntity();
-
-    virtual void parse(const QJsonObject& obj) = 0;
+    virtual ~BaseEntity() = default;
 
     virtual QString localFilename() const = 0;
     virtual QUrl url() const;
-
     bool isLoaded() const;
-    bool shouldStartRemoteUpdate() const;
+    LoadStatus status() const;
+
+    /* for parsers */
+    void setSha256(QString sha256);
+
+    virtual void parse(const QJsonObject& obj) = 0;
+    [[nodiscard]] Task::Ptr loadTask(Net::Mode loadType = Net::Mode::Online);
 
-    void load(Net::Mode loadType);
-    Task::Ptr getCurrentTask();
+   protected:
+    QString m_sha256;       // the expected sha256
+    QString m_file_sha256;  // the file sha256
+
+   private:
+    LoadStatus m_load_status = LoadStatus::NotLoaded;
+    Task::Ptr m_task;
+};
+
+class BaseEntityLoadTask : public Task {
+    Q_OBJECT
+
+   public:
+    explicit BaseEntityLoadTask(BaseEntity* parent, Net::Mode mode);
+    ~BaseEntityLoadTask() override = default;
 
-   protected: /* methods */
-    bool loadLocalFile();
+    virtual void executeTask() override;
+    virtual bool canAbort() const override;
+    virtual bool abort() override;
 
    private:
-    LoadStatus m_loadStatus = LoadStatus::NotLoaded;
-    UpdateStatus m_updateStatus = UpdateStatus::NotDone;
-    NetJob::Ptr m_updateTask;
+    BaseEntity* m_entity;
+    Net::Mode m_mode;
+    NetJob::Ptr m_task;
 };
 }  // namespace Meta
diff --git a/launcher/meta/Index.cpp b/launcher/meta/Index.cpp
index 657019f8a..bd0745b6b 100644
--- a/launcher/meta/Index.cpp
+++ b/launcher/meta/Index.cpp
@@ -16,7 +16,10 @@
 #include "Index.h"
 
 #include "JsonFormat.h"
+#include "QObjectPtr.h"
 #include "VersionList.h"
+#include "meta/BaseEntity.h"
+#include "tasks/SequentialTask.h"
 
 namespace Meta {
 Index::Index(QObject* parent) : QAbstractListModel(parent) {}
@@ -51,14 +54,17 @@ QVariant Index::data(const QModelIndex& index, int role) const
     }
     return QVariant();
 }
+
 int Index::rowCount(const QModelIndex& parent) const
 {
     return parent.isValid() ? 0 : m_lists.size();
 }
+
 int Index::columnCount(const QModelIndex& parent) const
 {
     return parent.isValid() ? 0 : 1;
 }
+
 QVariant Index::headerData(int section, Qt::Orientation orientation, int role) const
 {
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole && section == 0) {
@@ -79,6 +85,7 @@ VersionList::Ptr Index::get(const QString& uid)
     if (!out) {
         out = std::make_shared<VersionList>(uid);
         m_uids[uid] = out;
+        m_lists.append(out);
     }
     return out;
 }
@@ -96,7 +103,7 @@ void Index::parse(const QJsonObject& obj)
 
 void Index::merge(const std::shared_ptr<Index>& other)
 {
-    const QVector<VersionList::Ptr> lists = std::dynamic_pointer_cast<Index>(other)->m_lists;
+    const QVector<VersionList::Ptr> lists = other->m_lists;
     // initial load, no need to merge
     if (m_lists.isEmpty()) {
         beginResetModel();
@@ -123,7 +130,33 @@ void Index::merge(const std::shared_ptr<Index>& other)
 
 void Index::connectVersionList(const int row, const VersionList::Ptr& list)
 {
-    connect(list.get(), &VersionList::nameChanged, this,
-            [this, row]() { emit dataChanged(index(row), index(row), QVector<int>() << Qt::DisplayRole); });
+    connect(list.get(), &VersionList::nameChanged, this, [this, row] { emit dataChanged(index(row), index(row), { Qt::DisplayRole }); });
+}
+
+Task::Ptr Index::loadVersion(const QString& uid, const QString& version, Net::Mode mode, bool force)
+{
+    if (mode == Net::Mode::Offline) {
+        return get(uid, version)->loadTask(mode);
+    }
+
+    auto versionList = get(uid);
+    auto loadTask = makeShared<SequentialTask>(
+        this, tr("Load meta for %1:%2", "This is for the task name that loads the meta index.").arg(uid, version));
+    if (status() != BaseEntity::LoadStatus::Remote || force) {
+        loadTask->addTask(this->loadTask(mode));
+    }
+    loadTask->addTask(versionList->loadTask(mode));
+    loadTask->addTask(versionList->getVersion(version)->loadTask(mode));
+    return loadTask;
+}
+
+Version::Ptr Index::getLoadedVersion(const QString& uid, const QString& version)
+{
+    QEventLoop ev;
+    auto task = loadVersion(uid, version);
+    QObject::connect(task.get(), &Task::finished, &ev, &QEventLoop::quit);
+    task->start();
+    ev.exec();
+    return get(uid, version);
 }
 }  // namespace Meta
diff --git a/launcher/meta/Index.h b/launcher/meta/Index.h
index 2c650ce2f..026a00c07 100644
--- a/launcher/meta/Index.h
+++ b/launcher/meta/Index.h
@@ -16,10 +16,10 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <memory>
 
 #include "BaseEntity.h"
 #include "meta/VersionList.h"
+#include "net/Mode.h"
 
 class Task;
 
@@ -30,6 +30,7 @@ class Index : public QAbstractListModel, public BaseEntity {
    public:
     explicit Index(QObject* parent = nullptr);
     explicit Index(const QVector<VersionList::Ptr>& lists, QObject* parent = nullptr);
+    virtual ~Index() = default;
 
     enum { UidRole = Qt::UserRole, NameRole, ListPtrRole };
 
@@ -47,8 +48,15 @@ class Index : public QAbstractListModel, public BaseEntity {
 
     QVector<VersionList::Ptr> lists() const { return m_lists; }
 
+    Task::Ptr loadVersion(const QString& uid, const QString& version = {}, Net::Mode mode = Net::Mode::Online, bool force = false);
+
+    // this blocks until the version is loaded
+    Version::Ptr getLoadedVersion(const QString& uid, const QString& version);
+
    public:  // for usage by parsers only
     void merge(const std::shared_ptr<Index>& other);
+
+   protected:
     void parse(const QJsonObject& obj) override;
 
    private:
diff --git a/launcher/meta/JsonFormat.cpp b/launcher/meta/JsonFormat.cpp
index 6c993f720..86af7277e 100644
--- a/launcher/meta/JsonFormat.cpp
+++ b/launcher/meta/JsonFormat.cpp
@@ -41,6 +41,7 @@ static std::shared_ptr<Index> parseIndexInternal(const QJsonObject& obj)
     std::transform(objects.begin(), objects.end(), std::back_inserter(lists), [](const QJsonObject& obj) {
         VersionList::Ptr list = std::make_shared<VersionList>(requireString(obj, "uid"));
         list->setName(ensureString(obj, "name", QString()));
+        list->setSha256(ensureString(obj, "sha256", QString()));
         return list;
     });
     return std::make_shared<Index>(lists);
@@ -58,6 +59,9 @@ static Version::Ptr parseCommonVersion(const QString& uid, const QJsonObject& ob
     parseRequires(obj, &reqs, "requires");
     parseRequires(obj, &conflicts, "conflicts");
     version->setRequires(reqs, conflicts);
+    if (auto sha256 = ensureString(obj, "sha256", QString()); !sha256.isEmpty()) {
+        version->setSha256(sha256);
+    }
     return version;
 }
 
diff --git a/launcher/meta/JsonFormat.h b/launcher/meta/JsonFormat.h
index d474bcc39..7fbf808a7 100644
--- a/launcher/meta/JsonFormat.h
+++ b/launcher/meta/JsonFormat.h
@@ -16,11 +16,9 @@
 #pragma once
 
 #include <QJsonObject>
-#include <memory>
 
 #include <set>
 #include "Exception.h"
-#include "meta/BaseEntity.h"
 
 namespace Meta {
 class Index;
diff --git a/launcher/meta/Version.cpp b/launcher/meta/Version.cpp
index 655a20b93..74e71e91c 100644
--- a/launcher/meta/Version.cpp
+++ b/launcher/meta/Version.cpp
@@ -18,12 +18,9 @@
 #include <QDateTime>
 
 #include "JsonFormat.h"
-#include "minecraft/PackProfile.h"
 
 Meta::Version::Version(const QString& uid, const QString& version) : BaseVersion(), m_uid(uid), m_version(version) {}
 
-Meta::Version::~Version() {}
-
 QString Meta::Version::descriptor()
 {
     return m_version;
@@ -71,6 +68,9 @@ void Meta::Version::mergeFromList(const Meta::Version::Ptr& other)
     if (m_volatile != other->m_volatile) {
         setVolatile(other->m_volatile);
     }
+    if (!other->m_sha256.isEmpty()) {
+        m_sha256 = other->m_sha256;
+    }
 }
 
 void Meta::Version::merge(const Version::Ptr& other)
diff --git a/launcher/meta/Version.h b/launcher/meta/Version.h
index 24da12d6d..46dc740da 100644
--- a/launcher/meta/Version.h
+++ b/launcher/meta/Version.h
@@ -38,7 +38,7 @@ class Version : public QObject, public BaseVersion, public BaseEntity {
     using Ptr = std::shared_ptr<Version>;
 
     explicit Version(const QString& uid, const QString& version);
-    virtual ~Version();
+    virtual ~Version() = default;
 
     QString descriptor() override;
     QString name() override;
@@ -52,7 +52,7 @@ class Version : public QObject, public BaseVersion, public BaseEntity {
     const Meta::RequireSet& requiredSet() const { return m_requires; }
     VersionFilePtr data() const { return m_data; }
     bool isRecommended() const { return m_recommended; }
-    bool isLoaded() const { return m_data != nullptr; }
+    bool isLoaded() const { return m_data != nullptr && BaseEntity::isLoaded(); }
 
     void merge(const Version::Ptr& other);
     void mergeFromList(const Version::Ptr& other);
diff --git a/launcher/meta/VersionList.cpp b/launcher/meta/VersionList.cpp
index 7b7ae1fa3..6856b5f8d 100644
--- a/launcher/meta/VersionList.cpp
+++ b/launcher/meta/VersionList.cpp
@@ -16,9 +16,15 @@
 #include "VersionList.h"
 
 #include <QDateTime>
+#include <algorithm>
 
+#include "Application.h"
+#include "Index.h"
 #include "JsonFormat.h"
 #include "Version.h"
+#include "meta/BaseEntity.h"
+#include "net/Mode.h"
+#include "tasks/SequentialTask.h"
 
 namespace Meta {
 VersionList::VersionList(const QString& uid, QObject* parent) : BaseVersionList(parent), m_uid(uid)
@@ -28,8 +34,11 @@ VersionList::VersionList(const QString& uid, QObject* parent) : BaseVersionList(
 
 Task::Ptr VersionList::getLoadTask()
 {
-    load(Net::Mode::Online);
-    return getCurrentTask();
+    auto loadTask =
+        makeShared<SequentialTask>(this, tr("Load meta for %1", "This is for the task name that loads the meta index.").arg(m_uid));
+    loadTask->addTask(APPLICATION->metadataIndex()->loadTask(Net::Mode::Online));
+    loadTask->addTask(this->loadTask(Net::Mode::Online));
+    return loadTask;
 }
 
 bool VersionList::isLoaded()
@@ -91,7 +100,14 @@ QVariant VersionList::data(const QModelIndex& index, int role) const
         case VersionPtrRole:
             return QVariant::fromValue(version);
         case RecommendedRole:
-            return version->isRecommended();
+            return version->isRecommended() || m_externalRecommendsVersions.contains(version->version());
+        case JavaMajorRole: {
+            auto major = version->version();
+            if (major.startsWith("java")) {
+                major = "Java " + major.mid(4);
+            }
+            return major;
+        }
         // FIXME: this should be determined in whatever view/proxy is used...
         // case LatestRole: return version == getLatestStable();
         default:
@@ -101,10 +117,14 @@ QVariant VersionList::data(const QModelIndex& index, int role) const
 
 BaseVersionList::RoleList VersionList::providesRoles() const
 {
-    return { VersionPointerRole, VersionRole,  VersionIdRole, ParentVersionRole, TypeRole,   UidRole,
-             TimeRole,           RequiresRole, SortRole,      RecommendedRole,   LatestRole, VersionPtrRole };
+    return m_provided_roles;
 }
 
+void VersionList::setProvidedRoles(RoleList roles)
+{
+    m_provided_roles = roles;
+};
+
 QHash<int, QByteArray> VersionList::roleNames() const
 {
     QHash<int, QByteArray> roles = BaseVersionList::roleNames();
@@ -131,6 +151,8 @@ Version::Ptr VersionList::getVersion(const QString& version)
     if (!out) {
         out = std::make_shared<Version>(m_uid, version);
         m_lookup[version] = out;
+        setupAddedVersion(m_versions.size(), out);
+        m_versions.append(out);
     }
     return out;
 }
@@ -171,6 +193,16 @@ void VersionList::parse(const QJsonObject& obj)
     parseVersionList(obj, this);
 }
 
+void VersionList::addExternalRecommends(const QStringList& recommends)
+{
+    m_externalRecommendsVersions.append(recommends);
+}
+
+void VersionList::clearExternalRecommends()
+{
+    m_externalRecommendsVersions.clear();
+}
+
 // FIXME: this is dumb, we have 'recommended' as part of the metadata already...
 static const Meta::Version::Ptr& getBetterVersion(const Meta::Version::Ptr& a, const Meta::Version::Ptr& b)
 {
@@ -191,6 +223,9 @@ void VersionList::mergeFromIndex(const VersionList::Ptr& other)
     if (m_name != other->m_name) {
         setName(other->m_name);
     }
+    if (!other->m_sha256.isEmpty()) {
+        m_sha256 = other->m_sha256;
+    }
 }
 
 void VersionList::merge(const VersionList::Ptr& other)
@@ -198,23 +233,27 @@ void VersionList::merge(const VersionList::Ptr& other)
     if (m_name != other->m_name) {
         setName(other->m_name);
     }
+    if (!other->m_sha256.isEmpty()) {
+        m_sha256 = other->m_sha256;
+    }
 
     // TODO: do not reset the whole model. maybe?
     beginResetModel();
-    m_versions.clear();
     if (other->m_versions.isEmpty()) {
         qWarning() << "Empty list loaded ...";
     }
-    for (const Version::Ptr& version : other->m_versions) {
+    for (auto version : other->m_versions) {
         // we already have the version. merge the contents
         if (m_lookup.contains(version->version())) {
-            m_lookup.value(version->version())->mergeFromList(version);
+            auto existing = m_lookup.value(version->version());
+            existing->mergeFromList(version);
+            version = existing;
         } else {
-            m_lookup.insert(version->uid(), version);
+            m_lookup.insert(version->version(), version);
+            // connect it.
+            setupAddedVersion(m_versions.size(), version);
+            m_versions.append(version);
         }
-        // connect it.
-        setupAddedVersion(m_versions.size(), version);
-        m_versions.append(version);
         m_recommended = getBetterVersion(m_recommended, version);
     }
     endResetModel();
@@ -222,14 +261,15 @@ void VersionList::merge(const VersionList::Ptr& other)
 
 void VersionList::setupAddedVersion(const int row, const Version::Ptr& version)
 {
-    // FIXME: do not disconnect from everythin, disconnect only the lambdas here
-    version->disconnect();
+    disconnect(version.get(), &Version::requiresChanged, this, nullptr);
+    disconnect(version.get(), &Version::timeChanged, this, nullptr);
+    disconnect(version.get(), &Version::typeChanged, this, nullptr);
+
     connect(version.get(), &Version::requiresChanged, this,
             [this, row]() { emit dataChanged(index(row), index(row), QVector<int>() << RequiresRole); });
     connect(version.get(), &Version::timeChanged, this,
-            [this, row]() { emit dataChanged(index(row), index(row), QVector<int>() << TimeRole << SortRole); });
-    connect(version.get(), &Version::typeChanged, this,
-            [this, row]() { emit dataChanged(index(row), index(row), QVector<int>() << TypeRole); });
+            [this, row]() { emit dataChanged(index(row), index(row), { TimeRole, SortRole }); });
+    connect(version.get(), &Version::typeChanged, this, [this, row]() { emit dataChanged(index(row), index(row), { TypeRole }); });
 }
 
 BaseVersion::Ptr VersionList::getRecommended() const
@@ -237,4 +277,45 @@ BaseVersion::Ptr VersionList::getRecommended() const
     return m_recommended;
 }
 
+void VersionList::waitToLoad()
+{
+    if (isLoaded())
+        return;
+    QEventLoop ev;
+    auto task = getLoadTask();
+    QObject::connect(task.get(), &Task::finished, &ev, &QEventLoop::quit);
+    task->start();
+    ev.exec();
+}
+
+Version::Ptr VersionList::getRecommendedForParent(const QString& uid, const QString& version)
+{
+    auto foundExplicit = std::find_if(m_versions.begin(), m_versions.end(), [uid, version](Version::Ptr ver) -> bool {
+        auto& reqs = ver->requiredSet();
+        auto parentReq = std::find_if(reqs.begin(), reqs.end(), [uid, version](const Require& req) -> bool {
+            return req.uid == uid && req.equalsVersion == version;
+        });
+        return parentReq != reqs.end() && ver->isRecommended();
+    });
+    if (foundExplicit != m_versions.end()) {
+        return *foundExplicit;
+    }
+    return nullptr;
+}
+
+Version::Ptr VersionList::getLatestForParent(const QString& uid, const QString& version)
+{
+    Version::Ptr latestCompat = nullptr;
+    for (auto ver : m_versions) {
+        auto& reqs = ver->requiredSet();
+        auto parentReq = std::find_if(reqs.begin(), reqs.end(), [uid, version](const Require& req) -> bool {
+            return req.uid == uid && req.equalsVersion == version;
+        });
+        if (parentReq != reqs.end()) {
+            latestCompat = getBetterVersion(latestCompat, ver);
+        }
+    }
+    return latestCompat;
+}
+
 }  // namespace Meta
diff --git a/launcher/meta/VersionList.h b/launcher/meta/VersionList.h
index 2c5624701..4215439db 100644
--- a/launcher/meta/VersionList.h
+++ b/launcher/meta/VersionList.h
@@ -30,23 +30,28 @@ class VersionList : public BaseVersionList, public BaseEntity {
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
    public:
     explicit VersionList(const QString& uid, QObject* parent = nullptr);
+    virtual ~VersionList() = default;
 
     using Ptr = std::shared_ptr<VersionList>;
 
     enum Roles { UidRole = Qt::UserRole + 100, TimeRole, RequiresRole, VersionPtrRole };
 
-    Task::Ptr getLoadTask() override;
     bool isLoaded() override;
+    [[nodiscard]] Task::Ptr getLoadTask() override;
     const BaseVersion::Ptr at(int i) const override;
     int count() const override;
     void sortVersions() override;
 
     BaseVersion::Ptr getRecommended() const override;
+    Version::Ptr getRecommendedForParent(const QString& uid, const QString& version);
+    Version::Ptr getLatestForParent(const QString& uid, const QString& version);
 
     QVariant data(const QModelIndex& index, int role) const override;
     RoleList providesRoles() const override;
     QHash<int, QByteArray> roleNames() const override;
 
+    void setProvidedRoles(RoleList roles);
+
     QString localFilename() const override;
 
     QString uid() const { return m_uid; }
@@ -58,12 +63,17 @@ class VersionList : public BaseVersionList, public BaseEntity {
 
     QVector<Version::Ptr> versions() const { return m_versions; }
 
+    // this blocks until the version list is loaded
+    void waitToLoad();
+
    public:  // for usage only by parsers
     void setName(const QString& name);
     void setVersions(const QVector<Version::Ptr>& versions);
     void merge(const VersionList::Ptr& other);
     void mergeFromIndex(const VersionList::Ptr& other);
     void parse(const QJsonObject& obj) override;
+    void addExternalRecommends(const QStringList& recommends);
+    void clearExternalRecommends();
 
    signals:
     void nameChanged(const QString& name);
@@ -73,12 +83,16 @@ class VersionList : public BaseVersionList, public BaseEntity {
 
    private:
     QVector<Version::Ptr> m_versions;
+    QStringList m_externalRecommendsVersions;
     QHash<QString, Version::Ptr> m_lookup;
     QString m_uid;
     QString m_name;
 
     Version::Ptr m_recommended;
 
+    RoleList m_provided_roles = { VersionPointerRole, VersionRole,  VersionIdRole, ParentVersionRole, TypeRole,   UidRole,
+                                  TimeRole,           RequiresRole, SortRole,      RecommendedRole,   LatestRole, VersionPtrRole };
+
     void setupAddedVersion(int row, const Version::Ptr& version);
 };
 }  // namespace Meta
diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp
index 48e150d16..4406d9b34 100644
--- a/launcher/minecraft/AssetsUtils.cpp
+++ b/launcher/minecraft/AssetsUtils.cpp
@@ -51,6 +51,7 @@
 #include "net/Download.h"
 
 #include "Application.h"
+#include "net/NetRequest.h"
 
 namespace {
 QSet<QString> collectPathsFromDir(QString dirPath)
@@ -276,14 +277,13 @@ bool reconstructAssets(QString assetsId, QString resourcesFolder)
 
 }  // namespace AssetsUtils
 
-NetAction::Ptr AssetObject::getDownloadAction()
+Net::NetRequest::Ptr AssetObject::getDownloadAction()
 {
     QFileInfo objectFile(getLocalPath());
     if ((!objectFile.isFile()) || (objectFile.size() != size)) {
         auto objectDL = Net::ApiDownload::makeFile(getUrl(), objectFile.filePath());
         if (hash.size()) {
-            auto rawHash = QByteArray::fromHex(hash.toLatin1());
-            objectDL->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawHash));
+            objectDL->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, hash));
         }
         objectDL->setProgress(objectDL->getProgress(), size);
         return objectDL;
diff --git a/launcher/minecraft/AssetsUtils.h b/launcher/minecraft/AssetsUtils.h
index 87956e57a..ea3613bd0 100644
--- a/launcher/minecraft/AssetsUtils.h
+++ b/launcher/minecraft/AssetsUtils.h
@@ -17,14 +17,14 @@
 
 #include <QMap>
 #include <QString>
-#include "net/NetAction.h"
 #include "net/NetJob.h"
+#include "net/NetRequest.h"
 
 struct AssetObject {
     QString getRelPath();
     QUrl getUrl();
     QString getLocalPath();
-    NetAction::Ptr getDownloadAction();
+    Net::NetRequest::Ptr getDownloadAction();
 
     QString hash;
     qint64 size;
diff --git a/launcher/minecraft/Component.cpp b/launcher/minecraft/Component.cpp
index 79ea7a06d..1073ef324 100644
--- a/launcher/minecraft/Component.cpp
+++ b/launcher/minecraft/Component.cpp
@@ -44,10 +44,19 @@
 #include "OneSixVersionFormat.h"
 #include "VersionFile.h"
 #include "meta/Version.h"
+#include "minecraft/Component.h"
 #include "minecraft/PackProfile.h"
 
 #include <assert.h>
 
+const QMap<QString, ModloaderMapEntry> Component::KNOWN_MODLOADERS = {
+    { "net.neoforged", { ModPlatform::NeoForge, { "net.minecraftforge", "net.fabricmc.fabric-loader", "org.quiltmc.quilt-loader" } } },
+    { "net.minecraftforge", { ModPlatform::Forge, { "net.neoforged", "net.fabricmc.fabric-loader", "org.quiltmc.quilt-loader" } } },
+    { "net.fabricmc.fabric-loader", { ModPlatform::Fabric, { "net.minecraftforge", "net.neoforged", "org.quiltmc.quilt-loader" } } },
+    { "org.quiltmc.quilt-loader", { ModPlatform::Quilt, { "net.minecraftforge", "net.neoforged", "net.fabricmc.fabric-loader" } } },
+    { "com.mumfrey.liteloader", { ModPlatform::LiteLoader, {} } }
+};
+
 Component::Component(PackProfile* parent, const QString& uid)
 {
     assert(parent);
@@ -56,18 +65,6 @@ Component::Component(PackProfile* parent, const QString& uid)
     m_uid = uid;
 }
 
-Component::Component(PackProfile* parent, std::shared_ptr<Meta::Version> version)
-{
-    assert(parent);
-    m_parent = parent;
-
-    m_metaVersion = version;
-    m_uid = version->uid();
-    m_version = m_cachedVersion = version->version();
-    m_cachedName = version->name();
-    m_loaded = version->isLoaded();
-}
-
 Component::Component(PackProfile* parent, const QString& uid, std::shared_ptr<VersionFile> file)
 {
     assert(parent);
@@ -102,9 +99,6 @@ void Component::applyTo(LaunchProfile* profile)
 std::shared_ptr<class VersionFile> Component::getVersionFile() const
 {
     if (m_metaVersion) {
-        if (!m_metaVersion->isLoaded()) {
-            m_metaVersion->load(Net::Mode::Online);
-        }
         return m_metaVersion->data();
     } else {
         return m_file;
@@ -131,29 +125,35 @@ int Component::getOrder()
     }
     return 0;
 }
+
 void Component::setOrder(int order)
 {
     m_orderOverride = true;
     m_order = order;
 }
+
 QString Component::getID()
 {
     return m_uid;
 }
+
 QString Component::getName()
 {
     if (!m_cachedName.isEmpty())
         return m_cachedName;
     return m_uid;
 }
+
 QString Component::getVersion()
 {
     return m_cachedVersion;
 }
+
 QString Component::getFilename()
 {
     return m_parent->patchFilePathForUid(m_uid);
 }
+
 QDateTime Component::getReleaseDateTime()
 {
     if (m_metaVersion) {
@@ -198,17 +198,14 @@ bool Component::isCustom()
 
 bool Component::isCustomizable()
 {
-    if (m_metaVersion) {
-        if (getVersionFile()) {
-            return true;
-        }
-    }
-    return false;
+    return m_metaVersion && getVersionFile();
 }
+
 bool Component::isRemovable()
 {
     return !m_important;
 }
+
 bool Component::isRevertible()
 {
     if (isCustom()) {
@@ -218,23 +215,39 @@ bool Component::isRevertible()
     }
     return false;
 }
+
 bool Component::isMoveable()
 {
     // HACK, FIXME: this was too dumb and wouldn't follow dependency constraints anyway. For now hardcoded to 'true'.
     return true;
 }
+
 bool Component::isVersionChangeable()
 {
     auto list = getVersionList();
     if (list) {
-        if (!list->isLoaded()) {
-            list->load(Net::Mode::Online);
-        }
+        list->waitToLoad();
         return list->count() != 0;
     }
     return false;
 }
 
+bool Component::isKnownModloader()
+{
+    auto iter = KNOWN_MODLOADERS.find(m_uid);
+    return iter != KNOWN_MODLOADERS.cend();
+}
+
+QStringList Component::knownConflictingComponents()
+{
+    auto iter = KNOWN_MODLOADERS.find(m_uid);
+    if (iter != KNOWN_MODLOADERS.cend()) {
+        return (*iter).knownConflictingComponents;
+    } else {
+        return {};
+    }
+}
+
 void Component::setImportant(bool state)
 {
     if (m_important != state) {
@@ -247,7 +260,8 @@ ProblemSeverity Component::getProblemSeverity() const
 {
     auto file = getVersionFile();
     if (file) {
-        return file->getProblemSeverity();
+        auto severity = file->getProblemSeverity();
+        return m_componentProblemSeverity > severity ? m_componentProblemSeverity : severity;
     }
     return ProblemSeverity::Error;
 }
@@ -256,11 +270,31 @@ const QList<PatchProblem> Component::getProblems() const
 {
     auto file = getVersionFile();
     if (file) {
-        return file->getProblems();
+        auto problems = file->getProblems();
+        problems.append(m_componentProblems);
+        return problems;
     }
     return { { ProblemSeverity::Error, QObject::tr("Patch is not loaded yet.") } };
 }
 
+void Component::addComponentProblem(ProblemSeverity severity, const QString& description)
+{
+    if (severity > m_componentProblemSeverity) {
+        m_componentProblemSeverity = severity;
+    }
+    m_componentProblems.append({ severity, description });
+
+    emit dataChanged();
+}
+
+void Component::resetComponentProblems()
+{
+    m_componentProblems.clear();
+    m_componentProblemSeverity = ProblemSeverity::None;
+
+    emit dataChanged();
+}
+
 void Component::setVersion(const QString& version)
 {
     if (version == m_version) {
@@ -336,7 +370,7 @@ bool Component::revert()
     bool result = true;
     // just kill the file and reload
     if (QFile::exists(filename)) {
-        result = QFile::remove(filename);
+        result = FS::deletePath(filename);
     }
     if (result) {
         // file gone...
@@ -414,3 +448,36 @@ void Component::updateCachedData()
         emit dataChanged();
     }
 }
+
+void Component::waitLoadMeta()
+{
+    if (!m_loaded) {
+        if (!m_metaVersion || !m_metaVersion->isLoaded()) {
+            // wait for the loaded version from meta
+            m_metaVersion = APPLICATION->metadataIndex()->getLoadedVersion(m_uid, m_version);
+        }
+        m_loaded = true;
+        updateCachedData();
+    }
+}
+
+void Component::setUpdateAction(UpdateAction action)
+{
+    m_updateAction = action;
+}
+
+UpdateAction Component::getUpdateAction()
+{
+    return m_updateAction;
+}
+
+void Component::clearUpdateAction()
+{
+    m_updateAction = UpdateAction{ UpdateActionNone{} };
+}
+
+QDebug operator<<(QDebug d, const Component& comp)
+{
+    d << "Component(" << comp.m_uid << " : " << comp.m_cachedVersion << ")";
+    return d;
+}
diff --git a/launcher/minecraft/Component.h b/launcher/minecraft/Component.h
index fdb61c45e..7ff30889f 100644
--- a/launcher/minecraft/Component.h
+++ b/launcher/minecraft/Component.h
@@ -4,9 +4,12 @@
 #include <QJsonDocument>
 #include <QList>
 #include <memory>
+#include <optional>
+#include <variant>
 #include "ProblemProvider.h"
 #include "QObjectPtr.h"
 #include "meta/JsonFormat.h"
+#include "modplatform/ModIndex.h"
 
 class PackProfile;
 class LaunchProfile;
@@ -16,17 +19,48 @@ class VersionList;
 }  // namespace Meta
 class VersionFile;
 
+struct UpdateActionChangeVersion {
+    /// version to change to
+    QString targetVersion;
+};
+struct UpdateActionLatestRecommendedCompatible {
+    /// Parent uid
+    QString parentUid;
+    QString parentName;
+    /// Parent version
+    QString version;
+    ///
+};
+struct UpdateActionRemove {};
+struct UpdateActionImportantChanged {
+    QString oldVersion;
+};
+
+using UpdateActionNone = std::monostate;
+
+using UpdateAction = std::variant<UpdateActionNone,
+                                  UpdateActionChangeVersion,
+                                  UpdateActionLatestRecommendedCompatible,
+                                  UpdateActionRemove,
+                                  UpdateActionImportantChanged>;
+
+struct ModloaderMapEntry {
+    ModPlatform::ModLoaderType type;
+    QStringList knownConflictingComponents;
+};
+
 class Component : public QObject, public ProblemProvider {
     Q_OBJECT
    public:
     Component(PackProfile* parent, const QString& uid);
 
     // DEPRECATED: remove these constructors?
-    Component(PackProfile* parent, std::shared_ptr<Meta::Version> version);
     Component(PackProfile* parent, const QString& uid, std::shared_ptr<VersionFile> file);
 
     virtual ~Component() {}
 
+    static const QMap<QString, ModloaderMapEntry> KNOWN_MODLOADERS;
+
     void applyTo(LaunchProfile* profile);
 
     bool isEnabled();
@@ -39,6 +73,8 @@ class Component : public QObject, public ProblemProvider {
     bool isRemovable();
     bool isCustom();
     bool isVersionChangeable();
+    bool isKnownModloader();
+    QStringList knownConflictingComponents();
 
     // DEPRECATED: explicit numeric order values, used for loading old non-component config. TODO: refactor and move to migration code
     void setOrder(int order);
@@ -59,6 +95,8 @@ class Component : public QObject, public ProblemProvider {
 
     const QList<PatchProblem> getProblems() const override;
     ProblemSeverity getProblemSeverity() const override;
+    void addComponentProblem(ProblemSeverity severity, const QString& description);
+    void resetComponentProblems();
 
     void setVersion(const QString& version);
     bool customize();
@@ -66,6 +104,12 @@ class Component : public QObject, public ProblemProvider {
 
     void updateCachedData();
 
+    void waitLoadMeta();
+
+    void setUpdateAction(UpdateAction action);
+    void clearUpdateAction();
+    UpdateAction getUpdateAction();
+
    signals:
     void dataChanged();
 
@@ -103,6 +147,11 @@ class Component : public QObject, public ProblemProvider {
     std::shared_ptr<Meta::Version> m_metaVersion;
     std::shared_ptr<VersionFile> m_file;
     bool m_loaded = false;
+
+   private:
+    QList<PatchProblem> m_componentProblems;
+    ProblemSeverity m_componentProblemSeverity = ProblemSeverity::None;
+    UpdateAction m_updateAction = UpdateAction{ UpdateActionNone{} };
 };
 
 using ComponentPtr = shared_qobject_ptr<Component>;
diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp
index bb838043a..6656a84f8 100644
--- a/launcher/minecraft/ComponentUpdateTask.cpp
+++ b/launcher/minecraft/ComponentUpdateTask.cpp
@@ -1,18 +1,24 @@
 #include "ComponentUpdateTask.h"
+#include <algorithm>
 
 #include "Component.h"
 #include "ComponentUpdateTask_p.h"
 #include "PackProfile.h"
 #include "PackProfile_p.h"
+#include "ProblemProvider.h"
 #include "Version.h"
 #include "cassert"
 #include "meta/Index.h"
 #include "meta/Version.h"
+#include "minecraft/MinecraftInstance.h"
 #include "minecraft/OneSixVersionFormat.h"
 #include "minecraft/ProfileUtils.h"
 #include "net/Mode.h"
 
 #include "Application.h"
+#include "tasks/Task.h"
+
+#include "minecraft/Logging.h"
 
 /*
  * This is responsible for loading the components of a component list AND resolving dependency issues between them
@@ -35,7 +41,7 @@
 ComponentUpdateTask::ComponentUpdateTask(Mode mode, Net::Mode netmode, PackProfile* list, QObject* parent) : Task(parent)
 {
     d.reset(new ComponentUpdateTaskData);
-    d->m_list = list;
+    d->m_profile = list;
     d->mode = mode;
     d->netmode = netmode;
 }
@@ -44,7 +50,7 @@ ComponentUpdateTask::~ComponentUpdateTask() {}
 
 void ComponentUpdateTask::executeTask()
 {
-    qDebug() << "Loading components";
+    qCDebug(instanceProfileResolveC) << "Loading components";
     loadComponents();
 }
 
@@ -62,7 +68,7 @@ LoadResult composeLoadResult(LoadResult a, LoadResult b)
 static LoadResult loadComponent(ComponentPtr component, Task::Ptr& loadTask, Net::Mode netmode)
 {
     if (component->m_loaded) {
-        qDebug() << component->getName() << "is already loaded";
+        qCDebug(instanceProfileResolveC) << component->getName() << "is already loaded";
         return LoadResult::LoadedLocal;
     }
 
@@ -93,9 +99,9 @@ static LoadResult loadComponent(ComponentPtr component, Task::Ptr& loadTask, Net
             component->m_loaded = true;
             result = LoadResult::LoadedLocal;
         } else {
-            metaVersion->load(netmode);
-            loadTask = metaVersion->getCurrentTask();
-            if (loadTask)
+            loadTask = APPLICATION->metadataIndex()->loadVersion(component->m_uid, component->m_version, netmode);
+            loadTask->start();
+            if (netmode == Net::Mode::Online)
                 result = LoadResult::RequiresRemote;
             else if (metaVersion->isLoaded())
                 result = LoadResult::LoadedLocal;
@@ -133,21 +139,6 @@ static LoadResult loadPackProfile(ComponentPtr component, Task::Ptr& loadTask, N
 }
 */
 
-static LoadResult loadIndex(Task::Ptr& loadTask, Net::Mode netmode)
-{
-    // FIXME: DECIDE. do we want to run the update task anyway?
-    if (APPLICATION->metadataIndex()->isLoaded()) {
-        qDebug() << "Index is already loaded";
-        return LoadResult::LoadedLocal;
-    }
-    APPLICATION->metadataIndex()->load(netmode);
-    loadTask = APPLICATION->metadataIndex()->getCurrentTask();
-    if (loadTask) {
-        return LoadResult::RequiresRemote;
-    }
-    // FIXME: this is assuming the load succeeded... did it really?
-    return LoadResult::LoadedLocal;
-}
 }  // namespace
 
 void ComponentUpdateTask::loadComponents()
@@ -156,28 +147,13 @@ void ComponentUpdateTask::loadComponents()
     size_t taskIndex = 0;
     size_t componentIndex = 0;
     d->remoteLoadSuccessful = true;
-    // load the main index (it is needed to determine if components can revert)
-    {
-        // FIXME: tear out as a method? or lambda?
-        Task::Ptr indexLoadTask;
-        auto singleResult = loadIndex(indexLoadTask, d->netmode);
-        result = composeLoadResult(result, singleResult);
-        if (indexLoadTask) {
-            qDebug() << "Remote loading is being run for metadata index";
-            RemoteLoadStatus status;
-            status.type = RemoteLoadStatus::Type::Index;
-            d->remoteLoadStatusList.append(status);
-            connect(indexLoadTask.get(), &Task::succeeded, [=]() { remoteLoadSucceeded(taskIndex); });
-            connect(indexLoadTask.get(), &Task::failed, [=](const QString& error) { remoteLoadFailed(taskIndex, error); });
-            connect(indexLoadTask.get(), &Task::aborted, [=]() { remoteLoadFailed(taskIndex, tr("Aborted")); });
-            taskIndex++;
-        }
-    }
+
     // load all the components OR their lists...
-    for (auto component : d->m_list->d->components) {
+    for (auto component : d->m_profile->d->components) {
         Task::Ptr loadTask;
         LoadResult singleResult;
         RemoteLoadStatus::Type loadType;
+        component->resetComponentProblems();
         // FIXME: to do this right, we need to load the lists and decide on which versions to use during dependency resolution. For now,
         // ignore all that...
 #if 0
@@ -205,13 +181,15 @@ void ComponentUpdateTask::loadComponents()
         }
         result = composeLoadResult(result, singleResult);
         if (loadTask) {
-            qDebug() << "Remote loading is being run for" << component->getName();
-            connect(loadTask.get(), &Task::succeeded, [=]() { remoteLoadSucceeded(taskIndex); });
-            connect(loadTask.get(), &Task::failed, [=](const QString& error) { remoteLoadFailed(taskIndex, error); });
-            connect(loadTask.get(), &Task::aborted, [=]() { remoteLoadFailed(taskIndex, tr("Aborted")); });
+            qCDebug(instanceProfileResolveC) << d->m_profile->d->m_instance->name() << "|"
+                                             << "Remote loading is being run for" << component->getName();
+            connect(loadTask.get(), &Task::succeeded, this, [this, taskIndex]() { remoteLoadSucceeded(taskIndex); });
+            connect(loadTask.get(), &Task::failed, this, [this, taskIndex](const QString& error) { remoteLoadFailed(taskIndex, error); });
+            connect(loadTask.get(), &Task::aborted, this, [this, taskIndex]() { remoteLoadFailed(taskIndex, tr("Aborted")); });
             RemoteLoadStatus status;
             status.type = loadType;
             status.PackProfileIndex = componentIndex;
+            status.task = loadTask;
             d->remoteLoadStatusList.append(status);
             taskIndex++;
         }
@@ -221,6 +199,7 @@ void ComponentUpdateTask::loadComponents()
     switch (result) {
         case LoadResult::LoadedLocal: {
             // Everything got loaded. Advance to dependency resolution.
+            performUpdateActions();
             resolveDependencies(d->mode == Mode::Launch || d->netmode == Net::Mode::Offline);
             break;
         }
@@ -299,8 +278,8 @@ static bool gatherRequirementsFromComponents(const ComponentContainer& input, Re
                     output.erase(componenRequireEx);
                     output.insert(result.outcome);
                 } else {
-                    qCritical() << "Conflicting requirements:" << componentRequire.uid << "versions:" << componentRequire.equalsVersion
-                                << ";" << (*found).equalsVersion;
+                    qCCritical(instanceProfileResolveC) << "Conflicting requirements:" << componentRequire.uid
+                                                        << "versions:" << componentRequire.equalsVersion << ";" << (*found).equalsVersion;
                 }
                 succeeded &= result.ok;
             } else {
@@ -382,22 +361,22 @@ static bool getTrivialComponentChanges(const ComponentIndex& index, const Requir
         } while (false);
         switch (decision) {
             case Decision::Undetermined:
-                qCritical() << "No decision for" << reqStr;
+                qCCritical(instanceProfileResolveC) << "No decision for" << reqStr;
                 succeeded = false;
                 break;
             case Decision::Met:
-                qDebug() << reqStr << "Is met.";
+                qCDebug(instanceProfileResolveC) << reqStr << "Is met.";
                 break;
             case Decision::Missing:
-                qDebug() << reqStr << "Is missing and should be added at" << req.indexOfFirstDependee;
+                qCDebug(instanceProfileResolveC) << reqStr << "Is missing and should be added at" << req.indexOfFirstDependee;
                 toAdd.insert(req);
                 break;
             case Decision::VersionNotSame:
-                qDebug() << reqStr << "already has different version that can be changed.";
+                qCDebug(instanceProfileResolveC) << reqStr << "already has different version that can be changed.";
                 toChange.insert(req);
                 break;
             case Decision::LockedVersionNotSame:
-                qDebug() << reqStr << "already has different version that cannot be changed.";
+                qCDebug(instanceProfileResolveC) << reqStr << "already has different version that cannot be changed.";
                 succeeded = false;
                 break;
         }
@@ -405,12 +384,48 @@ static bool getTrivialComponentChanges(const ComponentIndex& index, const Requir
     return succeeded;
 }
 
+ComponentContainer ComponentUpdateTask::collectTreeLinked(const QString& uid)
+{
+    ComponentContainer linked;
+
+    auto& components = d->m_profile->d->components;
+    auto& componentIndex = d->m_profile->d->componentIndex;
+    auto& instance = d->m_profile->d->m_instance;
+    for (auto comp : components) {
+        qCDebug(instanceProfileResolveC) << instance->name() << "|"
+                                         << "scanning" << comp->getID() << ":" << comp->getVersion() << "for tree link";
+        auto dep = std::find_if(comp->m_cachedRequires.cbegin(), comp->m_cachedRequires.cend(),
+                                [uid](const Meta::Require& req) -> bool { return req.uid == uid; });
+        if (dep != comp->m_cachedRequires.cend()) {
+            qCDebug(instanceProfileResolveC) << instance->name() << "|" << comp->getID() << ":" << comp->getVersion() << "depends on"
+                                             << uid;
+            linked.append(comp);
+        }
+    }
+    auto iter = componentIndex.find(uid);
+    if (iter != componentIndex.end()) {
+        ComponentPtr comp = *iter;
+        comp->updateCachedData();
+        qCDebug(instanceProfileResolveC) << instance->name() << "|" << comp->getID() << ":" << comp->getVersion() << "has"
+                                         << comp->m_cachedRequires.size() << "dependencies";
+        for (auto dep : comp->m_cachedRequires) {
+            qCDebug(instanceProfileC) << instance->name() << "|" << uid << "depends on" << dep.uid;
+            auto found = componentIndex.find(dep.uid);
+            if (found != componentIndex.end()) {
+                qCDebug(instanceProfileC) << instance->name() << "|" << (*found)->getID() << "is present";
+                linked.append(*found);
+            }
+        }
+    }
+    return linked;
+}
+
 // FIXME, TODO: decouple dependency resolution from loading
 // FIXME: This works directly with the PackProfile internals. It shouldn't! It needs richer data types than PackProfile uses.
 // FIXME: throw all this away and use a graph
 void ComponentUpdateTask::resolveDependencies(bool checkOnly)
 {
-    qDebug() << "Resolving dependencies";
+    qCDebug(instanceProfileResolveC) << "Resolving dependencies";
     /*
      * this is a naive dependency resolving algorithm. all it does is check for following conditions and react in simple ways:
      * 1. There are conflicting dependencies on the same uid with different exact version numbers
@@ -422,8 +437,8 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
      *
      * NOTE: this is a placeholder and should eventually be replaced with something 'serious'
      */
-    auto& components = d->m_list->d->components;
-    auto& componentIndex = d->m_list->d->componentIndex;
+    auto& components = d->m_profile->d->components;
+    auto& componentIndex = d->m_profile->d->componentIndex;
 
     RequireExSet allRequires;
     QStringList toRemove;
@@ -431,15 +446,16 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
         allRequires.clear();
         toRemove.clear();
         if (!gatherRequirementsFromComponents(components, allRequires)) {
+            finalizeComponents();
             emitFailed(tr("Conflicting requirements detected during dependency checking!"));
             return;
         }
         getTrivialRemovals(components, allRequires, toRemove);
         if (!toRemove.isEmpty()) {
-            qDebug() << "Removing obsolete components...";
+            qCDebug(instanceProfileResolveC) << "Removing obsolete components...";
             for (auto& remove : toRemove) {
-                qDebug() << "Removing" << remove;
-                d->m_list->remove(remove);
+                qCDebug(instanceProfileResolveC) << "Removing" << remove;
+                d->m_profile->remove(remove);
             }
         }
     } while (!toRemove.isEmpty());
@@ -447,10 +463,12 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
     RequireExSet toChange;
     bool succeeded = getTrivialComponentChanges(componentIndex, allRequires, toAdd, toChange);
     if (!succeeded) {
+        finalizeComponents();
         emitFailed(tr("Instance has conflicting dependencies."));
         return;
     }
     if (checkOnly) {
+        finalizeComponents();
         if (toAdd.size() || toChange.size()) {
             emitFailed(tr("Instance has unresolved dependencies while loading/checking for launch."));
         } else {
@@ -463,14 +481,15 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
     if (toAdd.size()) {
         // add stuff...
         for (auto& add : toAdd) {
-            auto component = makeShared<Component>(d->m_list, add.uid);
+            auto component = makeShared<Component>(d->m_profile, add.uid);
             if (!add.equalsVersion.isEmpty()) {
                 // exact version
-                qDebug() << "Adding" << add.uid << "version" << add.equalsVersion << "at position" << add.indexOfFirstDependee;
+                qCDebug(instanceProfileResolveC)
+                    << "Adding" << add.uid << "version" << add.equalsVersion << "at position" << add.indexOfFirstDependee;
                 component->m_version = add.equalsVersion;
             } else {
                 // version needs to be decided
-                qDebug() << "Adding" << add.uid << "at position" << add.indexOfFirstDependee;
+                qCDebug(instanceProfileResolveC) << "Adding" << add.uid << "at position" << add.indexOfFirstDependee;
                 // ############################################################################################################
                 // HACK HACK HACK HACK FIXME: this is a placeholder for deciding what version to use. For now, it is hardcoded.
                 if (!add.suggests.isEmpty()) {
@@ -493,7 +512,7 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
             }
             component->m_dependencyOnly = true;
             // FIXME: this should not work directly with the component list
-            d->m_list->insertComponent(add.indexOfFirstDependee, component);
+            d->m_profile->insertComponent(add.indexOfFirstDependee, component);
             componentIndex[add.uid] = component;
         }
         recursionNeeded = true;
@@ -502,7 +521,7 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
         // change a version of something that exists
         for (auto& change : toChange) {
             // FIXME: this should not work directly with the component list
-            qDebug() << "Setting version of " << change.uid << "to" << change.equalsVersion;
+            qCDebug(instanceProfileResolveC) << "Setting version of " << change.uid << "to" << change.equalsVersion;
             auto component = componentIndex[change.uid];
             component->setVersion(change.equalsVersion);
         }
@@ -512,24 +531,199 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
     if (recursionNeeded) {
         loadComponents();
     } else {
+        finalizeComponents();
         emitSucceeded();
     }
 }
 
+// Variant visitation via lambda
+template <class... Ts>
+struct overload : Ts... {
+    using Ts::operator()...;
+};
+template <class... Ts>
+overload(Ts...) -> overload<Ts...>;
+
+void ComponentUpdateTask::performUpdateActions()
+{
+    auto& instance = d->m_profile->d->m_instance;
+    bool addedActions;
+    QStringList toRemove;
+    do {
+        addedActions = false;
+        toRemove.clear();
+        auto& components = d->m_profile->d->components;
+        auto& componentIndex = d->m_profile->d->componentIndex;
+        for (auto component : components) {
+            if (!component) {
+                continue;
+            }
+            auto action = component->getUpdateAction();
+            auto visitor =
+                overload{ [](const UpdateActionNone&) {
+                             // noop
+                         },
+                          [&component, &instance](const UpdateActionChangeVersion& cv) {
+                              qCDebug(instanceProfileResolveC) << instance->name() << "|"
+                                                               << "UpdateActionChangeVersion" << component->getID() << ":"
+                                                               << component->getVersion() << "change to" << cv.targetVersion;
+                              component->setVersion(cv.targetVersion);
+                              component->waitLoadMeta();
+                          },
+                          [&component, &instance](const UpdateActionLatestRecommendedCompatible lrc) {
+                              qCDebug(instanceProfileResolveC)
+                                  << instance->name() << "|"
+                                  << "UpdateActionLatestRecommendedCompatible" << component->getID() << ":" << component->getVersion()
+                                  << "updating to latest recommend or compatible with" << lrc.parentUid << lrc.version;
+                              auto versionList = APPLICATION->metadataIndex()->get(component->getID());
+                              if (versionList) {
+                                  versionList->waitToLoad();
+                                  auto recommended = versionList->getRecommendedForParent(lrc.parentUid, lrc.version);
+                                  if (!recommended) {
+                                      recommended = versionList->getLatestForParent(lrc.parentUid, lrc.version);
+                                  }
+                                  if (recommended) {
+                                      component->setVersion(recommended->version());
+                                      component->waitLoadMeta();
+                                      return;
+                                  } else {
+                                      component->addComponentProblem(ProblemSeverity::Error,
+                                                                     QObject::tr("No compatible version of %1 found for %2 %3")
+                                                                         .arg(component->getName(), lrc.parentName, lrc.version));
+                                  }
+                              } else {
+                                  component->addComponentProblem(
+                                      ProblemSeverity::Error,
+                                      QObject::tr("No version list in metadata index for %1").arg(component->getID()));
+                              }
+                          },
+                          [&component, &instance, &toRemove](const UpdateActionRemove&) {
+                              qCDebug(instanceProfileResolveC)
+                                  << instance->name() << "|"
+                                  << "UpdateActionRemove" << component->getID() << ":" << component->getVersion() << "removing";
+                              toRemove.append(component->getID());
+                          },
+                          [this, &component, &instance, &addedActions, &componentIndex](const UpdateActionImportantChanged& ic) {
+                              qCDebug(instanceProfileResolveC)
+                                  << instance->name() << "|"
+                                  << "UpdateImportantChanged" << component->getID() << ":" << component->getVersion() << "was changed from"
+                                  << ic.oldVersion << "updating linked components";
+                              auto oldVersion = APPLICATION->metadataIndex()->getLoadedVersion(component->getID(), ic.oldVersion);
+                              for (auto oldReq : oldVersion->requiredSet()) {
+                                  auto currentlyRequired = component->m_cachedRequires.find(oldReq);
+                                  if (currentlyRequired == component->m_cachedRequires.cend()) {
+                                      auto oldReqComp = componentIndex.find(oldReq.uid);
+                                      if (oldReqComp != componentIndex.cend()) {
+                                          (*oldReqComp)->setUpdateAction(UpdateAction{ UpdateActionRemove{} });
+                                          addedActions = true;
+                                      }
+                                  }
+                              }
+                              auto linked = collectTreeLinked(component->getID());
+                              for (auto comp : linked) {
+                                  if (comp->isCustom()) {
+                                      continue;
+                                  }
+                                  auto compUid = comp->getID();
+                                  auto parentReq = std::find_if(component->m_cachedRequires.begin(), component->m_cachedRequires.end(),
+                                                                [compUid](const Meta::Require& req) { return req.uid == compUid; });
+                                  if (parentReq != component->m_cachedRequires.end()) {
+                                      auto newVersion = parentReq->equalsVersion.isEmpty() ? parentReq->suggests : parentReq->equalsVersion;
+                                      if (!newVersion.isEmpty()) {
+                                          comp->setUpdateAction(UpdateAction{ UpdateActionChangeVersion{ newVersion } });
+                                      } else {
+                                          comp->setUpdateAction(UpdateAction{ UpdateActionLatestRecommendedCompatible{
+                                              component->getID(),
+                                              component->getName(),
+                                              component->getVersion(),
+                                          } });
+                                      }
+                                  } else {
+                                      comp->setUpdateAction(UpdateAction{ UpdateActionLatestRecommendedCompatible{
+                                          component->getID(),
+                                          component->getName(),
+                                          component->getVersion(),
+                                      } });
+                                  }
+                                  addedActions = true;
+                              }
+                          } };
+            std::visit(visitor, action);
+            component->clearUpdateAction();
+            for (auto uid : toRemove) {
+                d->m_profile->remove(uid);
+            }
+        }
+    } while (addedActions);
+}
+
+void ComponentUpdateTask::finalizeComponents()
+{
+    auto& components = d->m_profile->d->components;
+    auto& componentIndex = d->m_profile->d->componentIndex;
+    for (auto component : components) {
+        for (auto req : component->m_cachedRequires) {
+            auto found = componentIndex.find(req.uid);
+            if (found == componentIndex.cend()) {
+                component->addComponentProblem(
+                    ProblemSeverity::Error,
+                    QObject::tr("%1 is missing requirement %2 %3")
+                        .arg(component->getName(), req.uid, req.equalsVersion.isEmpty() ? req.suggests : req.equalsVersion));
+            } else {
+                auto reqComp = *found;
+                if (!reqComp->getProblems().isEmpty()) {
+                    component->addComponentProblem(
+                        reqComp->getProblemSeverity(),
+                        QObject::tr("%1, a dependency of this component, has reported issues").arg(reqComp->getName()));
+                }
+                if (!req.equalsVersion.isEmpty() && req.equalsVersion != reqComp->getVersion()) {
+                    component->addComponentProblem(ProblemSeverity::Error,
+                                                   QObject::tr("%1, a dependency of this component, is not the required version %2")
+                                                       .arg(reqComp->getName(), req.equalsVersion));
+                } else if (!req.suggests.isEmpty() && req.suggests != reqComp->getVersion()) {
+                    component->addComponentProblem(ProblemSeverity::Warning,
+                                                   QObject::tr("%1, a dependency of this component, is not the suggested version %2")
+                                                       .arg(reqComp->getName(), req.suggests));
+                }
+            }
+        }
+        for (auto conflict : component->knownConflictingComponents()) {
+            auto found = componentIndex.find(conflict);
+            if (found != componentIndex.cend()) {
+                auto foundComp = *found;
+                if (foundComp->isCustom()) {
+                    continue;
+                }
+                component->addComponentProblem(
+                    ProblemSeverity::Warning,
+                    QObject::tr("%1 and %2 are known to not work together. It is recommended to remove one of them.")
+                        .arg(component->getName(), foundComp->getName()));
+            }
+        }
+    }
+}
+
 void ComponentUpdateTask::remoteLoadSucceeded(size_t taskIndex)
 {
+    if (static_cast<size_t>(d->remoteLoadStatusList.size()) < taskIndex) {
+        qCWarning(instanceProfileResolveC) << "Got task index outside of results" << taskIndex;
+        return;
+    }
     auto& taskSlot = d->remoteLoadStatusList[taskIndex];
+    disconnect(taskSlot.task.get(), &Task::succeeded, this, nullptr);
+    disconnect(taskSlot.task.get(), &Task::failed, this, nullptr);
+    disconnect(taskSlot.task.get(), &Task::aborted, this, nullptr);
     if (taskSlot.finished) {
-        qWarning() << "Got multiple results from remote load task" << taskIndex;
+        qCWarning(instanceProfileResolveC) << "Got multiple results from remote load task" << taskIndex;
         return;
     }
-    qDebug() << "Remote task" << taskIndex << "succeeded";
+    qCDebug(instanceProfileResolveC) << "Remote task" << taskIndex << "succeeded";
     taskSlot.succeeded = false;
     taskSlot.finished = true;
     d->remoteTasksInProgress--;
     // update the cached data of the component from the downloaded version file.
     if (taskSlot.type == RemoteLoadStatus::Type::Version) {
-        auto component = d->m_list->getComponent(taskSlot.PackProfileIndex);
+        auto component = d->m_profile->getComponent(taskSlot.PackProfileIndex);
         component->m_loaded = true;
         component->updateCachedData();
     }
@@ -538,12 +732,19 @@ void ComponentUpdateTask::remoteLoadSucceeded(size_t taskIndex)
 
 void ComponentUpdateTask::remoteLoadFailed(size_t taskIndex, const QString& msg)
 {
+    if (static_cast<size_t>(d->remoteLoadStatusList.size()) < taskIndex) {
+        qCWarning(instanceProfileResolveC) << "Got task index outside of results" << taskIndex;
+        return;
+    }
     auto& taskSlot = d->remoteLoadStatusList[taskIndex];
+    disconnect(taskSlot.task.get(), &Task::succeeded, this, nullptr);
+    disconnect(taskSlot.task.get(), &Task::failed, this, nullptr);
+    disconnect(taskSlot.task.get(), &Task::aborted, this, nullptr);
     if (taskSlot.finished) {
-        qWarning() << "Got multiple results from remote load task" << taskIndex;
+        qCWarning(instanceProfileResolveC) << "Got multiple results from remote load task" << taskIndex;
         return;
     }
-    qDebug() << "Remote task" << taskIndex << "failed: " << msg;
+    qCDebug(instanceProfileResolveC) << "Remote task" << taskIndex << "failed: " << msg;
     d->remoteLoadSuccessful = false;
     taskSlot.succeeded = false;
     taskSlot.finished = true;
@@ -561,6 +762,7 @@ void ComponentUpdateTask::checkIfAllFinished()
     if (d->remoteLoadSuccessful) {
         // nothing bad happened... clear the temp load status and proceed with looking at dependencies
         d->remoteLoadStatusList.clear();
+        performUpdateActions();
         resolveDependencies(d->mode == Mode::Launch);
     } else {
         // remote load failed... report error and bail
diff --git a/launcher/minecraft/ComponentUpdateTask.h b/launcher/minecraft/ComponentUpdateTask.h
index 2f396a049..484c0bedd 100644
--- a/launcher/minecraft/ComponentUpdateTask.h
+++ b/launcher/minecraft/ComponentUpdateTask.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "minecraft/Component.h"
 #include "net/Mode.h"
 #include "tasks/Task.h"
 
@@ -21,7 +22,11 @@ class ComponentUpdateTask : public Task {
 
    private:
     void loadComponents();
+    /// collects components that are dependent on or dependencies of the component
+    QList<ComponentPtr> collectTreeLinked(const QString& uid);
     void resolveDependencies(bool checkOnly);
+    void performUpdateActions();
+    void finalizeComponents();
 
     void remoteLoadSucceeded(size_t index);
     void remoteLoadFailed(size_t index, const QString& msg);
diff --git a/launcher/minecraft/ComponentUpdateTask_p.h b/launcher/minecraft/ComponentUpdateTask_p.h
index 00e8f2fbe..2fc0b6d9a 100644
--- a/launcher/minecraft/ComponentUpdateTask_p.h
+++ b/launcher/minecraft/ComponentUpdateTask_p.h
@@ -4,6 +4,9 @@
 #include <QString>
 #include <cstddef>
 #include "net/Mode.h"
+#include "tasks/Task.h"
+
+#include "minecraft/ComponentUpdateTask.h"
 
 class PackProfile;
 
@@ -13,10 +16,11 @@ struct RemoteLoadStatus {
     bool finished = false;
     bool succeeded = false;
     QString error;
+    Task::Ptr task;
 };
 
 struct ComponentUpdateTaskData {
-    PackProfile* m_list = nullptr;
+    PackProfile* m_profile = nullptr;
     QList<RemoteLoadStatus> remoteLoadStatusList;
     bool remoteLoadSuccessful = true;
     size_t remoteTasksInProgress = 0;
diff --git a/launcher/minecraft/LaunchProfile.cpp b/launcher/minecraft/LaunchProfile.cpp
index cf819b411..c11a0f915 100644
--- a/launcher/minecraft/LaunchProfile.cpp
+++ b/launcher/minecraft/LaunchProfile.cpp
@@ -165,6 +165,12 @@ void LaunchProfile::applyCompatibleJavaMajors(QList<int>& javaMajor)
     m_compatibleJavaMajors.append(javaMajor);
 }
 
+void LaunchProfile::applyCompatibleJavaName(QString javaName)
+{
+    if (!javaName.isEmpty())
+        m_compatibleJavaName = javaName;
+}
+
 void LaunchProfile::applyLibrary(LibraryPtr library, const RuntimeContext& runtimeContext)
 {
     if (!library->isActive(runtimeContext)) {
@@ -334,6 +340,11 @@ const QList<int>& LaunchProfile::getCompatibleJavaMajors() const
     return m_compatibleJavaMajors;
 }
 
+const QString LaunchProfile::getCompatibleJavaName() const
+{
+    return m_compatibleJavaName;
+}
+
 void LaunchProfile::getLibraryFiles(const RuntimeContext& runtimeContext,
                                     QStringList& jars,
                                     QStringList& nativeJars,
diff --git a/launcher/minecraft/LaunchProfile.h b/launcher/minecraft/LaunchProfile.h
index 12b312383..f1be6fee0 100644
--- a/launcher/minecraft/LaunchProfile.h
+++ b/launcher/minecraft/LaunchProfile.h
@@ -59,6 +59,7 @@ class LaunchProfile : public ProblemProvider {
     void applyMavenFile(LibraryPtr library, const RuntimeContext& runtimeContext);
     void applyAgent(AgentPtr agent, const RuntimeContext& runtimeContext);
     void applyCompatibleJavaMajors(QList<int>& javaMajor);
+    void applyCompatibleJavaName(QString javaName);
     void applyMainJar(LibraryPtr jar);
     void applyProblemSeverity(ProblemSeverity severity);
     /// clear the profile
@@ -80,6 +81,7 @@ class LaunchProfile : public ProblemProvider {
     const QList<LibraryPtr>& getMavenFiles() const;
     const QList<AgentPtr>& getAgents() const;
     const QList<int>& getCompatibleJavaMajors() const;
+    const QString getCompatibleJavaName() const;
     const LibraryPtr getMainJar() const;
     void getLibraryFiles(const RuntimeContext& runtimeContext,
                          QStringList& jars,
@@ -150,5 +152,7 @@ class LaunchProfile : public ProblemProvider {
     /// compatible java major versions
     QList<int> m_compatibleJavaMajors;
 
+    QString m_compatibleJavaName;
+
     ProblemSeverity m_problemSeverity = ProblemSeverity::None;
 };
diff --git a/launcher/minecraft/Library.cpp b/launcher/minecraft/Library.cpp
index b4e5a6095..4f04f0eb9 100644
--- a/launcher/minecraft/Library.cpp
+++ b/launcher/minecraft/Library.cpp
@@ -35,12 +35,27 @@
 
 #include "Library.h"
 #include "MinecraftInstance.h"
+#include "net/NetRequest.h"
 
 #include <BuildConfig.h>
 #include <FileSystem.h>
 #include <net/ApiDownload.h>
 #include <net/ChecksumValidator.h>
 
+/**
+ * @brief Collect applicable files for the library.
+ *
+ * Depending on whether the library is native or not, it adds paths to the
+ * appropriate lists for jar files, native libraries for 32-bit, and native
+ * libraries for 64-bit.
+ *
+ * @param runtimeContext The current runtime context.
+ * @param jar List to store paths for jar files.
+ * @param native List to store paths for native libraries.
+ * @param native32 List to store paths for 32-bit native libraries.
+ * @param native64 List to store paths for 64-bit native libraries.
+ * @param overridePath Optional path to override the default storage path.
+ */
 void Library::getApplicableFiles(const RuntimeContext& runtimeContext,
                                  QStringList& jar,
                                  QStringList& native,
@@ -49,6 +64,7 @@ void Library::getApplicableFiles(const RuntimeContext& runtimeContext,
                                  const QString& overridePath) const
 {
     bool local = isLocal();
+    // Lambda function to get the absolute file path
     auto actualPath = [&](QString relPath) {
         relPath = FS::RemoveInvalidPathChars(relPath);
         QFileInfo out(FS::PathCombine(storagePrefix(), relPath));
@@ -58,6 +74,7 @@ void Library::getApplicableFiles(const RuntimeContext& runtimeContext,
         }
         return out.absoluteFilePath();
     };
+
     QString raw_storage = storageSuffix(runtimeContext);
     if (isNative()) {
         if (raw_storage.contains("${arch}")) {
@@ -75,15 +92,29 @@ void Library::getApplicableFiles(const RuntimeContext& runtimeContext,
     }
 }
 
-QList<NetAction::Ptr> Library::getDownloads(const RuntimeContext& runtimeContext,
-                                            class HttpMetaCache* cache,
-                                            QStringList& failedLocalFiles,
-                                            const QString& overridePath) const
+/**
+ * @brief Get download requests for the library files.
+ *
+ * Depending on whether the library is native or not, and the current runtime context,
+ * this function prepares download requests for the necessary files. It handles both local
+ * and remote files, checks for stale cache entries, and adds checksummed downloads.
+ *
+ * @param runtimeContext The current runtime context.
+ * @param cache Pointer to the HTTP meta cache.
+ * @param failedLocalFiles List to store paths for failed local files.
+ * @param overridePath Optional path to override the default storage path.
+ * @return QList<Net::NetRequest::Ptr> List of download requests.
+ */
+QList<Net::NetRequest::Ptr> Library::getDownloads(const RuntimeContext& runtimeContext,
+                                                  class HttpMetaCache* cache,
+                                                  QStringList& failedLocalFiles,
+                                                  const QString& overridePath) const
 {
-    QList<NetAction::Ptr> out;
+    QList<Net::NetRequest::Ptr> out;
     bool stale = isAlwaysStale();
     bool local = isLocal();
 
+    // Lambda function to check if a local file exists
     auto check_local_file = [&](QString storage) {
         QFileInfo fileinfo(storage);
         QString fileName = fileinfo.fileName();
@@ -96,6 +127,7 @@ QList<NetAction::Ptr> Library::getDownloads(const RuntimeContext& runtimeContext
         return true;
     };
 
+    // Lambda function to add a download request
     auto add_download = [&](QString storage, QString url, QString sha1) {
         if (local) {
             return check_local_file(storage);
@@ -115,9 +147,8 @@ QList<NetAction::Ptr> Library::getDownloads(const RuntimeContext& runtimeContext
         options |= Net::Download::Option::MakeEternal;
 
         if (sha1.size()) {
-            auto rawSha1 = QByteArray::fromHex(sha1.toLatin1());
             auto dl = Net::ApiDownload::makeCached(url, entry, options);
-            dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
+            dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, sha1));
             qDebug() << "Checksummed Download for:" << rawName().serialize() << "storage:" << storage << "url:" << url;
             out.append(dl);
         } else {
@@ -196,6 +227,15 @@ QList<NetAction::Ptr> Library::getDownloads(const RuntimeContext& runtimeContext
     return out;
 }
 
+/**
+ * @brief Check if the library is active in the given runtime context.
+ *
+ * This function evaluates rules to determine if the library should be active,
+ * considering both general rules and native compatibility.
+ *
+ * @param runtimeContext The current runtime context.
+ * @return bool True if the library is active, false otherwise.
+ */
 bool Library::isActive(const RuntimeContext& runtimeContext) const
 {
     bool result = true;
@@ -216,16 +256,35 @@ bool Library::isActive(const RuntimeContext& runtimeContext) const
     return result;
 }
 
+/**
+ * @brief Check if the library is considered local.
+ *
+ * @return bool True if the library is local, false otherwise.
+ */
 bool Library::isLocal() const
 {
     return m_hint == "local";
 }
 
+/**
+ * @brief Check if the library is always considered stale.
+ *
+ * @return bool True if the library is always stale, false otherwise.
+ */
 bool Library::isAlwaysStale() const
 {
     return m_hint == "always-stale";
 }
 
+/**
+ * @brief Get the compatible native classifier for the current runtime context.
+ *
+ * This function attempts to match the current runtime context with the appropriate
+ * native classifier.
+ *
+ * @param runtimeContext The current runtime context.
+ * @return QString The compatible native classifier, or an empty string if none is found.
+ */
 QString Library::getCompatibleNative(const RuntimeContext& runtimeContext) const
 {
     // try to match precise classifier "[os]-[arch]"
@@ -240,16 +299,31 @@ QString Library::getCompatibleNative(const RuntimeContext& runtimeContext) const
     return entry.value();
 }
 
+/**
+ * @brief Set the storage prefix for the library.
+ *
+ * @param prefix The storage prefix to set.
+ */
 void Library::setStoragePrefix(QString prefix)
 {
     m_storagePrefix = prefix;
 }
 
+/**
+ * @brief Get the default storage prefix for libraries.
+ *
+ * @return QString The default storage prefix.
+ */
 QString Library::defaultStoragePrefix()
 {
     return "libraries/";
 }
 
+/**
+ * @brief Get the current storage prefix for the library.
+ *
+ * @return QString The current storage prefix.
+ */
 QString Library::storagePrefix() const
 {
     if (m_storagePrefix.isEmpty()) {
@@ -258,6 +332,15 @@ QString Library::storagePrefix() const
     return m_storagePrefix;
 }
 
+/**
+ * @brief Get the filename for the library in the current runtime context.
+ *
+ * This function determines the appropriate filename for the library, taking into
+ * account native classifiers if applicable.
+ *
+ * @param runtimeContext The current runtime context.
+ * @return QString The filename of the library.
+ */
 QString Library::filename(const RuntimeContext& runtimeContext) const
 {
     if (!m_filename.isEmpty()) {
@@ -279,6 +362,15 @@ QString Library::filename(const RuntimeContext& runtimeContext) const
     return nativeSpec.getFileName();
 }
 
+/**
+ * @brief Get the display name for the library in the current runtime context.
+ *
+ * This function returns the display name for the library, defaulting to the filename
+ * if no display name is set.
+ *
+ * @param runtimeContext The current runtime context.
+ * @return QString The display name of the library.
+ */
 QString Library::displayName(const RuntimeContext& runtimeContext) const
 {
     if (!m_displayname.isEmpty())
@@ -286,6 +378,15 @@ QString Library::displayName(const RuntimeContext& runtimeContext) const
     return filename(runtimeContext);
 }
 
+/**
+ * @brief Get the storage suffix for the library in the current runtime context.
+ *
+ * This function determines the appropriate storage suffix for the library, taking into
+ * account native classifiers if applicable.
+ *
+ * @param runtimeContext The current runtime context.
+ * @return QString The storage suffix of the library.
+ */
 QString Library::storageSuffix(const RuntimeContext& runtimeContext) const
 {
     // non-native? use only the gradle specifier
diff --git a/launcher/minecraft/Library.h b/launcher/minecraft/Library.h
index adb89c4c6..d3019e814 100644
--- a/launcher/minecraft/Library.h
+++ b/launcher/minecraft/Library.h
@@ -34,7 +34,6 @@
  */
 
 #pragma once
-#include <net/NetAction.h>
 #include <QDir>
 #include <QList>
 #include <QMap>
@@ -48,6 +47,7 @@
 #include "MojangDownloadInfo.h"
 #include "Rule.h"
 #include "RuntimeContext.h"
+#include "net/NetRequest.h"
 
 class Library;
 class MinecraftInstance;
@@ -144,10 +144,10 @@ class Library {
     bool isForge() const;
 
     // Get a list of downloads for this library
-    QList<NetAction::Ptr> getDownloads(const RuntimeContext& runtimeContext,
-                                       class HttpMetaCache* cache,
-                                       QStringList& failedLocalFiles,
-                                       const QString& overridePath) const;
+    QList<Net::NetRequest::Ptr> getDownloads(const RuntimeContext& runtimeContext,
+                                             class HttpMetaCache* cache,
+                                             QStringList& failedLocalFiles,
+                                             const QString& overridePath) const;
 
     QString getCompatibleNative(const RuntimeContext& runtimeContext) const;
 
diff --git a/launcher/minecraft/Logging.cpp b/launcher/minecraft/Logging.cpp
new file mode 100644
index 000000000..92596de3e
--- /dev/null
+++ b/launcher/minecraft/Logging.cpp
@@ -0,0 +1,25 @@
+
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "minecraft/Logging.h"
+#include <qloggingcategory.h>
+
+Q_LOGGING_CATEGORY(instanceProfileC, "launcher.instance.profile")
+Q_LOGGING_CATEGORY(instanceProfileResolveC, "launcher.instance.profile.resolve")
diff --git a/launcher/net/StaticHeaderProxy.h b/launcher/minecraft/Logging.h
similarity index 62%
rename from launcher/net/StaticHeaderProxy.h
rename to launcher/minecraft/Logging.h
index 389dd2e85..00d43f419 100644
--- a/launcher/net/StaticHeaderProxy.h
+++ b/launcher/minecraft/Logging.h
@@ -1,39 +1,26 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include "net/HeaderProxy.h"
-
-namespace Net {
-
-class StaticHeaderProxy : public HeaderProxy {
-   public:
-    StaticHeaderProxy(QList<HeaderPair> hdrs = {}) : HeaderProxy(), m_hdrs(hdrs) {};
-    virtual ~StaticHeaderProxy() = default;
-
-   public:
-    virtual QList<HeaderPair> headers(const QNetworkRequest&) const override { return m_hdrs; };
-    void setHeaders(QList<HeaderPair> hdrs) { m_hdrs = hdrs; };
-
-   private:
-    QList<HeaderPair> m_hdrs;
-};
-
-}  // namespace Net
+
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(instanceProfileC)
+Q_DECLARE_LOGGING_CATEGORY(instanceProfileResolveC)
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 4809cdc06..526a8c3bb 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -38,9 +38,14 @@
 #include "MinecraftInstance.h"
 #include "Application.h"
 #include "BuildConfig.h"
+#include "QObjectPtr.h"
+#include "minecraft/launch/AutoInstallJava.h"
 #include "minecraft/launch/CreateGameFolders.h"
 #include "minecraft/launch/ExtractNatives.h"
 #include "minecraft/launch/PrintInstanceInfo.h"
+#include "minecraft/update/AssetUpdateTask.h"
+#include "minecraft/update/FMLLibrariesTask.h"
+#include "minecraft/update/LibrariesTask.h"
 #include "settings/Setting.h"
 #include "settings/SettingsObject.h"
 
@@ -51,13 +56,13 @@
 #include "pathmatcher/RegexpMatcher.h"
 
 #include "launch/LaunchTask.h"
+#include "launch/TaskStepWrapper.h"
 #include "launch/steps/CheckJava.h"
 #include "launch/steps/LookupServerAddress.h"
 #include "launch/steps/PostLaunchCommand.h"
 #include "launch/steps/PreLaunchCommand.h"
 #include "launch/steps/QuitAfterGameStop.h"
 #include "launch/steps/TextPrint.h"
-#include "launch/steps/Update.h"
 
 #include "minecraft/launch/ClaimAccount.h"
 #include "minecraft/launch/LauncherPartLaunch.h"
@@ -68,9 +73,6 @@
 
 #include "java/JavaUtils.h"
 
-#include "meta/Index.h"
-#include "meta/VersionList.h"
-
 #include "icons/IconList.h"
 
 #include "mod/ModFolderModel.h"
@@ -82,7 +84,6 @@
 
 #include "AssetsUtils.h"
 #include "MinecraftLoadAndCheck.h"
-#include "MinecraftUpdate.h"
 #include "PackProfile.h"
 #include "minecraft/gameoptions/GameOptions.h"
 #include "minecraft/update/FoldersTask.h"
@@ -134,25 +135,21 @@ void MinecraftInstance::loadSpecificSettings()
         return;
 
     // Java Settings
-    auto javaOverride = m_settings->registerSetting("OverrideJava", false);
     auto locationOverride = m_settings->registerSetting("OverrideJavaLocation", false);
     auto argsOverride = m_settings->registerSetting("OverrideJavaArgs", false);
-
-    // combinations
-    auto javaOrLocation = std::make_shared<OrSetting>("JavaOrLocationOverride", javaOverride, locationOverride);
-    auto javaOrArgs = std::make_shared<OrSetting>("JavaOrArgsOverride", javaOverride, argsOverride);
+    m_settings->registerSetting("AutomaticJava", false);
 
     if (auto global_settings = globalSettings()) {
-        m_settings->registerOverride(global_settings->getSetting("JavaPath"), javaOrLocation);
-        m_settings->registerOverride(global_settings->getSetting("JvmArgs"), javaOrArgs);
-        m_settings->registerOverride(global_settings->getSetting("IgnoreJavaCompatibility"), javaOrLocation);
+        m_settings->registerOverride(global_settings->getSetting("JavaPath"), locationOverride);
+        m_settings->registerOverride(global_settings->getSetting("JvmArgs"), argsOverride);
+        m_settings->registerOverride(global_settings->getSetting("IgnoreJavaCompatibility"), locationOverride);
 
         // special!
-        m_settings->registerPassthrough(global_settings->getSetting("JavaSignature"), javaOrLocation);
-        m_settings->registerPassthrough(global_settings->getSetting("JavaArchitecture"), javaOrLocation);
-        m_settings->registerPassthrough(global_settings->getSetting("JavaRealArchitecture"), javaOrLocation);
-        m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), javaOrLocation);
-        m_settings->registerPassthrough(global_settings->getSetting("JavaVendor"), javaOrLocation);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaSignature"), locationOverride);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaArchitecture"), locationOverride);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaRealArchitecture"), locationOverride);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), locationOverride);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaVendor"), locationOverride);
 
         // Window Size
         auto windowSetting = m_settings->registerSetting("OverrideWindow", false);
@@ -173,11 +170,12 @@ void MinecraftInstance::loadSpecificSettings()
         m_settings->registerOverride(global_settings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
         m_settings->registerOverride(global_settings->getSetting("CustomGLFWPath"), nativeLibraryWorkaroundsOverride);
 
-        // Peformance related options
+        // Performance related options
         auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
         m_settings->registerOverride(global_settings->getSetting("EnableFeralGamemode"), performanceOverride);
         m_settings->registerOverride(global_settings->getSetting("EnableMangoHud"), performanceOverride);
         m_settings->registerOverride(global_settings->getSetting("UseDiscreteGpu"), performanceOverride);
+        m_settings->registerOverride(global_settings->getSetting("UseZink"), performanceOverride);
 
         // Miscellaneous
         auto miscellaneousOverride = m_settings->registerSetting("OverrideMiscellaneous", false);
@@ -197,6 +195,7 @@ void MinecraftInstance::loadSpecificSettings()
     // Join server on launch, this does not have a global override
     m_settings->registerSetting("JoinServerOnLaunch", false);
     m_settings->registerSetting("JoinServerOnLaunchAddress", "");
+    m_settings->registerSetting("JoinWorldOnLaunch", "");
 
     // Use account for instance, this does not have a global override
     m_settings->registerSetting("UseAccountForInstance", false);
@@ -218,6 +217,7 @@ void MinecraftInstance::loadSpecificSettings()
 void MinecraftInstance::updateRuntimeContext()
 {
     m_runtimeContext.updateFromInstanceSettings(m_settings);
+    m_components->invalidateLaunchProfile();
 }
 
 QString MinecraftInstance::typeName() const
@@ -292,10 +292,10 @@ QString MinecraftInstance::gameRoot() const
     QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft"));
     QFileInfo dotMCDir(FS::PathCombine(instanceRoot(), ".minecraft"));
 
-    if (mcDir.exists() && !dotMCDir.exists())
-        return mcDir.filePath();
-    else
+    if (dotMCDir.exists() && !mcDir.exists())
         return dotMCDir.filePath();
+    else
+        return mcDir.filePath();
 }
 
 QString MinecraftInstance::binRoot() const
@@ -525,8 +525,7 @@ QStringList MinecraftInstance::javaArguments()
 
     if (javaVersion.isModular() && shouldApplyOnlineFixes())
         // allow reflective access to java.net - required by the skin fix
-        args << "--add-opens"
-             << "java.base/java.net=ALL-UNNAMED";
+        args << "--add-opens" << "java.base/java.net=ALL-UNNAMED";
 
     return args;
 }
@@ -655,7 +654,7 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment()
             // dlsym variant is only needed for OpenGL and not included in the vulkan layer
             appendLib("libMangoHud_dlsym.so");
             appendLib("libMangoHud_opengl.so");
-            appendLib(mangoHudLib.fileName());
+            preloadList << mangoHudLibString;
         }
 
         env.insert("LD_PRELOAD", preloadList.join(QLatin1String(":")));
@@ -670,6 +669,13 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment()
         env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only");
         env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia");
     }
+
+    if (settings()->get("UseZink").toBool()) {
+        // taken from https://wiki.archlinux.org/title/OpenGL#OpenGL_over_Vulkan_(Zink)
+        env.insert("__GLX_VENDOR_LIBRARY_NAME", "mesa");
+        env.insert("MESA_LOADER_DRIVER_OVERRIDE", "zink");
+        env.insert("GALLIUM_DRIVER", "zink");
+    }
 #endif
     return env;
 }
@@ -696,7 +702,7 @@ static QString replaceTokensIn(QString text, QMap<QString, QString> with)
     return result;
 }
 
-QStringList MinecraftInstance::processMinecraftArgs(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) const
+QStringList MinecraftInstance::processMinecraftArgs(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin) const
 {
     auto profile = m_components->getProfile();
     QString args_pattern = profile->getMinecraftArguments();
@@ -704,12 +710,16 @@ QStringList MinecraftInstance::processMinecraftArgs(AuthSessionPtr session, Mine
         args_pattern += " --tweakClass " + tweaker;
     }
 
-    if (serverToJoin && !serverToJoin->address.isEmpty()) {
-        if (profile->hasTrait("feature:is_quick_play_multiplayer")) {
-            args_pattern += " --quickPlayMultiplayer " + serverToJoin->address + ':' + QString::number(serverToJoin->port);
-        } else {
-            args_pattern += " --server " + serverToJoin->address;
-            args_pattern += " --port " + QString::number(serverToJoin->port);
+    if (targetToJoin) {
+        if (!targetToJoin->address.isEmpty()) {
+            if (profile->hasTrait("feature:is_quick_play_multiplayer")) {
+                args_pattern += " --quickPlayMultiplayer " + targetToJoin->address + ':' + QString::number(targetToJoin->port);
+            } else {
+                args_pattern += " --server " + targetToJoin->address;
+                args_pattern += " --port " + QString::number(targetToJoin->port);
+            }
+        } else if (!targetToJoin->world.isEmpty() && profile->hasTrait("feature:is_quick_play_singleplayer")) {
+            args_pattern += " --quickPlaySingleplayer " + targetToJoin->world;
         }
     }
 
@@ -753,7 +763,7 @@ QStringList MinecraftInstance::processMinecraftArgs(AuthSessionPtr session, Mine
     return parts;
 }
 
-QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
+QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin)
 {
     QString launchScript;
 
@@ -772,9 +782,13 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
         launchScript += "appletClass " + appletClass + "\n";
     }
 
-    if (serverToJoin && !serverToJoin->address.isEmpty()) {
-        launchScript += "serverAddress " + serverToJoin->address + "\n";
-        launchScript += "serverPort " + QString::number(serverToJoin->port) + "\n";
+    if (targetToJoin) {
+        if (!targetToJoin->address.isEmpty()) {
+            launchScript += "serverAddress " + targetToJoin->address + "\n";
+            launchScript += "serverPort " + QString::number(targetToJoin->port) + "\n";
+        } else if (!targetToJoin->world.isEmpty()) {
+            launchScript += "worldName " + targetToJoin->world + "\n";
+        }
     }
 
     // generic minecraft params
@@ -827,16 +841,15 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
     return launchScript;
 }
 
-QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
+QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin)
 {
     QStringList out;
-    out << "Main Class:"
-        << "  " + getMainClass() << "";
-    out << "Native path:"
-        << "  " + getNativePath() << "";
+    out << "Main Class:" << "  " + getMainClass() << "";
+    out << "Native path:" << "  " + getNativePath() << "";
 
     auto profile = m_components->getProfile();
 
+    // traits
     auto alltraits = traits();
     if (alltraits.size()) {
         out << "Traits:";
@@ -846,6 +859,7 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
         out << "";
     }
 
+    // native libraries
     auto settings = this->settings();
     bool nativeOpenAL = settings->get("UseNativeOpenAL").toBool();
     bool nativeGLFW = settings->get("UseNativeGLFW").toBool();
@@ -881,6 +895,7 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
         out << "";
     }
 
+    // mods and core mods
     auto printModList = [&](const QString& label, ModFolderModel& model) {
         if (model.size()) {
             out << QString("%1:").arg(label);
@@ -909,6 +924,7 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
     printModList("Mods", *(loaderModList().get()));
     printModList("Core Mods", *(coreModList().get()));
 
+    // jar mods
     auto& jarMods = profile->getJarMods();
     if (jarMods.size()) {
         out << "Jar Mods:";
@@ -924,11 +940,13 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
         out << "";
     }
 
-    auto params = processMinecraftArgs(nullptr, serverToJoin);
+    // minecraft arguments
+    auto params = processMinecraftArgs(nullptr, targetToJoin);
     out << "Params:";
     out << "  " + params.join(' ');
     out << "";
 
+    // window size
     QString windowParams;
     if (settings->get("LaunchMaximized").toBool()) {
         out << "Window size: max (if available)";
@@ -1060,21 +1078,21 @@ QString MinecraftInstance::getStatusbarDescription()
     return description;
 }
 
-Task::Ptr MinecraftInstance::createUpdateTask(Net::Mode mode)
+QList<LaunchStep::Ptr> MinecraftInstance::createUpdateTask()
 {
-    updateRuntimeContext();
-    switch (mode) {
-        case Net::Mode::Offline: {
-            return Task::Ptr(new MinecraftLoadAndCheck(this));
-        }
-        case Net::Mode::Online: {
-            return Task::Ptr(new MinecraftUpdate(this));
-        }
-    }
-    return nullptr;
+    return {
+        // create folders
+        makeShared<FoldersTask>(this),
+        // libraries download
+        makeShared<LibrariesTask>(this),
+        // FML libraries download and copy into the instance
+        makeShared<FMLLibrariesTask>(this),
+        // assets update
+        makeShared<AssetUpdateTask>(this),
+    };
 }
 
-shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
+shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin)
 {
     updateRuntimeContext();
     // FIXME: get rid of shared_from_this ...
@@ -1088,26 +1106,28 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(makeShared<TextPrint>(pptr, "Minecraft folder is:\n" + gameRoot() + "\n\n", MessageLevel::Launcher));
     }
 
-    // check java
-    {
-        process->appendStep(makeShared<CheckJava>(pptr));
-    }
-
     // create the .minecraft folder and server-resource-packs (workaround for Minecraft bug MCL-3732)
     {
         process->appendStep(makeShared<CreateGameFolders>(pptr));
     }
 
-    if (!serverToJoin && settings()->get("JoinServerOnLaunch").toBool()) {
+    if (!targetToJoin && settings()->get("JoinServerOnLaunch").toBool()) {
         QString fullAddress = settings()->get("JoinServerOnLaunchAddress").toString();
-        serverToJoin.reset(new MinecraftServerTarget(MinecraftServerTarget::parse(fullAddress)));
+        if (!fullAddress.isEmpty()) {
+            targetToJoin.reset(new MinecraftTarget(MinecraftTarget::parse(fullAddress, false)));
+        } else {
+            QString world = settings()->get("JoinWorldOnLaunch").toString();
+            if (!world.isEmpty()) {
+                targetToJoin.reset(new MinecraftTarget(MinecraftTarget::parse(world, true)));
+            }
+        }
     }
 
-    if (serverToJoin && serverToJoin->port == 25565) {
+    if (targetToJoin && targetToJoin->port == 25565) {
         // Resolve server address to join on launch
         auto step = makeShared<LookupServerAddress>(pptr);
-        step->setLookupAddress(serverToJoin->address);
-        step->setOutputAddressPtr(serverToJoin);
+        step->setLookupAddress(targetToJoin->address);
+        step->setOutputAddressPtr(targetToJoin);
         process->appendStep(step);
     }
 
@@ -1118,14 +1138,26 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(step);
     }
 
+    // load meta
+    {
+        auto mode = session->status != AuthSession::PlayableOffline ? Net::Mode::Online : Net::Mode::Offline;
+        process->appendStep(makeShared<TaskStepWrapper>(pptr, makeShared<MinecraftLoadAndCheck>(this, mode, pptr)));
+    }
+
+    // check java
+    {
+        process->appendStep(makeShared<AutoInstallJava>(pptr));
+        process->appendStep(makeShared<CheckJava>(pptr));
+    }
+
     // if we aren't in offline mode,.
     if (session->status != AuthSession::PlayableOffline) {
         if (!session->demo) {
             process->appendStep(makeShared<ClaimAccount>(pptr, session));
         }
-        process->appendStep(makeShared<Update>(pptr, Net::Mode::Online));
-    } else {
-        process->appendStep(makeShared<Update>(pptr, Net::Mode::Offline));
+        for (auto t : createUpdateTask()) {
+            process->appendStep(makeShared<TaskStepWrapper>(pptr, t));
+        }
     }
 
     // if there are any jar mods
@@ -1140,7 +1172,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
 
     // print some instance info here...
     {
-        process->appendStep(makeShared<PrintInstanceInfo>(pptr, session, serverToJoin));
+        process->appendStep(makeShared<PrintInstanceInfo>(pptr, session, targetToJoin));
     }
 
     // extract native jars if needed
@@ -1163,7 +1195,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         auto step = makeShared<LauncherPartLaunch>(pptr);
         step->setWorkingDirectory(gameRoot());
         step->setAuthSession(session);
-        step->setServerToJoin(serverToJoin);
+        step->setTargetToJoin(targetToJoin);
         process->appendStep(step);
     }
 
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 9234ba7f2..bedaf6a9f 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -39,7 +39,7 @@
 #include <QDir>
 #include <QProcess>
 #include "BaseInstance.h"
-#include "minecraft/launch/MinecraftServerTarget.h"
+#include "minecraft/launch/MinecraftTarget.h"
 #include "minecraft/mod/Mod.h"
 
 class ModFolderModel;
@@ -56,7 +56,7 @@ class MinecraftInstance : public BaseInstance {
     Q_OBJECT
    public:
     MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir);
-    virtual ~MinecraftInstance() {};
+    virtual ~MinecraftInstance() = default;
     virtual void saveNow() override;
 
     void loadSpecificSettings() override;
@@ -104,7 +104,7 @@ class MinecraftInstance : public BaseInstance {
     /** Returns whether the instance, with its version, has support for demo mode. */
     [[nodiscard]] bool supportsDemo() const;
 
-    void updateRuntimeContext();
+    void updateRuntimeContext() override;
 
     //////  Profile management //////
     std::shared_ptr<PackProfile> getPackProfile() const;
@@ -120,12 +120,12 @@ class MinecraftInstance : public BaseInstance {
     std::shared_ptr<GameOptions> gameOptionsModel();
 
     //////  Launch stuff //////
-    Task::Ptr createUpdateTask(Net::Mode mode) override;
-    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) override;
+    QList<Task::Ptr> createUpdateTask() override;
+    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftTarget::Ptr targetToJoin) override;
     QStringList extraArguments() override;
-    QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override;
+    QStringList verboseDescription(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin) override;
     QList<Mod*> getJarMods() const;
-    QString createLaunchScript(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin);
+    QString createLaunchScript(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin);
     /// get arguments passed to java
     QStringList javaArguments();
     QString getLauncher();
@@ -157,7 +157,7 @@ class MinecraftInstance : public BaseInstance {
     virtual QStringList processAuthArgs(AuthSessionPtr account) const;
 
     // FIXME: remove
-    virtual QStringList processMinecraftArgs(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) const;
+    virtual QStringList processMinecraftArgs(AuthSessionPtr account, MinecraftTarget::Ptr targetToJoin) const;
 
     virtual JavaVersion getJavaVersion();
 
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp
index 818e90cfc..a9dcdf067 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.cpp
+++ b/launcher/minecraft/MinecraftLoadAndCheck.cpp
@@ -2,41 +2,44 @@
 #include "MinecraftInstance.h"
 #include "PackProfile.h"
 
-MinecraftLoadAndCheck::MinecraftLoadAndCheck(MinecraftInstance* inst, QObject* parent) : Task(parent), m_inst(inst) {}
+MinecraftLoadAndCheck::MinecraftLoadAndCheck(MinecraftInstance* inst, Net::Mode netmode, QObject* parent)
+    : Task(parent), m_inst(inst), m_netmode(netmode)
+{}
 
 void MinecraftLoadAndCheck::executeTask()
 {
     // add offline metadata load task
     auto components = m_inst->getPackProfile();
-    components->reload(Net::Mode::Offline);
+    components->reload(m_netmode);
     m_task = components->getCurrentTask();
 
     if (!m_task) {
         emitSucceeded();
         return;
     }
-    connect(m_task.get(), &Task::succeeded, this, &MinecraftLoadAndCheck::subtaskSucceeded);
-    connect(m_task.get(), &Task::failed, this, &MinecraftLoadAndCheck::subtaskFailed);
-    connect(m_task.get(), &Task::aborted, this, [this] { subtaskFailed(tr("Aborted")); });
-    connect(m_task.get(), &Task::progress, this, &MinecraftLoadAndCheck::progress);
+    connect(m_task.get(), &Task::succeeded, this, &MinecraftLoadAndCheck::emitSucceeded);
+    connect(m_task.get(), &Task::failed, this, &MinecraftLoadAndCheck::emitFailed);
+    connect(m_task.get(), &Task::aborted, this, [this] { emitFailed(tr("Aborted")); });
+    connect(m_task.get(), &Task::progress, this, &MinecraftLoadAndCheck::setProgress);
     connect(m_task.get(), &Task::stepProgress, this, &MinecraftLoadAndCheck::propagateStepProgress);
     connect(m_task.get(), &Task::status, this, &MinecraftLoadAndCheck::setStatus);
+    connect(m_task.get(), &Task::details, this, &MinecraftLoadAndCheck::setDetails);
 }
 
-void MinecraftLoadAndCheck::subtaskSucceeded()
+bool MinecraftLoadAndCheck::canAbort() const
 {
-    if (isFinished()) {
-        qCritical() << "MinecraftUpdate: Subtask" << sender() << "succeeded, but work was already done!";
-        return;
+    if (m_task) {
+        return m_task->canAbort();
     }
-    emitSucceeded();
+    return true;
 }
 
-void MinecraftLoadAndCheck::subtaskFailed(QString error)
+bool MinecraftLoadAndCheck::abort()
 {
-    if (isFinished()) {
-        qCritical() << "MinecraftUpdate: Subtask" << sender() << "failed, but work was already done!";
-        return;
+    if (m_task && m_task->canAbort()) {
+        auto status = m_task->abort();
+        emitFailed("Aborted.");
+        return status;
     }
-    emitFailed(error);
-}
+    return Task::abort();
+}
\ No newline at end of file
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h
index 09edaf909..72e9e0caa 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.h
+++ b/launcher/minecraft/MinecraftLoadAndCheck.h
@@ -15,32 +15,24 @@
 
 #pragma once
 
-#include <QList>
-#include <QObject>
-#include <QUrl>
-
-#include <quazip/quazip.h>
+#include "net/Mode.h"
 #include "tasks/Task.h"
 
-#include "QObjectPtr.h"
-
-class MinecraftVersion;
 class MinecraftInstance;
 
 class MinecraftLoadAndCheck : public Task {
     Q_OBJECT
    public:
-    explicit MinecraftLoadAndCheck(MinecraftInstance* inst, QObject* parent = 0);
-    virtual ~MinecraftLoadAndCheck() {};
+    explicit MinecraftLoadAndCheck(MinecraftInstance* inst, Net::Mode netmode, QObject* parent = nullptr);
+    virtual ~MinecraftLoadAndCheck() = default;
     void executeTask() override;
 
-   private slots:
-    void subtaskSucceeded();
-    void subtaskFailed(QString error);
+    bool canAbort() const override;
+   public slots:
+    bool abort() override;
 
    private:
     MinecraftInstance* m_inst = nullptr;
     Task::Ptr m_task;
-    QString m_preFailure;
-    QString m_fail_reason;
+    Net::Mode m_netmode;
 };
diff --git a/launcher/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp
deleted file mode 100644
index c009317a6..000000000
--- a/launcher/minecraft/MinecraftUpdate.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MinecraftUpdate.h"
-#include "MinecraftInstance.h"
-
-#include <QDataStream>
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
-
-#include <FileSystem.h>
-#include "BaseInstance.h"
-#include "minecraft/Library.h"
-#include "minecraft/PackProfile.h"
-
-#include "update/AssetUpdateTask.h"
-#include "update/FMLLibrariesTask.h"
-#include "update/FoldersTask.h"
-#include "update/LibrariesTask.h"
-
-#include <meta/Index.h>
-#include <meta/Version.h>
-
-MinecraftUpdate::MinecraftUpdate(MinecraftInstance* inst, QObject* parent) : Task(parent), m_inst(inst) {}
-
-void MinecraftUpdate::executeTask()
-{
-    m_tasks.clear();
-    // create folders
-    {
-        m_tasks.append(makeShared<FoldersTask>(m_inst));
-    }
-
-    // add metadata update task if necessary
-    {
-        auto components = m_inst->getPackProfile();
-        components->reload(Net::Mode::Online);
-        auto task = components->getCurrentTask();
-        if (task) {
-            m_tasks.append(task);
-        }
-    }
-
-    // libraries download
-    {
-        m_tasks.append(makeShared<LibrariesTask>(m_inst));
-    }
-
-    // FML libraries download and copy into the instance
-    {
-        m_tasks.append(makeShared<FMLLibrariesTask>(m_inst));
-    }
-
-    // assets update
-    {
-        m_tasks.append(makeShared<AssetUpdateTask>(m_inst));
-    }
-
-    if (!m_preFailure.isEmpty()) {
-        emitFailed(m_preFailure);
-        return;
-    }
-    next();
-}
-
-void MinecraftUpdate::next()
-{
-    if (m_abort) {
-        emitFailed(tr("Aborted by user."));
-        return;
-    }
-    if (m_failed_out_of_order) {
-        emitFailed(m_fail_reason);
-        return;
-    }
-    m_currentTask++;
-    if (m_currentTask > 0) {
-        auto task = m_tasks[m_currentTask - 1];
-        disconnect(task.get(), &Task::succeeded, this, &MinecraftUpdate::subtaskSucceeded);
-        disconnect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
-        disconnect(task.get(), &Task::aborted, this, &Task::abort);
-        disconnect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
-        disconnect(task.get(), &Task::stepProgress, this, &MinecraftUpdate::propagateStepProgress);
-        disconnect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
-        disconnect(task.get(), &Task::details, this, &MinecraftUpdate::setDetails);
-    }
-    if (m_currentTask == m_tasks.size()) {
-        emitSucceeded();
-        return;
-    }
-    auto task = m_tasks[m_currentTask];
-    // if the task is already finished by the time we look at it, skip it
-    if (task->isFinished()) {
-        qCritical() << "MinecraftUpdate: Skipping finished subtask" << m_currentTask << ":" << task.get();
-        next();
-    }
-    connect(task.get(), &Task::succeeded, this, &MinecraftUpdate::subtaskSucceeded);
-    connect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
-    connect(task.get(), &Task::aborted, this, &Task::abort);
-    connect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
-    connect(task.get(), &Task::stepProgress, this, &MinecraftUpdate::propagateStepProgress);
-    connect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
-    connect(task.get(), &Task::details, this, &MinecraftUpdate::setDetails);
-    // if the task is already running, do not start it again
-    if (!task->isRunning()) {
-        task->start();
-    }
-}
-
-void MinecraftUpdate::subtaskSucceeded()
-{
-    if (isFinished()) {
-        qCritical() << "MinecraftUpdate: Subtask" << sender() << "succeeded, but work was already done!";
-        return;
-    }
-    auto senderTask = QObject::sender();
-    auto currentTask = m_tasks[m_currentTask].get();
-    if (senderTask != currentTask) {
-        qDebug() << "MinecraftUpdate: Subtask" << sender() << "succeeded out of order.";
-        return;
-    }
-    next();
-}
-
-void MinecraftUpdate::subtaskFailed(QString error)
-{
-    if (isFinished()) {
-        qCritical() << "MinecraftUpdate: Subtask" << sender() << "failed, but work was already done!";
-        return;
-    }
-    auto senderTask = QObject::sender();
-    auto currentTask = m_tasks[m_currentTask].get();
-    if (senderTask != currentTask) {
-        qDebug() << "MinecraftUpdate: Subtask" << sender() << "failed out of order.";
-        m_failed_out_of_order = true;
-        m_fail_reason = error;
-        return;
-    }
-    emitFailed(error);
-}
-
-bool MinecraftUpdate::abort()
-{
-    if (!m_abort) {
-        m_abort = true;
-        auto task = m_tasks[m_currentTask];
-        if (task->canAbort()) {
-            return task->abort();
-        }
-    }
-    return true;
-}
-
-bool MinecraftUpdate::canAbort() const
-{
-    return true;
-}
diff --git a/launcher/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h
deleted file mode 100644
index 591c6afcb..000000000
--- a/launcher/minecraft/MinecraftUpdate.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QList>
-#include <QObject>
-#include <QUrl>
-
-#include <quazip/quazip.h>
-#include "minecraft/VersionFilterData.h"
-#include "net/NetJob.h"
-#include "tasks/Task.h"
-
-class MinecraftVersion;
-class MinecraftInstance;
-
-// FIXME: This looks very similar to a SequentialTask. Maybe we can reduce code duplications? :^)
-
-class MinecraftUpdate : public Task {
-    Q_OBJECT
-   public:
-    explicit MinecraftUpdate(MinecraftInstance* inst, QObject* parent = 0);
-    virtual ~MinecraftUpdate() {};
-
-    void executeTask() override;
-    bool canAbort() const override;
-
-   private slots:
-    bool abort() override;
-    void subtaskSucceeded();
-    void subtaskFailed(QString error);
-
-   private:
-    void next();
-
-   private:
-    MinecraftInstance* m_inst = nullptr;
-    QList<Task::Ptr> m_tasks;
-    QString m_preFailure;
-    int m_currentTask = -1;
-    bool m_abort = false;
-    bool m_failed_out_of_order = false;
-    QString m_fail_reason;
-};
diff --git a/launcher/minecraft/MojangVersionFormat.cpp b/launcher/minecraft/MojangVersionFormat.cpp
index bb782e47f..d17a3a21f 100644
--- a/launcher/minecraft/MojangVersionFormat.cpp
+++ b/launcher/minecraft/MojangVersionFormat.cpp
@@ -185,6 +185,9 @@ void MojangVersionFormat::readVersionProperties(const QJsonObject& in, VersionFi
             out->compatibleJavaMajors.append(requireInteger(compatible));
         }
     }
+    if (in.contains("compatibleJavaName")) {
+        out->compatibleJavaName = requireString(in.value("compatibleJavaName"));
+    }
 
     if (in.contains("downloads")) {
         auto downloadsObj = requireObject(in, "downloads");
@@ -259,6 +262,9 @@ void MojangVersionFormat::writeVersionProperties(const VersionFile* in, QJsonObj
         }
         out.insert("compatibleJavaMajors", compatibleJavaMajorsOut);
     }
+    if (!in->compatibleJavaName.isEmpty()) {
+        writeString(out, "compatibleJavaName", in->compatibleJavaName);
+    }
 }
 
 QJsonDocument MojangVersionFormat::versionFileToJson(const VersionFilePtr& patch)
diff --git a/launcher/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp
index 306c95a6a..bd587beb2 100644
--- a/launcher/minecraft/OneSixVersionFormat.cpp
+++ b/launcher/minecraft/OneSixVersionFormat.cpp
@@ -36,6 +36,8 @@
 #include "OneSixVersionFormat.h"
 #include <Json.h>
 #include <minecraft/MojangVersionFormat.h>
+#include <QList>
+#include "java/JavaMetadata.h"
 #include "minecraft/Agent.h"
 #include "minecraft/ParseUtils.h"
 
@@ -255,6 +257,13 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument& doc
         out->m_volatile = requireBoolean(root, "volatile");
     }
 
+    if (root.contains("runtimes")) {
+        out->runtimes = {};
+        for (auto runtime : ensureArray(root, "runtimes")) {
+            out->runtimes.append(Java::parseJavaMeta(ensureObject(runtime)));
+        }
+    }
+
     /* removed features that shouldn't be used */
     if (root.contains("tweakers")) {
         out->addProblem(ProblemSeverity::Error, QObject::tr("Version file contains unsupported element 'tweakers'"));
diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 42804cbd0..cf6129dff 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -40,6 +40,7 @@
 #include "Application.h"
 
 #include <Version.h>
+#include <qlogging.h>
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
 #include <quazip/quazipfile.h>
@@ -52,12 +53,18 @@
 #include <QSaveFile>
 #include <QTimer>
 #include <QUuid>
+#include <algorithm>
 #include <sstream>
+#include <utility>
 
+#include "Application.h"
 #include "Exception.h"
 #include "FileSystem.h"
 #include "Json.h"
 #include "Manifest.h"
+#include "meta/Index.h"
+#include "meta/JsonFormat.h"
+#include "minecraft/Component.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/OneSixVersionFormat.h"
 #include "minecraft/ProfileUtils.h"
@@ -65,14 +72,11 @@
 #include "ComponentUpdateTask.h"
 #include "PackProfile.h"
 #include "PackProfile_p.h"
-#include "minecraft/mod/Mod.h"
 #include "modplatform/ModIndex.h"
 
-static const QMap<QString, ModPlatform::ModLoaderType> modloaderMapping{ { "net.neoforged", ModPlatform::NeoForge },
-                                                                         { "net.minecraftforge", ModPlatform::Forge },
-                                                                         { "net.fabricmc.fabric-loader", ModPlatform::Fabric },
-                                                                         { "org.quiltmc.quilt-loader", ModPlatform::Quilt },
-                                                                         { "com.mumfrey.liteloader", ModPlatform::LiteLoader } };
+#include "minecraft/Logging.h"
+
+#include "ui/dialogs/CustomMessageBox.h"
 
 PackProfile::PackProfile(MinecraftInstance* instance) : QAbstractListModel()
 {
@@ -161,16 +165,16 @@ static bool savePackProfile(const QString& filename, const ComponentContainer& c
     obj.insert("components", orderArray);
     QSaveFile outFile(filename);
     if (!outFile.open(QFile::WriteOnly)) {
-        qCritical() << "Couldn't open" << outFile.fileName() << "for writing:" << outFile.errorString();
+        qCCritical(instanceProfileC) << "Couldn't open" << outFile.fileName() << "for writing:" << outFile.errorString();
         return false;
     }
     auto data = QJsonDocument(obj).toJson(QJsonDocument::Indented);
     if (outFile.write(data) != data.size()) {
-        qCritical() << "Couldn't write all the data into" << outFile.fileName() << "because:" << outFile.errorString();
+        qCCritical(instanceProfileC) << "Couldn't write all the data into" << outFile.fileName() << "because:" << outFile.errorString();
         return false;
     }
     if (!outFile.commit()) {
-        qCritical() << "Couldn't save" << outFile.fileName() << "because:" << outFile.errorString();
+        qCCritical(instanceProfileC) << "Couldn't save" << outFile.fileName() << "because:" << outFile.errorString();
     }
     return true;
 }
@@ -183,12 +187,12 @@ static bool loadPackProfile(PackProfile* parent,
 {
     QFile componentsFile(filename);
     if (!componentsFile.exists()) {
-        qWarning() << "Components file doesn't exist. This should never happen.";
+        qCWarning(instanceProfileC) << "Components file" << filename << "doesn't exist. This should never happen.";
         return false;
     }
     if (!componentsFile.open(QFile::ReadOnly)) {
-        qCritical() << "Couldn't open" << componentsFile.fileName() << " for reading:" << componentsFile.errorString();
-        qWarning() << "Ignoring overriden order";
+        qCCritical(instanceProfileC) << "Couldn't open" << componentsFile.fileName() << " for reading:" << componentsFile.errorString();
+        qCWarning(instanceProfileC) << "Ignoring overridden order";
         return false;
     }
 
@@ -196,8 +200,8 @@ static bool loadPackProfile(PackProfile* parent,
     QJsonParseError error;
     QJsonDocument doc = QJsonDocument::fromJson(componentsFile.readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
-        qCritical() << "Couldn't parse" << componentsFile.fileName() << ":" << error.errorString();
-        qWarning() << "Ignoring overriden order";
+        qCCritical(instanceProfileC) << "Couldn't parse" << componentsFile.fileName() << ":" << error.errorString();
+        qCWarning(instanceProfileC) << "Ignoring overridden order";
         return false;
     }
 
@@ -215,7 +219,7 @@ static bool loadPackProfile(PackProfile* parent,
             container.append(componentFromJsonV1(parent, componentJsonPattern, comp_obj));
         }
     } catch ([[maybe_unused]] const JSONValidationError& err) {
-        qCritical() << "Couldn't parse" << componentsFile.fileName() << ": bad file format";
+        qCCritical(instanceProfileC) << "Couldn't parse" << componentsFile.fileName() << ": bad file format";
         container.clear();
         return false;
     }
@@ -248,12 +252,12 @@ void PackProfile::buildingFromScratch()
 void PackProfile::scheduleSave()
 {
     if (!d->loaded) {
-        qDebug() << "Component list should never save if it didn't successfully load, instance:" << d->m_instance->name();
+        qDebug() << d->m_instance->name() << "|" << "Component list should never save if it didn't successfully load";
         return;
     }
     if (!d->dirty) {
         d->dirty = true;
-        qDebug() << "Component list save is scheduled for" << d->m_instance->name();
+        qDebug() << d->m_instance->name() << "|" << "Component list save is scheduled";
     }
     d->m_saveTimer.start();
 }
@@ -280,7 +284,7 @@ QString PackProfile::patchFilePathForUid(const QString& uid) const
 
 void PackProfile::save_internal()
 {
-    qDebug() << "Component list save performed now for" << d->m_instance->name();
+    qDebug() << d->m_instance->name() << "|" << "Component list save performed now";
     auto filename = componentsFilePath();
     savePackProfile(filename, d->components);
     d->dirty = false;
@@ -293,7 +297,7 @@ bool PackProfile::load()
     // load the new component list and swap it with the current one...
     ComponentContainer newComponents;
     if (!loadPackProfile(this, filename, patchesPattern(), newComponents)) {
-        qCritical() << "Failed to load the component config for instance" << d->m_instance->name();
+        qCritical() << d->m_instance->name() << "|" << "Failed to load the component config";
         return false;
     } else {
         // FIXME: actually use fine-grained updates, not this...
@@ -306,7 +310,7 @@ bool PackProfile::load()
         d->componentIndex.clear();
         for (auto component : newComponents) {
             if (d->componentIndex.contains(component->m_uid)) {
-                qWarning() << "Ignoring duplicate component entry" << component->m_uid;
+                qWarning() << d->m_instance->name() << "|" << "Ignoring duplicate component entry" << component->m_uid;
                 continue;
             }
             connect(component.get(), &Component::dataChanged, this, &PackProfile::componentDataChanged);
@@ -354,14 +358,14 @@ void PackProfile::resolve(Net::Mode netmode)
 
 void PackProfile::updateSucceeded()
 {
-    qDebug() << "Component list update/resolve task succeeded for" << d->m_instance->name();
+    qCDebug(instanceProfileC) << d->m_instance->name() << "|" << "Component list update/resolve task succeeded";
     d->m_updateTask.reset();
     invalidateLaunchProfile();
 }
 
 void PackProfile::updateFailed(const QString& error)
 {
-    qDebug() << "Component list update/resolve task failed for" << d->m_instance->name() << "Reason:" << error;
+    qCDebug(instanceProfileC) << d->m_instance->name() << "|" << "Component list update/resolve task failed " << "Reason:" << error;
     d->m_updateTask.reset();
     invalidateLaunchProfile();
 }
@@ -377,11 +381,11 @@ void PackProfile::insertComponent(size_t index, ComponentPtr component)
 {
     auto id = component->getID();
     if (id.isEmpty()) {
-        qWarning() << "Attempt to add a component with empty ID!";
+        qCWarning(instanceProfileC) << d->m_instance->name() << "|" << "Attempt to add a component with empty ID!";
         return;
     }
     if (d->componentIndex.contains(id)) {
-        qWarning() << "Attempt to add a component that is already present!";
+        qCWarning(instanceProfileC) << d->m_instance->name() << "|" << "Attempt to add a component that is already present!";
         return;
     }
     beginInsertRows(QModelIndex(), static_cast<int>(index), static_cast<int>(index));
@@ -396,7 +400,7 @@ void PackProfile::componentDataChanged()
 {
     auto objPtr = qobject_cast<Component*>(sender());
     if (!objPtr) {
-        qWarning() << "PackProfile got dataChanged signal from a non-Component!";
+        qCWarning(instanceProfileC) << d->m_instance->name() << "|" << "PackProfile got dataChanged signal from a non-Component!";
         return;
     }
     if (objPtr->getID() == "net.minecraft") {
@@ -412,19 +416,20 @@ void PackProfile::componentDataChanged()
         }
         index++;
     }
-    qWarning() << "PackProfile got dataChanged signal from a Component which does not belong to it!";
+    qCWarning(instanceProfileC) << d->m_instance->name() << "|"
+                                << "PackProfile got dataChanged signal from a Component which does not belong to it!";
 }
 
 bool PackProfile::remove(const int index)
 {
     auto patch = getComponent(index);
     if (!patch->isRemovable()) {
-        qWarning() << "Patch" << patch->getID() << "is non-removable";
+        qCWarning(instanceProfileC) << d->m_instance->name() << "|" << "Patch" << patch->getID() << "is non-removable";
         return false;
     }
 
     if (!removeComponent_internal(patch)) {
-        qCritical() << "Patch" << patch->getID() << "could not be removed";
+        qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "Patch" << patch->getID() << "could not be removed";
         return false;
     }
 
@@ -453,11 +458,11 @@ bool PackProfile::customize(int index)
 {
     auto patch = getComponent(index);
     if (!patch->isCustomizable()) {
-        qDebug() << "Patch" << patch->getID() << "is not customizable";
+        qCDebug(instanceProfileC) << d->m_instance->name() << "|" << "Patch" << patch->getID() << "is not customizable";
         return false;
     }
     if (!patch->customize()) {
-        qCritical() << "Patch" << patch->getID() << "could not be customized";
+        qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "Patch" << patch->getID() << "could not be customized";
         return false;
     }
     invalidateLaunchProfile();
@@ -469,11 +474,11 @@ bool PackProfile::revertToBase(int index)
 {
     auto patch = getComponent(index);
     if (!patch->isRevertible()) {
-        qDebug() << "Patch" << patch->getID() << "is not revertible";
+        qCDebug(instanceProfileC) << d->m_instance->name() << "|" << "Patch" << patch->getID() << "is not revertible";
         return false;
     }
     if (!patch->revert()) {
-        qCritical() << "Patch" << patch->getID() << "could not be reverted";
+        qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "Patch" << patch->getID() << "could not be reverted";
         return false;
     }
     invalidateLaunchProfile();
@@ -686,7 +691,8 @@ bool PackProfile::installComponents(QStringList selectedFiles)
         const QString target = FS::PathCombine(patchDir, versionFile->uid + ".json");
 
         if (!QFile::copy(source, target)) {
-            qWarning() << "Component" << source << "could not be copied to target" << target;
+            qCWarning(instanceProfileC) << d->m_instance->name() << "|" << "Component" << source << "could not be copied to target"
+                                        << target;
             result = false;
             continue;
         }
@@ -719,7 +725,8 @@ bool PackProfile::installEmpty(const QString& uid, const QString& name)
     QString patchFileName = FS::PathCombine(patchDir, uid + ".json");
     QFile file(patchFileName);
     if (!file.open(QFile::WriteOnly)) {
-        qCritical() << "Error opening" << file.fileName() << "for reading:" << file.errorString();
+        qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "Error opening" << file.fileName()
+                                     << "for reading:" << file.errorString();
         return false;
     }
     file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
@@ -739,7 +746,8 @@ bool PackProfile::removeComponent_internal(ComponentPtr patch)
     if (fileName.size()) {
         QFile patchFile(fileName);
         if (patchFile.exists() && !patchFile.remove()) {
-            qCritical() << "File" << fileName << "could not be removed because:" << patchFile.errorString();
+            qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "File" << fileName
+                                         << "could not be removed because:" << patchFile.errorString();
             return false;
         }
     }
@@ -755,7 +763,8 @@ bool PackProfile::removeComponent_internal(ComponentPtr patch)
         if (finfo.exists()) {
             QFile jarModFile(jar[0]);
             if (!jarModFile.remove()) {
-                qCritical() << "File" << jar[0] << "could not be removed because:" << jarModFile.errorString();
+                qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "File" << jar[0]
+                                             << "could not be removed because:" << jarModFile.errorString();
                 return false;
             }
             return true;
@@ -812,7 +821,8 @@ bool PackProfile::installJarMods_internal(QStringList filepaths)
 
         QFile file(patchFileName);
         if (!file.open(QFile::WriteOnly)) {
-            qCritical() << "Error opening" << file.fileName() << "for reading:" << file.errorString();
+            qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "Error opening" << file.fileName()
+                                         << "for reading:" << file.errorString();
             return false;
         }
         file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
@@ -846,7 +856,7 @@ bool PackProfile::installCustomJar_internal(QString filepath)
 
     QFileInfo jarInfo(finalPath);
     if (jarInfo.exists()) {
-        if (!QFile::remove(finalPath)) {
+        if (!FS::deletePath(finalPath)) {
             return false;
         }
     }
@@ -866,7 +876,8 @@ bool PackProfile::installCustomJar_internal(QString filepath)
 
     QFile file(patchFileName);
     if (!file.open(QFile::WriteOnly)) {
-        qCritical() << "Error opening" << file.fileName() << "for reading:" << file.errorString();
+        qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "Error opening" << file.fileName()
+                                     << "for reading:" << file.errorString();
         return false;
     }
     file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
@@ -964,7 +975,8 @@ bool PackProfile::installAgents_internal(QStringList filepaths)
         QFile patchFile(FS::PathCombine(patchDir, targetId + ".json"));
 
         if (!patchFile.open(QFile::WriteOnly)) {
-            qCritical() << "Error opening" << patchFile.fileName() << "for reading:" << patchFile.errorString();
+            qCCritical(instanceProfileC) << d->m_instance->name() << "|" << "Error opening" << patchFile.fileName()
+                                         << "for reading:" << patchFile.errorString();
             return false;
         }
 
@@ -986,12 +998,13 @@ std::shared_ptr<LaunchProfile> PackProfile::getProfile() const
         try {
             auto profile = std::make_shared<LaunchProfile>();
             for (auto file : d->components) {
-                qDebug() << "Applying" << file->getID() << (file->getProblemSeverity() == ProblemSeverity::Error ? "ERROR" : "GOOD");
+                qCDebug(instanceProfileC) << d->m_instance->name() << "|" << "Applying" << file->getID()
+                                          << (file->getProblemSeverity() == ProblemSeverity::Error ? "ERROR" : "GOOD");
                 file->applyTo(profile.get());
             }
             d->m_profile = profile;
         } catch (const Exception& error) {
-            qWarning() << "Couldn't apply profile patches because: " << error.cause();
+            qCWarning(instanceProfileC) << d->m_instance->name() << "|" << "Couldn't apply profile patches because: " << error.cause();
         }
     }
     return d->m_profile;
@@ -1004,8 +1017,16 @@ bool PackProfile::setComponentVersion(const QString& uid, const QString& version
         ComponentPtr component = *iter;
         // set existing
         if (component->revert()) {
+            // set new version
+            auto oldVersion = component->getVersion();
             component->setVersion(version);
             component->setImportant(important);
+
+            if (important) {
+                component->setUpdateAction(UpdateAction{ UpdateActionImportantChanged{ oldVersion } });
+                resolve(Net::Mode::Online);
+            }
+
             return true;
         }
         return false;
@@ -1044,12 +1065,12 @@ std::optional<ModPlatform::ModLoaderTypes> PackProfile::getModLoaders()
     ModPlatform::ModLoaderTypes result;
     bool has_any_loader = false;
 
-    QMapIterator<QString, ModPlatform::ModLoaderType> i(modloaderMapping);
+    QMapIterator<QString, ModloaderMapEntry> i(Component::KNOWN_MODLOADERS);
 
     while (i.hasNext()) {
         i.next();
         if (auto c = getComponent(i.key()); c != nullptr && c->isEnabled()) {
-            result |= i.value();
+            result |= i.value().type;
             has_any_loader = true;
         }
     }
@@ -1072,3 +1093,23 @@ std::optional<ModPlatform::ModLoaderTypes> PackProfile::getSupportedModLoaders()
         loaders |= ModPlatform::Forge;
     return loaders;
 }
+
+QList<ModPlatform::ModLoaderType> PackProfile::getModLoadersList()
+{
+    QList<ModPlatform::ModLoaderType> result;
+    for (auto c : d->components) {
+        if (c->isEnabled() && Component::KNOWN_MODLOADERS.contains(c->getID())) {
+            result.append(Component::KNOWN_MODLOADERS[c->getID()].type);
+        }
+    }
+
+    // TODO: remove this or add version condition once Quilt drops official Fabric support
+    if (result.contains(ModPlatform::Quilt) && !result.contains(ModPlatform::Fabric)) {
+        result.append(ModPlatform::Fabric);
+    }
+    if (getComponentVersion("net.minecraft") == "1.20.1" && result.contains(ModPlatform::NeoForge) &&
+        !result.contains(ModPlatform::Forge)) {
+        result.append(ModPlatform::Forge);
+    }
+    return result;
+}
diff --git a/launcher/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h
index e58e9ae9a..b2de26ea0 100644
--- a/launcher/minecraft/PackProfile.h
+++ b/launcher/minecraft/PackProfile.h
@@ -146,14 +146,15 @@ class PackProfile : public QAbstractListModel {
     std::optional<ModPlatform::ModLoaderTypes> getModLoaders();
     // this returns aditional loaders(Quilt supports fabric and NeoForge supports Forge)
     std::optional<ModPlatform::ModLoaderTypes> getSupportedModLoaders();
+    QList<ModPlatform::ModLoaderType> getModLoadersList();
+
+    /// apply the component patches. Catches all the errors and returns true/false for success/failure
+    void invalidateLaunchProfile();
 
    private:
     void scheduleSave();
     bool saveIsScheduled() const;
 
-    /// apply the component patches. Catches all the errors and returns true/false for success/failure
-    void invalidateLaunchProfile();
-
     /// insert component so that its index is ideally the specified one (returns real index)
     void insertComponent(size_t index, ComponentPtr component);
 
diff --git a/launcher/minecraft/PackProfile_p.h b/launcher/minecraft/PackProfile_p.h
index 0cd4fb839..4fb3621f0 100644
--- a/launcher/minecraft/PackProfile_p.h
+++ b/launcher/minecraft/PackProfile_p.h
@@ -3,8 +3,8 @@
 #include <QList>
 #include <QMap>
 #include <QTimer>
-#include <map>
 #include "Component.h"
+#include "tasks/Task.h"
 
 class MinecraftInstance;
 using ComponentContainer = QList<ComponentPtr>;
diff --git a/launcher/minecraft/ProfileUtils.cpp b/launcher/minecraft/ProfileUtils.cpp
index f81d6cb7f..08ec0fac3 100644
--- a/launcher/minecraft/ProfileUtils.cpp
+++ b/launcher/minecraft/ProfileUtils.cpp
@@ -57,7 +57,7 @@ bool readOverrideOrders(QString path, PatchOrder& order)
     }
     if (!orderFile.open(QFile::ReadOnly)) {
         qCritical() << "Couldn't open" << orderFile.fileName() << " for reading:" << orderFile.errorString();
-        qWarning() << "Ignoring overriden order";
+        qWarning() << "Ignoring overridden order";
         return false;
     }
 
@@ -66,7 +66,7 @@ bool readOverrideOrders(QString path, PatchOrder& order)
     QJsonDocument doc = QJsonDocument::fromJson(orderFile.readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
         qCritical() << "Couldn't parse" << orderFile.fileName() << ":" << error.errorString();
-        qWarning() << "Ignoring overriden order";
+        qWarning() << "Ignoring overridden order";
         return false;
     }
 
@@ -84,7 +84,7 @@ bool readOverrideOrders(QString path, PatchOrder& order)
         }
     } catch ([[maybe_unused]] const JSONValidationError& err) {
         qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format";
-        qWarning() << "Ignoring overriden order";
+        qWarning() << "Ignoring overridden order";
         order.clear();
         return false;
     }
diff --git a/launcher/minecraft/VersionFile.cpp b/launcher/minecraft/VersionFile.cpp
index 6632bb8bf..8ee61128f 100644
--- a/launcher/minecraft/VersionFile.cpp
+++ b/launcher/minecraft/VersionFile.cpp
@@ -73,6 +73,7 @@ void VersionFile::applyTo(LaunchProfile* profile, const RuntimeContext& runtimeC
     profile->applyMods(mods);
     profile->applyTraits(traits);
     profile->applyCompatibleJavaMajors(compatibleJavaMajors);
+    profile->applyCompatibleJavaName(compatibleJavaName);
 
     for (auto library : libraries) {
         profile->applyLibrary(library, runtimeContext);
diff --git a/launcher/minecraft/VersionFile.h b/launcher/minecraft/VersionFile.h
index 280e35ee3..40f49aaa4 100644
--- a/launcher/minecraft/VersionFile.h
+++ b/launcher/minecraft/VersionFile.h
@@ -36,6 +36,8 @@
 #pragma once
 
 #include <QDateTime>
+#include <QHash>
+#include <QList>
 #include <QSet>
 #include <QString>
 #include <QStringList>
@@ -45,6 +47,7 @@
 #include "Agent.h"
 #include "Library.h"
 #include "ProblemProvider.h"
+#include "java/JavaMetadata.h"
 #include "minecraft/Rule.h"
 
 class PackProfile;
@@ -98,6 +101,9 @@ class VersionFile : public ProblemContainer {
     /// Mojang: list of compatible java majors
     QList<int> compatibleJavaMajors;
 
+    /// Mojang: the name of recommended java version
+    QString compatibleJavaName;
+
     /// Mojang: type of the Minecraft version
     QString type;
 
@@ -149,6 +155,8 @@ class VersionFile : public ProblemContainer {
     /// is volatile -- may be removed as soon as it is no longer needed by something else
     bool m_volatile = false;
 
+    QList<Java::MetadataPtr> runtimes;
+
    public:
     // Mojang: DEPRECATED list of 'downloads' - client jar, server jar, windows server exe, maybe more.
     QMap<QString, std::shared_ptr<MojangDownloadInfo>> mojangDownloads;
diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp
index 1a680ac56..1eba148a5 100644
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@@ -206,8 +206,8 @@ int64_t calculateWorldSize(const QFileInfo& file)
         QDirIterator it(file.absoluteFilePath(), QDir::Files, QDirIterator::Subdirectories);
         int64_t total = 0;
         while (it.hasNext()) {
-            total += it.fileInfo().size();
             it.next();
+            total += it.fileInfo().size();
         }
         return total;
     }
diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp
index f6aa96f3d..65aa8cf81 100644
--- a/launcher/minecraft/auth/AccountData.cpp
+++ b/launcher/minecraft/auth/AccountData.cpp
@@ -43,7 +43,7 @@
 #include "BuildConfig.h"
 
 namespace {
-void tokenToJSONV3(QJsonObject& parent, Katabasis::Token t, const char* tokenName)
+void tokenToJSONV3(QJsonObject& parent, Token t, const char* tokenName)
 {
     if (!t.persistent) {
         return;
@@ -75,9 +75,9 @@ void tokenToJSONV3(QJsonObject& parent, Katabasis::Token t, const char* tokenNam
     }
 }
 
-Katabasis::Token tokenFromJSONV3(const QJsonObject& parent, const char* tokenName)
+Token tokenFromJSONV3(const QJsonObject& parent, const char* tokenName)
 {
-    Katabasis::Token out;
+    Token out;
     auto tokenObject = parent.value(tokenName).toObject();
     if (tokenObject.isEmpty()) {
         return out;
@@ -95,7 +95,7 @@ Katabasis::Token tokenFromJSONV3(const QJsonObject& parent, const char* tokenNam
     auto token = tokenObject.value("token");
     if (token.isString()) {
         out.token = token.toString();
-        out.validity = Katabasis::Validity::Assumed;
+        out.validity = Validity::Assumed;
     }
 
     auto refresh_token = tokenObject.value("refresh_token");
@@ -242,13 +242,13 @@ MinecraftProfile profileFromJSONV3(const QJsonObject& parent, const char* tokenN
             }
         }
     }
-    out.validity = Katabasis::Validity::Assumed;
+    out.validity = Validity::Assumed;
     return out;
 }
 
 void entitlementToJSONV3(QJsonObject& parent, MinecraftEntitlement p)
 {
-    if (p.validity == Katabasis::Validity::None) {
+    if (p.validity == Validity::None) {
         return;
     }
     QJsonObject out;
@@ -272,7 +272,7 @@ bool entitlementFromJSONV3(const QJsonObject& parent, MinecraftEntitlement& out)
         }
         out.canPlayMinecraft = canPlayMinecraftV.toBool(false);
         out.ownsMinecraft = ownsMinecraftV.toBool(false);
-        out.validity = Katabasis::Validity::Assumed;
+        out.validity = Validity::Assumed;
     }
     return true;
 }
@@ -290,8 +290,6 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
     bool needsElyByMigration = false;
     if (typeS == "MSA") {
         type = AccountType::MSA;
-    } else if (typeS == "Mojang") {
-        type = AccountType::Mojang;
     } else if (typeS == "AuthlibInjector") {
         type = AccountType::AuthlibInjector;
     } else if (typeS == "Elyby") {
@@ -305,11 +303,6 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
         return false;
     }
 
-    if (type == AccountType::Mojang) {
-        legacy = data.value("legacy").toBool(false);
-        canMigrateToMSA = data.value("canMigrateToMSA").toBool(false);
-    }
-
     if (type == AccountType::AuthlibInjector) {
         if (needsElyByMigration) {
             customAuthServerUrl = "https://authserver.ely.by/api/authlib-injector/authserver";
@@ -346,10 +339,10 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
 
     minecraftProfile = profileFromJSONV3(data, "profile");
     if (!entitlementFromJSONV3(data, minecraftEntitlement)) {
-        if (minecraftProfile.validity != Katabasis::Validity::None) {
+        if (minecraftProfile.validity != Validity::None) {
             minecraftEntitlement.canPlayMinecraft = true;
             minecraftEntitlement.ownsMinecraft = true;
-            minecraftEntitlement.validity = Katabasis::Validity::Assumed;
+            minecraftEntitlement.validity = Validity::Assumed;
         }
     }
 
@@ -369,14 +362,6 @@ QJsonObject AccountData::saveState() const
         tokenToJSONV3(output, mojangservicesToken, "xrp-mc");
     } else if (type == AccountType::Offline) {
         output["type"] = "Offline";
-    } else if (type == AccountType::Mojang) {
-        if (legacy) {
-            output["legacy"] = true;
-        }
-        if (canMigrateToMSA) {
-            output["canMigrateToMSA"] = true;
-        }
-        output["type"] = "Mojang";
     } else if (type == AccountType::AuthlibInjector) {
         output["type"] = "AuthlibInjector";
         output["customAuthServerUrl"] = customAuthServerUrl;
@@ -398,6 +383,11 @@ bool AccountData::usesCustomApiServers() const
     return type == AccountType::AuthlibInjector;
 }
 
+bool AccountData::supportsSkinManagement() const
+{
+    return type == AccountType::MSA;
+}
+
 QString AccountData::authServerUrl() const
 {
     if (usesCustomApiServers()) {
@@ -458,7 +448,7 @@ QString AccountData::accessToken() const
 
 QString AccountData::clientToken() const
 {
-    if (type != AccountType::Mojang && type != AccountType::AuthlibInjector) {
+    if (type != AccountType::AuthlibInjector) {
         return QString();
     }
     return yggdrasilToken.extra["clientToken"].toString();
@@ -466,7 +456,7 @@ QString AccountData::clientToken() const
 
 void AccountData::setClientToken(QString clientToken)
 {
-    if (type != AccountType::Mojang && type != AccountType::AuthlibInjector) {
+    if (type != AccountType::AuthlibInjector) {
         return;
     }
     yggdrasilToken.extra["clientToken"] = clientToken;
@@ -482,7 +472,7 @@ void AccountData::generateClientTokenIfMissing()
 
 void AccountData::invalidateClientToken()
 {
-    if (type != AccountType::Mojang && type != AccountType::AuthlibInjector) {
+    if (type != AccountType::AuthlibInjector) {
         return;
     }
     yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{-}]"));
@@ -505,7 +495,6 @@ QString AccountData::profileName() const
 QString AccountData::accountDisplayString() const
 {
     switch (type) {
-        case AccountType::Mojang:
         case AccountType::AuthlibInjector: {
             return userName();
         }
diff --git a/launcher/minecraft/auth/AccountData.h b/launcher/minecraft/auth/AccountData.h
index 438f1f297..a0b0a17f2 100644
--- a/launcher/minecraft/auth/AccountData.h
+++ b/launcher/minecraft/auth/AccountData.h
@@ -34,12 +34,29 @@
  */
 
 #pragma once
-#include <katabasis/Bits.h>
 #include <QByteArray>
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
 
+#include <QDateTime>
+#include <QMap>
+#include <QString>
+#include <QVariantMap>
+
+enum class Validity { None, Assumed, Certain };
+
+struct Token {
+    QDateTime issueInstant;
+    QDateTime notAfter;
+    QString token;
+    QString refresh_token;
+    QVariantMap extra;
+
+    Validity validity = Validity::None;
+    bool persistent = true;
+};
+
 struct Skin {
     QString id;
     QString url;
@@ -59,7 +76,7 @@ struct Cape {
 struct MinecraftEntitlement {
     bool ownsMinecraft = false;
     bool canPlayMinecraft = false;
-    Katabasis::Validity validity = Katabasis::Validity::None;
+    Validity validity = Validity::None;
 };
 
 struct MinecraftProfile {
@@ -68,10 +85,10 @@ struct MinecraftProfile {
     Skin skin;
     QString currentCape;
     QMap<QString, Cape> capes;
-    Katabasis::Validity validity = Katabasis::Validity::None;
+    Validity validity = Validity::None;
 };
 
-enum class AccountType { MSA, Mojang, AuthlibInjector, Offline };
+enum class AccountType { MSA, AuthlibInjector, Offline };
 
 enum class AccountState { Unchecked, Offline, Working, Online, Disabled, Errored, Expired, Gone };
 
@@ -79,6 +96,7 @@ struct AccountData {
     QJsonObject saveState() const;
     bool resumeStateFromV3(QJsonObject data);
 
+    bool supportsSkinManagement() const;
     bool usesCustomApiServers() const;
     QString authServerUrl() const;
     QString accountServerUrl() const;
@@ -86,13 +104,13 @@ struct AccountData {
     QString servicesServerUrl() const;
     QString authlibInjectorUrl() const;
 
-    //! userName for Mojang accounts, gamertag for MSA
+    //! userName for authlib-injector accounts, gamertag for MSA
     QString accountDisplayString() const;
 
-    //! Only valid for Mojang accounts. MSA does not preserve this information
+    //! Only valid for authlib-injector accounts. MSA does not preserve this information
     QString userName() const;
 
-    //! Only valid for Mojang accounts.
+    //! Only valid for authlib-injector accounts.
     QString clientToken() const;
     void setClientToken(QString clientToken);
     void invalidateClientToken();
@@ -107,8 +125,6 @@ struct AccountData {
     QString lastError() const;
 
     AccountType type = AccountType::MSA;
-    bool legacy = false;
-    bool canMigrateToMSA = false;
 
     QString customAuthServerUrl;
     QString customAccountServerUrl;
@@ -118,15 +134,15 @@ struct AccountData {
     QString authlibInjectorMetadata;
 
     QString msaClientID;
-    Katabasis::Token msaToken;
-    Katabasis::Token userToken;
-    Katabasis::Token xboxApiToken;
-    Katabasis::Token mojangservicesToken;
+    Token msaToken;
+    Token userToken;
+    Token xboxApiToken;
+    Token mojangservicesToken;
 
-    Katabasis::Token yggdrasilToken;
+    Token yggdrasilToken;
     MinecraftProfile minecraftProfile;
     MinecraftEntitlement minecraftEntitlement;
-    Katabasis::Validity validity_ = Katabasis::Validity::None;
+    Validity validity_ = Validity::None;
 
     // runtime only information (not saved with the account)
     QString internalId;
diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp
index 575a8912a..9eb455ba5 100644
--- a/launcher/minecraft/auth/AccountList.cpp
+++ b/launcher/minecraft/auth/AccountList.cpp
@@ -35,7 +35,7 @@
 
 #include "AccountList.h"
 #include "AccountData.h"
-#include "AccountTask.h"
+#include "tasks/Task.h"
 
 #include <QDir>
 #include <QFile>
@@ -336,17 +336,6 @@ QVariant AccountList::data(const QModelIndex& index, int role) const
                     return account->authlibInjectorUrl();
                 }
 
-                case MigrationColumn: {
-                    if (account->accountType() != AccountType::Mojang) {
-                        return tr("N/A", "Can Migrate");
-                    }
-                    if (account->canMigrate()) {
-                        return tr("Yes", "Can Migrate");
-                    } else {
-                        return tr("No", "Can Migrate");
-                    }
-                }
-
                 default:
                     return QVariant();
             }
@@ -660,8 +649,8 @@ void AccountList::tryNext()
             if (account->internalId() == accountId) {
                 m_currentTask = account->refresh();
                 if (m_currentTask) {
-                    connect(m_currentTask.get(), &AccountTask::succeeded, this, &AccountList::authSucceeded);
-                    connect(m_currentTask.get(), &AccountTask::failed, this, &AccountList::authFailed);
+                    connect(m_currentTask.get(), &Task::succeeded, this, &AccountList::authSucceeded);
+                    connect(m_currentTask.get(), &Task::failed, this, &AccountList::authFailed);
                     m_currentTask->start();
                     qDebug() << "RefreshSchedule: Processing account " << account->accountDisplayString() << " with internal ID "
                              << accountId;
diff --git a/launcher/minecraft/auth/AccountList.h b/launcher/minecraft/auth/AccountList.h
index 0d93a0727..222718157 100644
--- a/launcher/minecraft/auth/AccountList.h
+++ b/launcher/minecraft/auth/AccountList.h
@@ -36,6 +36,7 @@
 #pragma once
 
 #include "MinecraftAccount.h"
+#include "minecraft/auth/AuthFlow.h"
 
 #include <QAbstractListModel>
 #include <QObject>
@@ -55,7 +56,6 @@ class AccountList : public QAbstractListModel {
         // TODO: Add icon column.
         ProfileNameColumn = 0,
         NameColumn,
-        MigrationColumn,
         TypeColumn,
         StatusColumn,
         AuthServerColumn,
@@ -147,7 +147,7 @@ class AccountList : public QAbstractListModel {
     QList<QString> m_refreshQueue;
     QTimer* m_refreshTimer;
     QTimer* m_nextTimer;
-    shared_qobject_ptr<AccountTask> m_currentTask;
+    shared_qobject_ptr<AuthFlow> m_currentTask;
 
     /*!
      * Called whenever the list changes.
diff --git a/launcher/minecraft/auth/AccountTask.cpp b/launcher/minecraft/auth/AccountTask.cpp
deleted file mode 100644
index 4c3d6ee19..000000000
--- a/launcher/minecraft/auth/AccountTask.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#include "AccountTask.h"
-#include "MinecraftAccount.h"
-
-#include <QByteArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkReply>
-#include <QObject>
-#include <QString>
-
-#include <QDebug>
-
-AccountTask::AccountTask(AccountData* data, QObject* parent) : Task(parent), m_data(data)
-{
-    changeState(AccountTaskState::STATE_CREATED);
-}
-
-QString AccountTask::getStateMessage() const
-{
-    switch (m_taskState) {
-        case AccountTaskState::STATE_CREATED:
-            return "Waiting...";
-        case AccountTaskState::STATE_WORKING:
-            return tr("Sending request to auth servers...");
-        case AccountTaskState::STATE_SUCCEEDED:
-            return tr("Authentication task succeeded.");
-        case AccountTaskState::STATE_OFFLINE:
-            return tr("Failed to contact the authentication server.");
-        case AccountTaskState::STATE_DISABLED:
-            return tr("Client ID has changed. New session needs to be created.");
-        case AccountTaskState::STATE_FAILED_SOFT:
-            return tr("Encountered an error during authentication.");
-        case AccountTaskState::STATE_FAILED_HARD:
-            return tr("Failed to authenticate. The session has expired.");
-        case AccountTaskState::STATE_FAILED_GONE:
-            return tr("Failed to authenticate. The account no longer exists.");
-        default:
-            return tr("...");
-    }
-}
-
-bool AccountTask::changeState(AccountTaskState newState, QString reason)
-{
-    m_taskState = newState;
-    // FIXME: virtual method invoked in constructor.
-    // We want that behavior, but maybe make it less weird?
-    setStatus(getStateMessage());
-    switch (newState) {
-        case AccountTaskState::STATE_CREATED: {
-            m_data->errorString.clear();
-            return true;
-        }
-        case AccountTaskState::STATE_WORKING: {
-            m_data->accountState = AccountState::Working;
-            return true;
-        }
-        case AccountTaskState::STATE_SUCCEEDED: {
-            m_data->accountState = AccountState::Online;
-            emitSucceeded();
-            return false;
-        }
-        case AccountTaskState::STATE_OFFLINE: {
-            m_data->errorString = reason;
-            m_data->accountState = AccountState::Offline;
-            emitFailed(reason);
-            return false;
-        }
-        case AccountTaskState::STATE_DISABLED: {
-            m_data->errorString = reason;
-            m_data->accountState = AccountState::Disabled;
-            emitFailed(reason);
-            return false;
-        }
-        case AccountTaskState::STATE_FAILED_SOFT: {
-            m_data->errorString = reason;
-            m_data->accountState = AccountState::Errored;
-            emitFailed(reason);
-            return false;
-        }
-        case AccountTaskState::STATE_FAILED_HARD: {
-            m_data->errorString = reason;
-            m_data->accountState = AccountState::Expired;
-            emitFailed(reason);
-            return false;
-        }
-        case AccountTaskState::STATE_FAILED_GONE: {
-            m_data->errorString = reason;
-            m_data->accountState = AccountState::Gone;
-            emitFailed(reason);
-            return false;
-        }
-        default: {
-            QString error = tr("Unknown account task state: %1").arg(int(newState));
-            m_data->accountState = AccountState::Errored;
-            emitFailed(error);
-            return false;
-        }
-    }
-}
diff --git a/launcher/minecraft/auth/AccountTask.h b/launcher/minecraft/auth/AccountTask.h
deleted file mode 100644
index 91ea1941a..000000000
--- a/launcher/minecraft/auth/AccountTask.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#pragma once
-
-#include <tasks/Task.h>
-
-#include <qsslerror.h>
-#include <QJsonObject>
-#include <QString>
-#include <QTimer>
-
-#include "MinecraftAccount.h"
-
-class QNetworkReply;
-
-/**
- * Enum for describing the state of the current task.
- * Used by the getStateMessage function to determine what the status message should be.
- */
-enum class AccountTaskState {
-    STATE_CREATED,
-    STATE_WORKING,
-    STATE_SUCCEEDED,
-    STATE_DISABLED,     //!< MSA Client ID has changed. Tell user to reloginn
-    STATE_FAILED_SOFT,  //!< soft failure. authentication went through partially
-    STATE_FAILED_HARD,  //!< hard failure. main tokens are invalid
-    STATE_FAILED_GONE,  //!< hard failure. main tokens are invalid, and the account no longer exists
-    STATE_OFFLINE       //!< soft failure. authentication failed in the first step in a 'soft' way
-};
-
-class AccountTask : public Task {
-    Q_OBJECT
-   public:
-    explicit AccountTask(AccountData* data, QObject* parent = 0);
-    virtual ~AccountTask() {};
-
-    AccountTaskState m_taskState = AccountTaskState::STATE_CREATED;
-
-    AccountTaskState taskState() { return m_taskState; }
-
-   signals:
-    void showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn);
-    void hideVerificationUriAndCode();
-
-   protected:
-    /**
-     * Returns the state message for the given state.
-     * Used to set the status message for the task.
-     * Should be overridden by subclasses that want to change messages for a given state.
-     */
-    virtual QString getStateMessage() const;
-
-   protected slots:
-    // NOTE: true -> non-terminal state, false -> terminal state
-    bool changeState(AccountTaskState newState, QString reason = QString());
-
-   protected:
-    AccountData* m_data = nullptr;
-};
diff --git a/launcher/minecraft/auth/AuthFlow.cpp b/launcher/minecraft/auth/AuthFlow.cpp
new file mode 100644
index 000000000..c3a159197
--- /dev/null
+++ b/launcher/minecraft/auth/AuthFlow.cpp
@@ -0,0 +1,162 @@
+#include <QDebug>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+#include "minecraft/auth/AccountData.h"
+#include "minecraft/auth/steps/EntitlementsStep.h"
+#include "minecraft/auth/steps/GetSkinStep.h"
+#include "minecraft/auth/steps/LauncherLoginStep.h"
+#include "minecraft/auth/steps/MSADeviceCodeStep.h"
+#include "minecraft/auth/steps/MSAStep.h"
+#include "minecraft/auth/steps/MinecraftProfileStep.h"
+#include "minecraft/auth/steps/XboxAuthorizationStep.h"
+#include "minecraft/auth/steps/XboxProfileStep.h"
+#include "minecraft/auth/steps/XboxUserStep.h"
+#include "minecraft/auth/steps/YggdrasilMinecraftProfileStep.h"
+#include "minecraft/auth/steps/YggdrasilStep.h"
+#include "tasks/Task.h"
+
+#include "AuthFlow.h"
+
+#include <Application.h>
+
+AuthFlow::AuthFlow(AccountData* data, Action action, QObject* parent, const std::optional<QString> password) : Task(parent), m_data(data)
+{
+    if (data->type == AccountType::MSA) {
+        if (action == Action::DeviceCode) {
+            auto oauthStep = makeShared<MSADeviceCodeStep>(m_data);
+            connect(oauthStep.get(), &MSADeviceCodeStep::authorizeWithBrowser, this, &AuthFlow::authorizeWithBrowserWithExtra);
+            connect(this, &Task::aborted, oauthStep.get(), &MSADeviceCodeStep::abort);
+            m_steps.append(oauthStep);
+        } else {
+            auto oauthStep = makeShared<MSAStep>(m_data, action == Action::Refresh);
+            connect(oauthStep.get(), &MSAStep::authorizeWithBrowser, this, &AuthFlow::authorizeWithBrowser);
+            m_steps.append(oauthStep);
+        }
+        m_steps.append(makeShared<XboxUserStep>(m_data));
+        m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
+        m_steps.append(
+            makeShared<XboxAuthorizationStep>(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
+        m_steps.append(makeShared<LauncherLoginStep>(m_data));
+        m_steps.append(makeShared<XboxProfileStep>(m_data));
+        m_steps.append(makeShared<EntitlementsStep>(m_data));
+        m_steps.append(makeShared<MinecraftProfileStep>(m_data));
+        m_steps.append(makeShared<GetSkinStep>(m_data));
+    } else if (data->type == AccountType::AuthlibInjector) {
+        m_steps.append(makeShared<YggdrasilStep>(m_data, password));
+        m_steps.append(makeShared<YggdrasilMinecraftProfileStep>(m_data));
+        m_steps.append(makeShared<GetSkinStep>(m_data));
+    }
+    changeState(AccountTaskState::STATE_CREATED);
+}
+
+void AuthFlow::succeed()
+{
+    m_data->validity_ = Validity::Certain;
+    changeState(AccountTaskState::STATE_SUCCEEDED, tr("Finished all authentication steps"));
+}
+
+void AuthFlow::executeTask()
+{
+    changeState(AccountTaskState::STATE_WORKING, tr("Initializing"));
+    nextStep();
+}
+
+void AuthFlow::nextStep()
+{
+    if (!Task::isRunning()) {
+        return;
+    }
+    if (m_steps.size() == 0) {
+        // we got to the end without an incident... assume this is all.
+        m_currentStep.reset();
+        succeed();
+        return;
+    }
+    m_currentStep = m_steps.front();
+    qDebug() << "AuthFlow:" << m_currentStep->describe();
+    m_steps.pop_front();
+    connect(m_currentStep.get(), &AuthStep::finished, this, &AuthFlow::stepFinished);
+
+    m_currentStep->perform();
+}
+
+void AuthFlow::stepFinished(AccountTaskState resultingState, QString message)
+{
+    if (changeState(resultingState, message))
+        nextStep();
+}
+
+bool AuthFlow::changeState(AccountTaskState newState, QString reason)
+{
+    m_taskState = newState;
+    setDetails(reason);
+    switch (newState) {
+        case AccountTaskState::STATE_CREATED: {
+            setStatus(tr("Waiting..."));
+            m_data->errorString.clear();
+            return true;
+        }
+        case AccountTaskState::STATE_WORKING: {
+            setStatus(m_currentStep ? m_currentStep->describe() : tr("Working..."));
+            m_data->accountState = AccountState::Working;
+            return true;
+        }
+        case AccountTaskState::STATE_SUCCEEDED: {
+            setStatus(tr("Authentication task succeeded."));
+            m_data->accountState = AccountState::Online;
+            emitSucceeded();
+            return false;
+        }
+        case AccountTaskState::STATE_OFFLINE: {
+            setStatus(tr("Failed to contact the authentication server."));
+            m_data->errorString = reason;
+            m_data->accountState = AccountState::Offline;
+            emitFailed(reason);
+            return false;
+        }
+        case AccountTaskState::STATE_DISABLED: {
+            setStatus(tr("Client ID has changed. New session needs to be created."));
+            m_data->errorString = reason;
+            m_data->accountState = AccountState::Disabled;
+            emitFailed(reason);
+            return false;
+        }
+        case AccountTaskState::STATE_FAILED_SOFT: {
+            setStatus(tr("Encountered an error during authentication."));
+            m_data->errorString = reason;
+            m_data->accountState = AccountState::Errored;
+            emitFailed(reason);
+            return false;
+        }
+        case AccountTaskState::STATE_FAILED_HARD: {
+            setStatus(tr("Failed to authenticate."));
+            m_data->errorString = reason;
+            m_data->accountState = AccountState::Expired;
+            emitFailed(reason);
+            return false;
+        }
+        case AccountTaskState::STATE_FAILED_GONE: {
+            setStatus(tr("Failed to authenticate. The account no longer exists."));
+            m_data->errorString = reason;
+            m_data->accountState = AccountState::Gone;
+            emitFailed(reason);
+            return false;
+        }
+        default: {
+            setStatus(tr("..."));
+            QString error = tr("Unknown account task state: %1").arg(int(newState));
+            m_data->accountState = AccountState::Errored;
+            emitFailed(error);
+            return false;
+        }
+    }
+}
+bool AuthFlow::abort()
+{
+    emitAborted();
+    if (m_currentStep)
+        m_currentStep->abort();
+    return true;
+}
diff --git a/launcher/minecraft/auth/AuthFlow.h b/launcher/minecraft/auth/AuthFlow.h
new file mode 100644
index 000000000..a5aea9fa1
--- /dev/null
+++ b/launcher/minecraft/auth/AuthFlow.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <QImage>
+#include <QList>
+#include <QNetworkReply>
+#include <QObject>
+#include <QSet>
+#include <QVector>
+#include <optional>
+
+#include "minecraft/auth/AccountData.h"
+#include "minecraft/auth/AuthStep.h"
+#include "tasks/Task.h"
+
+class AuthFlow : public Task {
+    Q_OBJECT
+
+   public:
+    enum class Action { Refresh, Login, DeviceCode };
+
+    explicit AuthFlow(AccountData* data,
+                      Action action = Action::Refresh,
+                      QObject* parent = 0,
+                      std::optional<QString> password = std::nullopt);
+    virtual ~AuthFlow() = default;
+
+    void executeTask() override;
+
+    AccountTaskState taskState() { return m_taskState; }
+
+   public slots:
+    bool abort() override;
+
+   signals:
+    void authorizeWithBrowser(const QUrl& url);
+    void authorizeWithBrowserWithExtra(QString url, QString code, int expiresIn);
+
+   protected:
+    void succeed();
+    void nextStep();
+
+   private slots:
+    // NOTE: true -> non-terminal state, false -> terminal state
+    bool changeState(AccountTaskState newState, QString reason = QString());
+    void stepFinished(AccountTaskState resultingState, QString message);
+
+   private:
+    AccountTaskState m_taskState = AccountTaskState::STATE_CREATED;
+    QList<AuthStep::Ptr> m_steps;
+    AuthStep::Ptr m_currentStep;
+    AccountData* m_data = nullptr;
+};
diff --git a/launcher/minecraft/auth/AuthRequest.cpp b/launcher/minecraft/auth/AuthRequest.cpp
deleted file mode 100644
index 189978cc0..000000000
--- a/launcher/minecraft/auth/AuthRequest.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#include <cassert>
-
-#include <QBuffer>
-#include <QDebug>
-#include <QTimer>
-#include <QUrlQuery>
-
-#include "Application.h"
-#include "AuthRequest.h"
-#include "katabasis/Globals.h"
-
-AuthRequest::AuthRequest(QObject* parent) : QObject(parent) {}
-
-AuthRequest::~AuthRequest() {}
-
-void AuthRequest::get(const QNetworkRequest& req, int timeout /* = 60*1000*/)
-{
-    setup(req, QNetworkAccessManager::GetOperation);
-    reply_ = APPLICATION->network()->get(request_);
-    status_ = Requesting;
-    timedReplies_.add(new Katabasis::Reply(reply_, timeout));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(reply_, &QNetworkReply::errorOccurred, this, &AuthRequest::onRequestError);
-#else  // &QNetworkReply::error SIGNAL depricated
-    connect(reply_, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &AuthRequest::onRequestError);
-#endif
-    connect(reply_, &QNetworkReply::finished, this, &AuthRequest::onRequestFinished);
-    connect(reply_, &QNetworkReply::sslErrors, this, &AuthRequest::onSslErrors);
-}
-
-void AuthRequest::post(const QNetworkRequest& req, const QByteArray& data, int timeout /* = 60*1000*/)
-{
-    setup(req, QNetworkAccessManager::PostOperation);
-    data_ = data;
-    status_ = Requesting;
-    reply_ = APPLICATION->network()->post(request_, data_);
-    timedReplies_.add(new Katabasis::Reply(reply_, timeout));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(reply_, &QNetworkReply::errorOccurred, this, &AuthRequest::onRequestError);
-#else  // &QNetworkReply::error SIGNAL depricated
-    connect(reply_, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &AuthRequest::onRequestError);
-#endif
-    connect(reply_, &QNetworkReply::finished, this, &AuthRequest::onRequestFinished);
-    connect(reply_, &QNetworkReply::sslErrors, this, &AuthRequest::onSslErrors);
-    connect(reply_, &QNetworkReply::uploadProgress, this, &AuthRequest::onUploadProgress);
-}
-
-void AuthRequest::onRequestFinished()
-{
-    if (status_ == Idle) {
-        return;
-    }
-    if (reply_ != qobject_cast<QNetworkReply*>(sender())) {
-        return;
-    }
-    httpStatus_ = reply_->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    finish();
-}
-
-void AuthRequest::onRequestError(QNetworkReply::NetworkError error)
-{
-    qWarning() << "AuthRequest::onRequestError: Error" << (int)error;
-    if (status_ == Idle) {
-        return;
-    }
-    if (reply_ != qobject_cast<QNetworkReply*>(sender())) {
-        return;
-    }
-    errorString_ = reply_->errorString();
-    httpStatus_ = reply_->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    error_ = error;
-    qWarning() << "AuthRequest::onRequestError: Error string: " << errorString_;
-    qWarning() << "AuthRequest::onRequestError: HTTP status" << httpStatus_
-               << reply_->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
-
-    // QTimer::singleShot(10, this, SLOT(finish()));
-}
-
-void AuthRequest::onSslErrors(QList<QSslError> errors)
-{
-    int i = 1;
-    for (auto error : errors) {
-        qCritical() << "LOGIN SSL Error #" << i << " : " << error.errorString();
-        auto cert = error.certificate();
-        qCritical() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-void AuthRequest::onUploadProgress(qint64 uploaded, qint64 total)
-{
-    if (status_ == Idle) {
-        qWarning() << "AuthRequest::onUploadProgress: No pending request";
-        return;
-    }
-    if (reply_ != qobject_cast<QNetworkReply*>(sender())) {
-        return;
-    }
-    // Restart timeout because request in progress
-    Katabasis::Reply* o2Reply = timedReplies_.find(reply_);
-    if (o2Reply) {
-        o2Reply->start();
-    }
-    emit uploadProgress(uploaded, total);
-}
-
-void AuthRequest::setup(const QNetworkRequest& req, QNetworkAccessManager::Operation operation, const QByteArray& verb)
-{
-    request_ = req;
-    operation_ = operation;
-    url_ = req.url();
-
-    QUrl url = url_;
-    request_.setUrl(url);
-
-    if (!verb.isEmpty()) {
-        request_.setRawHeader(Katabasis::HTTP_HTTP_HEADER, verb);
-    }
-
-    status_ = Requesting;
-    error_ = QNetworkReply::NoError;
-    errorString_.clear();
-    httpStatus_ = 0;
-}
-
-void AuthRequest::finish()
-{
-    QByteArray data;
-    if (status_ == Idle) {
-        qWarning() << "AuthRequest::finish: No pending request";
-        return;
-    }
-    data = reply_->readAll();
-    status_ = Idle;
-    timedReplies_.remove(reply_);
-    reply_->disconnect(this);
-    reply_->deleteLater();
-    QList<QNetworkReply::RawHeaderPair> headers = reply_->rawHeaderPairs();
-    emit finished(error_, data, headers);
-}
diff --git a/launcher/minecraft/auth/AuthRequest.h b/launcher/minecraft/auth/AuthRequest.h
deleted file mode 100644
index 84d2a7d68..000000000
--- a/launcher/minecraft/auth/AuthRequest.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#pragma once
-#include <QByteArray>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QObject>
-#include <QUrl>
-
-#include "katabasis/Reply.h"
-
-/// Makes authentication requests.
-class AuthRequest : public QObject {
-    Q_OBJECT
-
-   public:
-    explicit AuthRequest(QObject* parent = 0);
-    ~AuthRequest();
-
-   public slots:
-    void get(const QNetworkRequest& req, int timeout = 60 * 1000);
-    void post(const QNetworkRequest& req, const QByteArray& data, int timeout = 60 * 1000);
-
-   signals:
-
-    /// Emitted when a request has been completed or failed.
-    void finished(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers);
-
-    /// Emitted when an upload has progressed.
-    void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
-
-   protected slots:
-
-    /// Handle request finished.
-    void onRequestFinished();
-
-    /// Handle request error.
-    void onRequestError(QNetworkReply::NetworkError error);
-
-    /// Handle ssl errors.
-    void onSslErrors(QList<QSslError> errors);
-
-    /// Finish the request, emit finished() signal.
-    void finish();
-
-    /// Handle upload progress.
-    void onUploadProgress(qint64 uploaded, qint64 total);
-
-   public:
-    QNetworkReply::NetworkError error_;
-    int httpStatus_ = 0;
-    QString errorString_;
-
-   protected:
-    void setup(const QNetworkRequest& request, QNetworkAccessManager::Operation operation, const QByteArray& verb = QByteArray());
-
-    enum Status { Idle, Requesting, ReRequesting };
-
-    QNetworkRequest request_;
-    QByteArray data_;
-    QNetworkReply* reply_;
-    Status status_;
-    QNetworkAccessManager::Operation operation_;
-    QUrl url_;
-    Katabasis::ReplyList timedReplies_;
-
-    QTimer* timer_;
-};
diff --git a/launcher/minecraft/auth/AuthSession.cpp b/launcher/minecraft/auth/AuthSession.cpp
index 37534f983..3657befec 100644
--- a/launcher/minecraft/auth/AuthSession.cpp
+++ b/launcher/minecraft/auth/AuthSession.cpp
@@ -30,8 +30,13 @@ bool AuthSession::MakeOffline(QString offline_playername)
     return true;
 }
 
-void AuthSession::MakeDemo()
+void AuthSession::MakeDemo(QString name, QString u)
 {
-    player_name = "Player";
+    wants_online = false;
     demo = true;
-}
+    uuid = u;
+    session = "-";
+    access_token = "0";
+    player_name = name;
+    status = PlayableOnline;  // needs online to download the assets
+};
\ No newline at end of file
diff --git a/launcher/minecraft/auth/AuthSession.h b/launcher/minecraft/auth/AuthSession.h
index 489cca24f..1117f7fa2 100644
--- a/launcher/minecraft/auth/AuthSession.h
+++ b/launcher/minecraft/auth/AuthSession.h
@@ -10,7 +10,7 @@ class QNetworkAccessManager;
 
 struct AuthSession {
     bool MakeOffline(QString offline_playername);
-    void MakeDemo();
+    void MakeDemo(QString name, QString uuid);
 
     QString serializeUserProperties();
 
diff --git a/launcher/minecraft/auth/AuthStep.cpp b/launcher/minecraft/auth/AuthStep.cpp
deleted file mode 100644
index 6240cc549..000000000
--- a/launcher/minecraft/auth/AuthStep.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "AuthStep.h"
-
-AuthStep::AuthStep(AccountData* data) : QObject(nullptr), m_data(data) {}
-
-AuthStep::~AuthStep() noexcept = default;
diff --git a/launcher/minecraft/auth/AuthStep.h b/launcher/minecraft/auth/AuthStep.h
index becd9b0c5..aaaec6e7f 100644
--- a/launcher/minecraft/auth/AuthStep.h
+++ b/launcher/minecraft/auth/AuthStep.h
@@ -3,30 +3,41 @@
 #include <QNetworkReply>
 #include <QObject>
 
-#include "AccountTask.h"
 #include "QObjectPtr.h"
 #include "minecraft/auth/AccountData.h"
 
+/**
+ * Enum for describing the state of the current task.
+ * Used by the getStateMessage function to determine what the status message should be.
+ */
+enum class AccountTaskState {
+    STATE_CREATED,
+    STATE_WORKING,
+    STATE_SUCCEEDED,
+    STATE_DISABLED,     //!< MSA Client ID has changed. Tell user to reloginn
+    STATE_FAILED_SOFT,  //!< soft failure. authentication went through partially
+    STATE_FAILED_HARD,  //!< hard failure. main tokens are invalid
+    STATE_FAILED_GONE,  //!< hard failure. main tokens are invalid, and the account no longer exists
+    STATE_OFFLINE       //!< soft failure. authentication failed in the first step in a 'soft' way
+};
+
 class AuthStep : public QObject {
     Q_OBJECT
 
    public:
     using Ptr = shared_qobject_ptr<AuthStep>;
 
-   public:
-    explicit AuthStep(AccountData* data);
-    virtual ~AuthStep() noexcept;
+    explicit AuthStep(AccountData* data) : QObject(nullptr), m_data(data) {};
+    virtual ~AuthStep() noexcept = default;
 
     virtual QString describe() = 0;
 
    public slots:
     virtual void perform() = 0;
-    virtual void rehydrate() = 0;
+    virtual void abort() {}
 
    signals:
     void finished(AccountTaskState resultingState, QString message);
-    void showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn);
-    void hideVerificationUriAndCode();
 
    protected:
     AccountData* m_data;
diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
index 17c4570a2..ea4331c2c 100644
--- a/launcher/minecraft/auth/MinecraftAccount.cpp
+++ b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -50,11 +50,8 @@
 
 #include <QPainter>
 
-#include "flows/AuthlibInjector.h"
-#include "flows/MSA.h"
-#include "flows/Mojang.h"
-#include "flows/Offline.h"
 #include "minecraft/auth/AccountData.h"
+#include "minecraft/auth/AuthFlow.h"
 
 MinecraftAccount::MinecraftAccount(QObject* parent) : QObject(parent)
 {
@@ -70,15 +67,6 @@ MinecraftAccountPtr MinecraftAccount::loadFromJsonV3(const QJsonObject& json)
     return nullptr;
 }
 
-MinecraftAccountPtr MinecraftAccount::createFromUsername(const QString& username)
-{
-    auto account = makeShared<MinecraftAccount>();
-    account->data.type = AccountType::Mojang;
-    account->data.yggdrasilToken.extra["userName"] = username;
-    account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
-    return account;
-}
-
 MinecraftAccountPtr MinecraftAccount::createFromUsernameAuthlibInjector(const QString& username, const QString& authlibInjectorUrl)
 {
     auto account = makeShared<MinecraftAccount>();
@@ -108,15 +96,13 @@ MinecraftAccountPtr MinecraftAccount::createOffline(const QString& username)
     auto account = makeShared<MinecraftAccount>();
     account->data.type = AccountType::Offline;
     account->data.yggdrasilToken.token = "0";
-    account->data.yggdrasilToken.validity = Katabasis::Validity::Certain;
+    account->data.yggdrasilToken.validity = Validity::Certain;
     account->data.yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
     account->data.yggdrasilToken.extra["userName"] = username;
     account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
-    account->data.minecraftEntitlement.ownsMinecraft = true;
-    account->data.minecraftEntitlement.canPlayMinecraft = true;
     account->data.minecraftProfile.id = uuidFromUsername(username).toString().remove(QRegularExpression("[{}-]"));
     account->data.minecraftProfile.name = username;
-    account->data.minecraftProfile.validity = Katabasis::Validity::Certain;
+    account->data.minecraftProfile.validity = Validity::Certain;
     return account;
 }
 
@@ -148,11 +134,11 @@ QPixmap MinecraftAccount::getFace() const
     return skin.scaled(64, 64, Qt::KeepAspectRatio);
 }
 
-shared_qobject_ptr<AccountTask> MinecraftAccount::login(QString password)
+shared_qobject_ptr<AuthFlow> MinecraftAccount::login(bool useDeviceCode, std::optional<QString> password)
 {
     Q_ASSERT(m_currentTask.get() == nullptr);
 
-    m_currentTask.reset(new MojangLogin(&data, password));
+    m_currentTask.reset(new AuthFlow(&data, useDeviceCode ? AuthFlow::Action::DeviceCode : AuthFlow::Action::Login, this, password));
     connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
     connect(m_currentTask.get(), &Task::failed, this, &MinecraftAccount::authFailed);
     connect(m_currentTask.get(), &Task::aborted, this, [this] { authFailed(tr("Aborted")); });
@@ -160,57 +146,13 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::login(QString password)
     return m_currentTask;
 }
 
-shared_qobject_ptr<AccountTask> MinecraftAccount::loginAuthlibInjector(QString password)
-{
-    Q_ASSERT(m_currentTask.get() == nullptr);
-
-    m_currentTask.reset(new AuthlibInjectorLogin(&data, password));
-    connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
-    connect(m_currentTask.get(), &Task::failed, this, &MinecraftAccount::authFailed);
-    connect(m_currentTask.get(), &Task::aborted, this, [this] { authFailed(tr("Aborted")); });
-    emit activityChanged(true);
-    return m_currentTask;
-}
-
-shared_qobject_ptr<AccountTask> MinecraftAccount::loginMSA()
-{
-    Q_ASSERT(m_currentTask.get() == nullptr);
-
-    m_currentTask.reset(new MSAInteractive(&data));
-    connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
-    connect(m_currentTask.get(), &Task::failed, this, &MinecraftAccount::authFailed);
-    connect(m_currentTask.get(), &Task::aborted, this, [this] { authFailed(tr("Aborted")); });
-    emit activityChanged(true);
-    return m_currentTask;
-}
-
-shared_qobject_ptr<AccountTask> MinecraftAccount::loginOffline()
-{
-    Q_ASSERT(m_currentTask.get() == nullptr);
-
-    m_currentTask.reset(new OfflineLogin(&data));
-    connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
-    connect(m_currentTask.get(), &Task::failed, this, &MinecraftAccount::authFailed);
-    connect(m_currentTask.get(), &Task::aborted, this, [this] { authFailed(tr("Aborted")); });
-    emit activityChanged(true);
-    return m_currentTask;
-}
-
-shared_qobject_ptr<AccountTask> MinecraftAccount::refresh()
+shared_qobject_ptr<AuthFlow> MinecraftAccount::refresh()
 {
     if (m_currentTask) {
         return m_currentTask;
     }
 
-    if (data.type == AccountType::MSA) {
-        m_currentTask.reset(new MSASilent(&data));
-    } else if (data.type == AccountType::Offline) {
-        m_currentTask.reset(new OfflineRefresh(&data));
-    } else if (data.type == AccountType::AuthlibInjector) {
-        m_currentTask.reset(new AuthlibInjectorRefresh(&data));
-    } else {
-        m_currentTask.reset(new MojangRefresh(&data));
-    }
+    m_currentTask.reset(new AuthFlow(&data, AuthFlow::Action::Refresh, this));
 
     connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
     connect(m_currentTask.get(), &Task::failed, this, &MinecraftAccount::authFailed);
@@ -219,7 +161,7 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::refresh()
     return m_currentTask;
 }
 
-shared_qobject_ptr<AccountTask> MinecraftAccount::currentTask()
+shared_qobject_ptr<AuthFlow> MinecraftAccount::currentTask()
 {
     return m_currentTask;
 }
@@ -245,17 +187,17 @@ void MinecraftAccount::authFailed(QString reason)
             if (accountType() == AccountType::MSA) {
                 data.msaToken.token = QString();
                 data.msaToken.refresh_token = QString();
-                data.msaToken.validity = Katabasis::Validity::None;
-                data.validity_ = Katabasis::Validity::None;
+                data.msaToken.validity = Validity::None;
+                data.validity_ = Validity::None;
             } else {
                 data.yggdrasilToken.token = QString();
-                data.yggdrasilToken.validity = Katabasis::Validity::None;
-                data.validity_ = Katabasis::Validity::None;
+                data.yggdrasilToken.validity = Validity::None;
+                data.validity_ = Validity::None;
             }
             emit changed();
         } break;
         case AccountTaskState::STATE_FAILED_GONE: {
-            data.validity_ = Katabasis::Validity::None;
+            data.validity_ = Validity::None;
             emit changed();
         } break;
         case AccountTaskState::STATE_CREATED:
@@ -288,13 +230,13 @@ bool MinecraftAccount::shouldRefresh() const
         return true;
     }
     switch (data.validity_) {
-        case Katabasis::Validity::Certain: {
+        case Validity::Certain: {
             break;
         }
-        case Katabasis::Validity::None: {
+        case Validity::None: {
             return false;
         }
-        case Katabasis::Validity::Assumed: {
+        case Validity::Assumed: {
             return true;
         }
     }
@@ -334,6 +276,8 @@ void MinecraftAccount::fillSession(AuthSessionPtr session)
     session->player_name = data.profileName();
     // profile ID
     session->uuid = data.profileId();
+    if (session->uuid.isEmpty())
+        session->uuid = uuidFromUsername(session->player_name).toString().remove(QRegularExpression("[{}-]"));
     // 'legacy' or 'mojang', depending on account type
     session->user_type = typeString();
     if (!session->access_token.isEmpty()) {
diff --git a/launcher/minecraft/auth/MinecraftAccount.h b/launcher/minecraft/auth/MinecraftAccount.h
index f04d24c6f..515a9d43c 100644
--- a/launcher/minecraft/auth/MinecraftAccount.h
+++ b/launcher/minecraft/auth/MinecraftAccount.h
@@ -42,16 +42,15 @@
 #include <QPair>
 #include <QPixmap>
 #include <QString>
-
-#include <memory>
+#include <optional>
 
 #include "AccountData.h"
 #include "AuthSession.h"
 #include "QObjectPtr.h"
 #include "Usable.h"
+#include "minecraft/auth/AuthFlow.h"
 
 class Task;
-class AccountTask;
 class MinecraftAccount;
 
 using MinecraftAccountPtr = shared_qobject_ptr<MinecraftAccount>;
@@ -85,7 +84,6 @@ class MinecraftAccount : public QObject, public Usable {
     //! Default constructor
     explicit MinecraftAccount(QObject* parent = 0);
 
-    static MinecraftAccountPtr createFromUsername(const QString& username);
     static MinecraftAccountPtr createFromUsernameAuthlibInjector(const QString& username, const QString& authlibInjectorUrl);
 
     static MinecraftAccountPtr createBlankMSA();
@@ -100,21 +98,11 @@ class MinecraftAccount : public QObject, public Usable {
     QJsonObject saveToJson() const;
 
    public: /* manipulation */
-    /**
-     * Attempt to login. Empty password means we use the token.
-     * If the attempt fails because we already are performing some task, it returns false.
-     */
-    shared_qobject_ptr<AccountTask> login(QString password);
-
-    shared_qobject_ptr<AccountTask> loginAuthlibInjector(QString password);
-
-    shared_qobject_ptr<AccountTask> loginMSA();
-
-    shared_qobject_ptr<AccountTask> loginOffline();
+    shared_qobject_ptr<AuthFlow> login(bool useDeviceCode = false, std::optional<QString> password = std::nullopt);
 
-    shared_qobject_ptr<AccountTask> refresh();
+    shared_qobject_ptr<AuthFlow> refresh();
 
-    shared_qobject_ptr<AccountTask> currentTask();
+    shared_qobject_ptr<AuthFlow> currentTask();
 
    public: /* queries */
     QString internalId() const { return data.internalId; }
@@ -131,6 +119,8 @@ class MinecraftAccount : public QObject, public Usable {
 
     bool usesCustomApiServers() const { return data.usesCustomApiServers(); }
 
+    bool supportsSkinManagement() const { return data.supportsSkinManagement(); }
+
     QString accountDisplayString() const { return data.accountDisplayString(); }
 
     QString accessToken() const { return data.accessToken(); }
@@ -141,23 +131,15 @@ class MinecraftAccount : public QObject, public Usable {
 
     bool isActive() const;
 
-    bool canMigrate() const { return data.canMigrateToMSA; }
-
     [[nodiscard]] AccountType accountType() const noexcept { return data.type; }
 
-    bool ownsMinecraft() const { return data.minecraftEntitlement.ownsMinecraft; }
+    bool ownsMinecraft() const { return data.type != AccountType::Offline && data.minecraftEntitlement.ownsMinecraft; }
 
     bool hasProfile() const { return data.profileId().size() != 0; }
 
     QString typeDisplayName() const
     {
         switch (data.type) {
-            case AccountType::Mojang: {
-                if (data.legacy) {
-                    return tr("Legacy", "Account type");
-                }
-                return tr("Mojang", "Account type");
-            } break;
             case AccountType::AuthlibInjector: {
                 return tr("authlib-injector", "Account type");
             } break;
@@ -176,12 +158,6 @@ class MinecraftAccount : public QObject, public Usable {
     QString typeString() const
     {
         switch (data.type) {
-            case AccountType::Mojang: {
-                if (data.legacy) {
-                    return "legacy";
-                }
-                return "mojang";
-            } break;
             case AccountType::AuthlibInjector: {
                 // This typeString gets passed to Minecraft; any Yggdrasil
                 // account should have the "mojang" type regardless of which
@@ -227,7 +203,7 @@ class MinecraftAccount : public QObject, public Usable {
     AccountData data;
 
     // current task we are executing here
-    shared_qobject_ptr<AccountTask> m_currentTask;
+    shared_qobject_ptr<AuthFlow> m_currentTask;
 
    protected: /* methods */
     void incrementUses() override;
diff --git a/launcher/minecraft/auth/Parsers.cpp b/launcher/minecraft/auth/Parsers.cpp
index f6179a93e..f61c05c5d 100644
--- a/launcher/minecraft/auth/Parsers.cpp
+++ b/launcher/minecraft/auth/Parsers.cpp
@@ -79,7 +79,7 @@ bool getBool(QJsonValue value, bool& out)
 // 2148916238 = child account not linked to a family
 */
 
-bool parseXTokenResponse(QByteArray& data, Katabasis::Token& output, QString name)
+bool parseXTokenResponse(QByteArray& data, Token& output, QString name)
 {
     qDebug() << "Parsing" << name << ":";
     qCDebug(authCredentials()) << data;
@@ -135,7 +135,7 @@ bool parseXTokenResponse(QByteArray& data, Katabasis::Token& output, QString nam
         qWarning() << "Missing uhs";
         return false;
     }
-    output.validity = Katabasis::Validity::Certain;
+    output.validity = Validity::Certain;
     qDebug() << name << "is valid.";
     return true;
 }
@@ -180,6 +180,7 @@ bool parseMinecraftProfile(QByteArray& data, MinecraftProfile& output)
         if (!getString(skinObj.value("url"), skinOut.url)) {
             continue;
         }
+        skinOut.url.replace("http://textures.minecraft.net", "https://textures.minecraft.net");
         if (!getString(skinObj.value("variant"), skinOut.variant)) {
             continue;
         }
@@ -213,7 +214,7 @@ bool parseMinecraftProfile(QByteArray& data, MinecraftProfile& output)
         output.capes[capeOut.id] = capeOut;
     }
     output.currentCape = currentCape;
-    output.validity = Katabasis::Validity::Certain;
+    output.validity = Validity::Certain;
     return true;
 }
 
@@ -221,9 +222,9 @@ namespace {
 // these skin URLs are for the MHF_Steve and MHF_Alex accounts (made by a Mojang employee)
 // they are needed because the session server doesn't return skin urls for default skins
 static const QString SKIN_URL_STEVE =
-    "http://textures.minecraft.net/texture/1a4af718455d4aab528e7a61f86fa25e6a369d1768dcb13f7df319a713eb810b";
+    "https://textures.minecraft.net/texture/1a4af718455d4aab528e7a61f86fa25e6a369d1768dcb13f7df319a713eb810b";
 static const QString SKIN_URL_ALEX =
-    "http://textures.minecraft.net/texture/83cee5ca6afcdb171285aa00e8049c297b2dbeba0efb8ff970a5677a1b644032";
+    "https://textures.minecraft.net/texture/83cee5ca6afcdb171285aa00e8049c297b2dbeba0efb8ff970a5677a1b644032";
 
 bool isDefaultModelSteve(QString uuid)
 {
@@ -347,7 +348,7 @@ bool parseMinecraftProfileMojang(QByteArray& data, MinecraftProfile& output)
     Skin skinOut;
     // fill in default skin info ourselves, as this endpoint doesn't provide it
     bool steve = isDefaultModelSteve(output.id);
-    skinOut.variant = steve ? "classic" : "slim";
+    skinOut.variant = steve ? "CLASSIC" : "SLIM";
     skinOut.url = steve ? SKIN_URL_STEVE : SKIN_URL_ALEX;
     // sadly we can't figure this out, but I don't think it really matters...
     skinOut.id = "00000000-0000-0000-0000-000000000000";
@@ -378,6 +379,7 @@ bool parseMinecraftProfileMojang(QByteArray& data, MinecraftProfile& output)
                 // we don't know the cape ID as it is not returned from the session server
                 // so just fake it - changing capes is probably locked anyway :(
                 capeOut.alias = "cape";
+                capeOut.id = "00000000-0000-0000-0000-000000000000";
             }
         }
     }
@@ -388,7 +390,7 @@ bool parseMinecraftProfileMojang(QByteArray& data, MinecraftProfile& output)
         output.currentCape = capeOut.alias;
     }
 
-    output.validity = Katabasis::Validity::Certain;
+    output.validity = Validity::Certain;
     return true;
 }
 
@@ -422,7 +424,7 @@ bool parseMinecraftEntitlements(QByteArray& data, MinecraftEntitlement& output)
             output.ownsMinecraft = true;
         }
     }
-    output.validity = Katabasis::Validity::Certain;
+    output.validity = Validity::Certain;
     return true;
 }
 
@@ -456,7 +458,7 @@ bool parseRolloutResponse(QByteArray& data, bool& result)
     return true;
 }
 
-bool parseMojangResponse(QByteArray& data, Katabasis::Token& output)
+bool parseMojangResponse(QByteArray& data, Token& output)
 {
     QJsonParseError jsonError;
     qDebug() << "Parsing Mojang response...";
@@ -488,7 +490,7 @@ bool parseMojangResponse(QByteArray& data, Katabasis::Token& output)
         qWarning() << "access_token is not valid";
         return false;
     }
-    output.validity = Katabasis::Validity::Certain;
+    output.validity = Validity::Certain;
     qDebug() << "Mojang response is valid.";
     return true;
 }
diff --git a/launcher/minecraft/auth/Parsers.h b/launcher/minecraft/auth/Parsers.h
index d073f9994..4a235e4c2 100644
--- a/launcher/minecraft/auth/Parsers.h
+++ b/launcher/minecraft/auth/Parsers.h
@@ -9,8 +9,8 @@ bool getNumber(QJsonValue value, double& out);
 bool getNumber(QJsonValue value, int64_t& out);
 bool getBool(QJsonValue value, bool& out);
 
-bool parseXTokenResponse(QByteArray& data, Katabasis::Token& output, QString name);
-bool parseMojangResponse(QByteArray& data, Katabasis::Token& output);
+bool parseXTokenResponse(QByteArray& data, Token& output, QString name);
+bool parseMojangResponse(QByteArray& data, Token& output);
 
 bool parseMinecraftProfile(QByteArray& data, MinecraftProfile& output);
 bool parseMinecraftProfileMojang(QByteArray& data, MinecraftProfile& output);
diff --git a/launcher/minecraft/auth/Yggdrasil.cpp b/launcher/minecraft/auth/Yggdrasil.cpp
deleted file mode 100644
index dc0e1855c..000000000
--- a/launcher/minecraft/auth/Yggdrasil.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Yggdrasil.h"
-#include "AccountData.h"
-
-#include <QByteArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkReply>
-#include <QObject>
-#include <QString>
-
-#include <QDebug>
-
-#include "Application.h"
-#include "BuildConfig.h"
-
-Yggdrasil::Yggdrasil(AccountData* data, QObject* parent) : AccountTask(data, parent)
-{
-    changeState(AccountTaskState::STATE_CREATED);
-}
-
-void Yggdrasil::sendRequest(QUrl endpoint, QByteArray content)
-{
-    changeState(AccountTaskState::STATE_WORKING);
-
-    QNetworkRequest netRequest(endpoint);
-    netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    m_netReply = APPLICATION->network()->post(netRequest, content);
-    connect(m_netReply, &QNetworkReply::finished, this, &Yggdrasil::processReply);
-    connect(m_netReply, &QNetworkReply::uploadProgress, this, &Yggdrasil::refreshTimers);
-    connect(m_netReply, &QNetworkReply::downloadProgress, this, &Yggdrasil::refreshTimers);
-    connect(m_netReply, &QNetworkReply::sslErrors, this, &Yggdrasil::sslErrors);
-    timeout_keeper.setSingleShot(true);
-    timeout_keeper.start(timeout_max);
-    counter.setSingleShot(false);
-    counter.start(time_step);
-    progress(0, timeout_max);
-    connect(&timeout_keeper, &QTimer::timeout, this, &Yggdrasil::abortByTimeout);
-    connect(&counter, &QTimer::timeout, this, &Yggdrasil::heartbeat);
-}
-
-void Yggdrasil::executeTask() {}
-
-void Yggdrasil::refresh()
-{
-    start();
-    /*
-     * {
-     *  "clientToken": "client identifier"
-     *  "accessToken": "current access token to be refreshed"
-     *  "selectedProfile":                      // specifying this causes errors
-     *  {
-     *   "id": "profile ID"
-     *   "name": "profile name"
-     *  }
-     *  "requestUser": true/false               // request the user structure
-     * }
-     */
-    QJsonObject req;
-    req.insert("clientToken", m_data->clientToken());
-    req.insert("accessToken", m_data->accessToken());
-    /*
-    {
-        auto currentProfile = m_account->currentProfile();
-        QJsonObject profile;
-        profile.insert("id", currentProfile->id());
-        profile.insert("name", currentProfile->name());
-        req.insert("selectedProfile", profile);
-    }
-    */
-    req.insert("requestUser", false);
-    QJsonDocument doc(req);
-
-    QUrl reqUrl(m_data->authServerUrl() + "/refresh");
-    QByteArray requestData = doc.toJson();
-
-    sendRequest(reqUrl, requestData);
-}
-
-void Yggdrasil::login(QString password)
-{
-    start();
-    /*
-     * {
-     *   "agent": {                              // optional
-     *   "name": "Minecraft",                    // So far this is the only encountered value
-     *   "version": 1                            // This number might be increased
-     *                                           // by the vanilla client in the future
-     *   },
-     *   "username": "mojang account name",      // Can be an email address or player name for
-     *                                           // unmigrated accounts
-     *   "password": "mojang account password",
-     *   "clientToken": "client identifier",     // optional
-     *   "requestUser": true/false               // request the user structure
-     * }
-     */
-    QJsonObject req;
-
-    {
-        QJsonObject agent;
-        // C++ makes string literals void* for some stupid reason, so we have to tell it
-        // QString... Thanks Obama.
-        agent.insert("name", QString("Minecraft"));
-        agent.insert("version", 1);
-        req.insert("agent", agent);
-    }
-
-    req.insert("username", m_data->userName());
-    req.insert("password", password);
-    req.insert("requestUser", false);
-
-    // If we already have a client token, give it to the server.
-    // Otherwise, let the server give us one.
-
-    m_data->generateClientTokenIfMissing();
-    req.insert("clientToken", m_data->clientToken());
-
-    QJsonDocument doc(req);
-
-    QUrl reqUrl(m_data->authServerUrl() + "/authenticate");
-    QNetworkRequest netRequest(reqUrl);
-    QByteArray requestData = doc.toJson();
-
-    sendRequest(reqUrl, requestData);
-}
-
-void Yggdrasil::refreshTimers(qint64, qint64)
-{
-    timeout_keeper.stop();
-    timeout_keeper.start(timeout_max);
-    progress(count = 0, timeout_max);
-}
-
-void Yggdrasil::heartbeat()
-{
-    count += time_step;
-    progress(count, timeout_max);
-}
-
-bool Yggdrasil::abort()
-{
-    progress(timeout_max, timeout_max);
-    // TODO: actually use this in a meaningful way
-    m_aborted = Yggdrasil::BY_USER;
-    m_netReply->abort();
-    return true;
-}
-
-void Yggdrasil::abortByTimeout()
-{
-    progress(timeout_max, timeout_max);
-    // TODO: actually use this in a meaningful way
-    m_aborted = Yggdrasil::BY_TIMEOUT;
-    m_netReply->abort();
-}
-
-void Yggdrasil::sslErrors(QList<QSslError> errors)
-{
-    int i = 1;
-    for (auto error : errors) {
-        qCritical() << "LOGIN SSL Error #" << i << " : " << error.errorString();
-        auto cert = error.certificate();
-        qCritical() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-void Yggdrasil::processResponse(QJsonObject responseData)
-{
-    // Read the response data. We need to get the client token, access token, and the selected
-    // profile.
-    qDebug() << "Processing authentication response.";
-
-    // qDebug() << responseData;
-    // If we already have a client token, make sure the one the server gave us matches our
-    // existing one.
-    QString clientToken = responseData.value("clientToken").toString("");
-    if (clientToken.isEmpty()) {
-        // Fail if the server gave us an empty client token
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a client token."));
-        return;
-    }
-    if (m_data->clientToken().isEmpty()) {
-        m_data->setClientToken(clientToken);
-    } else if (clientToken != m_data->clientToken()) {
-        changeState(AccountTaskState::STATE_FAILED_HARD,
-                    tr("Authentication server attempted to change the client token. This isn't supported."));
-        return;
-    }
-
-    // Now, we set the access token.
-    qDebug() << "Getting access token.";
-    QString accessToken = responseData.value("accessToken").toString("");
-    if (accessToken.isEmpty()) {
-        // Fail if the server didn't give us an access token.
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send an access token."));
-        return;
-    }
-    // Set the access token.
-    m_data->yggdrasilToken.token = accessToken;
-    m_data->yggdrasilToken.validity = Katabasis::Validity::Certain;
-    m_data->yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
-
-    // Get UUID here since we need it for later
-    // FIXME: Here is a simple workaround for now,, which uses the first available profile when selectedProfile is not provided
-    auto profile = responseData.value("selectedProfile");
-    if (!profile.isObject()) {
-        auto profiles = responseData.value("availableProfiles");
-        if (!profiles.isArray()) {
-            changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send available profiles."));
-            return;
-        } else {
-            if (profiles.toArray().isEmpty()) {
-                changeState(AccountTaskState::STATE_FAILED_HARD, tr("Account has no available profile."));
-                return;
-            } else {
-                profile = profiles.toArray().first();
-            }
-        }
-    }
-
-    auto profileObj = profile.toObject();
-    for (auto i = profileObj.constBegin(); i != profileObj.constEnd(); ++i) {
-        if (i.key() == "name" && i.value().isString()) {
-            m_data->minecraftProfile.name = i->toString();
-        } else if (i.key() == "id" && i.value().isString()) {
-            m_data->minecraftProfile.id = i->toString();
-        }
-    }
-
-    if (m_data->minecraftProfile.id.isEmpty()) {
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a UUID in selected profile."));
-        return;
-    }
-
-    // We've made it through the minefield of possible errors. Return true to indicate that
-    // we've succeeded.
-    qDebug() << "Finished reading authentication response.";
-    changeState(AccountTaskState::STATE_SUCCEEDED);
-}
-
-void Yggdrasil::processReply()
-{
-    changeState(AccountTaskState::STATE_WORKING);
-
-    switch (m_netReply->error()) {
-        case QNetworkReply::NoError:
-            break;
-        case QNetworkReply::TimeoutError:
-            changeState(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation timed out."));
-            return;
-        case QNetworkReply::OperationCanceledError:
-            changeState(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation cancelled."));
-            return;
-        case QNetworkReply::SslHandshakeFailedError:
-            changeState(AccountTaskState::STATE_FAILED_SOFT,
-                        tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>"
-                           "<ul>"
-                           "<li>You use Windows and need to update your root certificates, please install any outstanding updates.</li>"
-                           "<li>Some device on your network is interfering with SSL traffic. In that case, "
-                           "you have bigger worries than Minecraft not starting.</li>"
-                           "<li>Possibly something else. Check the log file for details</li>"
-                           "</ul>"));
-            return;
-        // used for invalid credentials and similar errors. Fall through.
-        case QNetworkReply::ContentAccessDenied:
-        case QNetworkReply::ContentOperationNotPermittedError:
-            break;
-        case QNetworkReply::ContentGoneError: {
-            changeState(AccountTaskState::STATE_FAILED_GONE,
-                        tr("The Mojang account no longer exists. It may have been migrated to a Microsoft account."));
-            return;
-        }
-        default:
-            changeState(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation failed due to a network error: %1 (%2)")
-                                                                 .arg(m_netReply->errorString())
-                                                                 .arg(m_netReply->error()));
-            return;
-    }
-
-    // Try to parse the response regardless of the response code.
-    // Sometimes the auth server will give more information and an error code.
-    QJsonParseError jsonError;
-    QByteArray replyData = m_netReply->readAll();
-    QJsonDocument doc = QJsonDocument::fromJson(replyData, &jsonError);
-    // Check the response code.
-    int responseCode = m_netReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-
-    if (responseCode == 200) {
-        // If the response code was 200, then there shouldn't be an error. Make sure
-        // anyways.
-        // Also, sometimes an empty reply indicates success. If there was no data received,
-        // pass an empty json object to the processResponse function.
-        if (jsonError.error == QJsonParseError::NoError || replyData.size() == 0) {
-            processResponse(replyData.size() > 0 ? doc.object() : QJsonObject());
-            return;
-        } else {
-            changeState(AccountTaskState::STATE_FAILED_SOFT,
-                        tr("Failed to parse authentication server response JSON response: %1 at offset %2.")
-                            .arg(jsonError.errorString())
-                            .arg(jsonError.offset));
-            qCritical() << replyData;
-        }
-        return;
-    }
-
-    // If the response code was not 200, then Yggdrasil may have given us information
-    // about the error.
-    // If we can parse the response, then get information from it. Otherwise just say
-    // there was an unknown error.
-    if (jsonError.error == QJsonParseError::NoError) {
-        // We were able to parse the server's response. Woo!
-        // Call processError. If a subclass has overridden it then they'll handle their
-        // stuff there.
-        qDebug() << "The request failed, but the server gave us an error message. Processing error.";
-        processError(doc.object());
-    } else {
-        // The server didn't say anything regarding the error. Give the user an unknown
-        // error.
-        qDebug() << "The request failed and the server gave no error message. Unknown error.";
-        changeState(
-            AccountTaskState::STATE_FAILED_SOFT,
-            tr("An unknown error occurred when trying to communicate with the authentication server: %1").arg(m_netReply->errorString()));
-    }
-}
-
-void Yggdrasil::processError(QJsonObject responseData)
-{
-    QJsonValue errorVal = responseData.value("error");
-    QJsonValue errorMessageValue = responseData.value("errorMessage");
-    QJsonValue causeVal = responseData.value("cause");
-
-    if (errorVal.isString() && errorMessageValue.isString()) {
-        m_error = std::shared_ptr<Error>(new Error{ errorVal.toString(""), errorMessageValue.toString(""), causeVal.toString("") });
-        changeState(AccountTaskState::STATE_FAILED_HARD, m_error->m_errorMessageVerbose);
-    } else {
-        // Error is not in standard format. Don't set m_error and return unknown error.
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("An unknown Yggdrasil error occurred."));
-    }
-}
diff --git a/launcher/minecraft/auth/Yggdrasil.h b/launcher/minecraft/auth/Yggdrasil.h
deleted file mode 100644
index 560d7fb81..000000000
--- a/launcher/minecraft/auth/Yggdrasil.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "AccountTask.h"
-
-#include <qsslerror.h>
-#include <QJsonObject>
-#include <QString>
-#include <QTimer>
-
-#include "MinecraftAccount.h"
-
-class QNetworkAccessManager;
-class QNetworkReply;
-
-/**
- * A Yggdrasil task is a task that performs an operation on a given mojang account.
- */
-class Yggdrasil : public AccountTask {
-    Q_OBJECT
-   public:
-    explicit Yggdrasil(AccountData* data, QObject* parent = 0);
-    virtual ~Yggdrasil() = default;
-
-    void refresh();
-    void login(QString password);
-
-    struct Error {
-        QString m_errorMessageShort;
-        QString m_errorMessageVerbose;
-        QString m_cause;
-    };
-    std::shared_ptr<Error> m_error;
-
-    enum AbortedBy { BY_NOTHING, BY_USER, BY_TIMEOUT } m_aborted = BY_NOTHING;
-
-   protected:
-    void executeTask() override;
-
-    /**
-     * Processes the response received from the server.
-     * If an error occurred, this should emit a failed signal.
-     * If Yggdrasil gave an error response, it should call setError() first, and then return false.
-     * Otherwise, it should return true.
-     * Note: If the response from the server was blank, and the HTTP code was 200, this function is called with
-     * an empty QJsonObject.
-     */
-    void processResponse(QJsonObject responseData);
-
-    /**
-     * Processes an error response received from the server.
-     * The default implementation will read data from Yggdrasil's standard error response format and set it as this task's Error.
-     * \returns a QString error message that will be passed to emitFailed.
-     */
-    virtual void processError(QJsonObject responseData);
-
-   protected slots:
-    void processReply();
-    void refreshTimers(qint64, qint64);
-    void heartbeat();
-    void sslErrors(QList<QSslError>);
-    void abortByTimeout();
-
-   public slots:
-    virtual bool abort() override;
-
-   private:
-    void sendRequest(QUrl endpoint, QByteArray content);
-
-   protected:
-    QNetworkReply* m_netReply = nullptr;
-    QTimer timeout_keeper;
-    QTimer counter;
-    int count = 0;  // num msec since time reset
-
-    const int timeout_max = 30000;
-    const int time_step = 50;
-};
diff --git a/launcher/minecraft/auth/flows/AuthFlow.cpp b/launcher/minecraft/auth/flows/AuthFlow.cpp
deleted file mode 100644
index c51839a8c..000000000
--- a/launcher/minecraft/auth/flows/AuthFlow.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <QDebug>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-
-#include "AuthFlow.h"
-#include "katabasis/Globals.h"
-
-#include <Application.h>
-
-AuthFlow::AuthFlow(AccountData* data, QObject* parent) : AccountTask(data, parent) {}
-
-void AuthFlow::succeed()
-{
-    m_data->validity_ = Katabasis::Validity::Certain;
-    changeState(AccountTaskState::STATE_SUCCEEDED, tr("Finished all authentication steps"));
-}
-
-void AuthFlow::executeTask()
-{
-    if (m_currentStep) {
-        return;
-    }
-    changeState(AccountTaskState::STATE_WORKING, tr("Initializing"));
-    nextStep();
-}
-
-void AuthFlow::nextStep()
-{
-    if (m_steps.size() == 0) {
-        // we got to the end without an incident... assume this is all.
-        m_currentStep.reset();
-        succeed();
-        return;
-    }
-    m_currentStep = m_steps.front();
-    qDebug() << "AuthFlow:" << m_currentStep->describe();
-    m_steps.pop_front();
-    connect(m_currentStep.get(), &AuthStep::finished, this, &AuthFlow::stepFinished);
-    connect(m_currentStep.get(), &AuthStep::showVerificationUriAndCode, this, &AuthFlow::showVerificationUriAndCode);
-    connect(m_currentStep.get(), &AuthStep::hideVerificationUriAndCode, this, &AuthFlow::hideVerificationUriAndCode);
-
-    m_currentStep->perform();
-}
-
-QString AuthFlow::getStateMessage() const
-{
-    switch (m_taskState) {
-        case AccountTaskState::STATE_WORKING: {
-            if (m_currentStep) {
-                return m_currentStep->describe();
-            } else {
-                return tr("Working...");
-            }
-        }
-        default: {
-            return AccountTask::getStateMessage();
-        }
-    }
-}
-
-void AuthFlow::stepFinished(AccountTaskState resultingState, QString message)
-{
-    if (changeState(resultingState, message)) {
-        nextStep();
-    }
-}
diff --git a/launcher/minecraft/auth/flows/AuthFlow.h b/launcher/minecraft/auth/flows/AuthFlow.h
deleted file mode 100644
index e39e926dd..000000000
--- a/launcher/minecraft/auth/flows/AuthFlow.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <QImage>
-#include <QList>
-#include <QNetworkReply>
-#include <QObject>
-#include <QSet>
-#include <QVector>
-
-#include <katabasis/DeviceFlow.h>
-
-#include "minecraft/auth/AccountData.h"
-#include "minecraft/auth/AccountTask.h"
-#include "minecraft/auth/AuthStep.h"
-
-class AuthFlow : public AccountTask {
-    Q_OBJECT
-
-   public:
-    explicit AuthFlow(AccountData* data, QObject* parent = 0);
-
-    Katabasis::Validity validity() { return m_data->validity_; };
-
-    QString getStateMessage() const override;
-
-    void executeTask() override;
-
-   signals:
-    void activityChanged(Katabasis::Activity activity);
-
-   private slots:
-    void stepFinished(AccountTaskState resultingState, QString message);
-
-   protected:
-    void succeed();
-    void nextStep();
-
-   protected:
-    QList<AuthStep::Ptr> m_steps;
-    AuthStep::Ptr m_currentStep;
-};
diff --git a/launcher/minecraft/auth/flows/AuthlibInjector.cpp b/launcher/minecraft/auth/flows/AuthlibInjector.cpp
deleted file mode 100644
index 0eee1fa01..000000000
--- a/launcher/minecraft/auth/flows/AuthlibInjector.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "AuthlibInjector.h"
-
-#include "minecraft/auth/steps/AuthlibInjectorMetadataStep.h"
-#include "minecraft/auth/steps/GetSkinStep.h"
-#include "minecraft/auth/steps/MinecraftProfileStepMojang.h"
-#include "minecraft/auth/steps/YggdrasilStep.h"
-
-AuthlibInjectorRefresh::AuthlibInjectorRefresh(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-{
-    m_steps.append(makeShared<YggdrasilStep>(m_data, QString()));
-    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
-    m_steps.append(makeShared<AuthlibInjectorMetadataStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
-
-AuthlibInjectorLogin::AuthlibInjectorLogin(AccountData* data, QString password, QObject* parent)
-    : AuthFlow(data, parent), m_password(password)
-{
-    m_steps.append(makeShared<YggdrasilStep>(m_data, m_password));
-    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
-    m_steps.append(makeShared<AuthlibInjectorMetadataStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
diff --git a/launcher/minecraft/auth/flows/AuthlibInjector.h b/launcher/minecraft/auth/flows/AuthlibInjector.h
deleted file mode 100644
index d2e575ae6..000000000
--- a/launcher/minecraft/auth/flows/AuthlibInjector.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "AuthFlow.h"
-
-class AuthlibInjectorRefresh : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit AuthlibInjectorRefresh(AccountData* data, QObject* parent = 0);
-};
-
-class AuthlibInjectorLogin : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit AuthlibInjectorLogin(AccountData* data, QString password, QObject* parent = 0);
-
-   private:
-    QString m_password;
-};
diff --git a/launcher/minecraft/auth/flows/MSA.cpp b/launcher/minecraft/auth/flows/MSA.cpp
deleted file mode 100644
index f0399342e..000000000
--- a/launcher/minecraft/auth/flows/MSA.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "MSA.h"
-
-#include "minecraft/auth/steps/EntitlementsStep.h"
-#include "minecraft/auth/steps/GetSkinStep.h"
-#include "minecraft/auth/steps/LauncherLoginStep.h"
-#include "minecraft/auth/steps/MSAStep.h"
-#include "minecraft/auth/steps/MinecraftProfileStep.h"
-#include "minecraft/auth/steps/XboxAuthorizationStep.h"
-#include "minecraft/auth/steps/XboxProfileStep.h"
-#include "minecraft/auth/steps/XboxUserStep.h"
-
-MSASilent::MSASilent(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-{
-    m_steps.append(makeShared<MSAStep>(m_data, MSAStep::Action::Refresh));
-    m_steps.append(makeShared<XboxUserStep>(m_data));
-    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
-    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
-    m_steps.append(makeShared<LauncherLoginStep>(m_data));
-    m_steps.append(makeShared<XboxProfileStep>(m_data));
-    m_steps.append(makeShared<EntitlementsStep>(m_data));
-    m_steps.append(makeShared<MinecraftProfileStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
-
-MSAInteractive::MSAInteractive(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-{
-    m_steps.append(makeShared<MSAStep>(m_data, MSAStep::Action::Login));
-    m_steps.append(makeShared<XboxUserStep>(m_data));
-    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
-    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
-    m_steps.append(makeShared<LauncherLoginStep>(m_data));
-    m_steps.append(makeShared<XboxProfileStep>(m_data));
-    m_steps.append(makeShared<EntitlementsStep>(m_data));
-    m_steps.append(makeShared<MinecraftProfileStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
diff --git a/launcher/minecraft/auth/flows/MSA.h b/launcher/minecraft/auth/flows/MSA.h
deleted file mode 100644
index e403d530f..000000000
--- a/launcher/minecraft/auth/flows/MSA.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "AuthFlow.h"
-
-class MSAInteractive : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit MSAInteractive(AccountData* data, QObject* parent = 0);
-};
-
-class MSASilent : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit MSASilent(AccountData* data, QObject* parent = 0);
-};
diff --git a/launcher/minecraft/auth/flows/Mojang.cpp b/launcher/minecraft/auth/flows/Mojang.cpp
deleted file mode 100644
index 7e2db16fa..000000000
--- a/launcher/minecraft/auth/flows/Mojang.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "Mojang.h"
-
-#include "minecraft/auth/steps/GetSkinStep.h"
-#include "minecraft/auth/steps/MigrationEligibilityStep.h"
-#include "minecraft/auth/steps/MinecraftProfileStepMojang.h"
-#include "minecraft/auth/steps/YggdrasilStep.h"
-
-MojangRefresh::MojangRefresh(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-{
-    m_steps.append(makeShared<YggdrasilStep>(m_data, QString()));
-    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
-    m_steps.append(makeShared<MigrationEligibilityStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
-
-MojangLogin::MojangLogin(AccountData* data, QString password, QObject* parent) : AuthFlow(data, parent), m_password(password)
-{
-    m_steps.append(makeShared<YggdrasilStep>(m_data, m_password));
-    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
-    m_steps.append(makeShared<MigrationEligibilityStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
diff --git a/launcher/minecraft/auth/flows/Mojang.h b/launcher/minecraft/auth/flows/Mojang.h
deleted file mode 100644
index 779ca7e34..000000000
--- a/launcher/minecraft/auth/flows/Mojang.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "AuthFlow.h"
-
-class MojangRefresh : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit MojangRefresh(AccountData* data, QObject* parent = 0);
-};
-
-class MojangLogin : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit MojangLogin(AccountData* data, QString password, QObject* parent = 0);
-
-   private:
-    QString m_password;
-};
diff --git a/launcher/minecraft/auth/flows/Offline.cpp b/launcher/minecraft/auth/flows/Offline.cpp
deleted file mode 100644
index 3770b869a..000000000
--- a/launcher/minecraft/auth/flows/Offline.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "Offline.h"
-
-#include "minecraft/auth/steps/OfflineStep.h"
-
-OfflineRefresh::OfflineRefresh(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-{
-    m_steps.append(makeShared<OfflineStep>(m_data));
-}
-
-OfflineLogin::OfflineLogin(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-{
-    m_steps.append(makeShared<OfflineStep>(m_data));
-}
diff --git a/launcher/minecraft/auth/flows/Offline.h b/launcher/minecraft/auth/flows/Offline.h
deleted file mode 100644
index 2bc9c7612..000000000
--- a/launcher/minecraft/auth/flows/Offline.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "AuthFlow.h"
-
-class OfflineRefresh : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit OfflineRefresh(AccountData* data, QObject* parent = 0);
-};
-
-class OfflineLogin : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit OfflineLogin(AccountData* data, QObject* parent = 0);
-};
diff --git a/launcher/minecraft/auth/steps/EntitlementsStep.cpp b/launcher/minecraft/auth/steps/EntitlementsStep.cpp
index 0573dcb6e..5b9809c52 100644
--- a/launcher/minecraft/auth/steps/EntitlementsStep.cpp
+++ b/launcher/minecraft/auth/steps/EntitlementsStep.cpp
@@ -1,16 +1,21 @@
 #include "EntitlementsStep.h"
 
+#include <QList>
 #include <QNetworkRequest>
+#include <QUrl>
 #include <QUuid>
+#include <memory>
 
+#include "Application.h"
 #include "Logging.h"
-#include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
+#include "net/Download.h"
+#include "net/NetJob.h"
+#include "net/RawHeaderProxy.h"
+#include "tasks/Task.h"
 
 EntitlementsStep::EntitlementsStep(AccountData* data) : AuthStep(data) {}
 
-EntitlementsStep::~EntitlementsStep() noexcept = default;
-
 QString EntitlementsStep::describe()
 {
     return tr("Determining game ownership.");
@@ -19,35 +24,34 @@ QString EntitlementsStep::describe()
 void EntitlementsStep::perform()
 {
     auto uuid = QUuid::createUuid();
-    m_entitlementsRequestId = uuid.toString().remove('{').remove('}');
-    auto url = "https://api.minecraftservices.com/entitlements/license?requestId=" + m_entitlementsRequestId;
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Accept", "application/json");
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8());
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &EntitlementsStep::onRequestDone);
-    requestor->get(request);
-    qDebug() << "Getting entitlements...";
-}
+    m_entitlements_request_id = uuid.toString().remove('{').remove('}');
 
-void EntitlementsStep::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
+    QUrl url("https://api.minecraftservices.com/entitlements/license?requestId=" + m_entitlements_request_id);
+    auto headers = QList<Net::HeaderPair>{ { "Content-Type", "application/json" },
+                                           { "Accept", "application/json" },
+                                           { "Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8() } };
+
+    m_response.reset(new QByteArray());
+    m_request = Net::Download::makeByteArray(url, m_response);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("EntitlementsStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &EntitlementsStep::onRequestDone);
+
+    m_task->start();
+    qDebug() << "Getting entitlements...";
 }
 
-void EntitlementsStep::onRequestDone([[maybe_unused]] QNetworkReply::NetworkError error,
-                                     QByteArray data,
-                                     [[maybe_unused]] QList<QNetworkReply::RawHeaderPair> headers)
+void EntitlementsStep::onRequestDone()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    qCDebug(authCredentials()) << data;
+    qCDebug(authCredentials()) << *m_response;
 
     // TODO: check presence of same entitlementsRequestId?
     // TODO: validate JWTs?
-    Parsers::parseMinecraftEntitlements(data, m_data->minecraftEntitlement);
+    Parsers::parseMinecraftEntitlements(*m_response, m_data->minecraftEntitlement);
 
     emit finished(AccountTaskState::STATE_WORKING, tr("Got entitlements"));
 }
diff --git a/launcher/minecraft/auth/steps/EntitlementsStep.h b/launcher/minecraft/auth/steps/EntitlementsStep.h
index be16bda13..f20fcac08 100644
--- a/launcher/minecraft/auth/steps/EntitlementsStep.h
+++ b/launcher/minecraft/auth/steps/EntitlementsStep.h
@@ -1,24 +1,28 @@
 #pragma once
 #include <QObject>
+#include <memory>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/Download.h"
+#include "net/NetJob.h"
 
 class EntitlementsStep : public AuthStep {
     Q_OBJECT
 
    public:
     explicit EntitlementsStep(AccountData* data);
-    virtual ~EntitlementsStep() noexcept;
+    virtual ~EntitlementsStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
+    void onRequestDone();
 
    private:
-    QString m_entitlementsRequestId;
+    QString m_entitlements_request_id;
+    std::shared_ptr<QByteArray> m_response;
+    Net::Download::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/auth/steps/GetSkinStep.cpp b/launcher/minecraft/auth/steps/GetSkinStep.cpp
index 520877020..e067bc34c 100644
--- a/launcher/minecraft/auth/steps/GetSkinStep.cpp
+++ b/launcher/minecraft/auth/steps/GetSkinStep.cpp
@@ -3,13 +3,10 @@
 
 #include <QNetworkRequest>
 
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
+#include "Application.h"
 
 GetSkinStep::GetSkinStep(AccountData* data) : AuthStep(data) {}
 
-GetSkinStep::~GetSkinStep() noexcept = default;
-
 QString GetSkinStep::describe()
 {
     return tr("Getting skin.");
@@ -17,25 +14,23 @@ QString GetSkinStep::describe()
 
 void GetSkinStep::perform()
 {
-    auto url = QUrl(m_data->minecraftProfile.skin.url);
-    QNetworkRequest request = QNetworkRequest(url);
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &GetSkinStep::onRequestDone);
-    requestor->get(request);
-}
+    QUrl url(m_data->minecraftProfile.skin.url);
 
-void GetSkinStep::rehydrate()
-{
-    // NOOP, for now.
+    m_response.reset(new QByteArray());
+    m_request = Net::Download::makeByteArray(url, m_response);
+
+    m_task.reset(new NetJob("GetSkinStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &GetSkinStep::onRequestDone);
+
+    m_task->start();
 }
 
-void GetSkinStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+void GetSkinStep::onRequestDone()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    if (error == QNetworkReply::NoError) {
-        m_data->minecraftProfile.skin.data = data;
-    }
-    emit finished(AccountTaskState::STATE_SUCCEEDED, tr("Got skin"));
+    if (m_request->error() == QNetworkReply::NoError)
+        m_data->minecraftProfile.skin.data = *m_response;
+    emit finished(AccountTaskState::STATE_WORKING, tr("Got skin"));
 }
diff --git a/launcher/minecraft/auth/steps/GetSkinStep.h b/launcher/minecraft/auth/steps/GetSkinStep.h
index 105e497d1..c598f05d9 100644
--- a/launcher/minecraft/auth/steps/GetSkinStep.h
+++ b/launcher/minecraft/auth/steps/GetSkinStep.h
@@ -1,21 +1,27 @@
 #pragma once
 #include <QObject>
+#include <memory>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/Download.h"
+#include "net/NetJob.h"
 
 class GetSkinStep : public AuthStep {
     Q_OBJECT
 
    public:
     explicit GetSkinStep(AccountData* data);
-    virtual ~GetSkinStep() noexcept;
+    virtual ~GetSkinStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
+    void onRequestDone();
+
+   private:
+    std::shared_ptr<QByteArray> m_response;
+    Net::Download::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/auth/steps/LauncherLoginStep.cpp b/launcher/minecraft/auth/steps/LauncherLoginStep.cpp
index c57f51113..954f013af 100644
--- a/launcher/minecraft/auth/steps/LauncherLoginStep.cpp
+++ b/launcher/minecraft/auth/steps/LauncherLoginStep.cpp
@@ -1,17 +1,17 @@
 #include "LauncherLoginStep.h"
 
 #include <QNetworkRequest>
+#include <QUrl>
 
+#include "Application.h"
 #include "Logging.h"
-#include "minecraft/auth/AccountTask.h"
-#include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
 #include "net/NetUtils.h"
+#include "net/RawHeaderProxy.h"
+#include "net/Upload.h"
 
 LauncherLoginStep::LauncherLoginStep(AccountData* data) : AuthStep(data) {}
 
-LauncherLoginStep::~LauncherLoginStep() noexcept = default;
-
 QString LauncherLoginStep::describe()
 {
     return tr("Accessing Mojang services.");
@@ -19,7 +19,7 @@ QString LauncherLoginStep::describe()
 
 void LauncherLoginStep::perform()
 {
-    auto requestURL = "https://api.minecraftservices.com/launcher/login";
+    QUrl url("https://api.minecraftservices.com/launcher/login");
     auto uhs = m_data->mojangservicesToken.extra["uhs"].toString();
     auto xToken = m_data->mojangservicesToken.token;
 
@@ -31,40 +31,41 @@ void LauncherLoginStep::perform()
 )XXX";
     auto requestBody = mc_auth_template.arg(uhs, xToken);
 
-    QNetworkRequest request = QNetworkRequest(QUrl(requestURL));
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Accept", "application/json");
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &LauncherLoginStep::onRequestDone);
-    requestor->post(request, requestBody.toUtf8());
-    qDebug() << "Getting Minecraft access token...";
-}
+    auto headers = QList<Net::HeaderPair>{
+        { "Content-Type", "application/json" },
+        { "Accept", "application/json" },
+    };
 
-void LauncherLoginStep::rehydrate()
-{
-    // TODO: check the token validity
+    m_response.reset(new QByteArray());
+    m_request = Net::Upload::makeByteArray(url, m_response, requestBody.toUtf8());
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("LauncherLoginStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &LauncherLoginStep::onRequestDone);
+
+    m_task->start();
+    qDebug() << "Getting Minecraft access token...";
 }
 
-void LauncherLoginStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+void LauncherLoginStep::onRequestDone()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    qCDebug(authCredentials()) << data;
-    if (error != QNetworkReply::NoError) {
-        qWarning() << "Reply error:" << error;
-        qCDebug(authCredentials()) << data;
-        if (Net::isApplicationError(error)) {
-            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Failed to get Minecraft access token: %1").arg(requestor->errorString_));
+    qCDebug(authCredentials()) << *m_response;
+    if (m_request->error() != QNetworkReply::NoError) {
+        qWarning() << "Reply error:" << m_request->error();
+        if (Net::isApplicationError(m_request->error())) {
+            emit finished(AccountTaskState::STATE_FAILED_SOFT,
+                          tr("Failed to get Minecraft access token: %1").arg(m_request->errorString()));
         } else {
-            emit finished(AccountTaskState::STATE_OFFLINE, tr("Failed to get Minecraft access token: %1").arg(requestor->errorString_));
+            emit finished(AccountTaskState::STATE_OFFLINE, tr("Failed to get Minecraft access token: %1").arg(m_request->errorString()));
         }
         return;
     }
 
-    if (!Parsers::parseMojangResponse(data, m_data->yggdrasilToken)) {
+    if (!Parsers::parseMojangResponse(*m_response, m_data->yggdrasilToken)) {
         qWarning() << "Could not parse login_with_xbox response...";
-        qCDebug(authCredentials()) << data;
         emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Failed to parse the Minecraft access token response."));
         return;
     }
diff --git a/launcher/minecraft/auth/steps/LauncherLoginStep.h b/launcher/minecraft/auth/steps/LauncherLoginStep.h
index 30c18e675..0b5969f2b 100644
--- a/launcher/minecraft/auth/steps/LauncherLoginStep.h
+++ b/launcher/minecraft/auth/steps/LauncherLoginStep.h
@@ -1,21 +1,27 @@
 #pragma once
 #include <QObject>
+#include <memory>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/NetJob.h"
+#include "net/Upload.h"
 
 class LauncherLoginStep : public AuthStep {
     Q_OBJECT
 
    public:
     explicit LauncherLoginStep(AccountData* data);
-    virtual ~LauncherLoginStep() noexcept;
+    virtual ~LauncherLoginStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
+    void onRequestDone();
+
+   private:
+    std::shared_ptr<QByteArray> m_response;
+    Net::Upload::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/auth/steps/MSADeviceCodeStep.cpp b/launcher/minecraft/auth/steps/MSADeviceCodeStep.cpp
new file mode 100644
index 000000000..de2c61605
--- /dev/null
+++ b/launcher/minecraft/auth/steps/MSADeviceCodeStep.cpp
@@ -0,0 +1,279 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include "MSADeviceCodeStep.h"
+
+#include <QDateTime>
+#include <QUrlQuery>
+
+#include "Application.h"
+#include "Json.h"
+#include "net/RawHeaderProxy.h"
+
+// https://learn.microsoft.com/en-us/entra/identity-platform/v2-oauth2-device-code
+MSADeviceCodeStep::MSADeviceCodeStep(AccountData* data) : AuthStep(data)
+{
+    m_clientId = APPLICATION->getMSAClientID();
+    connect(&m_expiration_timer, &QTimer::timeout, this, &MSADeviceCodeStep::abort);
+    connect(&m_pool_timer, &QTimer::timeout, this, &MSADeviceCodeStep::authenticateUser);
+}
+
+QString MSADeviceCodeStep::describe()
+{
+    return tr("Logging in with Microsoft account(device code).");
+}
+
+void MSADeviceCodeStep::perform()
+{
+    QUrlQuery data;
+    data.addQueryItem("client_id", m_clientId);
+    data.addQueryItem("scope", "service::user.auth.xboxlive.com::MBI_SSL");
+    data.addQueryItem("response_type", "device_code");
+    auto payload = data.query(QUrl::FullyEncoded).toUtf8();
+    QUrl url("https://login.live.com/oauth20_connect.srf");
+    auto headers = QList<Net::HeaderPair>{
+        { "Content-Type", "application/x-www-form-urlencoded" },
+        { "Accept", "application/json" },
+    };
+    m_response.reset(new QByteArray());
+    m_request = Net::Upload::makeByteArray(url, m_response, payload);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("MSADeviceCodeStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &MSADeviceCodeStep::deviceAutorizationFinished);
+
+    m_task->start();
+}
+
+struct DeviceAutorizationResponse {
+    QString device_code;
+    QString user_code;
+    QString verification_uri;
+    int expires_in;
+    int interval;
+
+    QString error;
+    QString error_description;
+};
+
+DeviceAutorizationResponse parseDeviceAutorizationResponse(const QByteArray& data)
+{
+    QJsonParseError err;
+    QJsonDocument doc = QJsonDocument::fromJson(data, &err);
+    if (err.error != QJsonParseError::NoError) {
+        qWarning() << "Failed to parse device autorization response due to err:" << err.errorString();
+        return {};
+    }
+
+    if (!doc.isObject()) {
+        qWarning() << "Device autorization response is not an object";
+        return {};
+    }
+    auto obj = doc.object();
+    return {
+        Json::ensureString(obj, "device_code"),       Json::ensureString(obj, "user_code"), Json::ensureString(obj, "verification_uri"),
+        Json::ensureInteger(obj, "expires_in"),       Json::ensureInteger(obj, "interval"), Json::ensureString(obj, "error"),
+        Json::ensureString(obj, "error_description"),
+    };
+}
+
+void MSADeviceCodeStep::deviceAutorizationFinished()
+{
+    auto rsp = parseDeviceAutorizationResponse(*m_response);
+    if (!rsp.error.isEmpty() || !rsp.error_description.isEmpty()) {
+        qWarning() << "Device authorization failed:" << rsp.error;
+        emit finished(AccountTaskState::STATE_FAILED_HARD,
+                      tr("Device authorization failed: %1").arg(rsp.error_description.isEmpty() ? rsp.error : rsp.error_description));
+        return;
+    }
+    if (!m_request->wasSuccessful() || m_request->error() != QNetworkReply::NoError) {
+        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Failed to retrieve device authorization"));
+        qDebug() << *m_response;
+        return;
+    }
+
+    if (rsp.device_code.isEmpty() || rsp.user_code.isEmpty() || rsp.verification_uri.isEmpty() || rsp.expires_in == 0) {
+        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Device authorization failed: required fields missing"));
+        return;
+    }
+    if (rsp.interval != 0) {
+        interval = rsp.interval;
+    }
+    m_device_code = rsp.device_code;
+    emit authorizeWithBrowser(rsp.verification_uri, rsp.user_code, rsp.expires_in);
+    m_expiration_timer.setTimerType(Qt::VeryCoarseTimer);
+    m_expiration_timer.setInterval(rsp.expires_in * 1000);
+    m_expiration_timer.setSingleShot(true);
+    m_expiration_timer.start();
+    m_pool_timer.setTimerType(Qt::VeryCoarseTimer);
+    m_pool_timer.setSingleShot(true);
+    startPoolTimer();
+}
+
+void MSADeviceCodeStep::abort()
+{
+    m_expiration_timer.stop();
+    m_pool_timer.stop();
+    if (m_request) {
+        m_request->abort();
+    }
+    m_is_aborted = true;
+    emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Task aborted"));
+}
+
+void MSADeviceCodeStep::startPoolTimer()
+{
+    if (m_is_aborted) {
+        return;
+    }
+    if (m_expiration_timer.remainingTime() < interval * 1000) {
+        perform();
+        return;
+    }
+
+    m_pool_timer.setInterval(interval * 1000);
+    m_pool_timer.start();
+}
+
+void MSADeviceCodeStep::authenticateUser()
+{
+    QUrlQuery data;
+    data.addQueryItem("client_id", m_clientId);
+    data.addQueryItem("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
+    data.addQueryItem("device_code", m_device_code);
+    data.addQueryItem("response_type", "device_code");
+    auto payload = data.query(QUrl::FullyEncoded).toUtf8();
+    QUrl url("https://login.live.com/oauth20_token.srf");
+    auto headers = QList<Net::HeaderPair>{
+        { "Content-Type", "application/x-www-form-urlencoded" },
+        { "Accept", "application/json" },
+    };
+    m_response.reset(new QByteArray());
+    m_request = Net::Upload::makeByteArray(url, m_response, payload);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    connect(m_request.get(), &Task::finished, this, &MSADeviceCodeStep::authenticationFinished);
+
+    m_request->setNetwork(APPLICATION->network());
+    m_request->start();
+}
+
+struct AuthenticationResponse {
+    QString access_token;
+    QString token_type;
+    QString refresh_token;
+    int expires_in;
+
+    QString error;
+    QString error_description;
+
+    QVariantMap extra;
+};
+
+AuthenticationResponse parseAuthenticationResponse(const QByteArray& data)
+{
+    QJsonParseError err;
+    QJsonDocument doc = QJsonDocument::fromJson(data, &err);
+    if (err.error != QJsonParseError::NoError) {
+        qWarning() << "Failed to parse device autorization response due to err:" << err.errorString();
+        return {};
+    }
+
+    if (!doc.isObject()) {
+        qWarning() << "Device autorization response is not an object";
+        return {};
+    }
+    auto obj = doc.object();
+    return { Json::ensureString(obj, "access_token"),
+             Json::ensureString(obj, "token_type"),
+             Json::ensureString(obj, "refresh_token"),
+             Json::ensureInteger(obj, "expires_in"),
+             Json::ensureString(obj, "error"),
+             Json::ensureString(obj, "error_description"),
+             obj.toVariantMap() };
+}
+
+void MSADeviceCodeStep::authenticationFinished()
+{
+    if (m_request->error() == QNetworkReply::TimeoutError) {
+        // rfc8628#section-3.5
+        // "On encountering a connection timeout, clients MUST unilaterally
+        // reduce their polling frequency before retrying.  The use of an
+        // exponential backoff algorithm to achieve this, such as doubling the
+        // polling interval on each such connection timeout, is RECOMMENDED."
+        interval *= 2;
+        startPoolTimer();
+        return;
+    }
+    auto rsp = parseAuthenticationResponse(*m_response);
+    if (rsp.error == "slow_down") {
+        // rfc8628#section-3.5
+        // "A variant of 'authorization_pending', the authorization request is
+        // still pending and polling should continue, but the interval MUST
+        // be increased by 5 seconds for this and all subsequent requests."
+        interval += 5;
+        startPoolTimer();
+        return;
+    }
+    if (rsp.error == "authorization_pending") {
+        // keep trying - rfc8628#section-3.5
+        // "The authorization request is still pending as the end user hasn't
+        // yet completed the user-interaction steps (Section 3.3)."
+        startPoolTimer();
+        return;
+    }
+    if (!rsp.error.isEmpty() || !rsp.error_description.isEmpty()) {
+        qWarning() << "Device Access failed:" << rsp.error;
+        emit finished(AccountTaskState::STATE_FAILED_HARD,
+                      tr("Device Access failed: %1").arg(rsp.error_description.isEmpty() ? rsp.error : rsp.error_description));
+        return;
+    }
+    if (!m_request->wasSuccessful() || m_request->error() != QNetworkReply::NoError) {
+        startPoolTimer();  // it failed so just try again without increasing the interval
+        return;
+    }
+
+    m_expiration_timer.stop();
+    m_data->msaClientID = m_clientId;
+    m_data->msaToken.issueInstant = QDateTime::currentDateTimeUtc();
+    m_data->msaToken.notAfter = QDateTime::currentDateTime().addSecs(rsp.expires_in);
+    m_data->msaToken.extra = rsp.extra;
+    m_data->msaToken.refresh_token = rsp.refresh_token;
+    m_data->msaToken.token = rsp.access_token;
+    emit finished(AccountTaskState::STATE_WORKING, tr("Got"));
+}
diff --git a/launcher/minecraft/auth/steps/MSADeviceCodeStep.h b/launcher/minecraft/auth/steps/MSADeviceCodeStep.h
new file mode 100644
index 000000000..616008def
--- /dev/null
+++ b/launcher/minecraft/auth/steps/MSADeviceCodeStep.h
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#pragma once
+#include <QObject>
+#include <QTimer>
+
+#include "minecraft/auth/AuthStep.h"
+#include "net/NetJob.h"
+#include "net/Upload.h"
+
+class MSADeviceCodeStep : public AuthStep {
+    Q_OBJECT
+   public:
+    explicit MSADeviceCodeStep(AccountData* data);
+    virtual ~MSADeviceCodeStep() noexcept = default;
+
+    void perform() override;
+
+    QString describe() override;
+
+   public slots:
+    void abort() override;
+
+   signals:
+    void authorizeWithBrowser(QString url, QString code, int expiresIn);
+
+   private slots:
+    void deviceAutorizationFinished();
+    void startPoolTimer();
+    void authenticateUser();
+    void authenticationFinished();
+
+   private:
+    QString m_clientId;
+    QString m_device_code;
+    bool m_is_aborted = false;
+    int interval = 5;
+
+    QTimer m_pool_timer;
+    QTimer m_expiration_timer;
+
+    std::shared_ptr<QByteArray> m_response;
+    Net::Upload::Ptr m_request;
+    NetJob::Ptr m_task;
+};
diff --git a/launcher/minecraft/auth/steps/MSAStep.cpp b/launcher/minecraft/auth/steps/MSAStep.cpp
index 925de75b6..f5981f536 100644
--- a/launcher/minecraft/auth/steps/MSAStep.cpp
+++ b/launcher/minecraft/auth/steps/MSAStep.cpp
@@ -35,124 +35,167 @@
 
 #include "MSAStep.h"
 
+#include <QAbstractOAuth2>
 #include <QNetworkRequest>
-
-#include "BuildConfig.h"
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
+#include <QOAuthHttpServerReplyHandler>
+#include <QOAuthOobReplyHandler>
 
 #include "Application.h"
-#include "Logging.h"
+#include "BuildConfig.h"
+#include "FileSystem.h"
 
-using OAuth2 = Katabasis::DeviceFlow;
-using Activity = Katabasis::Activity;
+#include <QProcess>
+#include <QSettings>
+#include <QStandardPaths>
 
-MSAStep::MSAStep(AccountData* data, Action action) : AuthStep(data), m_action(action)
+bool isSchemeHandlerRegistered()
 {
-    m_clientId = APPLICATION->getMSAClientID();
-    OAuth2::Options opts;
-    opts.scope = "service::user.auth.xboxlive.com::MBI_SSL";
-    opts.clientIdentifier = m_clientId;
-    opts.authorizationUrl = "https://login.live.com/oauth20_connect.srf";
-    opts.accessTokenUrl = "https://login.live.com/oauth20_token.srf";
-    opts.responseType = "device_code";
-
-    // FIXME: OAuth2 is not aware of our fancy shared pointers
-    m_oauth2 = new OAuth2(opts, m_data->msaToken, this, APPLICATION->network().get());
-
-    connect(m_oauth2, &OAuth2::activityChanged, this, &MSAStep::onOAuthActivityChanged);
-    connect(m_oauth2, &OAuth2::showVerificationUriAndCode, this, &MSAStep::showVerificationUriAndCode);
-}
+#ifdef Q_OS_LINUX
+    QProcess process;
+    process.start("xdg-mime", { "query", "default", "x-scheme-handler/" + BuildConfig.LAUNCHER_APP_BINARY_NAME });
+    process.waitForFinished();
+    QString output = process.readAllStandardOutput().trimmed();
 
-MSAStep::~MSAStep() noexcept = default;
+    return output.contains(BuildConfig.LAUNCHER_APP_BINARY_NAME);
 
-QString MSAStep::describe()
-{
-    return tr("Logging in with Microsoft account.");
+#elif defined(Q_OS_WIN)
+    QString regPath = QString("HKEY_CURRENT_USER\\Software\\Classes\\%1").arg(BuildConfig.LAUNCHER_APP_BINARY_NAME);
+    QSettings settings(regPath, QSettings::NativeFormat);
+
+    return settings.contains("shell/open/command/.");
+#endif
+    return true;
 }
 
-void MSAStep::rehydrate()
+class CustomOAuthOobReplyHandler : public QOAuthOobReplyHandler {
+    Q_OBJECT
+
+   public:
+    explicit CustomOAuthOobReplyHandler(QObject* parent = nullptr) : QOAuthOobReplyHandler(parent)
+    {
+        connect(APPLICATION, &Application::oauthReplyRecieved, this, &QOAuthOobReplyHandler::callbackReceived);
+    }
+    ~CustomOAuthOobReplyHandler() override
+    {
+        disconnect(APPLICATION, &Application::oauthReplyRecieved, this, &QOAuthOobReplyHandler::callbackReceived);
+    }
+    QString callback() const override { return BuildConfig.LAUNCHER_APP_BINARY_NAME + "://oauth/microsoft"; }
+};
+
+MSAStep::MSAStep(AccountData* data, bool silent) : AuthStep(data), m_silent(silent)
 {
-    switch (m_action) {
-        case Refresh: {
-            // TODO: check the tokens and see if they are old (older than a day)
-            return;
+    m_clientId = APPLICATION->getMSAClientID();
+    if (QCoreApplication::applicationFilePath().startsWith("/tmp/.mount_") ||
+        QFile::exists(FS::PathCombine(APPLICATION->root(), "portable.txt")) || !isSchemeHandlerRegistered())
+
+    {
+        auto replyHandler = new QOAuthHttpServerReplyHandler(this);
+        replyHandler->setCallbackText(QString(R"XXX(
+    <noscript>
+      <meta http-equiv="Refresh" content="0; URL=%1" />
+    </noscript>
+    Login Successful, redirecting...
+    <script>
+      window.location.replace("%1");
+    </script>
+    )XXX")
+                                          .arg(BuildConfig.LOGIN_CALLBACK_URL));
+        oauth2.setReplyHandler(replyHandler);
+    } else {
+        oauth2.setReplyHandler(new CustomOAuthOobReplyHandler(this));
+    }
+    oauth2.setAuthorizationUrl(QUrl("https://login.live.com/oauth20_connect.srf"));
+    oauth2.setAccessTokenUrl(QUrl("https://login.live.com/oauth20_token.srf"));
+    const auto& scope = "service::user.auth.xboxlive.com::MBI_SSL";
+    oauth2.setScope(scope);
+    // QOAuth2AuthorizationCodeFlow doesn't pass a "scope" when refreshing access tokens, but Microsoft expects it.
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    oauth2.setModifyParametersFunction([&](QAbstractOAuth::Stage stage, QVariantMap* parameters) {
+        if (stage == QAbstractOAuth::Stage::RefreshingAccessToken) {
+            (*parameters)["scope"] = scope;
         }
-        case Login: {
-            // NOOP
-            return;
+    });
+#else
+    oauth2.setModifyParametersFunction([&](QAbstractOAuth::Stage stage, QMultiMap<QString, QVariant>* parameters) {
+        if (stage == QAbstractOAuth::Stage::RefreshingAccessToken) {
+            (*parameters).insert("scope", scope);
         }
-    }
-}
+    });
+#endif
+    oauth2.setClientIdentifier(m_clientId);
+    oauth2.setNetworkAccessManager(APPLICATION->network().get());
 
-void MSAStep::perform()
-{
-    switch (m_action) {
-        case Refresh: {
-            if (m_data->msaClientID != m_clientId) {
-                emit hideVerificationUriAndCode();
-                emit finished(AccountTaskState::STATE_DISABLED,
-                              tr("Microsoft user authentication failed - client identification has changed."));
+    connect(&oauth2, &QOAuth2AuthorizationCodeFlow::granted, this, [this] {
+        m_data->msaClientID = oauth2.clientIdentifier();
+        m_data->msaToken.issueInstant = QDateTime::currentDateTimeUtc();
+        m_data->msaToken.notAfter = oauth2.expirationAt();
+        m_data->msaToken.extra = oauth2.extraTokens();
+        m_data->msaToken.refresh_token = oauth2.refreshToken();
+        m_data->msaToken.token = oauth2.token();
+        emit finished(AccountTaskState::STATE_WORKING, tr("Got "));
+    });
+    connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser, this, &MSAStep::authorizeWithBrowser);
+    connect(&oauth2, &QOAuth2AuthorizationCodeFlow::requestFailed, this, [this, silent](const QAbstractOAuth2::Error err) {
+        auto state = AccountTaskState::STATE_FAILED_HARD;
+        if (oauth2.status() == QAbstractOAuth::Status::Granted || silent) {
+            if (err == QAbstractOAuth2::Error::NetworkError) {
+                state = AccountTaskState::STATE_OFFLINE;
+            } else {
+                state = AccountTaskState::STATE_FAILED_SOFT;
             }
-            m_oauth2->refresh();
-            return;
         }
-        case Login: {
-            QVariantMap extraOpts;
-            extraOpts["prompt"] = "select_account";
-            m_oauth2->setExtraRequestParams(extraOpts);
-
-            *m_data = AccountData();
-            m_data->msaClientID = m_clientId;
-            m_oauth2->login();
-            return;
+        auto message = tr("Microsoft user authentication failed.");
+        if (silent) {
+            message = tr("Failed to refresh token.");
         }
-    }
+        qWarning() << message;
+        emit finished(state, message);
+    });
+    connect(&oauth2, &QOAuth2AuthorizationCodeFlow::error, this,
+            [this](const QString& error, const QString& errorDescription, const QUrl& uri) {
+                qWarning() << "Failed to login because" << error << errorDescription;
+                emit finished(AccountTaskState::STATE_FAILED_HARD, errorDescription);
+            });
+
+    connect(&oauth2, &QOAuth2AuthorizationCodeFlow::extraTokensChanged, this,
+            [this](const QVariantMap& tokens) { m_data->msaToken.extra = tokens; });
+
+    connect(&oauth2, &QOAuth2AuthorizationCodeFlow::clientIdentifierChanged, this,
+            [this](const QString& clientIdentifier) { m_data->msaClientID = clientIdentifier; });
 }
 
-void MSAStep::onOAuthActivityChanged(Katabasis::Activity activity)
+QString MSAStep::describe()
 {
-    switch (activity) {
-        case Katabasis::Activity::Idle:
-        case Katabasis::Activity::LoggingIn:
-        case Katabasis::Activity::Refreshing:
-        case Katabasis::Activity::LoggingOut: {
-            // We asked it to do something, it's doing it. Nothing to act upon.
-            return;
-        }
-        case Katabasis::Activity::Succeeded: {
-            // Succeeded or did not invalidate tokens
-            emit hideVerificationUriAndCode();
-            QVariantMap extraTokens = m_oauth2->extraTokens();
-            if (!extraTokens.isEmpty()) {
-                qCDebug(authCredentials()) << "Extra tokens in response:";
-                foreach (QString key, extraTokens.keys()) {
-                    qCDebug(authCredentials()) << "\t" << key << ":" << extraTokens.value(key);
-                }
-            }
-            emit finished(AccountTaskState::STATE_WORKING, tr("Got "));
-            return;
-        }
-        case Katabasis::Activity::FailedSoft: {
-            // NOTE: soft error in the first step means 'offline'
-            emit hideVerificationUriAndCode();
-            emit finished(AccountTaskState::STATE_OFFLINE, tr("Microsoft user authentication ended with a network error."));
-            return;
-        }
-        case Katabasis::Activity::FailedGone: {
-            emit hideVerificationUriAndCode();
-            emit finished(AccountTaskState::STATE_FAILED_GONE, tr("Microsoft user authentication failed - user no longer exists."));
-            return;
-        }
-        case Katabasis::Activity::FailedHard: {
-            emit hideVerificationUriAndCode();
-            emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Microsoft user authentication failed."));
+    return tr("Logging in with Microsoft account.");
+}
+
+void MSAStep::perform()
+{
+    if (m_silent) {
+        if (m_data->msaClientID != m_clientId) {
+            emit finished(AccountTaskState::STATE_DISABLED,
+                          tr("Microsoft user authentication failed - client identification has changed."));
             return;
         }
-        default: {
-            emit hideVerificationUriAndCode();
-            emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Microsoft user authentication completed with an unrecognized result."));
+        if (m_data->msaToken.refresh_token.isEmpty()) {
+            emit finished(AccountTaskState::STATE_DISABLED, tr("Microsoft user authentication failed - refresh token is empty."));
             return;
         }
+        oauth2.setRefreshToken(m_data->msaToken.refresh_token);
+        oauth2.refreshAccessToken();
+    } else {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)  // QMultiMap param changed in 6.0
+        oauth2.setModifyParametersFunction(
+            [](QAbstractOAuth::Stage stage, QMultiMap<QString, QVariant>* map) { map->insert("prompt", "select_account"); });
+#else
+        oauth2.setModifyParametersFunction(
+            [](QAbstractOAuth::Stage stage, QMap<QString, QVariant>* map) { map->insert("prompt", "select_account"); });
+#endif
+
+        *m_data = AccountData();
+        m_data->msaClientID = m_clientId;
+        oauth2.grant();
     }
 }
+
+#include "MSAStep.moc"
diff --git a/launcher/minecraft/auth/steps/MSAStep.h b/launcher/minecraft/auth/steps/MSAStep.h
index b6635d4a5..675cfb2ca 100644
--- a/launcher/minecraft/auth/steps/MSAStep.h
+++ b/launcher/minecraft/auth/steps/MSAStep.h
@@ -36,30 +36,24 @@
 #pragma once
 #include <QObject>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
 
-#include <katabasis/DeviceFlow.h>
-
+#include <QtNetworkAuth/qoauth2authorizationcodeflow.h>
 class MSAStep : public AuthStep {
     Q_OBJECT
    public:
-    enum Action { Refresh, Login };
-
-   public:
-    explicit MSAStep(AccountData* data, Action action);
-    virtual ~MSAStep() noexcept;
+    explicit MSAStep(AccountData* data, bool silent = false);
+    virtual ~MSAStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
-   private slots:
-    void onOAuthActivityChanged(Katabasis::Activity activity);
+   signals:
+    void authorizeWithBrowser(const QUrl& url);
 
    private:
-    Katabasis::DeviceFlow* m_oauth2 = nullptr;
-    Action m_action;
+    bool m_silent;
     QString m_clientId;
+    QOAuth2AuthorizationCodeFlow oauth2;
 };
diff --git a/launcher/minecraft/auth/steps/MigrationEligibilityStep.cpp b/launcher/minecraft/auth/steps/MigrationEligibilityStep.cpp
deleted file mode 100644
index 5ce953dfb..000000000
--- a/launcher/minecraft/auth/steps/MigrationEligibilityStep.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "MigrationEligibilityStep.h"
-
-#include <QNetworkRequest>
-
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
-
-MigrationEligibilityStep::MigrationEligibilityStep(AccountData* data) : AuthStep(data) {}
-
-MigrationEligibilityStep::~MigrationEligibilityStep() noexcept = default;
-
-QString MigrationEligibilityStep::describe()
-{
-    return tr("Checking for migration eligibility.");
-}
-
-void MigrationEligibilityStep::perform()
-{
-    auto url = QUrl("https://api.minecraftservices.com/rollout/v1/msamigration");
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8());
-
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &MigrationEligibilityStep::onRequestDone);
-    requestor->get(request);
-}
-
-void MigrationEligibilityStep::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
-}
-
-void MigrationEligibilityStep::onRequestDone(QNetworkReply::NetworkError error,
-                                             QByteArray data,
-                                             QList<QNetworkReply::RawHeaderPair> headers)
-{
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    if (error == QNetworkReply::NoError) {
-        Parsers::parseRolloutResponse(data, m_data->canMigrateToMSA);
-    }
-    emit finished(AccountTaskState::STATE_WORKING, tr("Got migration flags"));
-}
diff --git a/launcher/minecraft/auth/steps/MigrationEligibilityStep.h b/launcher/minecraft/auth/steps/MigrationEligibilityStep.h
deleted file mode 100644
index 8638975d8..000000000
--- a/launcher/minecraft/auth/steps/MigrationEligibilityStep.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include <QObject>
-
-#include "QObjectPtr.h"
-#include "minecraft/auth/AuthStep.h"
-
-class MigrationEligibilityStep : public AuthStep {
-    Q_OBJECT
-
-   public:
-    explicit MigrationEligibilityStep(AccountData* data);
-    virtual ~MigrationEligibilityStep() noexcept;
-
-    void perform() override;
-    void rehydrate() override;
-
-    QString describe() override;
-
-   private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
-};
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
index a854342bc..c1529b086 100644
--- a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
+++ b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
@@ -2,15 +2,13 @@
 
 #include <QNetworkRequest>
 
-#include "Logging.h"
-#include "minecraft/auth/AuthRequest.h"
+#include "Application.h"
 #include "minecraft/auth/Parsers.h"
 #include "net/NetUtils.h"
+#include "net/RawHeaderProxy.h"
 
 MinecraftProfileStep::MinecraftProfileStep(AccountData* data) : AuthStep(data) {}
 
-MinecraftProfileStep::~MinecraftProfileStep() noexcept = default;
-
 QString MinecraftProfileStep::describe()
 {
     return tr("Fetching the Minecraft profile.");
@@ -18,52 +16,51 @@ QString MinecraftProfileStep::describe()
 
 void MinecraftProfileStep::perform()
 {
-    auto url = QUrl("https://api.minecraftservices.com/minecraft/profile");
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8());
+    QUrl url("https://api.minecraftservices.com/minecraft/profile");
+    auto headers = QList<Net::HeaderPair>{ { "Content-Type", "application/json" },
+                                           { "Accept", "application/json" },
+                                           { "Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8() } };
 
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &MinecraftProfileStep::onRequestDone);
-    requestor->get(request);
-}
+    m_response.reset(new QByteArray());
+    m_request = Net::Download::makeByteArray(url, m_response);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
 
-void MinecraftProfileStep::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
+    m_task.reset(new NetJob("MinecraftProfileStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &MinecraftProfileStep::onRequestDone);
+
+    m_task->start();
 }
 
-void MinecraftProfileStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+void MinecraftProfileStep::onRequestDone()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    qCDebug(authCredentials()) << data;
-    if (error == QNetworkReply::ContentNotFoundError) {
+    if (m_request->error() == QNetworkReply::ContentNotFoundError) {
         // NOTE: Succeed even if we do not have a profile. This is a valid account state.
         m_data->minecraftProfile = MinecraftProfile();
-        emit finished(AccountTaskState::STATE_SUCCEEDED, tr("Account has no Minecraft profile."));
+        emit finished(AccountTaskState::STATE_WORKING, tr("Account has no Minecraft profile."));
         return;
     }
-    if (error != QNetworkReply::NoError) {
+    if (m_request->error() != QNetworkReply::NoError) {
         qWarning() << "Error getting profile:";
-        qWarning() << " HTTP Status:        " << requestor->httpStatus_;
-        qWarning() << " Internal error no.: " << error;
-        qWarning() << " Error string:       " << requestor->errorString_;
+        qWarning() << " HTTP Status:        " << m_request->replyStatusCode();
+        qWarning() << " Internal error no.: " << m_request->error();
+        qWarning() << " Error string:       " << m_request->errorString();
 
         qWarning() << " Response:";
-        qWarning() << QString::fromUtf8(data);
+        qWarning() << QString::fromUtf8(*m_response);
 
-        if (Net::isApplicationError(error)) {
+        if (Net::isApplicationError(m_request->error())) {
             emit finished(AccountTaskState::STATE_FAILED_SOFT,
-                          tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
+                          tr("Minecraft Java profile acquisition failed: %1").arg(m_request->errorString()));
         } else {
             emit finished(AccountTaskState::STATE_OFFLINE,
-                          tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
+                          tr("Minecraft Java profile acquisition failed: %1").arg(m_request->errorString()));
         }
         return;
     }
-    if (!Parsers::parseMinecraftProfile(data, m_data->minecraftProfile)) {
+    if (!Parsers::parseMinecraftProfile(*m_response, m_data->minecraftProfile)) {
         m_data->minecraftProfile = MinecraftProfile();
         emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Minecraft Java profile response could not be parsed"));
         return;
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStep.h b/launcher/minecraft/auth/steps/MinecraftProfileStep.h
index cb30dab21..e8b35b875 100644
--- a/launcher/minecraft/auth/steps/MinecraftProfileStep.h
+++ b/launcher/minecraft/auth/steps/MinecraftProfileStep.h
@@ -1,21 +1,27 @@
 #pragma once
 #include <QObject>
+#include <memory>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/Download.h"
+#include "net/NetJob.h"
 
 class MinecraftProfileStep : public AuthStep {
     Q_OBJECT
 
    public:
     explicit MinecraftProfileStep(AccountData* data);
-    virtual ~MinecraftProfileStep() noexcept;
+    virtual ~MinecraftProfileStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
+    void onRequestDone();
+
+   private:
+    std::shared_ptr<QByteArray> m_response;
+    Net::Download::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
deleted file mode 100644
index dacb709f8..000000000
--- a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "MinecraftProfileStepMojang.h"
-
-#include <QNetworkRequest>
-
-#include "BuildConfig.h"
-#include "Logging.h"
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
-#include "net/NetUtils.h"
-
-MinecraftProfileStepMojang::MinecraftProfileStepMojang(AccountData* data) : AuthStep(data) {}
-
-MinecraftProfileStepMojang::~MinecraftProfileStepMojang() noexcept = default;
-
-QString MinecraftProfileStepMojang::describe()
-{
-    return tr("Fetching the Minecraft profile.");
-}
-
-void MinecraftProfileStepMojang::perform()
-{
-    if (m_data->minecraftProfile.id.isEmpty()) {
-        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("A UUID is required to get the profile."));
-        return;
-    }
-
-    // use session server instead of profile due to profile endpoint being locked for locked Mojang accounts
-    QUrl url = QUrl(m_data->sessionServerUrl() + "/session/minecraft/profile/" + m_data->minecraftProfile.id);
-    QNetworkRequest req = QNetworkRequest(url);
-    AuthRequest* request = new AuthRequest(this);
-    connect(request, &AuthRequest::finished, this, &MinecraftProfileStepMojang::onRequestDone);
-    request->get(req);
-}
-
-void MinecraftProfileStepMojang::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
-}
-
-void MinecraftProfileStepMojang::onRequestDone(QNetworkReply::NetworkError error,
-                                               QByteArray data,
-                                               QList<QNetworkReply::RawHeaderPair> headers)
-{
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    qCDebug(authCredentials()) << data;
-    if (error == QNetworkReply::ContentNotFoundError) {
-        // NOTE: Succeed even if we do not have a profile. This is a valid account state.
-        if (m_data->type == AccountType::Mojang) {
-            m_data->minecraftEntitlement.canPlayMinecraft = false;
-            m_data->minecraftEntitlement.ownsMinecraft = false;
-        }
-        m_data->minecraftProfile = MinecraftProfile();
-        emit finished(AccountTaskState::STATE_SUCCEEDED, tr("Account has no Minecraft profile."));
-        return;
-    }
-    if (error != QNetworkReply::NoError) {
-        qWarning() << "Error getting profile:";
-        qWarning() << " HTTP Status:        " << requestor->httpStatus_;
-        qWarning() << " Internal error no.: " << error;
-        qWarning() << " Error string:       " << requestor->errorString_;
-
-        qWarning() << " Response:";
-        qWarning() << QString::fromUtf8(data);
-
-        if (Net::isApplicationError(error)) {
-            emit finished(AccountTaskState::STATE_FAILED_SOFT,
-                          tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
-        } else {
-            emit finished(AccountTaskState::STATE_OFFLINE,
-                          tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
-        }
-        return;
-    }
-    if (!Parsers::parseMinecraftProfileMojang(data, m_data->minecraftProfile)) {
-        m_data->minecraftProfile = MinecraftProfile();
-        emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Minecraft Java profile response could not be parsed"));
-        return;
-    }
-
-    if (m_data->type == AccountType::Mojang) {
-        auto validProfile = m_data->minecraftProfile.validity == Katabasis::Validity::Certain;
-        m_data->minecraftEntitlement.canPlayMinecraft = validProfile;
-        m_data->minecraftEntitlement.ownsMinecraft = validProfile;
-    }
-    emit finished(AccountTaskState::STATE_WORKING, tr("Minecraft Java profile acquisition succeeded."));
-}
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.h b/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.h
deleted file mode 100644
index 730ec3f68..000000000
--- a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include <QObject>
-
-#include "QObjectPtr.h"
-#include "minecraft/auth/AuthStep.h"
-
-class MinecraftProfileStepMojang : public AuthStep {
-    Q_OBJECT
-
-   public:
-    explicit MinecraftProfileStepMojang(AccountData* data);
-    virtual ~MinecraftProfileStepMojang() noexcept;
-
-    void perform() override;
-    void rehydrate() override;
-
-    QString describe() override;
-
-   private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
-};
diff --git a/launcher/minecraft/auth/steps/OfflineStep.cpp b/launcher/minecraft/auth/steps/OfflineStep.cpp
deleted file mode 100644
index bf111abe8..000000000
--- a/launcher/minecraft/auth/steps/OfflineStep.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "OfflineStep.h"
-
-#include "Application.h"
-
-OfflineStep::OfflineStep(AccountData* data) : AuthStep(data) {}
-OfflineStep::~OfflineStep() noexcept = default;
-
-QString OfflineStep::describe()
-{
-    return tr("Creating offline account.");
-}
-
-void OfflineStep::rehydrate()
-{
-    // NOOP
-}
-
-void OfflineStep::perform()
-{
-    emit finished(AccountTaskState::STATE_WORKING, tr("Created offline account."));
-}
diff --git a/launcher/minecraft/auth/steps/OfflineStep.h b/launcher/minecraft/auth/steps/OfflineStep.h
deleted file mode 100644
index 3bf123d6a..000000000
--- a/launcher/minecraft/auth/steps/OfflineStep.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include <QObject>
-
-#include "QObjectPtr.h"
-#include "minecraft/auth/AuthStep.h"
-
-#include <katabasis/DeviceFlow.h>
-
-class OfflineStep : public AuthStep {
-    Q_OBJECT
-   public:
-    explicit OfflineStep(AccountData* data);
-    virtual ~OfflineStep() noexcept;
-
-    void perform() override;
-    void rehydrate() override;
-
-    QString describe() override;
-};
diff --git a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
index 84c52c386..f9de9210b 100644
--- a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
+++ b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
@@ -4,27 +4,22 @@
 #include <QJsonParseError>
 #include <QNetworkRequest>
 
+#include "Application.h"
 #include "Logging.h"
-#include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
 #include "net/NetUtils.h"
+#include "net/RawHeaderProxy.h"
+#include "net/Upload.h"
 
-XboxAuthorizationStep::XboxAuthorizationStep(AccountData* data, Katabasis::Token* token, QString relyingParty, QString authorizationKind)
+XboxAuthorizationStep::XboxAuthorizationStep(AccountData* data, Token* token, QString relyingParty, QString authorizationKind)
     : AuthStep(data), m_token(token), m_relyingParty(relyingParty), m_authorizationKind(authorizationKind)
 {}
 
-XboxAuthorizationStep::~XboxAuthorizationStep() noexcept = default;
-
 QString XboxAuthorizationStep::describe()
 {
     return tr("Getting authorization to access %1 services.").arg(m_authorizationKind);
 }
 
-void XboxAuthorizationStep::rehydrate()
-{
-    // FIXME: check if the tokens are good?
-}
-
 void XboxAuthorizationStep::perform()
 {
     QString xbox_auth_template = R"XXX(
@@ -41,40 +36,47 @@ void XboxAuthorizationStep::perform()
 )XXX";
     auto xbox_auth_data = xbox_auth_template.arg(m_data->userToken.token, m_relyingParty);
     // http://xboxlive.com
-    QNetworkRequest request = QNetworkRequest(QUrl("https://xsts.auth.xboxlive.com/xsts/authorize"));
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Accept", "application/json");
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &XboxAuthorizationStep::onRequestDone);
-    requestor->post(request, xbox_auth_data.toUtf8());
+    QUrl url("https://xsts.auth.xboxlive.com/xsts/authorize");
+    auto headers = QList<Net::HeaderPair>{
+        { "Content-Type", "application/json" },
+        { "Accept", "application/json" },
+    };
+    m_response.reset(new QByteArray());
+    m_request = Net::Upload::makeByteArray(url, m_response, xbox_auth_data.toUtf8());
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("XboxAuthorizationStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &XboxAuthorizationStep::onRequestDone);
+
+    m_task->start();
     qDebug() << "Getting authorization token for " << m_relyingParty;
 }
 
-void XboxAuthorizationStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+void XboxAuthorizationStep::onRequestDone()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    qCDebug(authCredentials()) << data;
-    if (error != QNetworkReply::NoError) {
-        qWarning() << "Reply error:" << error;
-        if (Net::isApplicationError(error)) {
-            if (!processSTSError(error, data, headers)) {
+    qCDebug(authCredentials()) << *m_response;
+    if (m_request->error() != QNetworkReply::NoError) {
+        qWarning() << "Reply error:" << m_request->error();
+        if (Net::isApplicationError(m_request->error())) {
+            if (!processSTSError()) {
                 emit finished(AccountTaskState::STATE_FAILED_SOFT,
-                              tr("Failed to get authorization for %1 services. Error %2.").arg(m_authorizationKind, error));
+                              tr("Failed to get authorization for %1 services. Error %2.").arg(m_authorizationKind, m_request->error()));
             } else {
                 emit finished(AccountTaskState::STATE_FAILED_SOFT,
-                              tr("Unknown STS error for %1 services: %2").arg(m_authorizationKind, requestor->errorString_));
+                              tr("Unknown STS error for %1 services: %2").arg(m_authorizationKind, m_request->errorString()));
             }
         } else {
             emit finished(AccountTaskState::STATE_OFFLINE,
-                          tr("Failed to get authorization for %1 services: %2").arg(m_authorizationKind, requestor->errorString_));
+                          tr("Failed to get authorization for %1 services: %2").arg(m_authorizationKind, m_request->errorString()));
         }
         return;
     }
 
-    Katabasis::Token temp;
-    if (!Parsers::parseXTokenResponse(data, temp, m_authorizationKind)) {
+    Token temp;
+    if (!Parsers::parseXTokenResponse(*m_response, temp, m_authorizationKind)) {
         emit finished(AccountTaskState::STATE_FAILED_SOFT,
                       tr("Could not parse authorization response for access to %1 services.").arg(m_authorizationKind));
         return;
@@ -91,11 +93,11 @@ void XboxAuthorizationStep::onRequestDone(QNetworkReply::NetworkError error, QBy
     emit finished(AccountTaskState::STATE_WORKING, tr("Got authorization to access %1").arg(m_relyingParty));
 }
 
-bool XboxAuthorizationStep::processSTSError(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+bool XboxAuthorizationStep::processSTSError()
 {
-    if (error == QNetworkReply::AuthenticationRequiredError) {
+    if (m_request->error() == QNetworkReply::AuthenticationRequiredError) {
         QJsonParseError jsonError;
-        QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
+        QJsonDocument doc = QJsonDocument::fromJson(*m_response, &jsonError);
         if (jsonError.error) {
             qWarning() << "Cannot parse error XSTS response as JSON: " << jsonError.errorString();
             emit finished(AccountTaskState::STATE_FAILED_SOFT,
diff --git a/launcher/minecraft/auth/steps/XboxAuthorizationStep.h b/launcher/minecraft/auth/steps/XboxAuthorizationStep.h
index dee24c954..8418727c4 100644
--- a/launcher/minecraft/auth/steps/XboxAuthorizationStep.h
+++ b/launcher/minecraft/auth/steps/XboxAuthorizationStep.h
@@ -1,29 +1,34 @@
 #pragma once
 #include <QObject>
+#include <memory>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/NetJob.h"
+#include "net/Upload.h"
 
 class XboxAuthorizationStep : public AuthStep {
     Q_OBJECT
 
    public:
-    explicit XboxAuthorizationStep(AccountData* data, Katabasis::Token* token, QString relyingParty, QString authorizationKind);
-    virtual ~XboxAuthorizationStep() noexcept;
+    explicit XboxAuthorizationStep(AccountData* data, Token* token, QString relyingParty, QString authorizationKind);
+    virtual ~XboxAuthorizationStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private:
-    bool processSTSError(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers);
+    bool processSTSError();
 
    private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
+    void onRequestDone();
 
    private:
-    Katabasis::Token* m_token;
+    Token* m_token;
     QString m_relyingParty;
     QString m_authorizationKind;
+
+    std::shared_ptr<QByteArray> m_response;
+    Net::Upload::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/auth/steps/XboxProfileStep.cpp b/launcher/minecraft/auth/steps/XboxProfileStep.cpp
index fd2b32cce..b896357c0 100644
--- a/launcher/minecraft/auth/steps/XboxProfileStep.cpp
+++ b/launcher/minecraft/auth/steps/XboxProfileStep.cpp
@@ -3,28 +3,21 @@
 #include <QNetworkRequest>
 #include <QUrlQuery>
 
+#include "Application.h"
 #include "Logging.h"
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
 #include "net/NetUtils.h"
+#include "net/RawHeaderProxy.h"
 
 XboxProfileStep::XboxProfileStep(AccountData* data) : AuthStep(data) {}
 
-XboxProfileStep::~XboxProfileStep() noexcept = default;
-
 QString XboxProfileStep::describe()
 {
     return tr("Fetching Xbox profile.");
 }
 
-void XboxProfileStep::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
-}
-
 void XboxProfileStep::perform()
 {
-    auto url = QUrl("https://profile.xboxlive.com/users/me/profile/settings");
+    QUrl url("https://profile.xboxlive.com/users/me/profile/settings");
     QUrlQuery q;
     q.addQueryItem("settings",
                    "GameDisplayName,AppDisplayName,AppDisplayPicRaw,GameDisplayPicRaw,"
@@ -33,36 +26,41 @@ void XboxProfileStep::perform()
                    "PreferredColor,Location,Bio,Watermarks,"
                    "RealName,RealNameOverride,IsQuarantined");
     url.setQuery(q);
+    auto headers = QList<Net::HeaderPair>{
+        { "Content-Type", "application/json" },
+        { "Accept", "application/json" },
+        { "x-xbl-contract-version", "3" },
+        { "Authorization", QString("XBL3.0 x=%1;%2").arg(m_data->userToken.extra["uhs"].toString(), m_data->xboxApiToken.token).toUtf8() }
+    };
 
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Accept", "application/json");
-    request.setRawHeader("x-xbl-contract-version", "3");
-    request.setRawHeader("Authorization",
-                         QString("XBL3.0 x=%1;%2").arg(m_data->userToken.extra["uhs"].toString(), m_data->xboxApiToken.token).toUtf8());
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &XboxProfileStep::onRequestDone);
-    requestor->get(request);
+    m_response.reset(new QByteArray());
+    m_request = Net::Download::makeByteArray(url, m_response);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("XboxProfileStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &XboxProfileStep::onRequestDone);
+
+    m_task->start();
     qDebug() << "Getting Xbox profile...";
 }
 
-void XboxProfileStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+void XboxProfileStep::onRequestDone()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    if (error != QNetworkReply::NoError) {
-        qWarning() << "Reply error:" << error;
-        qCDebug(authCredentials()) << data;
-        if (Net::isApplicationError(error)) {
-            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Failed to retrieve the Xbox profile: %1").arg(requestor->errorString_));
+    if (m_request->error() != QNetworkReply::NoError) {
+        qWarning() << "Reply error:" << m_request->error();
+        qCDebug(authCredentials()) << *m_response;
+        if (Net::isApplicationError(m_request->error())) {
+            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Failed to retrieve the Xbox profile: %1").arg(m_request->errorString()));
         } else {
-            emit finished(AccountTaskState::STATE_OFFLINE, tr("Failed to retrieve the Xbox profile: %1").arg(requestor->errorString_));
+            emit finished(AccountTaskState::STATE_OFFLINE, tr("Failed to retrieve the Xbox profile: %1").arg(m_request->errorString()));
         }
         return;
     }
 
-    qCDebug(authCredentials()) << "XBox profile: " << data;
+    qCDebug(authCredentials()) << "XBox profile: " << *m_response;
 
     emit finished(AccountTaskState::STATE_WORKING, tr("Got Xbox profile"));
 }
diff --git a/launcher/minecraft/auth/steps/XboxProfileStep.h b/launcher/minecraft/auth/steps/XboxProfileStep.h
index b8494b6e5..f2ab874f2 100644
--- a/launcher/minecraft/auth/steps/XboxProfileStep.h
+++ b/launcher/minecraft/auth/steps/XboxProfileStep.h
@@ -1,21 +1,27 @@
 #pragma once
 #include <QObject>
+#include <memory>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/Download.h"
+#include "net/NetJob.h"
 
 class XboxProfileStep : public AuthStep {
     Q_OBJECT
 
    public:
     explicit XboxProfileStep(AccountData* data);
-    virtual ~XboxProfileStep() noexcept;
+    virtual ~XboxProfileStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
+    void onRequestDone();
+
+   private:
+    std::shared_ptr<QByteArray> m_response;
+    Net::Download::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/auth/steps/XboxUserStep.cpp b/launcher/minecraft/auth/steps/XboxUserStep.cpp
index d324b4ecb..6068db45b 100644
--- a/launcher/minecraft/auth/steps/XboxUserStep.cpp
+++ b/launcher/minecraft/auth/steps/XboxUserStep.cpp
@@ -2,24 +2,18 @@
 
 #include <QNetworkRequest>
 
-#include "minecraft/auth/AuthRequest.h"
+#include "Application.h"
 #include "minecraft/auth/Parsers.h"
 #include "net/NetUtils.h"
+#include "net/RawHeaderProxy.h"
 
 XboxUserStep::XboxUserStep(AccountData* data) : AuthStep(data) {}
 
-XboxUserStep::~XboxUserStep() noexcept = default;
-
 QString XboxUserStep::describe()
 {
     return tr("Logging in as an Xbox user.");
 }
 
-void XboxUserStep::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
-}
-
 void XboxUserStep::perform()
 {
     QString xbox_auth_template = R"XXX(
@@ -35,36 +29,42 @@ void XboxUserStep::perform()
 )XXX";
     auto xbox_auth_data = xbox_auth_template.arg(m_data->msaToken.token);
 
-    QNetworkRequest request = QNetworkRequest(QUrl("https://user.auth.xboxlive.com/user/authenticate"));
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Accept", "application/json");
-    // set contract-version header (prevent err 400 bad-request?)
-    // https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders
-    request.setRawHeader("x-xbl-contract-version", "1");
+    QUrl url("https://user.auth.xboxlive.com/user/authenticate");
+    auto headers = QList<Net::HeaderPair>{
+        { "Content-Type", "application/json" },
+        { "Accept", "application/json" },
+        // set contract-version header (prevent err 400 bad-request?)
+        // https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders
+        { "x-xbl-contract-version", "1" }
+    };
+    m_response.reset(new QByteArray());
+    m_request = Net::Upload::makeByteArray(url, m_response, xbox_auth_data.toUtf8());
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
 
-    auto* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &XboxUserStep::onRequestDone);
-    requestor->post(request, xbox_auth_data.toUtf8());
+    m_task.reset(new NetJob("XboxUserStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &XboxUserStep::onRequestDone);
+
+    m_task->start();
     qDebug() << "First layer of XBox auth ... commencing.";
 }
 
-void XboxUserStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+void XboxUserStep::onRequestDone()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    if (error != QNetworkReply::NoError) {
-        qWarning() << "Reply error:" << error;
-        if (Net::isApplicationError(error)) {
-            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("XBox user authentication failed: %1").arg(requestor->errorString_));
+    if (m_request->error() != QNetworkReply::NoError) {
+        qWarning() << "Reply error:" << m_request->error();
+        if (Net::isApplicationError(m_request->error())) {
+            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("XBox user authentication failed: %1").arg(m_request->errorString()));
         } else {
-            emit finished(AccountTaskState::STATE_OFFLINE, tr("XBox user authentication failed: %1").arg(requestor->errorString_));
+            emit finished(AccountTaskState::STATE_OFFLINE, tr("XBox user authentication failed: %1").arg(m_request->errorString()));
         }
         return;
     }
 
-    Katabasis::Token temp;
-    if (!Parsers::parseXTokenResponse(data, temp, "UToken")) {
+    Token temp;
+    if (!Parsers::parseXTokenResponse(*m_response, temp, "UToken")) {
         qWarning() << "Could not parse user authentication response...";
         emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("XBox user authentication response could not be understood."));
         return;
diff --git a/launcher/minecraft/auth/steps/XboxUserStep.h b/launcher/minecraft/auth/steps/XboxUserStep.h
index e92727a4d..f6cc822f2 100644
--- a/launcher/minecraft/auth/steps/XboxUserStep.h
+++ b/launcher/minecraft/auth/steps/XboxUserStep.h
@@ -1,21 +1,27 @@
 #pragma once
 #include <QObject>
+#include <memory>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/NetJob.h"
+#include "net/Upload.h"
 
 class XboxUserStep : public AuthStep {
     Q_OBJECT
 
    public:
     explicit XboxUserStep(AccountData* data);
-    virtual ~XboxUserStep() noexcept;
+    virtual ~XboxUserStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
+    void onRequestDone();
+
+   private:
+    std::shared_ptr<QByteArray> m_response;
+    Net::Upload::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/auth/steps/YggdrasilMinecraftProfileStep.cpp b/launcher/minecraft/auth/steps/YggdrasilMinecraftProfileStep.cpp
new file mode 100644
index 000000000..a2955a30e
--- /dev/null
+++ b/launcher/minecraft/auth/steps/YggdrasilMinecraftProfileStep.cpp
@@ -0,0 +1,73 @@
+#include "YggdrasilMinecraftProfileStep.h"
+
+#include <QNetworkRequest>
+
+#include "Application.h"
+#include "minecraft/auth/Parsers.h"
+#include "net/NetUtils.h"
+#include "net/RawHeaderProxy.h"
+
+YggdrasilMinecraftProfileStep::YggdrasilMinecraftProfileStep(AccountData* data) : AuthStep(data) {}
+
+QString YggdrasilMinecraftProfileStep::describe()
+{
+    return tr("Fetching the Minecraft profile.");
+}
+
+void YggdrasilMinecraftProfileStep::perform()
+{
+    if (m_data->minecraftProfile.id.isEmpty()) {
+        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("A UUID is required to get the profile."));
+        return;
+    }
+
+    QUrl url = QUrl(m_data->sessionServerUrl() + "/session/minecraft/profile/" + m_data->minecraftProfile.id);
+    auto headers = QList<Net::HeaderPair>{ { "Content-Type", "application/json" }, { "Accept", "application/json" } };
+
+    m_response.reset(new QByteArray());
+    m_request = Net::Download::makeByteArray(url, m_response);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("MinecraftProfileStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &YggdrasilMinecraftProfileStep::onRequestDone);
+
+    m_task->start();
+}
+
+void YggdrasilMinecraftProfileStep::onRequestDone()
+{
+    if (m_request->error() == QNetworkReply::ContentNotFoundError) {
+        // NOTE: Succeed even if we do not have a profile. This is a valid account state.
+        m_data->minecraftProfile = MinecraftProfile();
+        emit finished(AccountTaskState::STATE_WORKING, tr("Account has no Minecraft profile."));
+        return;
+    }
+    if (m_request->error() != QNetworkReply::NoError) {
+        qWarning() << "Error getting profile:";
+        qWarning() << " HTTP Status:        " << m_request->replyStatusCode();
+        qWarning() << " Internal error no.: " << m_request->error();
+        qWarning() << " Error string:       " << m_request->errorString();
+
+        qWarning() << " Response:";
+        qWarning() << QString::fromUtf8(*m_response);
+
+        if (Net::isApplicationError(m_request->error())) {
+            emit finished(AccountTaskState::STATE_FAILED_SOFT,
+                          tr("Minecraft Java profile acquisition failed: %1").arg(m_request->errorString()));
+        } else {
+            emit finished(AccountTaskState::STATE_OFFLINE,
+                          tr("Minecraft Java profile acquisition failed: %1").arg(m_request->errorString()));
+        }
+        return;
+    }
+    if (!Parsers::parseMinecraftProfileMojang(*m_response, m_data->minecraftProfile)) {
+        m_data->minecraftProfile = MinecraftProfile();
+        emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Minecraft Java profile response could not be parsed"));
+        return;
+    }
+
+    emit finished(AccountTaskState::STATE_WORKING, tr("Minecraft Java profile acquisition succeeded."));
+}
diff --git a/launcher/minecraft/auth/steps/YggdrasilMinecraftProfileStep.h b/launcher/minecraft/auth/steps/YggdrasilMinecraftProfileStep.h
new file mode 100644
index 000000000..c075ff9f5
--- /dev/null
+++ b/launcher/minecraft/auth/steps/YggdrasilMinecraftProfileStep.h
@@ -0,0 +1,26 @@
+#pragma once
+#include <QObject>
+
+#include "minecraft/auth/AuthStep.h"
+#include "net/Download.h"
+#include "net/NetJob.h"
+
+class YggdrasilMinecraftProfileStep : public AuthStep {
+    Q_OBJECT
+
+   public:
+    explicit YggdrasilMinecraftProfileStep(AccountData* data);
+    virtual ~YggdrasilMinecraftProfileStep() noexcept = default;
+
+    void perform() override;
+
+    QString describe() override;
+
+   private slots:
+    void onRequestDone();
+
+   private:
+    std::shared_ptr<QByteArray> m_response;
+    Net::Download::Ptr m_request;
+    NetJob::Ptr m_task;
+};
diff --git a/launcher/minecraft/auth/steps/YggdrasilStep.cpp b/launcher/minecraft/auth/steps/YggdrasilStep.cpp
index fdcaa0d67..6548646e7 100644
--- a/launcher/minecraft/auth/steps/YggdrasilStep.cpp
+++ b/launcher/minecraft/auth/steps/YggdrasilStep.cpp
@@ -1,57 +1,285 @@
 #include "YggdrasilStep.h"
+#include "Application.h"
 
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
-#include "minecraft/auth/Yggdrasil.h"
+#include "net/RawHeaderProxy.h"
 
-YggdrasilStep::YggdrasilStep(AccountData* data, QString password) : AuthStep(data), m_password(password)
-{
-    m_yggdrasil = new Yggdrasil(m_data, this);
+YggdrasilStep::YggdrasilStep(AccountData* data, std::optional<QString> password) : AuthStep(data), m_password(password) {}
 
-    connect(m_yggdrasil, &Task::failed, this, &YggdrasilStep::onAuthFailed);
-    connect(m_yggdrasil, &Task::succeeded, this, &YggdrasilStep::onAuthSucceeded);
-    connect(m_yggdrasil, &Task::aborted, this, &YggdrasilStep::onAuthFailed);
+QString YggdrasilStep::describe()
+{
+    return tr("Logging in with Yggdrasil.");
 }
 
-YggdrasilStep::~YggdrasilStep() noexcept = default;
+void YggdrasilStep::perform()
+{
+    if (m_password) {
+        login(*m_password);
+    } else {
+        refresh();
+    }
+}
 
-QString YggdrasilStep::describe()
+void YggdrasilStep::login(QString password)
 {
-    return tr("Logging in with Mojang account.");
+    QUrl url(m_data->authServerUrl() + "/authenticate");
+    auto headers = QList<Net::HeaderPair>{ { "Content-Type", "application/json" }, { "Accept", "application/json" } };
+
+    /*
+     * {
+     *   "agent": {                              // optional
+     *   "name": "Minecraft",                    // So far this is the only encountered value
+     *   "version": 1                            // This number might be increased
+     *                                           // by the vanilla client in the future
+     *   },
+     *   "username": "mojang account name",      // Can be an email address or player name for
+     *                                           // unmigrated accounts
+     *   "password": "mojang account password",
+     *   "clientToken": "client identifier",     // optional
+     *   "requestUser": true/false               // request the user structure
+     * }
+     */
+    QJsonObject req;
+    {
+        QJsonObject agent;
+        agent.insert("name", QString("Minecraft"));
+        agent.insert("version", 1);
+        req.insert("agent", agent);
+    }
+    req.insert("username", m_data->userName());
+    req.insert("password", password);
+    req.insert("requestUser", false);
+    //
+    // If we already have a client token, give it to the server.
+    // Otherwise, let the server give us one.
+
+    m_data->generateClientTokenIfMissing();
+    req.insert("clientToken", m_data->clientToken());
+
+    QJsonDocument doc(req);
+    QByteArray requestData = doc.toJson();
+
+    m_response.reset(new QByteArray());
+    m_request = Net::Upload::makeByteArray(url, m_response, requestData);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("YggdrasilStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->setAutoRetryLimit(0);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &YggdrasilStep::onRequestDone);
+
+    m_task->start();
 }
 
-void YggdrasilStep::rehydrate()
+void YggdrasilStep::refresh()
 {
-    // NOOP, for now.
+    QUrl url(m_data->authServerUrl() + "/refresh");
+    auto headers = QList<Net::HeaderPair>{ { "Content-Type", "application/json" }, { "Accept", "application/json" } };
+
+    /*
+     * {
+     *  "clientToken": "client identifier"
+     *  "accessToken": "current access token to be refreshed"
+     *  "selectedProfile":                      // specifying this causes errors
+     *  {
+     *   "id": "profile ID"
+     *   "name": "profile name"
+     *  }
+     *  "requestUser": true/false               // request the user structure
+     * }
+     */
+    QJsonObject req;
+    req.insert("clientToken", m_data->clientToken());
+    req.insert("accessToken", m_data->accessToken());
+    req.insert("requestUser", false);
+
+    QJsonDocument doc(req);
+    QByteArray requestData = doc.toJson();
+
+    m_response.reset(new QByteArray());
+    m_request = Net::Upload::makeByteArray(url, m_response, requestData);
+    m_request->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    m_task.reset(new NetJob("YggdrasilStep", APPLICATION->network()));
+    m_task->setAskRetry(false);
+    m_task->setAutoRetryLimit(0);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &YggdrasilStep::onRequestDone);
+
+    m_task->start();
 }
 
-void YggdrasilStep::perform()
+void YggdrasilStep::onRequestDone()
 {
-    if (m_password.size()) {
-        m_yggdrasil->login(m_password);
+    qDebug() << "Yggdrasil request done";
+    switch (m_request->error()) {
+        case QNetworkReply::NoError:
+            break;
+        case QNetworkReply::AuthenticationRequiredError:
+            // These cases will be handled as usual
+            break;
+        case QNetworkReply::TimeoutError:
+            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation timed out."));
+            return;
+        case QNetworkReply::OperationCanceledError:
+            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation cancelled."));
+            return;
+        case QNetworkReply::SslHandshakeFailedError:
+            emit finished(AccountTaskState::STATE_FAILED_SOFT,
+                          tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>"
+                             "<ul>"
+                             "<li>You use Windows and need to update your root certificates, please install any outstanding updates.</li>"
+                             "<li>Some device on your network is interfering with SSL traffic. In that case, "
+                             "you have bigger worries than Minecraft not starting.</li>"
+                             "<li>Possibly something else. Check the log file for details</li>"
+                             "</ul>"));
+            return;
+        // used for invalid credentials and similar errors. Fall through.
+        case QNetworkReply::ContentAccessDenied:
+        case QNetworkReply::ContentOperationNotPermittedError:
+            break;
+        case QNetworkReply::ContentGoneError: {
+            emit finished(AccountTaskState::STATE_FAILED_GONE,
+                          tr("The Mojang account no longer exists. It may have been migrated to a Microsoft account."));
+            return;
+        }
+        default:
+            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation failed due to a network error: %1 (%2)")
+                                                                   .arg(m_request->errorString())
+                                                                   .arg(m_request->error()));
+            return;
+    }
+
+    // Try to parse the response regardless of the response code.
+    // Sometimes the auth server will give more information and an error code.
+    // Check the response code.
+    QJsonParseError jsonError;
+    QJsonDocument doc = QJsonDocument::fromJson(*m_response, &jsonError);
+    // Check the response code.
+    int responseCode = m_request->replyStatusCode();
+
+    if (responseCode == 200) {
+        // If the response code was 200, then there shouldn't be an error. Make sure
+        // anyways.
+        // Also, sometimes an empty reply indicates success. If there was no data received,
+        // pass an empty json object to the processResponse function.
+        if (jsonError.error == QJsonParseError::NoError || m_response->size() == 0) {
+            processResponse(m_response->size() > 0 ? doc.object() : QJsonObject());
+            return;
+        } else {
+            emit finished(AccountTaskState::STATE_FAILED_SOFT,
+                          tr("Failed to parse authentication server response JSON response: %1 at offset %2.")
+                              .arg(jsonError.errorString())
+                              .arg(jsonError.offset));
+            qCritical() << *m_response;
+        }
+        return;
+    }
+
+    // If the response code was not 200, then Yggdrasil may have given us information
+    // about the error.
+    // If we can parse the response, then get information from it. Otherwise just say
+    // there was an unknown error.
+    if (jsonError.error == QJsonParseError::NoError) {
+        // We were able to parse the server's response. Woo!
+        // Call processError. If a subclass has overridden it then they'll handle their
+        // stuff there.
+        qDebug() << "The request failed, but the server gave us an error message. Processing error.";
+        processError(doc.object());
     } else {
-        m_yggdrasil->refresh();
+        // The server didn't say anything regarding the error. Give the user an unknown
+        // error.
+        qDebug() << "The request failed and the server gave no error message. Unknown error.";
+        emit finished(
+            AccountTaskState::STATE_FAILED_SOFT,
+            tr("An unknown error occurred when trying to communicate with the authentication server: %1").arg(m_request->errorString()));
     }
+
+    YggdrasilStep::processResponse(doc.object());
 }
 
-void YggdrasilStep::onAuthSucceeded()
+void YggdrasilStep::processResponse(QJsonObject responseData)
 {
-    emit finished(AccountTaskState::STATE_WORKING, tr("Logged in with Mojang"));
+    // Read the response data. We need to get the client token, access token, and the selected
+    // profile.
+
+    // If we already have a client token, make sure the one the server gave us matches our
+    // existing one.
+    QString clientToken = responseData.value("clientToken").toString("");
+    if (clientToken.isEmpty()) {
+        // Fail if the server gave us an empty client token
+        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a client token."));
+        return;
+    }
+    if (m_data->clientToken().isEmpty()) {
+        m_data->setClientToken(clientToken);
+    } else if (clientToken != m_data->clientToken()) {
+        emit finished(AccountTaskState::STATE_FAILED_HARD,
+                      tr("Authentication server attempted to change the client token. This isn't supported."));
+        return;
+    }
+
+    // Now, we set the access token.
+    qDebug() << "Getting access token.";
+    QString accessToken = responseData.value("accessToken").toString("");
+    if (accessToken.isEmpty()) {
+        // Fail if the server didn't give us an access token.
+        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send an access token."));
+        return;
+    }
+
+    // Set the access token.
+    m_data->yggdrasilToken.token = accessToken;
+    m_data->yggdrasilToken.validity = Validity::Certain;
+    m_data->yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
+
+    // Get UUID here since we need it for later
+    // FIXME: Here is a simple workaround for now,, which uses the first available profile when selectedProfile is not provided
+    auto profile = responseData.value("selectedProfile");
+    if (!profile.isObject()) {
+        auto profiles = responseData.value("availableProfiles");
+        if (!profiles.isArray()) {
+            emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send available profiles."));
+            return;
+        } else {
+            if (profiles.toArray().isEmpty()) {
+                emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Account has no available profile."));
+                return;
+            } else {
+                profile = profiles.toArray().first();
+            }
+        }
+    }
+
+    auto profileObj = profile.toObject();
+    for (auto i = profileObj.constBegin(); i != profileObj.constEnd(); ++i) {
+        if (i.key() == "name" && i.value().isString()) {
+            m_data->minecraftProfile.name = i->toString();
+        } else if (i.key() == "id" && i.value().isString()) {
+            m_data->minecraftProfile.id = i->toString();
+        }
+    }
+
+    if (m_data->minecraftProfile.id.isEmpty()) {
+        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a UUID in selected profile."));
+        return;
+    }
+
+    emit finished(AccountTaskState::STATE_WORKING, "Logged in");
 }
 
-void YggdrasilStep::onAuthFailed()
+void YggdrasilStep::processError(QJsonObject responseData)
 {
-    // TODO: hook these in again, expand to MSA
-    // m_error = m_yggdrasil->m_error;
-    // m_aborted = m_yggdrasil->m_aborted;
+    QJsonValue errorVal = responseData.value("error");
+    QJsonValue errorMessageValue = responseData.value("errorMessage");
+    QJsonValue causeVal = responseData.value("cause");
 
-    auto state = m_yggdrasil->taskState();
-    QString errorMessage = tr("Mojang user authentication failed.");
-
-    // NOTE: soft error in the first step means 'offline'
-    if (state == AccountTaskState::STATE_FAILED_SOFT) {
-        state = AccountTaskState::STATE_OFFLINE;
-        errorMessage = tr("Mojang user authentication ended with a network error.");
+    if (errorVal.isString() && errorMessageValue.isString()) {
+        emit finished(AccountTaskState::STATE_FAILED_HARD, errorMessageValue.toString(""));
+    } else {
+        // Error is not in standard format. Don't set m_error and return unknown error.
+        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("An unknown Yggdrasil error occurred."));
     }
-    emit finished(state, errorMessage);
 }
diff --git a/launcher/minecraft/auth/steps/YggdrasilStep.h b/launcher/minecraft/auth/steps/YggdrasilStep.h
index ef31f34d5..70f4f40f8 100644
--- a/launcher/minecraft/auth/steps/YggdrasilStep.h
+++ b/launcher/minecraft/auth/steps/YggdrasilStep.h
@@ -1,8 +1,10 @@
 #pragma once
 #include <QObject>
+#include <optional>
 
-#include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
+#include "net/NetJob.h"
+#include "net/Upload.h"
 
 class Yggdrasil;
 
@@ -10,19 +12,25 @@ class YggdrasilStep : public AuthStep {
     Q_OBJECT
 
    public:
-    explicit YggdrasilStep(AccountData* data, QString password);
-    virtual ~YggdrasilStep() noexcept;
+    explicit YggdrasilStep(AccountData* data, std::optional<QString> password);
+    virtual ~YggdrasilStep() noexcept = default;
 
     void perform() override;
-    void rehydrate() override;
 
     QString describe() override;
 
    private slots:
-    void onAuthSucceeded();
-    void onAuthFailed();
+    void onRequestDone();
 
    private:
-    Yggdrasil* m_yggdrasil = nullptr;
-    QString m_password;
+    void login(QString password);
+    void refresh();
+
+    void processResponse(QJsonObject responseData);
+    void processError(QJsonObject responseData);
+
+    std::optional<QString> m_password;
+    std::shared_ptr<QByteArray> m_response;
+    Net::Upload::Ptr m_request;
+    NetJob::Ptr m_task;
 };
diff --git a/launcher/minecraft/launch/AutoInstallJava.cpp b/launcher/minecraft/launch/AutoInstallJava.cpp
new file mode 100644
index 000000000..b23b23ed2
--- /dev/null
+++ b/launcher/minecraft/launch/AutoInstallJava.cpp
@@ -0,0 +1,251 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include "AutoInstallJava.h"
+#include <QDir>
+#include <QFileInfo>
+#include <memory>
+
+#include "Application.h"
+#include "FileSystem.h"
+#include "MessageLevel.h"
+#include "QObjectPtr.h"
+#include "SysInfo.h"
+#include "java/JavaInstall.h"
+#include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"
+#include "java/JavaVersion.h"
+#include "java/download/ArchiveDownloadTask.h"
+#include "java/download/ManifestDownloadTask.h"
+#include "java/download/SymlinkTask.h"
+#include "meta/Index.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/PackProfile.h"
+#include "net/Mode.h"
+#include "tasks/SequentialTask.h"
+
+AutoInstallJava::AutoInstallJava(LaunchTask* parent)
+    : LaunchStep(parent)
+    , m_instance(m_parent->instance())
+    , m_supported_arch(SysInfo::getSupportedJavaArchitecture()) {};
+
+void AutoInstallJava::executeTask()
+{
+    auto settings = m_instance->settings();
+    if (!APPLICATION->settings()->get("AutomaticJavaSwitch").toBool() ||
+        (settings->get("OverrideJavaLocation").toBool() && QFileInfo::exists(settings->get("JavaPath").toString()))) {
+        emitSucceeded();
+        return;
+    }
+    auto packProfile = m_instance->getPackProfile();
+    if (!APPLICATION->settings()->get("AutomaticJavaDownload").toBool()) {
+        auto javas = APPLICATION->javalist();
+        m_current_task = javas->getLoadTask();
+        connect(m_current_task.get(), &Task::finished, this, [this, javas, packProfile] {
+            for (auto i = 0; i < javas->count(); i++) {
+                auto java = std::dynamic_pointer_cast<JavaInstall>(javas->at(i));
+                if (java && packProfile->getProfile()->getCompatibleJavaMajors().contains(java->id.major())) {
+                    if (!java->is_64bit) {
+                        emit logLine(tr("The automatic Java mechanism detected a 32-bit installation of Java."), MessageLevel::Info);
+                    }
+                    setJavaPath(java->path);
+                    return;
+                }
+            }
+            emit logLine(tr("No compatible Java version was found. Using the default one."), MessageLevel::Warning);
+            emitSucceeded();
+        });
+        connect(m_current_task.get(), &Task::progress, this, &AutoInstallJava::setProgress);
+        connect(m_current_task.get(), &Task::stepProgress, this, &AutoInstallJava::propagateStepProgress);
+        connect(m_current_task.get(), &Task::status, this, &AutoInstallJava::setStatus);
+        connect(m_current_task.get(), &Task::details, this, &AutoInstallJava::setDetails);
+        emit progressReportingRequest();
+        return;
+    }
+    if (m_supported_arch.isEmpty()) {
+        emit logLine(tr("Your system (%1-%2) is not compatible with automatic Java installation. Using the default Java path.")
+                         .arg(SysInfo::currentSystem(), SysInfo::useQTForArch()),
+                     MessageLevel::Warning);
+        emitSucceeded();
+        return;
+    }
+    auto wantedJavaName = packProfile->getProfile()->getCompatibleJavaName();
+    if (wantedJavaName.isEmpty()) {
+        emit logLine(tr("Your meta information is out of date or doesn't have the information necessary to determine what installation of "
+                        "Java should be used. "
+                        "Using the default Java path."),
+                     MessageLevel::Warning);
+        emitSucceeded();
+        return;
+    }
+    QDir javaDir(APPLICATION->javaPath());
+    auto wantedJavaPath = javaDir.absoluteFilePath(wantedJavaName);
+    if (QFileInfo::exists(wantedJavaPath)) {
+        setJavaPathFromPartial();
+        return;
+    }
+    auto versionList = APPLICATION->metadataIndex()->get("net.minecraft.java");
+    m_current_task = versionList->getLoadTask();
+    connect(m_current_task.get(), &Task::succeeded, this, &AutoInstallJava::tryNextMajorJava);
+    connect(m_current_task.get(), &Task::failed, this, &AutoInstallJava::emitFailed);
+    connect(m_current_task.get(), &Task::progress, this, &AutoInstallJava::setProgress);
+    connect(m_current_task.get(), &Task::stepProgress, this, &AutoInstallJava::propagateStepProgress);
+    connect(m_current_task.get(), &Task::status, this, &AutoInstallJava::setStatus);
+    connect(m_current_task.get(), &Task::details, this, &AutoInstallJava::setDetails);
+    if (!m_current_task->isRunning()) {
+        m_current_task->start();
+    }
+    emit progressReportingRequest();
+}
+
+void AutoInstallJava::setJavaPath(QString path)
+{
+    auto settings = m_instance->settings();
+    settings->set("OverrideJavaLocation", true);
+    settings->set("JavaPath", path);
+    settings->set("AutomaticJava", true);
+    emit logLine(tr("Compatible Java found at: %1.").arg(path), MessageLevel::Info);
+    emitSucceeded();
+}
+
+void AutoInstallJava::setJavaPathFromPartial()
+{
+    auto packProfile = m_instance->getPackProfile();
+    auto javaName = packProfile->getProfile()->getCompatibleJavaName();
+    QDir javaDir(APPLICATION->javaPath());
+    // just checking if the executable is there should suffice
+    // but if needed this can be achieved through refreshing the javalist
+    // and retrieving the path that contains the java name
+    auto relativeBinary = FS::PathCombine(javaName, "bin", JavaUtils::javaExecutable);
+    auto finalPath = javaDir.absoluteFilePath(relativeBinary);
+    if (QFileInfo::exists(finalPath)) {
+        setJavaPath(finalPath);
+    } else {
+        emit logLine(tr("No compatible Java version was found (the binary file does not exist). Using the default one."),
+                     MessageLevel::Warning);
+        emitSucceeded();
+    }
+    return;
+}
+
+void AutoInstallJava::downloadJava(Meta::Version::Ptr version, QString javaName)
+{
+    auto runtimes = version->data()->runtimes;
+    for (auto java : runtimes) {
+        if (java->runtimeOS == m_supported_arch && java->name() == javaName) {
+            QDir javaDir(APPLICATION->javaPath());
+            auto final_path = javaDir.absoluteFilePath(java->m_name);
+            switch (java->downloadType) {
+                case Java::DownloadType::Manifest:
+                    m_current_task = makeShared<Java::ManifestDownloadTask>(java->url, final_path, java->checksumType, java->checksumHash);
+                    break;
+                case Java::DownloadType::Archive:
+                    m_current_task = makeShared<Java::ArchiveDownloadTask>(java->url, final_path, java->checksumType, java->checksumHash);
+                    break;
+                case Java::DownloadType::Unknown:
+                    emitFailed(tr("Could not determine Java download type!"));
+                    return;
+            }
+#if defined(Q_OS_MACOS)
+            auto seq = makeShared<SequentialTask>(this, tr("Install Java"));
+            seq->addTask(m_current_task);
+            seq->addTask(makeShared<Java::SymlinkTask>(final_path));
+            m_current_task = seq;
+#endif
+            auto deletePath = [final_path] { FS::deletePath(final_path); };
+            connect(m_current_task.get(), &Task::failed, this, [this, deletePath](QString reason) {
+                deletePath();
+                emitFailed(reason);
+            });
+            connect(m_current_task.get(), &Task::aborted, this, [deletePath] { deletePath(); });
+            connect(m_current_task.get(), &Task::succeeded, this, &AutoInstallJava::setJavaPathFromPartial);
+            connect(m_current_task.get(), &Task::failed, this, &AutoInstallJava::tryNextMajorJava);
+            connect(m_current_task.get(), &Task::progress, this, &AutoInstallJava::setProgress);
+            connect(m_current_task.get(), &Task::stepProgress, this, &AutoInstallJava::propagateStepProgress);
+            connect(m_current_task.get(), &Task::status, this, &AutoInstallJava::setStatus);
+            connect(m_current_task.get(), &Task::details, this, &AutoInstallJava::setDetails);
+            m_current_task->start();
+            return;
+        }
+    }
+    tryNextMajorJava();
+}
+
+void AutoInstallJava::tryNextMajorJava()
+{
+    if (!isRunning())
+        return;
+    auto versionList = APPLICATION->metadataIndex()->get("net.minecraft.java");
+    auto packProfile = m_instance->getPackProfile();
+    auto wantedJavaName = packProfile->getProfile()->getCompatibleJavaName();
+    auto majorJavaVersions = packProfile->getProfile()->getCompatibleJavaMajors();
+    if (m_majorJavaVersionIndex >= majorJavaVersions.length()) {
+        emit logLine(
+            tr("No versions of Java were found for your operating system: %1-%2").arg(SysInfo::currentSystem(), SysInfo::useQTForArch()),
+            MessageLevel::Warning);
+        emit logLine(tr("No compatible version of Java was found. Using the default one."), MessageLevel::Warning);
+        emitSucceeded();
+        return;
+    }
+    auto majorJavaVersion = majorJavaVersions[m_majorJavaVersionIndex];
+    m_majorJavaVersionIndex++;
+
+    auto javaMajor = versionList->getVersion(QString("java%1").arg(majorJavaVersion));
+
+    if (javaMajor->isLoaded()) {
+        downloadJava(javaMajor, wantedJavaName);
+    } else {
+        m_current_task = APPLICATION->metadataIndex()->loadVersion("net.minecraft.java", javaMajor->version(), Net::Mode::Online);
+        connect(m_current_task.get(), &Task::succeeded, this,
+                [this, javaMajor, wantedJavaName] { downloadJava(javaMajor, wantedJavaName); });
+        connect(m_current_task.get(), &Task::failed, this, &AutoInstallJava::tryNextMajorJava);
+        connect(m_current_task.get(), &Task::progress, this, &AutoInstallJava::setProgress);
+        connect(m_current_task.get(), &Task::stepProgress, this, &AutoInstallJava::propagateStepProgress);
+        connect(m_current_task.get(), &Task::status, this, &AutoInstallJava::setStatus);
+        connect(m_current_task.get(), &Task::details, this, &AutoInstallJava::setDetails);
+        if (!m_current_task->isRunning()) {
+            m_current_task->start();
+        }
+    }
+}
+bool AutoInstallJava::abort()
+{
+    if (m_current_task && m_current_task->canAbort()) {
+        auto status = m_current_task->abort();
+        emitFailed("Aborted.");
+        return status;
+    }
+    return Task::abort();
+}
diff --git a/launcher/minecraft/launch/AutoInstallJava.h b/launcher/minecraft/launch/AutoInstallJava.h
new file mode 100644
index 000000000..cbfcf5ee7
--- /dev/null
+++ b/launcher/minecraft/launch/AutoInstallJava.h
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023-2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#pragma once
+
+#include <launch/LaunchStep.h>
+#include <launch/LaunchTask.h>
+#include "meta/Version.h"
+#include "minecraft/MinecraftInstance.h"
+#include "tasks/Task.h"
+
+class AutoInstallJava : public LaunchStep {
+    Q_OBJECT
+
+   public:
+    explicit AutoInstallJava(LaunchTask* parent);
+    ~AutoInstallJava() override = default;
+
+    void executeTask() override;
+    bool canAbort() const override { return m_current_task ? m_current_task->canAbort() : false; }
+    bool abort() override;
+
+   protected:
+    void setJavaPath(QString path);
+    void setJavaPathFromPartial();
+    void downloadJava(Meta::Version::Ptr version, QString javaName);
+    void tryNextMajorJava();
+
+   private:
+    MinecraftInstancePtr m_instance;
+    Task::Ptr m_current_task;
+
+    qsizetype m_majorJavaVersionIndex = 0;
+    const QString m_supported_arch;
+};
diff --git a/launcher/minecraft/launch/ClaimAccount.h b/launcher/minecraft/launch/ClaimAccount.h
index 357a4d4c5..561f0e848 100644
--- a/launcher/minecraft/launch/ClaimAccount.h
+++ b/launcher/minecraft/launch/ClaimAccount.h
@@ -22,7 +22,7 @@ class ClaimAccount : public LaunchStep {
     Q_OBJECT
    public:
     explicit ClaimAccount(LaunchTask* parent, AuthSessionPtr session);
-    virtual ~ClaimAccount() {};
+    virtual ~ClaimAccount() = default;
 
     void executeTask() override;
     void finalize() override;
diff --git a/launcher/minecraft/launch/CreateGameFolders.cpp b/launcher/minecraft/launch/CreateGameFolders.cpp
index 36f5e6407..07bdbb600 100644
--- a/launcher/minecraft/launch/CreateGameFolders.cpp
+++ b/launcher/minecraft/launch/CreateGameFolders.cpp
@@ -8,16 +8,15 @@ CreateGameFolders::CreateGameFolders(LaunchTask* parent) : LaunchStep(parent) {}
 void CreateGameFolders::executeTask()
 {
     auto instance = m_parent->instance();
-    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
 
-    if (!FS::ensureFolderPathExists(minecraftInstance->gameRoot())) {
+    if (!FS::ensureFolderPathExists(instance->gameRoot())) {
         emit logLine("Couldn't create the main game folder", MessageLevel::Error);
         emitFailed(tr("Couldn't create the main game folder"));
         return;
     }
 
     // HACK: this is a workaround for MCL-3732 - 'server-resource-packs' folder is created.
-    if (!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->gameRoot(), "server-resource-packs"))) {
+    if (!FS::ensureFolderPathExists(FS::PathCombine(instance->gameRoot(), "server-resource-packs"))) {
         emit logLine("Couldn't create the 'server-resource-packs' folder", MessageLevel::Error);
     }
     emitSucceeded();
diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp
index 405008f40..afe091758 100644
--- a/launcher/minecraft/launch/ExtractNatives.cpp
+++ b/launcher/minecraft/launch/ExtractNatives.cpp
@@ -70,17 +70,16 @@ static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibH
 void ExtractNatives::executeTask()
 {
     auto instance = m_parent->instance();
-    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-    auto toExtract = minecraftInstance->getNativeJars();
+    auto toExtract = instance->getNativeJars();
     if (toExtract.isEmpty()) {
         emitSucceeded();
         return;
     }
-    auto settings = minecraftInstance->settings();
+    auto settings = instance->settings();
 
-    auto outputPath = minecraftInstance->getNativePath();
+    auto outputPath = instance->getNativePath();
     FS::ensureFolderPathExists(outputPath);
-    auto javaVersion = minecraftInstance->getJavaVersion();
+    auto javaVersion = instance->getJavaVersion();
     bool jniHackEnabled = javaVersion.major() >= 8;
     for (const auto& source : toExtract) {
         if (!unzipNatives(source, outputPath, jniHackEnabled)) {
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index f70e023b6..54dff3715 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -48,18 +48,20 @@
 #include "gamemode_client.h"
 #endif
 
-LauncherPartLaunch::LauncherPartLaunch(LaunchTask* parent) : LaunchStep(parent)
+LauncherPartLaunch::LauncherPartLaunch(LaunchTask* parent)
+    : LaunchStep(parent)
+    , m_process(parent->instance()->getJavaVersion().defaultsToUtf8() ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale())
 {
-    auto instance = parent->instance();
-    if (instance->settings()->get("CloseAfterLaunch").toBool()) {
+    if (parent->instance()->settings()->get("CloseAfterLaunch").toBool()) {
         std::shared_ptr<QMetaObject::Connection> connection{ new QMetaObject::Connection };
-        *connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, [[maybe_unused]] MessageLevel::Enum level) {
-            qDebug() << lines;
-            if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0) {
-                APPLICATION->closeAllWindows();
-                disconnect(*connection);
-            }
-        });
+        *connection =
+            connect(&m_process, &LoggedProcess::log, this, [=](const QStringList& lines, [[maybe_unused]] MessageLevel::Enum level) {
+                qDebug() << lines;
+                if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0) {
+                    APPLICATION->closeAllWindows();
+                    disconnect(*connection);
+                }
+            });
     }
 
     connect(&m_process, &LoggedProcess::log, this, &LauncherPartLaunch::logLines);
@@ -77,10 +79,9 @@ void LauncherPartLaunch::executeTask()
     }
 
     auto instance = m_parent->instance();
-    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
 
     QString legacyJarPath;
-    if (minecraftInstance->getLauncher() == "legacy" || minecraftInstance->shouldApplyOnlineFixes()) {
+    if (instance->getLauncher() == "legacy" || instance->shouldApplyOnlineFixes()) {
         legacyJarPath = APPLICATION->getJarPath("NewLaunchLegacy.jar");
         if (legacyJarPath.isEmpty()) {
             const char* reason = QT_TR_NOOP("Legacy launcher library could not be found. Please check your installation.");
@@ -90,11 +91,9 @@ void LauncherPartLaunch::executeTask()
         }
     }
 
-    m_launchScript = minecraftInstance->createLaunchScript(m_session, m_serverToJoin);
-
-    auto args = minecraftInstance->processAuthArgs(m_session);
-    args.append(minecraftInstance->javaArguments());
-
+    m_launchScript = instance->createLaunchScript(m_session, m_targetToJoin);
+    QStringList args = instance->processAuthArgs(m_session);
+    args.append(instance->javaArguments());
     QString allArgs = args.join(", ");
     emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::Launcher);
 
@@ -105,13 +104,13 @@ void LauncherPartLaunch::executeTask()
     // make detachable - this will keep the process running even if the object is destroyed
     m_process.setDetachable(true);
 
-    auto classPath = minecraftInstance->getClassPath();
+    auto classPath = instance->getClassPath();
     classPath.prepend(jarPath);
 
     if (!legacyJarPath.isEmpty())
         classPath.prepend(legacyJarPath);
 
-    auto natPath = minecraftInstance->getNativePath();
+    auto natPath = instance->getNativePath();
 #ifdef Q_OS_WIN
     natPath = FS::getPathNameInLocal8bit(natPath);
 #endif
@@ -181,6 +180,7 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
                 APPLICATION->showMainWindow();
 
             m_parent->setPid(-1);
+            m_parent->instance()->setMinecraftRunning(false);
             // if the exit code wasn't 0, report this as a crash
             auto exitCode = m_process.exitCode();
             if (exitCode != 0) {
@@ -196,7 +196,6 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
         case LoggedProcess::Running:
             emit logLine(QString("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::Launcher);
             m_parent->setPid(m_process.processId());
-            m_parent->instance()->setLastLaunch();
             // send the launch script to the launcher part
             m_process.write(m_launchScript.toUtf8());
 
@@ -216,6 +215,7 @@ void LauncherPartLaunch::setWorkingDirectory(const QString& wd)
 void LauncherPartLaunch::proceed()
 {
     if (mayProceed) {
+        m_parent->instance()->setMinecraftRunning(true);
         QString launchString("launch\n");
         m_process.write(launchString.toUtf8());
         mayProceed = false;
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.h b/launcher/minecraft/launch/LauncherPartLaunch.h
index fcd4daec6..ea125aa9e 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.h
+++ b/launcher/minecraft/launch/LauncherPartLaunch.h
@@ -19,13 +19,13 @@
 #include <launch/LaunchStep.h>
 #include <minecraft/auth/AuthSession.h>
 
-#include "MinecraftServerTarget.h"
+#include "MinecraftTarget.h"
 
 class LauncherPartLaunch : public LaunchStep {
     Q_OBJECT
    public:
     explicit LauncherPartLaunch(LaunchTask* parent);
-    virtual ~LauncherPartLaunch() {};
+    virtual ~LauncherPartLaunch() = default;
 
     virtual void executeTask();
     virtual bool abort();
@@ -34,7 +34,7 @@ class LauncherPartLaunch : public LaunchStep {
     void setWorkingDirectory(const QString& wd);
     void setAuthSession(AuthSessionPtr session) { m_session = session; }
 
-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin) { m_serverToJoin = std::move(serverToJoin); }
+    void setTargetToJoin(MinecraftTarget::Ptr targetToJoin) { m_targetToJoin = std::move(targetToJoin); }
 
    private slots:
     void on_state(LoggedProcess::State state);
@@ -44,7 +44,7 @@ class LauncherPartLaunch : public LaunchStep {
     QString m_command;
     AuthSessionPtr m_session;
     QString m_launchScript;
-    MinecraftServerTargetPtr m_serverToJoin;
+    MinecraftTarget::Ptr m_targetToJoin;
 
     bool mayProceed = false;
 };
diff --git a/launcher/minecraft/launch/MinecraftServerTarget.cpp b/launcher/minecraft/launch/MinecraftTarget.cpp
similarity index 86%
rename from launcher/minecraft/launch/MinecraftServerTarget.cpp
rename to launcher/minecraft/launch/MinecraftTarget.cpp
index e201efab1..ba9f87511 100644
--- a/launcher/minecraft/launch/MinecraftServerTarget.cpp
+++ b/launcher/minecraft/launch/MinecraftTarget.cpp
@@ -13,13 +13,18 @@
  * limitations under the License.
  */
 
-#include "MinecraftServerTarget.h"
+#include "MinecraftTarget.h"
 
 #include <QStringList>
 
 // FIXME: the way this is written, it can't ever do any sort of validation and can accept total junk
-MinecraftServerTarget MinecraftServerTarget::parse(const QString& fullAddress)
+MinecraftTarget MinecraftTarget::parse(const QString& fullAddress, bool useWorld)
 {
+    if (useWorld) {
+        MinecraftTarget target;
+        target.world = fullAddress;
+        return target;
+    }
     QStringList split = fullAddress.split(":");
 
     // The logic below replicates the exact logic minecraft uses for parsing server addresses.
@@ -56,5 +61,5 @@ MinecraftServerTarget MinecraftServerTarget::parse(const QString& fullAddress)
         }
     }
 
-    return MinecraftServerTarget{ realAddress, realPort };
+    return MinecraftTarget{ realAddress, realPort };
 }
diff --git a/launcher/minecraft/launch/MinecraftServerTarget.h b/launcher/minecraft/launch/MinecraftTarget.h
similarity index 80%
rename from launcher/minecraft/launch/MinecraftServerTarget.h
rename to launcher/minecraft/launch/MinecraftTarget.h
index 2edd8a30d..7f8b268d9 100644
--- a/launcher/minecraft/launch/MinecraftServerTarget.h
+++ b/launcher/minecraft/launch/MinecraftTarget.h
@@ -19,11 +19,11 @@
 
 #include <QString>
 
-struct MinecraftServerTarget {
+struct MinecraftTarget {
     QString address;
     quint16 port;
 
-    static MinecraftServerTarget parse(const QString& fullAddress);
+    QString world;
+    static MinecraftTarget parse(const QString& fullAddress, bool useWorld);
+    using Ptr = std::shared_ptr<MinecraftTarget>;
 };
-
-using MinecraftServerTargetPtr = std::shared_ptr<MinecraftServerTarget>;
diff --git a/launcher/minecraft/launch/ModMinecraftJar.cpp b/launcher/minecraft/launch/ModMinecraftJar.cpp
index 6e73333b1..e06080ba7 100644
--- a/launcher/minecraft/launch/ModMinecraftJar.cpp
+++ b/launcher/minecraft/launch/ModMinecraftJar.cpp
@@ -42,7 +42,7 @@
 
 void ModMinecraftJar::executeTask()
 {
-    auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+    auto m_inst = m_parent->instance();
 
     if (!m_inst->getJarMods().size()) {
         emitSucceeded();
@@ -82,7 +82,7 @@ void ModMinecraftJar::finalize()
 
 bool ModMinecraftJar::removeJar()
 {
-    auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+    auto m_inst = m_parent->instance();
     auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
     QFile finalJar(finalJarPath);
     if (finalJar.exists()) {
diff --git a/launcher/minecraft/launch/PrintInstanceInfo.cpp b/launcher/minecraft/launch/PrintInstanceInfo.cpp
index e3a45b030..e44d09839 100644
--- a/launcher/minecraft/launch/PrintInstanceInfo.cpp
+++ b/launcher/minecraft/launch/PrintInstanceInfo.cpp
@@ -129,6 +129,6 @@ void PrintInstanceInfo::executeTask()
 #endif
 
     logLines(log, MessageLevel::Launcher);
-    logLines(instance->verboseDescription(m_session, m_serverToJoin), MessageLevel::Launcher);
+    logLines(instance->verboseDescription(m_session, m_targetToJoin), MessageLevel::Launcher);
     emitSucceeded();
 }
diff --git a/launcher/minecraft/launch/PrintInstanceInfo.h b/launcher/minecraft/launch/PrintInstanceInfo.h
index 93c5f0fd6..4138c0cd2 100644
--- a/launcher/minecraft/launch/PrintInstanceInfo.h
+++ b/launcher/minecraft/launch/PrintInstanceInfo.h
@@ -16,22 +16,21 @@
 #pragma once
 
 #include <launch/LaunchStep.h>
-#include <memory>
 #include "minecraft/auth/AuthSession.h"
-#include "minecraft/launch/MinecraftServerTarget.h"
+#include "minecraft/launch/MinecraftTarget.h"
 
 // FIXME: temporary wrapper for existing task.
 class PrintInstanceInfo : public LaunchStep {
     Q_OBJECT
    public:
-    explicit PrintInstanceInfo(LaunchTask* parent, AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
-        : LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin) {};
-    virtual ~PrintInstanceInfo() {};
+    explicit PrintInstanceInfo(LaunchTask* parent, AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin)
+        : LaunchStep(parent), m_session(session), m_targetToJoin(targetToJoin) {};
+    virtual ~PrintInstanceInfo() = default;
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }
 
    private:
     AuthSessionPtr m_session;
-    MinecraftServerTargetPtr m_serverToJoin;
+    MinecraftTarget::Ptr m_targetToJoin;
 };
diff --git a/launcher/minecraft/launch/ReconstructAssets.cpp b/launcher/minecraft/launch/ReconstructAssets.cpp
index 843ccc554..21ae395f0 100644
--- a/launcher/minecraft/launch/ReconstructAssets.cpp
+++ b/launcher/minecraft/launch/ReconstructAssets.cpp
@@ -22,12 +22,11 @@
 void ReconstructAssets::executeTask()
 {
     auto instance = m_parent->instance();
-    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-    auto components = minecraftInstance->getPackProfile();
+    auto components = instance->getPackProfile();
     auto profile = components->getProfile();
     auto assets = profile->getMinecraftAssets();
 
-    if (!AssetsUtils::reconstructAssets(assets->id, minecraftInstance->resourcesDir())) {
+    if (!AssetsUtils::reconstructAssets(assets->id, instance->resourcesDir())) {
         emit logLine("Failed to reconstruct Minecraft assets.", MessageLevel::Error);
     }
 
diff --git a/launcher/minecraft/launch/ScanModFolders.cpp b/launcher/minecraft/launch/ScanModFolders.cpp
index 7e08a4e36..1a2ddf194 100644
--- a/launcher/minecraft/launch/ScanModFolders.cpp
+++ b/launcher/minecraft/launch/ScanModFolders.cpp
@@ -42,7 +42,7 @@
 
 void ScanModFolders::executeTask()
 {
-    auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+    auto m_inst = m_parent->instance();
 
     auto loaders = m_inst->loaderModList();
     connect(loaders.get(), &ModFolderModel::updateFinished, this, &ScanModFolders::modsDone);
diff --git a/launcher/minecraft/launch/VerifyJavaInstall.cpp b/launcher/minecraft/launch/VerifyJavaInstall.cpp
index cdd1f7fd1..bc950d673 100644
--- a/launcher/minecraft/launch/VerifyJavaInstall.cpp
+++ b/launcher/minecraft/launch/VerifyJavaInstall.cpp
@@ -34,18 +34,32 @@
  */
 
 #include "VerifyJavaInstall.h"
+#include <memory>
 
+#include "Application.h"
+#include "MessageLevel.h"
+#include "java/JavaInstall.h"
+#include "java/JavaInstallList.h"
 #include "java/JavaVersion.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
 
 void VerifyJavaInstall::executeTask()
 {
-    auto instance = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+    auto instance = m_parent->instance();
     auto packProfile = instance->getPackProfile();
     auto settings = instance->settings();
     auto storedVersion = settings->get("JavaVersion").toString();
     auto ignoreCompatibility = settings->get("IgnoreJavaCompatibility").toBool();
+    auto javaArchitecture = settings->get("JavaArchitecture").toString();
+    auto maxMemAlloc = settings->get("MaxMemAlloc").toInt();
+
+    if (javaArchitecture == "32" && maxMemAlloc > 2048) {
+        emit logLine(tr("Max memory allocation exceeds the supported value.\n"
+                        "The selected installation of Java is 32-bit and doesn't support more than 2048MiB of RAM.\n"
+                        "The instance may not start due to this."),
+                     MessageLevel::Error);
+    }
 
     auto compatibleMajors = packProfile->getProfile()->getCompatibleJavaMajors();
 
diff --git a/launcher/minecraft/mod/DataPack.cpp b/launcher/minecraft/mod/DataPack.cpp
index 64c687c03..4a9e77a70 100644
--- a/launcher/minecraft/mod/DataPack.cpp
+++ b/launcher/minecraft/mod/DataPack.cpp
@@ -102,29 +102,24 @@ std::pair<Version, Version> DataPack::compatibleVersions() const
     return s_pack_format_versions.constFind(m_pack_format).value();
 }
 
-std::pair<int, bool> DataPack::compare(const Resource& other, SortType type) const
+int DataPack::compare(const Resource& other, SortType type) const
 {
     auto const& cast_other = static_cast<DataPack const&>(other);
-
     switch (type) {
-        default: {
-            auto res = Resource::compare(other, type);
-            if (res.first != 0)
-                return res;
-            break;
-        }
+        default:
+            return Resource::compare(other, type);
         case SortType::PACK_FORMAT: {
             auto this_ver = packFormat();
             auto other_ver = cast_other.packFormat();
 
             if (this_ver > other_ver)
-                return { 1, type == SortType::PACK_FORMAT };
+                return 1;
             if (this_ver < other_ver)
-                return { -1, type == SortType::PACK_FORMAT };
+                return -1;
             break;
         }
     }
-    return { 0, false };
+    return 0;
 }
 
 bool DataPack::applyFilter(QRegularExpression filter) const
diff --git a/launcher/minecraft/mod/DataPack.h b/launcher/minecraft/mod/DataPack.h
index b3787b238..4855b0203 100644
--- a/launcher/minecraft/mod/DataPack.h
+++ b/launcher/minecraft/mod/DataPack.h
@@ -56,7 +56,7 @@ class DataPack : public Resource {
 
     bool valid() const override;
 
-    [[nodiscard]] auto compare(Resource const& other, SortType type) const -> std::pair<int, bool> override;
+    [[nodiscard]] int compare(Resource const& other, SortType type) const override;
     [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
    protected:
diff --git a/launcher/minecraft/mod/MetadataHandler.h b/launcher/minecraft/mod/MetadataHandler.h
index 3496da2a0..fb3a10133 100644
--- a/launcher/minecraft/mod/MetadataHandler.h
+++ b/launcher/minecraft/mod/MetadataHandler.h
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -52,4 +53,6 @@ class Metadata {
     static auto get(QDir& index_dir, QString mod_slug) -> ModStruct { return Packwiz::V1::getIndexForMod(index_dir, mod_slug); }
 
     static auto get(QDir& index_dir, QVariant& mod_id) -> ModStruct { return Packwiz::V1::getIndexForMod(index_dir, mod_id); }
+
+    static auto modSideToString(ModSide side) -> QString { return Packwiz::V1::sideToString(side); }
 };
diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 310946379..9663026cd 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -3,6 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@
  */
 
 #include "Mod.h"
+#include <qpixmap.h>
 
 #include <QDebug>
 #include <QDir>
@@ -45,9 +47,9 @@
 #include "MetadataHandler.h"
 #include "Version.h"
 #include "minecraft/mod/ModDetails.h"
+#include "minecraft/mod/Resource.h"
 #include "minecraft/mod/tasks/LocalModParseTask.h"
-
-static ModPlatform::ProviderCapabilities ProviderCaps;
+#include "modplatform/ModIndex.h"
 
 Mod::Mod(const QFileInfo& file) : Resource(file), m_local_details()
 {
@@ -77,7 +79,7 @@ void Mod::setDetails(const ModDetails& details)
     m_local_details = details;
 }
 
-std::pair<int, bool> Mod::compare(const Resource& other, SortType type) const
+int Mod::compare(const Resource& other, SortType type) const
 {
     auto cast_other = dynamic_cast<Mod const*>(&other);
     if (!cast_other)
@@ -87,30 +89,49 @@ std::pair<int, bool> Mod::compare(const Resource& other, SortType type) const
         default:
         case SortType::ENABLED:
         case SortType::NAME:
-        case SortType::DATE: {
-            auto res = Resource::compare(other, type);
-            if (res.first != 0)
-                return res;
-            break;
-        }
+        case SortType::DATE:
+        case SortType::SIZE:
+            return Resource::compare(other, type);
         case SortType::VERSION: {
             auto this_ver = Version(version());
             auto other_ver = Version(cast_other->version());
             if (this_ver > other_ver)
-                return { 1, type == SortType::VERSION };
+                return 1;
             if (this_ver < other_ver)
-                return { -1, type == SortType::VERSION };
+                return -1;
             break;
         }
         case SortType::PROVIDER: {
-            auto compare_result =
-                QString::compare(provider().value_or("Unknown"), cast_other->provider().value_or("Unknown"), Qt::CaseInsensitive);
-            if (compare_result != 0)
-                return { compare_result, type == SortType::PROVIDER };
+            return QString::compare(provider().value_or("Unknown"), cast_other->provider().value_or("Unknown"), Qt::CaseInsensitive);
+        }
+        case SortType::SIDE: {
+            if (side() > cast_other->side())
+                return 1;
+            else if (side() < cast_other->side())
+                return -1;
+            break;
+        }
+        case SortType::LOADERS: {
+            if (loaders() > cast_other->loaders())
+                return 1;
+            else if (loaders() < cast_other->loaders())
+                return -1;
+            break;
+        }
+        case SortType::MC_VERSIONS: {
+            auto thisVersion = mcVersions().join(",");
+            auto otherVersion = cast_other->mcVersions().join(",");
+            return QString::compare(thisVersion, otherVersion, Qt::CaseInsensitive);
+        }
+        case SortType::RELEASE_TYPE: {
+            if (releaseType() > cast_other->releaseType())
+                return 1;
+            else if (releaseType() < cast_other->releaseType())
+                return -1;
             break;
         }
     }
-    return { 0, false };
+    return 0;
 }
 
 bool Mod::applyFilter(QRegularExpression filter) const
@@ -221,14 +242,42 @@ void Mod::finishResolvingWithDetails(ModDetails&& details)
     if (metadata)
         setMetadata(std::move(metadata));
     if (!iconPath().isEmpty()) {
-        m_pack_image_cache_key.was_read_attempt = false;
+        m_packImageCacheKey.wasReadAttempt = false;
     }
 }
 
 auto Mod::provider() const -> std::optional<QString>
 {
     if (metadata())
-        return ProviderCaps.readableName(metadata()->provider);
+        return ModPlatform::ProviderCapabilities::readableName(metadata()->provider);
+    return {};
+}
+
+auto Mod::side() const -> Metadata::ModSide
+{
+    if (metadata())
+        return metadata()->side;
+    return Metadata::ModSide::UniversalSide;
+}
+
+auto Mod::releaseType() const -> ModPlatform::IndexedVersionType
+{
+    if (metadata())
+        return metadata()->releaseType;
+    return ModPlatform::IndexedVersionType::VersionType::Unknown;
+}
+
+auto Mod::loaders() const -> ModPlatform::ModLoaderTypes
+{
+    if (metadata())
+        return metadata()->loaders;
+    return {};
+}
+
+auto Mod::mcVersions() const -> QStringList
+{
+    if (metadata())
+        return metadata()->mcVersions;
     return {};
 }
 
@@ -242,45 +291,53 @@ auto Mod::issueTracker() const -> QString
     return details().issue_tracker;
 }
 
-void Mod::setIcon(QImage new_image) const
+QPixmap Mod::setIcon(QImage new_image) const
 {
     QMutexLocker locker(&m_data_lock);
 
     Q_ASSERT(!new_image.isNull());
 
-    if (m_pack_image_cache_key.key.isValid())
-        PixmapCache::remove(m_pack_image_cache_key.key);
+    if (m_packImageCacheKey.key.isValid())
+        PixmapCache::remove(m_packImageCacheKey.key);
 
     // scale the image to avoid flooding the pixmapcache
     auto pixmap =
         QPixmap::fromImage(new_image.scaled({ 64, 64 }, Qt::AspectRatioMode::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
 
-    m_pack_image_cache_key.key = PixmapCache::insert(pixmap);
-    m_pack_image_cache_key.was_ever_used = true;
-    m_pack_image_cache_key.was_read_attempt = true;
+    m_packImageCacheKey.key = PixmapCache::insert(pixmap);
+    m_packImageCacheKey.wasEverUsed = true;
+    m_packImageCacheKey.wasReadAttempt = true;
+    return pixmap;
 }
 
 QPixmap Mod::icon(QSize size, Qt::AspectRatioMode mode) const
 {
-    QPixmap cached_image;
-    if (PixmapCache::find(m_pack_image_cache_key.key, &cached_image)) {
+    auto pixmap_transform = [&size, &mode](QPixmap pixmap) {
         if (size.isNull())
-            return cached_image;
-        return cached_image.scaled(size, mode, Qt::SmoothTransformation);
+            return pixmap;
+        return pixmap.scaled(size, mode, Qt::SmoothTransformation);
+    };
+
+    QPixmap cached_image;
+    if (PixmapCache::find(m_packImageCacheKey.key, &cached_image)) {
+        return pixmap_transform(cached_image);
     }
 
     // No valid image we can get
-    if ((!m_pack_image_cache_key.was_ever_used && m_pack_image_cache_key.was_read_attempt) || iconPath().isEmpty())
+    if ((!m_packImageCacheKey.wasEverUsed && m_packImageCacheKey.wasReadAttempt) || iconPath().isEmpty())
         return {};
 
-    if (m_pack_image_cache_key.was_ever_used) {
-        qDebug() << "Mod" << name() << "Had it's icon evicted form the cache. reloading...";
+    if (m_packImageCacheKey.wasEverUsed) {
+        qDebug() << "Mod" << name() << "Had it's icon evicted from the cache. reloading...";
         PixmapCache::markCacheMissByEviciton();
     }
     // Image got evicted from the cache or an attempt to load it has not been made. load it and retry.
-    m_pack_image_cache_key.was_read_attempt = true;
-    ModUtils::loadIconFile(*this);
-    return icon(size);
+    m_packImageCacheKey.wasReadAttempt = true;
+    if (ModUtils::loadIconFile(*this, &cached_image)) {
+        return pixmap_transform(cached_image);
+    }
+    // Image failed to load
+    return {};
 }
 
 bool Mod::valid() const
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index e97ee9d3b..a0d9797ed 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,6 +48,7 @@
 
 #include "ModDetails.h"
 #include "Resource.h"
+#include "modplatform/ModIndex.h"
 
 class Mod : public Resource {
     Q_OBJECT
@@ -70,13 +72,17 @@ class Mod : public Resource {
     auto licenses() const -> const QList<ModLicense>&;
     auto issueTracker() const -> QString;
     auto metaurl() const -> QString;
+    auto side() const -> Metadata::ModSide;
+    auto loaders() const -> ModPlatform::ModLoaderTypes;
+    auto mcVersions() const -> QStringList;
+    auto releaseType() const -> ModPlatform::IndexedVersionType;
 
     /** Get the intneral path to the mod's icon file*/
     QString iconPath() const { return m_local_details.icon_file; }
     /** Gets the icon of the mod, converted to a QPixmap for drawing, and scaled to size. */
     [[nodiscard]] QPixmap icon(QSize size, Qt::AspectRatioMode mode = Qt::AspectRatioMode::IgnoreAspectRatio) const;
     /** Thread-safe. */
-    void setIcon(QImage new_image) const;
+    QPixmap setIcon(QImage new_image) const;
 
     auto metadata() -> std::shared_ptr<Metadata::ModStruct>;
     auto metadata() const -> const std::shared_ptr<Metadata::ModStruct>;
@@ -88,7 +94,7 @@ class Mod : public Resource {
 
     bool valid() const override;
 
-    [[nodiscard]] auto compare(Resource const& other, SortType type) const -> std::pair<int, bool> override;
+    [[nodiscard]] int compare(Resource const& other, SortType type) const override;
     [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
     // Delete all the files of this mod
@@ -105,7 +111,7 @@ class Mod : public Resource {
 
     struct {
         QPixmapCache::Key key;
-        bool was_ever_used = false;
-        bool was_read_attempt = false;
-    } mutable m_pack_image_cache_key;
+        bool wasEverUsed = false;
+        bool wasReadAttempt = false;
+    } mutable m_packImageCacheKey;
 };
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index fc543202f..5e4fe7f11 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -3,6 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,11 +48,12 @@
 #include <QThreadPool>
 #include <QUrl>
 #include <QUuid>
-#include <algorithm>
 
 #include "Application.h"
 
 #include "Json.h"
+#include "minecraft/mod/MetadataHandler.h"
+#include "minecraft/mod/Resource.h"
 #include "minecraft/mod/tasks/LocalModParseTask.h"
 #include "minecraft/mod/tasks/LocalModUpdateTask.h"
 #include "minecraft/mod/tasks/ModFolderLoadTask.h"
@@ -62,12 +64,18 @@
 ModFolderModel::ModFolderModel(const QString& dir, BaseInstance* instance, bool is_indexed, bool create_dir)
     : ResourceFolderModel(QDir(dir), instance, nullptr, create_dir), m_is_indexed(is_indexed)
 {
-    m_column_names = QStringList({ "Enable", "Image", "Name", "Version", "Last Modified", "Provider" });
-    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Version"), tr("Last Modified"), tr("Provider") });
-    m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::VERSION, SortType::DATE, SortType::PROVIDER };
-    m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch,
+    m_column_names = QStringList({ "Enable", "Image", "Name", "Version", "Last Modified", "Provider", "Size", "Side", "Loaders",
+                                   "Minecraft Versions", "Release Type" });
+    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Version"), tr("Last Modified"), tr("Provider"),
+                                              tr("Size"), tr("Side"), tr("Loaders"), tr("Minecraft Versions"), tr("Release Type") });
+    m_column_sort_keys = { SortType::ENABLED, SortType::NAME,        SortType::NAME,        SortType::VERSION,
+                           SortType::DATE,    SortType::PROVIDER,    SortType::SIZE,        SortType::SIDE,
+                           SortType::LOADERS, SortType::MC_VERSIONS, SortType::RELEASE_TYPE };
+    m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch,     QHeaderView::Interactive,
+                              QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive,
                               QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive };
-    m_columnsHideable = { false, true, false, true, true, true };
+    m_columnsHideable = { false, true, false, true, true, true, true, true, true, true, true };
+    m_columnsHiddenByDefault = { false, false, false, false, false, false, false, true, true, true, true };
 }
 
 QVariant ModFolderModel::data(const QModelIndex& index, int role) const
@@ -105,12 +113,34 @@ QVariant ModFolderModel::data(const QModelIndex& index, int role) const
 
                     return provider.value();
                 }
+                case SideColumn: {
+                    return Metadata::modSideToString(at(row)->side());
+                }
+                case LoadersColumn: {
+                    QStringList loaders;
+                    auto modLoaders = at(row)->loaders();
+                    for (auto loader : { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Cauldron, ModPlatform::LiteLoader,
+                                         ModPlatform::Fabric, ModPlatform::Quilt }) {
+                        if (modLoaders & loader) {
+                            loaders << getModLoaderAsString(loader);
+                        }
+                    }
+                    return loaders.join(", ");
+                }
+                case McVersionsColumn: {
+                    return at(row)->mcVersions().join(", ");
+                }
+                case ReleaseTypeColumn: {
+                    return at(row)->releaseType().toString();
+                }
+                case SizeColumn:
+                    return m_resources[row]->sizeStr();
                 default:
                     return QVariant();
             }
 
         case Qt::ToolTipRole:
-            if (column == NAME_COLUMN) {
+            if (column == NameColumn) {
                 if (at(row)->isSymLinkUnder(instDirPath())) {
                     return m_resources[row]->internal_id() +
                            tr("\nWarning: This resource is symbolically linked from elsewhere. Editing it will also change the original."
@@ -124,7 +154,7 @@ QVariant ModFolderModel::data(const QModelIndex& index, int role) const
             }
             return m_resources[row]->internal_id();
         case Qt::DecorationRole: {
-            if (column == NAME_COLUMN && (at(row)->isSymLinkUnder(instDirPath()) || at(row)->isMoreThanOneHardLink()))
+            if (column == NameColumn && (at(row)->isSymLinkUnder(instDirPath()) || at(row)->isMoreThanOneHardLink()))
                 return APPLICATION->getThemedIcon("status-yellow");
             if (column == ImageColumn) {
                 return at(row)->icon({ 32, 32 }, Qt::AspectRatioMode::KeepAspectRatioByExpanding);
@@ -159,6 +189,11 @@ QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientatio
                 case DateColumn:
                 case ProviderColumn:
                 case ImageColumn:
+                case SideColumn:
+                case LoadersColumn:
+                case McVersionsColumn:
+                case ReleaseTypeColumn:
+                case SizeColumn:
                     return columnNames().at(section);
                 default:
                     return QVariant();
@@ -176,6 +211,16 @@ QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientatio
                     return tr("The date and time this mod was last changed (or added).");
                 case ProviderColumn:
                     return tr("Where the mod was downloaded from.");
+                case SideColumn:
+                    return tr("On what environment the mod is running.");
+                case LoadersColumn:
+                    return tr("The mod loader.");
+                case McVersionsColumn:
+                    return tr("The supported minecraft versions.");
+                case ReleaseTypeColumn:
+                    return tr("The release type.");
+                case SizeColumn:
+                    return tr("The size of the mod.");
                 default:
                     return QVariant();
             }
@@ -206,7 +251,7 @@ Task* ModFolderModel::createParseTask(Resource& resource)
 bool ModFolderModel::uninstallMod(const QString& filename, bool preserve_metadata)
 {
     for (auto mod : allMods()) {
-        if (mod->fileinfo().fileName() == filename) {
+        if (mod->getOriginalFileName() == filename) {
             auto index_dir = indexDir();
             mod->destroy(index_dir, preserve_metadata, false);
 
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index 61d840f9b..db5edf66e 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -3,6 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -61,7 +62,20 @@ class QFileSystemWatcher;
 class ModFolderModel : public ResourceFolderModel {
     Q_OBJECT
    public:
-    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, VersionColumn, DateColumn, ProviderColumn, NUM_COLUMNS };
+    enum Columns {
+        ActiveColumn = 0,
+        ImageColumn,
+        NameColumn,
+        VersionColumn,
+        DateColumn,
+        ProviderColumn,
+        SizeColumn,
+        SideColumn,
+        LoadersColumn,
+        McVersionsColumn,
+        ReleaseTypeColumn,
+        NUM_COLUMNS
+    };
     enum ModStatusAction { Disable, Enable, Toggle };
     ModFolderModel(const QString& dir, BaseInstance* instance, bool is_indexed = false, bool create_dir = true);
 
diff --git a/launcher/minecraft/mod/Resource.cpp b/launcher/minecraft/mod/Resource.cpp
index da806f0f4..c52d76f1f 100644
--- a/launcher/minecraft/mod/Resource.cpp
+++ b/launcher/minecraft/mod/Resource.cpp
@@ -1,9 +1,12 @@
 #include "Resource.h"
 
+#include <QDirIterator>
 #include <QFileInfo>
 #include <QRegularExpression>
+#include <tuple>
 
 #include "FileSystem.h"
+#include "StringUtils.h"
 
 Resource::Resource(QObject* parent) : QObject(parent) {}
 
@@ -18,6 +21,20 @@ void Resource::setFile(QFileInfo file_info)
     parseFile();
 }
 
+std::tuple<QString, qint64> calculateFileSize(const QFileInfo& file)
+{
+    if (file.isDir()) {
+        auto dir = QDir(file.absoluteFilePath());
+        dir.setFilter(QDir::AllEntries | QDir::NoDotAndDotDot);
+        auto count = dir.count();
+        auto str = QObject::tr("item");
+        if (count != 1)
+            str = QObject::tr("items");
+        return { QString("%1 %2").arg(QString::number(count), str), count };
+    }
+    return { StringUtils::humanReadableFileSize(file.size(), true), file.size() };
+}
+
 void Resource::parseFile()
 {
     QString file_name{ m_file_info.fileName() };
@@ -26,6 +43,7 @@ void Resource::parseFile()
 
     m_internal_id = file_name;
 
+    std::tie(m_size_str, m_size_info) = calculateFileSize(m_file_info);
     if (m_file_info.isDir()) {
         m_type = ResourceType::FOLDER;
         m_name = file_name;
@@ -61,15 +79,15 @@ static void removeThePrefix(QString& string)
     string = string.trimmed();
 }
 
-std::pair<int, bool> Resource::compare(const Resource& other, SortType type) const
+int Resource::compare(const Resource& other, SortType type) const
 {
     switch (type) {
         default:
         case SortType::ENABLED:
             if (enabled() && !other.enabled())
-                return { 1, type == SortType::ENABLED };
+                return 1;
             if (!enabled() && other.enabled())
-                return { -1, type == SortType::ENABLED };
+                return -1;
             break;
         case SortType::NAME: {
             QString this_name{ name() };
@@ -78,20 +96,31 @@ std::pair<int, bool> Resource::compare(const Resource& other, SortType type) con
             removeThePrefix(this_name);
             removeThePrefix(other_name);
 
-            auto compare_result = QString::compare(this_name, other_name, Qt::CaseInsensitive);
-            if (compare_result != 0)
-                return { compare_result, type == SortType::NAME };
-            break;
+            return QString::compare(this_name, other_name, Qt::CaseInsensitive);
         }
         case SortType::DATE:
             if (dateTimeChanged() > other.dateTimeChanged())
-                return { 1, type == SortType::DATE };
+                return 1;
             if (dateTimeChanged() < other.dateTimeChanged())
-                return { -1, type == SortType::DATE };
+                return -1;
+            break;
+        case SortType::SIZE: {
+            if (this->type() != other.type()) {
+                if (this->type() == ResourceType::FOLDER)
+                    return -1;
+                if (other.type() == ResourceType::FOLDER)
+                    return 1;
+            }
+
+            if (sizeInfo() > other.sizeInfo())
+                return 1;
+            if (sizeInfo() < other.sizeInfo())
+                return -1;
             break;
+        }
     }
 
-    return { 0, false };
+    return 0;
 }
 
 bool Resource::applyFilter(QRegularExpression filter) const
@@ -130,15 +159,14 @@ bool Resource::enable(EnableAction action)
         if (!path.endsWith(".disabled"))
             return false;
         path.chop(9);
-
-        if (!file.rename(path))
-            return false;
     } else {
         path += ".disabled";
-
-        if (!file.rename(path))
-            return false;
+        if (QFile::exists(path)) {
+            path = FS::getUniqueResourceName(path);
+        }
     }
+    if (!file.rename(path))
+        return false;
 
     setFile(QFileInfo(path));
 
@@ -169,3 +197,11 @@ bool Resource::isMoreThanOneHardLink() const
 {
     return FS::hardLinkCount(m_file_info.absoluteFilePath()) > 1;
 }
+
+auto Resource::getOriginalFileName() const -> QString
+{
+    auto fileName = m_file_info.fileName();
+    if (!m_enabled)
+        fileName.chop(9);
+    return fileName;
+}
\ No newline at end of file
diff --git a/launcher/minecraft/mod/Resource.h b/launcher/minecraft/mod/Resource.h
index c1ed49461..c99dab8db 100644
--- a/launcher/minecraft/mod/Resource.h
+++ b/launcher/minecraft/mod/Resource.h
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #pragma once
 
 #include <QDateTime>
@@ -15,7 +50,7 @@ enum class ResourceType {
     LITEMOD,     //!< The resource is a litemod
 };
 
-enum class SortType { NAME, DATE, VERSION, ENABLED, PACK_FORMAT, PROVIDER };
+enum class SortType { NAME, DATE, VERSION, ENABLED, PACK_FORMAT, PROVIDER, SIZE, SIDE, LOADERS, MC_VERSIONS, RELEASE_TYPE };
 
 enum class EnableAction { ENABLE, DISABLE, TOGGLE };
 
@@ -45,6 +80,9 @@ class Resource : public QObject {
     [[nodiscard]] auto internal_id() const -> QString { return m_internal_id; }
     [[nodiscard]] auto type() const -> ResourceType { return m_type; }
     [[nodiscard]] bool enabled() const { return m_enabled; }
+    [[nodiscard]] auto getOriginalFileName() const -> QString;
+    [[nodiscard]] QString sizeStr() const { return m_size_str; }
+    [[nodiscard]] qint64 sizeInfo() const { return m_size_info; }
 
     [[nodiscard]] virtual auto name() const -> QString { return m_name; }
     [[nodiscard]] virtual bool valid() const { return m_type != ResourceType::UNKNOWN; }
@@ -53,10 +91,8 @@ class Resource : public QObject {
      *  > 0: 'this' comes after 'other'
      *  = 0: 'this' is equal to 'other'
      *  < 0: 'this' comes before 'other'
-     *
-     *  The second argument in the pair is true if the sorting type that decided which one is greater was 'type'.
      */
-    [[nodiscard]] virtual auto compare(Resource const& other, SortType type = SortType::NAME) const -> std::pair<int, bool>;
+    [[nodiscard]] virtual int compare(Resource const& other, SortType type = SortType::NAME) const;
 
     /** Returns whether the given filter should filter out 'this' (false),
      *  or if such filter includes the Resource (true).
@@ -117,4 +153,6 @@ class Resource : public QObject {
     bool m_is_resolving = false;
     bool m_is_resolved = false;
     int m_resolution_ticket = 0;
+    QString m_size_str;
+    qint64 m_size_info;
 };
diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp
index a28aa7e5c..ce3e16bce 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@@ -16,6 +16,7 @@
 #include "FileSystem.h"
 
 #include "QVariantUtils.h"
+#include "StringUtils.h"
 #include "minecraft/mod/tasks/BasicFolderLoadTask.h"
 
 #include "settings/Setting.h"
@@ -34,10 +35,9 @@ ResourceFolderModel::ResourceFolderModel(QDir dir, BaseInstance* instance, QObje
 
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &ResourceFolderModel::directoryChanged);
     connect(&m_helper_thread_task, &ConcurrentTask::finished, this, [this] { m_helper_thread_task.clear(); });
-#ifndef LAUNCHER_TEST
-    // in tests the application macro doesn't work
-    m_helper_thread_task.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
-#endif
+    if (APPLICATION_DYN) {  // in tests the application macro doesn't work
+        m_helper_thread_task.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
+    }
 }
 
 ResourceFolderModel::~ResourceFolderModel()
@@ -111,7 +111,7 @@ bool ResourceFolderModel::installResource(QString original_path)
         case ResourceType::ZIPFILE:
         case ResourceType::LITEMOD: {
             if (QFile::exists(new_path) || QFile::exists(new_path + QString(".disabled"))) {
-                if (!QFile::remove(new_path)) {
+                if (!FS::deletePath(new_path)) {
                     qCritical() << "Cleaning up new location (" << new_path << ") was unsuccessful!";
                     return false;
                 }
@@ -214,9 +214,6 @@ bool ResourceFolderModel::setResourceEnabled(const QModelIndexList& indexes, Ena
         }
 
         auto new_id = resource->internal_id();
-        if (m_resources_index.contains(new_id)) {
-            // FIXME: https://github.com/PolyMC/PolyMC/issues/550
-        }
 
         m_resources_index.remove(old_id);
         m_resources_index[new_id] = row;
@@ -282,7 +279,13 @@ void ResourceFolderModel::resolveResource(Resource* res)
     connect(
         task.get(), &Task::succeeded, this, [=] { onParseSucceeded(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
     connect(task.get(), &Task::failed, this, [=] { onParseFailed(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
-    connect(task.get(), &Task::finished, this, [=] { m_active_parse_tasks.remove(ticket); }, Qt::ConnectionType::QueuedConnection);
+    connect(
+        task.get(), &Task::finished, this,
+        [=] {
+            m_active_parse_tasks.remove(ticket);
+            emit parseFinished();
+        },
+        Qt::ConnectionType::QueuedConnection);
 
     m_helper_thread_task.addTask(task);
 
@@ -409,15 +412,17 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
     switch (role) {
         case Qt::DisplayRole:
             switch (column) {
-                case NAME_COLUMN:
+                case NameColumn:
                     return m_resources[row]->name();
-                case DATE_COLUMN:
+                case DateColumn:
                     return m_resources[row]->dateTimeChanged();
+                case SizeColumn:
+                    return m_resources[row]->sizeStr();
                 default:
                     return {};
             }
         case Qt::ToolTipRole:
-            if (column == NAME_COLUMN) {
+            if (column == NameColumn) {
                 if (at(row).isSymLinkUnder(instDirPath())) {
                     return m_resources[row]->internal_id() +
                            tr("\nWarning: This resource is symbolically linked from elsewhere. Editing it will also change the original."
@@ -433,14 +438,14 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
 
             return m_resources[row]->internal_id();
         case Qt::DecorationRole: {
-            if (column == NAME_COLUMN && (at(row).isSymLinkUnder(instDirPath()) || at(row).isMoreThanOneHardLink()))
+            if (column == NameColumn && (at(row).isSymLinkUnder(instDirPath()) || at(row).isMoreThanOneHardLink()))
                 return APPLICATION->getThemedIcon("status-yellow");
 
             return {};
         }
         case Qt::CheckStateRole:
             switch (column) {
-                case ACTIVE_COLUMN:
+                case ActiveColumn:
                     return m_resources[row]->enabled() ? Qt::Checked : Qt::Unchecked;
                 default:
                     return {};
@@ -479,24 +484,27 @@ QVariant ResourceFolderModel::headerData(int section, [[maybe_unused]] Qt::Orien
     switch (role) {
         case Qt::DisplayRole:
             switch (section) {
-                case ACTIVE_COLUMN:
-                case NAME_COLUMN:
-                case DATE_COLUMN:
+                case ActiveColumn:
+                case NameColumn:
+                case DateColumn:
+                case SizeColumn:
                     return columnNames().at(section);
                 default:
                     return {};
             }
         case Qt::ToolTipRole: {
             switch (section) {
-                case ACTIVE_COLUMN:
+                case ActiveColumn:
                     //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("Is the resource enabled?");
-                case NAME_COLUMN:
+                case NameColumn:
                     //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("The name of the resource.");
-                case DATE_COLUMN:
+                case DateColumn:
                     //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("The date and time this resource was last changed (or added).");
+                case SizeColumn:
+                    return tr("The size of the resource.");
                 default:
                     return {};
             }
@@ -526,6 +534,10 @@ void ResourceFolderModel::saveColumns(QTreeView* tree)
 
 void ResourceFolderModel::loadColumns(QTreeView* tree)
 {
+    for (auto i = 0; i < m_columnsHiddenByDefault.size(); ++i) {
+        tree->setColumnHidden(i, m_columnsHiddenByDefault[i]);
+    }
+
     auto const setting_name = QString("UI/%1_Page/Columns").arg(id());
     auto setting = (m_instance->settings()->contains(setting_name)) ? m_instance->settings()->getSetting(setting_name)
                                                                     : m_instance->settings()->registerSetting(setting_name);
@@ -603,15 +615,36 @@ SortType ResourceFolderModel::columnToSortKey(size_t column) const
     auto const& resource_right = model->at(source_right.row());
 
     auto compare_result = resource_left.compare(resource_right, column_sort_key);
-    if (compare_result.first == 0)
+    if (compare_result == 0)
         return QSortFilterProxyModel::lessThan(source_left, source_right);
 
-    if (compare_result.second || sortOrder() != Qt::DescendingOrder)
-        return (compare_result.first < 0);
-    return (compare_result.first > 0);
+    return compare_result < 0;
 }
 
 QString ResourceFolderModel::instDirPath() const
 {
     return QFileInfo(m_instance->instanceRoot()).absoluteFilePath();
 }
+
+void ResourceFolderModel::onParseFailed(int ticket, QString resource_id)
+{
+    auto iter = m_active_parse_tasks.constFind(ticket);
+    if (iter == m_active_parse_tasks.constEnd())
+        return;
+
+    auto removed_index = m_resources_index[resource_id];
+    auto removed_it = m_resources.begin() + removed_index;
+    Q_ASSERT(removed_it != m_resources.end());
+
+    beginRemoveRows(QModelIndex(), removed_index, removed_index);
+    m_resources.erase(removed_it);
+
+    // update index
+    m_resources_index.clear();
+    int idx = 0;
+    for (auto const& mod : qAsConst(m_resources)) {
+        m_resources_index[mod->internal_id()] = idx;
+        idx++;
+    }
+    endRemoveRows();
+}
diff --git a/launcher/minecraft/mod/ResourceFolderModel.h b/launcher/minecraft/mod/ResourceFolderModel.h
index 90e3aac2d..ca919d3e3 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.h
+++ b/launcher/minecraft/mod/ResourceFolderModel.h
@@ -96,7 +96,7 @@ class ResourceFolderModel : public QAbstractListModel {
     /* Qt behavior */
 
     /* Basic columns */
-    enum Columns { ACTIVE_COLUMN = 0, NAME_COLUMN, DATE_COLUMN, NUM_COLUMNS };
+    enum Columns { ActiveColumn = 0, NameColumn, DateColumn, SizeColumn, NUM_COLUMNS };
     QStringList columnNames(bool translated = true) const { return translated ? m_column_names_translated : m_column_names; }
 
     [[nodiscard]] int rowCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : static_cast<int>(size()); }
@@ -143,6 +143,7 @@ class ResourceFolderModel : public QAbstractListModel {
 
    signals:
     void updateFinished();
+    void parseFinished();
 
    protected:
     /** This creates a new update task to be executed by update().
@@ -189,20 +190,18 @@ class ResourceFolderModel : public QAbstractListModel {
      *  if the resource is complex and has more stuff to parse.
      */
     virtual void onParseSucceeded(int ticket, QString resource_id);
-    virtual void onParseFailed(int ticket, QString resource_id)
-    {
-        Q_UNUSED(ticket);
-        Q_UNUSED(resource_id);
-    }
+    virtual void onParseFailed(int ticket, QString resource_id);
 
    protected:
     // Represents the relationship between a column's index (represented by the list index), and it's sorting key.
     // As such, the order in with they appear is very important!
-    QList<SortType> m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::DATE };
-    QStringList m_column_names = { "Enable", "Name", "Last Modified" };
-    QStringList m_column_names_translated = { tr("Enable"), tr("Name"), tr("Last Modified") };
-    QList<QHeaderView::ResizeMode> m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Stretch, QHeaderView::Interactive };
-    QList<bool> m_columnsHideable = { false, false, true };
+    QList<SortType> m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::DATE, SortType::SIZE };
+    QStringList m_column_names = { "Enable", "Name", "Last Modified", "Size" };
+    QStringList m_column_names_translated = { tr("Enable"), tr("Name"), tr("Last Modified"), tr("Size") };
+    QList<QHeaderView::ResizeMode> m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Stretch, QHeaderView::Interactive,
+                                                             QHeaderView::Interactive };
+    QList<bool> m_columnsHideable = { false, false, true, true };
+    QList<bool> m_columnsHiddenByDefault = { false, false, false, false };
 
     QDir m_dir;
     BaseInstance* m_instance;
diff --git a/launcher/minecraft/mod/ResourcePack.cpp b/launcher/minecraft/mod/ResourcePack.cpp
index e885a3117..81fb91485 100644
--- a/launcher/minecraft/mod/ResourcePack.cpp
+++ b/launcher/minecraft/mod/ResourcePack.cpp
@@ -103,29 +103,24 @@ std::pair<Version, Version> ResourcePack::compatibleVersions() const
     return s_pack_format_versions.constFind(m_pack_format).value();
 }
 
-std::pair<int, bool> ResourcePack::compare(const Resource& other, SortType type) const
+int ResourcePack::compare(const Resource& other, SortType type) const
 {
     auto const& cast_other = static_cast<ResourcePack const&>(other);
-
     switch (type) {
-        default: {
-            auto res = Resource::compare(other, type);
-            if (res.first != 0)
-                return res;
-            break;
-        }
+        default:
+            return Resource::compare(other, type);
         case SortType::PACK_FORMAT: {
             auto this_ver = packFormat();
             auto other_ver = cast_other.packFormat();
 
             if (this_ver > other_ver)
-                return { 1, type == SortType::PACK_FORMAT };
+                return 1;
             if (this_ver < other_ver)
-                return { -1, type == SortType::PACK_FORMAT };
+                return -1;
             break;
         }
     }
-    return { 0, false };
+    return 0;
 }
 
 bool ResourcePack::applyFilter(QRegularExpression filter) const
diff --git a/launcher/minecraft/mod/ResourcePack.h b/launcher/minecraft/mod/ResourcePack.h
index c06f3793d..2254fc5c4 100644
--- a/launcher/minecraft/mod/ResourcePack.h
+++ b/launcher/minecraft/mod/ResourcePack.h
@@ -44,7 +44,7 @@ class ResourcePack : public Resource {
 
     bool valid() const override;
 
-    [[nodiscard]] auto compare(Resource const& other, SortType type) const -> std::pair<int, bool> override;
+    [[nodiscard]] int compare(Resource const& other, SortType type) const override;
     [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
    protected:
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index 693b8af05..1aa3a2e8c 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -44,17 +44,19 @@
 #include "Application.h"
 #include "Version.h"
 
+#include "minecraft/mod/Resource.h"
 #include "minecraft/mod/tasks/BasicFolderLoadTask.h"
 #include "minecraft/mod/tasks/LocalResourcePackParseTask.h"
 
 ResourcePackFolderModel::ResourcePackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance)
 {
-    m_column_names = QStringList({ "Enable", "Image", "Name", "Pack Format", "Last Modified" });
-    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Pack Format"), tr("Last Modified") });
-    m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::PACK_FORMAT, SortType::DATE };
-    m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch, QHeaderView::Interactive,
-                              QHeaderView::Interactive };
-    m_columnsHideable = { false, true, false, true, true };
+    m_column_names = QStringList({ "Enable", "Image", "Name", "Pack Format", "Last Modified", "Size" });
+    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Pack Format"), tr("Last Modified"), tr("Size") });
+    m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::PACK_FORMAT, SortType::DATE, SortType::SIZE };
+    m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch,
+                              QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Interactive };
+    m_columnsHideable = { false, true, false, true, true, true };
+    m_columnsHiddenByDefault = { false, false, false, false, false, false };
 }
 
 QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
@@ -85,6 +87,8 @@ QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
                 }
                 case DateColumn:
                     return m_resources[row]->dateTimeChanged();
+                case SizeColumn:
+                    return m_resources[row]->sizeStr();
 
                 default:
                     return {};
@@ -144,6 +148,7 @@ QVariant ResourcePackFolderModel::headerData(int section, [[maybe_unused]] Qt::O
                 case PackFormatColumn:
                 case DateColumn:
                 case ImageColumn:
+                case SizeColumn:
                     return columnNames().at(section);
                 default:
                     return {};
@@ -160,6 +165,8 @@ QVariant ResourcePackFolderModel::headerData(int section, [[maybe_unused]] Qt::O
                     return tr("The resource pack format ID, as well as the Minecraft versions it was designed for.");
                 case DateColumn:
                     return tr("The date and time this resource pack was last changed (or added).");
+                case SizeColumn:
+                    return tr("The size of the resource pack.");
                 default:
                     return {};
             }
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.h b/launcher/minecraft/mod/ResourcePackFolderModel.h
index 29c2c5995..755b9c4c6 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.h
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.h
@@ -7,7 +7,7 @@
 class ResourcePackFolderModel : public ResourceFolderModel {
     Q_OBJECT
    public:
-    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, PackFormatColumn, DateColumn, NUM_COLUMNS };
+    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, PackFormatColumn, DateColumn, SizeColumn, NUM_COLUMNS };
 
     explicit ResourcePackFolderModel(const QString& dir, BaseInstance* instance);
 
diff --git a/launcher/minecraft/mod/ShaderPack.cpp b/launcher/minecraft/mod/ShaderPack.cpp
index 2c094f26a..ccb344cb5 100644
--- a/launcher/minecraft/mod/ShaderPack.cpp
+++ b/launcher/minecraft/mod/ShaderPack.cpp
@@ -35,8 +35,3 @@ bool ShaderPack::valid() const
 {
     return m_pack_format != ShaderPackFormat::INVALID;
 }
-
-bool ShaderPack::applyFilter(QRegularExpression filter) const
-{
-    return valid() && Resource::applyFilter(filter);
-}
diff --git a/launcher/minecraft/mod/ShaderPack.h b/launcher/minecraft/mod/ShaderPack.h
index d07c124be..ec0f9404e 100644
--- a/launcher/minecraft/mod/ShaderPack.h
+++ b/launcher/minecraft/mod/ShaderPack.h
@@ -54,7 +54,6 @@ class ShaderPack : public Resource {
     void setPackFormat(ShaderPackFormat new_format);
 
     bool valid() const override;
-    [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
    protected:
     mutable QMutex m_data_lock;
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index f210501c7..48e940e9b 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.cpp
+++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp
@@ -44,11 +44,12 @@
 
 TexturePackFolderModel::TexturePackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance)
 {
-    m_column_names = QStringList({ "Enable", "Image", "Name", "Last Modified" });
-    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Last Modified") });
-    m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::DATE };
-    m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch, QHeaderView::Interactive };
-    m_columnsHideable = { false, true, false, true };
+    m_column_names = QStringList({ "Enable", "Image", "Name", "Last Modified", "Size" });
+    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Last Modified"), tr("Size") });
+    m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::DATE, SortType::SIZE };
+    m_column_resize_modes = { QHeaderView::Interactive, QHeaderView::Interactive, QHeaderView::Stretch, QHeaderView::Interactive,
+                              QHeaderView::Interactive };
+    m_columnsHideable = { false, true, false, true, true };
 }
 
 Task* TexturePackFolderModel::createUpdateTask()
@@ -76,6 +77,8 @@ QVariant TexturePackFolderModel::data(const QModelIndex& index, int role) const
                     return m_resources[row]->name();
                 case DateColumn:
                     return m_resources[row]->dateTimeChanged();
+                case SizeColumn:
+                    return m_resources[row]->sizeStr();
                 default:
                     return {};
             }
@@ -127,6 +130,7 @@ QVariant TexturePackFolderModel::headerData(int section, [[maybe_unused]] Qt::Or
                 case NameColumn:
                 case DateColumn:
                 case ImageColumn:
+                case SizeColumn:
                     return columnNames().at(section);
                 default:
                     return {};
@@ -135,13 +139,15 @@ QVariant TexturePackFolderModel::headerData(int section, [[maybe_unused]] Qt::Or
             switch (section) {
                 case ActiveColumn:
                     //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
-                    return tr("Is the resource enabled?");
+                    return tr("Is the texture pack enabled?");
                 case NameColumn:
                     //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
-                    return tr("The name of the resource.");
+                    return tr("The name of the texture pack.");
                 case DateColumn:
                     //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
-                    return tr("The date and time this resource was last changed (or added).");
+                    return tr("The date and time this texture pack was last changed (or added).");
+                case SizeColumn:
+                    return tr("The size of the texture pack.");
                 default:
                     return {};
             }
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.h b/launcher/minecraft/mod/TexturePackFolderModel.h
index b975d8641..de90f879f 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.h
+++ b/launcher/minecraft/mod/TexturePackFolderModel.h
@@ -44,7 +44,7 @@ class TexturePackFolderModel : public ResourceFolderModel {
     Q_OBJECT
 
    public:
-    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, DateColumn, NUM_COLUMNS };
+    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, DateColumn, SizeColumn, NUM_COLUMNS };
 
     explicit TexturePackFolderModel(const QString& dir, std::shared_ptr<const BaseInstance> instance);
 
diff --git a/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h b/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
index 23a2b649a..2bce2c137 100644
--- a/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "FileSystem.h"
 #include "minecraft/mod/Resource.h"
 
 #include "tasks/Task.h"
@@ -50,6 +51,12 @@ class BasicFolderLoadTask : public Task {
 
         m_dir.refresh();
         for (auto entry : m_dir.entryInfoList()) {
+            auto filePath = entry.absoluteFilePath();
+            auto newFilePath = FS::getUniqueResourceName(filePath);
+            if (newFilePath != filePath) {
+                FS::move(filePath, newFilePath);
+                entry = QFileInfo(newFilePath);
+            }
             auto resource = m_create_func(entry);
             resource->moveToThread(m_thread_to_spawn_into);
             m_result->resources.insert(resource->internal_id(), resource);
diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
index 5aef4e585..b9288d2b3 100644
--- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
+++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
@@ -23,12 +23,12 @@
 #include <memory>
 #include "Json.h"
 #include "QObjectPtr.h"
+#include "minecraft/PackProfile.h"
 #include "minecraft/mod/MetadataHandler.h"
 #include "modplatform/ModIndex.h"
 #include "modplatform/ResourceAPI.h"
 #include "modplatform/flame/FlameAPI.h"
 #include "modplatform/modrinth/ModrinthAPI.h"
-#include "tasks/ConcurrentTask.h"
 #include "tasks/SequentialTask.h"
 #include "ui/pages/modplatform/ModModel.h"
 #include "ui/pages/modplatform/flame/FlameResourceModels.h"
@@ -44,6 +44,14 @@ static ModPlatform::ModLoaderTypes mcLoaders(BaseInstance* inst)
     return static_cast<MinecraftInstance*>(inst)->getPackProfile()->getSupportedModLoaders().value();
 }
 
+static bool checkDependencies(std::shared_ptr<GetModDependenciesTask::PackDependency> sel,
+                              Version mcVersion,
+                              ModPlatform::ModLoaderTypes loaders)
+{
+    return (sel->pack->versions.isEmpty() || sel->version.mcVersion.contains(mcVersion.toString())) &&
+           (!loaders || !sel->version.loaders || sel->version.loaders & loaders);
+}
+
 GetModDependenciesTask::GetModDependenciesTask(QObject* parent,
                                                BaseInstance* instance,
                                                ModFolderModel* folder,
@@ -57,18 +65,21 @@ GetModDependenciesTask::GetModDependenciesTask(QObject* parent,
     , m_version(mcVersion(instance))
     , m_loaderType(mcLoaders(instance))
 {
-    for (auto mod : folder->allMods())
+    for (auto mod : folder->allMods()) {
+        m_mods_file_names << mod->fileinfo().fileName();
         if (auto meta = mod->metadata(); meta)
             m_mods.append(meta);
+    }
     prepare();
 }
 
 void GetModDependenciesTask::prepare()
 {
     for (auto sel : m_selected) {
-        for (auto dep : getDependenciesForVersion(sel->version, sel->pack->provider)) {
-            addTask(prepareDependencyTask(dep, sel->pack->provider, 20));
-        }
+        if (checkDependencies(sel, m_version, m_loaderType))
+            for (auto dep : getDependenciesForVersion(sel->version, sel->pack->provider)) {
+                addTask(prepareDependencyTask(dep, sel->pack->provider, 20));
+            }
     }
 }
 
@@ -231,8 +242,13 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
             if (dep_.addonId != pDep->version.addonId) {
                 removePack(pDep->version.addonId);
                 addTask(prepareDependencyTask(dep_, provider.name, level));
-            } else
+            } else {
                 addTask(getProjectInfoTask(pDep));
+            }
+        }
+        if (isLocalyInstalled(pDep)) {
+            removePack(pDep->version.addonId);
+            return;
         }
         for (auto dep_ : getDependenciesForVersion(pDep->version, provider.name)) {
             addTask(prepareDependencyTask(dep_, provider.name, level - 1));
@@ -258,9 +274,9 @@ void GetModDependenciesTask::removePack(const QVariant& addonId)
 #endif
 }
 
-QHash<QString, QStringList> GetModDependenciesTask::getRequiredBy()
+auto GetModDependenciesTask::getExtraInfo() -> QHash<QString, PackDependencyExtraInfo>
 {
-    QHash<QString, QStringList> rby;
+    QHash<QString, PackDependencyExtraInfo> rby;
     auto fullList = m_selected + m_pack_dependencies;
     for (auto& mod : fullList) {
         auto addonId = mod->pack->addonId;
@@ -282,7 +298,61 @@ QHash<QString, QStringList> GetModDependenciesTask::getRequiredBy()
                 req.append(smod->pack->name);
             }
         }
-        rby[addonId.toString()] = req;
+        rby[addonId.toString()] = { maybeInstalled(mod), req };
     }
     return rby;
 }
+
+// super lax compare (but not fuzzy)
+// convert to lowercase
+// convert all speratores to whitespace
+// simplify sequence of internal whitespace to a single space
+// efectivly compare two strings ignoring all separators and case
+auto laxCompare = [](QString fsfilename, QString metadataFilename, bool excludeDigits = false) {
+    // allowed character seperators
+    QList<QChar> allowedSeperators = { '-', '+', '.', '_' };
+    if (excludeDigits)
+        allowedSeperators.append({ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' });
+
+    // copy in lowercase
+    auto fsName = fsfilename.toLower();
+    auto metaName = metadataFilename.toLower();
+
+    // replace all potential allowed seperatores with whitespace
+    for (auto sep : allowedSeperators) {
+        fsName = fsName.replace(sep, ' ');
+        metaName = metaName.replace(sep, ' ');
+    }
+
+    // remove extraneous whitespace
+    fsName = fsName.simplified();
+    metaName = metaName.simplified();
+
+    return fsName.compare(metaName) == 0;
+};
+
+bool GetModDependenciesTask::isLocalyInstalled(std::shared_ptr<PackDependency> pDep)
+{
+    return pDep->version.fileName.isEmpty() ||
+
+           std::find_if(m_selected.begin(), m_selected.end(),
+                        [pDep](std::shared_ptr<PackDependency> i) {
+                            return !i->version.fileName.isEmpty() && laxCompare(i->version.fileName, pDep->version.fileName);
+                        }) != m_selected.end() ||  // check the selected versions
+
+           std::find_if(m_mods_file_names.begin(), m_mods_file_names.end(),
+                        [pDep](QString i) { return !i.isEmpty() && laxCompare(i, pDep->version.fileName); }) !=
+               m_mods_file_names.end() ||  // check the existing mods
+
+           std::find_if(m_pack_dependencies.begin(), m_pack_dependencies.end(), [pDep](std::shared_ptr<PackDependency> i) {
+               return pDep->pack->addonId != i->pack->addonId && !i->version.fileName.isEmpty() &&
+                      laxCompare(pDep->version.fileName, i->version.fileName);
+           }) != m_pack_dependencies.end();  // check loaded dependencies
+}
+
+bool GetModDependenciesTask::maybeInstalled(std::shared_ptr<PackDependency> pDep)
+{
+    return std::find_if(m_mods_file_names.begin(), m_mods_file_names.end(), [pDep](QString i) {
+               return !i.isEmpty() && laxCompare(i, pDep->version.fileName, true);
+           }) != m_mods_file_names.end();  // check the existing mods
+}
diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.h b/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
index e88204bdc..7202b01e0 100644
--- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
+++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
@@ -50,6 +50,11 @@ class GetModDependenciesTask : public SequentialTask {
         }
     };
 
+    struct PackDependencyExtraInfo {
+        bool maybe_installed;
+        QStringList required_by;
+    };
+
     struct Provider {
         ModPlatform::ResourceProvider name;
         std::shared_ptr<ResourceDownload::ModModel> mod;
@@ -62,7 +67,7 @@ class GetModDependenciesTask : public SequentialTask {
                                     QList<std::shared_ptr<PackDependency>> selected);
 
     auto getDependecies() const -> QList<std::shared_ptr<PackDependency>> { return m_pack_dependencies; }
-    QHash<QString, QStringList> getRequiredBy();
+    QHash<QString, PackDependencyExtraInfo> getExtraInfo();
 
    protected slots:
     Task::Ptr prepareDependencyTask(const ModPlatform::Dependency&, ModPlatform::ResourceProvider, int);
@@ -73,10 +78,14 @@ class GetModDependenciesTask : public SequentialTask {
     ModPlatform::Dependency getOverride(const ModPlatform::Dependency&, ModPlatform::ResourceProvider providerName);
     void removePack(const QVariant& addonId);
 
+    bool isLocalyInstalled(std::shared_ptr<PackDependency> pDep);
+    bool maybeInstalled(std::shared_ptr<PackDependency> pDep);
+
    private:
     QList<std::shared_ptr<PackDependency>> m_pack_dependencies;
     QList<std::shared_ptr<Metadata::ModStruct>> m_mods;
     QList<std::shared_ptr<PackDependency>> m_selected;
+    QStringList m_mods_file_names;
     Provider m_flame_provider;
     Provider m_modrinth_provider;
 
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index 3982f3338..d456211f8 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -647,11 +647,11 @@ bool validate(QFileInfo file)
     return ModUtils::process(mod, ProcessingLevel::BasicInfoOnly) && mod.valid();
 }
 
-bool processIconPNG(const Mod& mod, QByteArray&& raw_data)
+bool processIconPNG(const Mod& mod, QByteArray&& raw_data, QPixmap* pixmap)
 {
     auto img = QImage::fromData(raw_data);
     if (!img.isNull()) {
-        mod.setIcon(img);
+        *pixmap = mod.setIcon(img);
     } else {
         qWarning() << "Failed to parse mod logo:" << mod.iconPath() << "from" << mod.name();
         return false;
@@ -659,15 +659,15 @@ bool processIconPNG(const Mod& mod, QByteArray&& raw_data)
     return true;
 }
 
-bool loadIconFile(const Mod& mod)
+bool loadIconFile(const Mod& mod, QPixmap* pixmap)
 {
     if (mod.iconPath().isEmpty()) {
         qWarning() << "No Iconfile set, be sure to parse the mod first";
         return false;
     }
 
-    auto png_invalid = [&mod]() {
-        qWarning() << "Mod at" << mod.fileinfo().filePath() << "does not have a valid icon";
+    auto png_invalid = [&mod](const QString& reason) {
+        qWarning() << "Mod at" << mod.fileinfo().filePath() << "does not have a valid icon:" << reason;
         return false;
     };
 
@@ -676,24 +676,26 @@ bool loadIconFile(const Mod& mod)
             QFileInfo icon_info(FS::PathCombine(mod.fileinfo().filePath(), mod.iconPath()));
             if (icon_info.exists() && icon_info.isFile()) {
                 QFile icon(icon_info.filePath());
-                if (!icon.open(QIODevice::ReadOnly))
-                    return false;
+                if (!icon.open(QIODevice::ReadOnly)) {
+                    return png_invalid("failed  to open file " + icon_info.filePath());
+                }
                 auto data = icon.readAll();
 
-                bool icon_result = ModUtils::processIconPNG(mod, std::move(data));
+                bool icon_result = ModUtils::processIconPNG(mod, std::move(data), pixmap);
 
                 icon.close();
 
                 if (!icon_result) {
-                    return png_invalid();  // icon invalid
+                    return png_invalid("invalid png image");  // icon invalid
                 }
+                return true;
             }
-            return false;
+            return png_invalid("file '" + icon_info.filePath() + "' does not exists or is not a file");
         }
         case ResourceType::ZIPFILE: {
             QuaZip zip(mod.fileinfo().filePath());
             if (!zip.open(QuaZip::mdUnzip))
-                return false;
+                return png_invalid("failed to open '" + mod.fileinfo().filePath() + "' as a zip archive");
 
             QuaZipFile file(&zip);
 
@@ -701,28 +703,27 @@ bool loadIconFile(const Mod& mod)
                 if (!file.open(QIODevice::ReadOnly)) {
                     qCritical() << "Failed to open file in zip.";
                     zip.close();
-                    return png_invalid();
+                    return png_invalid("Failed to open '" + mod.iconPath() + "' in zip archive");
                 }
 
                 auto data = file.readAll();
 
-                bool icon_result = ModUtils::processIconPNG(mod, std::move(data));
+                bool icon_result = ModUtils::processIconPNG(mod, std::move(data), pixmap);
 
                 file.close();
                 if (!icon_result) {
-                    return png_invalid();  // icon png invalid
+                    return png_invalid("invalid png image");  // icon png invalid
                 }
-            } else {
-                return png_invalid();  // could not set icon as current file.
+                return true;
             }
-            return false;
+            return png_invalid("Failed to set '" + mod.iconPath() +
+                               "' as current file in zip archive");  // could not set icon as current file.
         }
         case ResourceType::LITEMOD: {
-            return false;  // can lightmods even have icons?
+            return png_invalid("litemods do not have icons");  // can lightmods even have icons?
         }
         default:
-            qWarning() << "Invalid type for mod, can not load icon.";
-            return false;
+            return png_invalid("Invalid type for mod, can not load icon.");
     }
 }
 
@@ -746,7 +747,7 @@ void LocalModParseTask::executeTask()
     m_result->details = mod.details();
 
     if (m_aborted)
-        emit finished();
+        emitAborted();
     else
         emitSucceeded();
 }
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.h b/launcher/minecraft/mod/tasks/LocalModParseTask.h
index a03217093..91ee6f253 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.h
@@ -26,8 +26,8 @@ bool processLitemod(Mod& mod, ProcessingLevel level = ProcessingLevel::Full);
 /** Checks whether a file is valid as a mod or not. */
 bool validate(QFileInfo file);
 
-bool processIconPNG(const Mod& mod, QByteArray&& raw_data);
-bool loadIconFile(const Mod& mod);
+bool processIconPNG(const Mod& mod, QByteArray&& raw_data, QPixmap* pixmap);
+bool loadIconFile(const Mod& mod, QPixmap* pixmap);
 }  // namespace ModUtils
 
 class LocalModParseTask : public Task {
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.h b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
index 080999294..5447083ba 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
@@ -42,6 +42,6 @@ class LocalModUpdateTask : public Task {
 
    private:
     QDir m_index_dir;
-    ModPlatform::IndexedPack& m_mod;
-    ModPlatform::IndexedVersion& m_mod_version;
+    ModPlatform::IndexedPack m_mod;
+    ModPlatform::IndexedVersion m_mod_version;
 };
diff --git a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
index 26bc07637..27fbf3c6d 100644
--- a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
@@ -178,6 +178,88 @@ bool processZIP(ResourcePack& pack, ProcessingLevel level)
     return true;
 }
 
+QString buildStyle(const QJsonObject& obj)
+{
+    QStringList styles;
+    if (auto color = Json::ensureString(obj, "color"); !color.isEmpty()) {
+        styles << QString("color: %1;").arg(color);
+    }
+    if (obj.contains("bold")) {
+        QString weight = "normal";
+        if (Json::ensureBoolean(obj, "bold", false)) {
+            weight = "bold";
+        }
+        styles << QString("font-weight: %1;").arg(weight);
+    }
+    if (obj.contains("italic")) {
+        QString style = "normal";
+        if (Json::ensureBoolean(obj, "italic", false)) {
+            style = "italic";
+        }
+        styles << QString("font-style: %1;").arg(style);
+    }
+
+    return styles.isEmpty() ? "" : QString("style=\"%1\"").arg(styles.join(" "));
+}
+
+QString processComponent(const QJsonArray& value, bool strikethrough, bool underline)
+{
+    QString result;
+    for (auto current : value)
+        result += processComponent(current, strikethrough, underline);
+    return result;
+}
+
+QString processComponent(const QJsonObject& obj, bool strikethrough, bool underline)
+{
+    underline = Json::ensureBoolean(obj, "underlined", underline);
+    strikethrough = Json::ensureBoolean(obj, "strikethrough", strikethrough);
+
+    QString result = Json::ensureString(obj, "text");
+    if (underline) {
+        result = QString("<u>%1</u>").arg(result);
+    }
+    if (strikethrough) {
+        result = QString("<s>%1</s>").arg(result);
+    }
+    // the extra needs to be a array
+    result += processComponent(Json::ensureArray(obj, "extra"), strikethrough, underline);
+    if (auto style = buildStyle(obj); !style.isEmpty()) {
+        result = QString("<span %1>%2</span>").arg(style, result);
+    }
+    if (obj.contains("clickEvent")) {
+        auto click_event = Json::ensureObject(obj, "clickEvent");
+        auto action = Json::ensureString(click_event, "action");
+        auto value = Json::ensureString(click_event, "value");
+        if (action == "open_url" && !value.isEmpty()) {
+            result = QString("<a href=\"%1\">%2</a>").arg(value, result);
+        }
+    }
+    return result;
+}
+
+QString processComponent(const QJsonValue& value, bool strikethrough, bool underline)
+{
+    if (value.isString()) {
+        return value.toString();
+    }
+    if (value.isBool()) {
+        return value.toBool() ? "true" : "false";
+    }
+    if (value.isDouble()) {
+        return QString::number(value.toDouble());
+    }
+    if (value.isArray()) {
+        return processComponent(value.toArray(), strikethrough, underline);
+    }
+    if (value.isObject()) {
+        return processComponent(value.toObject(), strikethrough, underline);
+    }
+    qWarning() << "Invalid component type!";
+    return {};
+}
+
+// https://minecraft.wiki/w/Raw_JSON_text_format
 // https://minecraft.wiki/w/Tutorials/Creating_a_resource_pack#Formatting_pack.mcmeta
 bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data)
 {
@@ -186,7 +268,9 @@ bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data)
         auto pack_obj = Json::requireObject(json_doc.object(), "pack", {});
 
         pack.setPackFormat(Json::ensureInteger(pack_obj, "pack_format", 0));
-        pack.setDescription(Json::ensureString(pack_obj, "description", ""));
+
+        pack.setDescription(processComponent(pack_obj.value("description")));
+
     } catch (Json::JsonException& e) {
         qWarning() << "JsonException: " << e.what() << e.cause();
         return false;
@@ -286,8 +370,10 @@ bool LocalResourcePackParseTask::abort()
 
 void LocalResourcePackParseTask::executeTask()
 {
-    if (!ResourcePackUtils::process(m_resource_pack))
+    if (!ResourcePackUtils::process(m_resource_pack)) {
+        emitFailed("this is not a resource pack");
         return;
+    }
 
     if (m_aborted)
         emitAborted();
diff --git a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h
index 5199bf3f0..97bf7b2ba 100644
--- a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h
+++ b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h
@@ -34,6 +34,7 @@ bool process(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
 bool processZIP(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
 bool processFolder(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
 
+QString processComponent(const QJsonValue& value, bool strikethrough = false, bool underline = false);
 bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data);
 bool processPackPNG(const ResourcePack& pack, QByteArray&& raw_data);
 
diff --git a/launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp
index a9949735b..4deebcd1d 100644
--- a/launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp
@@ -103,8 +103,10 @@ bool LocalShaderPackParseTask::abort()
 
 void LocalShaderPackParseTask::executeTask()
 {
-    if (!ShaderPackUtils::process(m_shader_pack))
+    if (!ShaderPackUtils::process(m_shader_pack)) {
+        emitFailed("this is not a shader pack");
         return;
+    }
 
     if (m_aborted)
         emitAborted();
diff --git a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
index d7e61ca90..00cc2def2 100644
--- a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
@@ -241,8 +241,10 @@ bool LocalTexturePackParseTask::abort()
 
 void LocalTexturePackParseTask::executeTask()
 {
-    if (!TexturePackUtils::process(m_texture_pack))
+    if (!TexturePackUtils::process(m_texture_pack)) {
+        emitFailed("this is not a texture pack");
         return;
+    }
 
     if (m_aborted)
         emitAborted();
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 2094df4fc..501d5be13 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -36,6 +36,7 @@
 
 #include "ModFolderLoadTask.h"
 
+#include "FileSystem.h"
 #include "minecraft/mod/MetadataHandler.h"
 
 #include <QThread>
@@ -63,6 +64,12 @@ void ModFolderLoadTask::executeTask()
     // Read JAR files that don't have metadata
     m_mods_dir.refresh();
     for (auto entry : m_mods_dir.entryInfoList()) {
+        auto filePath = entry.absoluteFilePath();
+        auto newFilePath = FS::getUniqueResourceName(filePath);
+        if (newFilePath != filePath) {
+            FS::move(filePath, newFilePath);
+            entry = QFileInfo(newFilePath);
+        }
         Mod* mod(new Mod(entry));
 
         if (mod->enabled()) {
diff --git a/launcher/minecraft/services/CapeChange.cpp b/launcher/minecraft/services/CapeChange.cpp
deleted file mode 100644
index 63a1cf05e..000000000
--- a/launcher/minecraft/services/CapeChange.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#include "CapeChange.h"
-
-#include <QHttpMultiPart>
-#include <QNetworkRequest>
-
-#include "Application.h"
-
-CapeChange::CapeChange(QObject* parent, MinecraftAccountPtr account, QString cape) : Task(parent), m_capeId(cape), m_account(account) {}
-
-void CapeChange::setCape([[maybe_unused]] QString& cape)
-{
-    QNetworkRequest request(QUrl(m_account->servicesServerUrl() + "/minecraft/profile/capes/active"));
-    QString token = m_account->accessToken();
-    auto requestString = QString("{\"capeId\":\"%1\"}").arg(m_capeId);
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toLocal8Bit());
-    QNetworkReply* rep = APPLICATION->network()->put(request, requestString.toUtf8());
-
-    setStatus(tr("Equipping cape"));
-
-    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
-    connect(rep, &QNetworkReply::uploadProgress, this, &CapeChange::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &CapeChange::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &CapeChange::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &CapeChange::sslErrors);
-    connect(rep, &QNetworkReply::finished, this, &CapeChange::downloadFinished);
-}
-
-void CapeChange::clearCape()
-{
-    QNetworkRequest request(QUrl(m_account->servicesServerUrl() + "/minecraft/profile/capes/active"));
-    QString token = m_account->accessToken();
-    auto requestString = QString("{\"capeId\":\"%1\"}").arg(m_capeId);
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toLocal8Bit());
-    QNetworkReply* rep = APPLICATION->network()->deleteResource(request);
-
-    setStatus(tr("Removing cape"));
-
-    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
-    connect(rep, &QNetworkReply::uploadProgress, this, &CapeChange::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &CapeChange::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &CapeChange::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &CapeChange::sslErrors);
-    connect(rep, &QNetworkReply::finished, this, &CapeChange::downloadFinished);
-}
-
-void CapeChange::executeTask()
-{
-    if (m_capeId.isEmpty()) {
-        clearCape();
-    } else {
-        setCape(m_capeId);
-    }
-}
-
-void CapeChange::downloadError(QNetworkReply::NetworkError error)
-{
-    // error happened during download.
-    qCritical() << "Network error: " << error;
-    emitFailed(m_reply->errorString());
-}
-
-void CapeChange::sslErrors(const QList<QSslError>& errors)
-{
-    int i = 1;
-    for (auto error : errors) {
-        qCritical() << "Cape change SSL Error #" << i << " : " << error.errorString();
-        auto cert = error.certificate();
-        qCritical() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-void CapeChange::downloadFinished()
-{
-    // if the download failed
-    if (m_reply->error() != QNetworkReply::NetworkError::NoError) {
-        emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
-        m_reply.reset();
-        return;
-    }
-    emitSucceeded();
-}
diff --git a/launcher/minecraft/services/CapeChange.h b/launcher/minecraft/services/CapeChange.h
deleted file mode 100644
index 6543e9bf0..000000000
--- a/launcher/minecraft/services/CapeChange.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <minecraft/auth/MinecraftAccount.h>
-#include <QFile>
-#include <QtNetwork/QtNetwork>
-#include <memory>
-#include "QObjectPtr.h"
-#include "tasks/Task.h"
-
-class CapeChange : public Task {
-    Q_OBJECT
-   public:
-    CapeChange(QObject* parent, MinecraftAccountPtr m_account, QString capeId);
-    virtual ~CapeChange() {}
-
-   private:
-    void setCape(QString& cape);
-    void clearCape();
-
-   private:
-    QString m_capeId;
-    MinecraftAccountPtr m_account;
-    shared_qobject_ptr<QNetworkReply> m_reply;
-
-   protected:
-    virtual void executeTask();
-
-   public slots:
-    void downloadError(QNetworkReply::NetworkError);
-    void sslErrors(const QList<QSslError>& errors);
-    void downloadFinished();
-};
diff --git a/launcher/minecraft/services/SkinDelete.cpp b/launcher/minecraft/services/SkinDelete.cpp
deleted file mode 100644
index fcaf3703c..000000000
--- a/launcher/minecraft/services/SkinDelete.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#include "SkinDelete.h"
-
-#include <QHttpMultiPart>
-#include <QNetworkRequest>
-
-#include "Application.h"
-
-SkinDelete::SkinDelete(QObject* parent, MinecraftAccountPtr account) : Task(parent), m_account(account) {}
-
-void SkinDelete::executeTask()
-{
-    QNetworkRequest request(QUrl(m_account->servicesServerUrl() + "/minecraft/profile/skins/active"));
-    QString token = m_account->accessToken();
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toLocal8Bit());
-    QNetworkReply* rep = APPLICATION->network()->deleteResource(request);
-    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
-
-    setStatus(tr("Deleting skin"));
-    connect(rep, &QNetworkReply::uploadProgress, this, &SkinDelete::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &SkinDelete::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &SkinDelete::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &SkinDelete::sslErrors);
-    connect(rep, &QNetworkReply::finished, this, &SkinDelete::downloadFinished);
-}
-
-void SkinDelete::downloadError(QNetworkReply::NetworkError error)
-{
-    // error happened during download.
-    qCritical() << "Network error: " << error;
-    emitFailed(m_reply->errorString());
-}
-
-void SkinDelete::sslErrors(const QList<QSslError>& errors)
-{
-    int i = 1;
-    for (auto error : errors) {
-        qCritical() << "Skin Delete SSL Error #" << i << " : " << error.errorString();
-        auto cert = error.certificate();
-        qCritical() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-void SkinDelete::downloadFinished()
-{
-    // if the download failed
-    if (m_reply->error() != QNetworkReply::NetworkError::NoError) {
-        emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
-        m_reply.reset();
-        return;
-    }
-    emitSucceeded();
-}
diff --git a/launcher/minecraft/services/SkinDelete.h b/launcher/minecraft/services/SkinDelete.h
deleted file mode 100644
index 40664a645..000000000
--- a/launcher/minecraft/services/SkinDelete.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <minecraft/auth/MinecraftAccount.h>
-#include <QFile>
-#include <QtNetwork/QtNetwork>
-#include "tasks/Task.h"
-
-using SkinDeletePtr = shared_qobject_ptr<class SkinDelete>;
-
-class SkinDelete : public Task {
-    Q_OBJECT
-   public:
-    SkinDelete(QObject* parent, MinecraftAccountPtr acct);
-    virtual ~SkinDelete() = default;
-
-   private:
-    MinecraftAccountPtr m_account;
-    shared_qobject_ptr<QNetworkReply> m_reply;
-
-   protected:
-    virtual void executeTask();
-
-   public slots:
-    void downloadError(QNetworkReply::NetworkError);
-    void sslErrors(const QList<QSslError>& errors);
-    void downloadFinished();
-};
diff --git a/launcher/minecraft/services/SkinUpload.cpp b/launcher/minecraft/services/SkinUpload.cpp
deleted file mode 100644
index 7bedfc0c2..000000000
--- a/launcher/minecraft/services/SkinUpload.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#include "SkinUpload.h"
-
-#include <QHttpMultiPart>
-#include <QNetworkRequest>
-
-#include "Application.h"
-
-QByteArray getVariant(SkinUpload::Model model)
-{
-    switch (model) {
-        default:
-            qDebug() << "Unknown skin type!";
-        case SkinUpload::STEVE:
-            return "CLASSIC";
-        case SkinUpload::ALEX:
-            return "SLIM";
-    }
-}
-
-SkinUpload::SkinUpload(QObject* parent, MinecraftAccountPtr account, QByteArray skin, SkinUpload::Model model)
-    : Task(parent), m_model(model), m_skin(skin), m_account(account)
-{}
-
-void SkinUpload::executeTask()
-{
-    QNetworkRequest request(QUrl(m_account->servicesServerUrl() + "/minecraft/profile/skins"));
-    QString token = m_account->accessToken();
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toLocal8Bit());
-    QHttpMultiPart* multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
-
-    QHttpPart skin;
-    skin.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/png"));
-    skin.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"file\"; filename=\"skin.png\""));
-    skin.setBody(m_skin);
-
-    QHttpPart model;
-    model.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"variant\""));
-    model.setBody(getVariant(m_model));
-
-    multiPart->append(skin);
-    multiPart->append(model);
-
-    QNetworkReply* rep = APPLICATION->network()->post(request, multiPart);
-    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
-
-    setStatus(tr("Uploading skin"));
-    connect(rep, &QNetworkReply::uploadProgress, this, &SkinUpload::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &SkinUpload::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &SkinUpload::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &SkinUpload::sslErrors);
-    connect(rep, &QNetworkReply::finished, this, &SkinUpload::downloadFinished);
-}
-
-void SkinUpload::downloadError(QNetworkReply::NetworkError error)
-{
-    // error happened during download.
-    qCritical() << "Network error: " << error;
-    emitFailed(m_reply->errorString());
-}
-
-void SkinUpload::sslErrors(const QList<QSslError>& errors)
-{
-    int i = 1;
-    for (auto error : errors) {
-        qCritical() << "Skin Upload SSL Error #" << i << " : " << error.errorString();
-        auto cert = error.certificate();
-        qCritical() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-void SkinUpload::downloadFinished()
-{
-    // if the download failed
-    if (m_reply->error() != QNetworkReply::NetworkError::NoError) {
-        emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
-        m_reply.reset();
-        return;
-    }
-    emitSucceeded();
-}
diff --git a/launcher/minecraft/services/SkinUpload.h b/launcher/minecraft/services/SkinUpload.h
deleted file mode 100644
index 75f1551bb..000000000
--- a/launcher/minecraft/services/SkinUpload.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <minecraft/auth/MinecraftAccount.h>
-#include <QFile>
-#include <QtNetwork/QtNetwork>
-#include <memory>
-#include "tasks/Task.h"
-
-using SkinUploadPtr = shared_qobject_ptr<class SkinUpload>;
-
-class SkinUpload : public Task {
-    Q_OBJECT
-   public:
-    enum Model { STEVE, ALEX };
-
-    // Note this class takes ownership of the file.
-    SkinUpload(QObject* parent, MinecraftAccountPtr account, QByteArray skin, Model model = STEVE);
-    virtual ~SkinUpload() {}
-
-   private:
-    Model m_model;
-    QByteArray m_skin;
-    MinecraftAccountPtr m_account;
-    shared_qobject_ptr<QNetworkReply> m_reply;
-
-   protected:
-    virtual void executeTask();
-
-   public slots:
-
-    void downloadError(QNetworkReply::NetworkError);
-    void sslErrors(const QList<QSslError>& errors);
-
-    void downloadFinished();
-};
diff --git a/launcher/minecraft/skins/CapeChange.cpp b/launcher/minecraft/skins/CapeChange.cpp
new file mode 100644
index 000000000..c8788e3bd
--- /dev/null
+++ b/launcher/minecraft/skins/CapeChange.cpp
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include "CapeChange.h"
+
+#include <memory>
+
+#include "net/ByteArraySink.h"
+#include "net/RawHeaderProxy.h"
+
+CapeChange::CapeChange(QString cape) : NetRequest(), m_capeId(cape)
+{
+    logCat = taskMCSkinsLogC;
+}
+
+QNetworkReply* CapeChange::getReply(QNetworkRequest& request)
+{
+    if (m_capeId.isEmpty()) {
+        setStatus(tr("Removing cape"));
+        return m_network->deleteResource(request);
+    } else {
+        setStatus(tr("Equipping cape"));
+        return m_network->put(request, QString("{\"capeId\":\"%1\"}").arg(m_capeId).toUtf8());
+    }
+}
+
+CapeChange::Ptr CapeChange::make(MinecraftAccountPtr account, QString capeId)
+{
+    auto up = makeShared<CapeChange>(capeId);
+    QString token = account->accessToken();
+    up->m_url = QUrl(account->servicesServerUrl() + "/minecraft/profile/capes/active");
+    up->setObjectName(QString("BYTES:") + up->m_url.toString());
+    up->m_sink.reset(new Net::ByteArraySink(std::make_shared<QByteArray>()));
+    up->addHeaderProxy(new Net::RawHeaderProxy(QList<Net::HeaderPair>{
+        { "Authorization", QString("Bearer %1").arg(token).toLocal8Bit() },
+    }));
+    return up;
+}
diff --git a/launcher/minecraft/skins/CapeChange.h b/launcher/minecraft/skins/CapeChange.h
new file mode 100644
index 000000000..95b6a5572
--- /dev/null
+++ b/launcher/minecraft/skins/CapeChange.h
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <minecraft/auth/MinecraftAccount.h>
+#include "net/NetRequest.h"
+
+class CapeChange : public Net::NetRequest {
+    Q_OBJECT
+   public:
+    using Ptr = shared_qobject_ptr<CapeChange>;
+    CapeChange(QString capeId);
+    virtual ~CapeChange() = default;
+
+    static CapeChange::Ptr make(MinecraftAccountPtr account, QString capeId);
+
+   protected:
+    virtual QNetworkReply* getReply(QNetworkRequest&) override;
+
+   private:
+    QString m_capeId;
+};
diff --git a/launcher/minecraft/skins/SkinDelete.cpp b/launcher/minecraft/skins/SkinDelete.cpp
new file mode 100644
index 000000000..42822a9df
--- /dev/null
+++ b/launcher/minecraft/skins/SkinDelete.cpp
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include "SkinDelete.h"
+
+#include "net/ByteArraySink.h"
+#include "net/RawHeaderProxy.h"
+
+SkinDelete::SkinDelete() : NetRequest()
+{
+    logCat = taskMCSkinsLogC;
+}
+
+QNetworkReply* SkinDelete::getReply(QNetworkRequest& request)
+{
+    setStatus(tr("Deleting skin"));
+    return m_network->deleteResource(request);
+}
+
+SkinDelete::Ptr SkinDelete::make(MinecraftAccountPtr account)
+{
+    auto up = makeShared<SkinDelete>();
+    QString token = account->accessToken();
+    up->m_url = QUrl(account->servicesServerUrl() + "/minecraft/profile/skins/active");
+    up->m_sink.reset(new Net::ByteArraySink(std::make_shared<QByteArray>()));
+    up->addHeaderProxy(new Net::RawHeaderProxy(QList<Net::HeaderPair>{
+        { "Authorization", QString("Bearer %1").arg(token).toLocal8Bit() },
+    }));
+    return up;
+}
diff --git a/launcher/minecraft/skins/SkinDelete.h b/launcher/minecraft/skins/SkinDelete.h
new file mode 100644
index 000000000..ccbc69d6e
--- /dev/null
+++ b/launcher/minecraft/skins/SkinDelete.h
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <minecraft/auth/MinecraftAccount.h>
+#include "net/NetRequest.h"
+
+class SkinDelete : public Net::NetRequest {
+    Q_OBJECT
+   public:
+    using Ptr = shared_qobject_ptr<SkinDelete>;
+    SkinDelete();
+    virtual ~SkinDelete() = default;
+
+    static SkinDelete::Ptr make(MinecraftAccountPtr account);
+
+   protected:
+    virtual QNetworkReply* getReply(QNetworkRequest&) override;
+};
diff --git a/launcher/minecraft/skins/SkinList.cpp b/launcher/minecraft/skins/SkinList.cpp
new file mode 100644
index 000000000..017cb8dc2
--- /dev/null
+++ b/launcher/minecraft/skins/SkinList.cpp
@@ -0,0 +1,393 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "SkinList.h"
+
+#include <QFileInfo>
+#include <QMimeData>
+
+#include "FileSystem.h"
+#include "Json.h"
+#include "minecraft/skins/SkinModel.h"
+
+SkinList::SkinList(QObject* parent, QString path, MinecraftAccountPtr acct) : QAbstractListModel(parent), m_acct(acct)
+{
+    FS::ensureFolderPathExists(m_dir.absolutePath());
+    m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
+    m_dir.setSorting(QDir::Name | QDir::IgnoreCase | QDir::LocaleAware);
+    m_watcher.reset(new QFileSystemWatcher(this));
+    is_watching = false;
+    connect(m_watcher.get(), &QFileSystemWatcher::directoryChanged, this, &SkinList::directoryChanged);
+    connect(m_watcher.get(), &QFileSystemWatcher::fileChanged, this, &SkinList::fileChanged);
+    directoryChanged(path);
+}
+
+void SkinList::startWatching()
+{
+    if (is_watching) {
+        return;
+    }
+    update();
+    is_watching = m_watcher->addPath(m_dir.absolutePath());
+    if (is_watching) {
+        qDebug() << "Started watching " << m_dir.absolutePath();
+    } else {
+        qDebug() << "Failed to start watching " << m_dir.absolutePath();
+    }
+}
+
+void SkinList::stopWatching()
+{
+    save();
+    if (!is_watching) {
+        return;
+    }
+    is_watching = !m_watcher->removePath(m_dir.absolutePath());
+    if (!is_watching) {
+        qDebug() << "Stopped watching " << m_dir.absolutePath();
+    } else {
+        qDebug() << "Failed to stop watching " << m_dir.absolutePath();
+    }
+}
+
+bool SkinList::update()
+{
+    QVector<SkinModel> newSkins;
+    m_dir.refresh();
+
+    auto manifestInfo = QFileInfo(m_dir.absoluteFilePath("index.json"));
+    if (manifestInfo.exists()) {
+        try {
+            auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "SkinList JSON file");
+            const auto root = doc.object();
+            auto skins = Json::ensureArray(root, "skins");
+            for (auto jSkin : skins) {
+                SkinModel s(m_dir, Json::ensureObject(jSkin));
+                if (s.isValid()) {
+                    newSkins << s;
+                }
+            }
+        } catch (const Exception& e) {
+            qCritical() << "Couldn't load skins json:" << e.cause();
+        }
+    }
+
+    bool needsSave = false;
+    const auto& skin = m_acct->accountData()->minecraftProfile.skin;
+    if (!skin.url.isEmpty() && !skin.data.isEmpty()) {
+        QPixmap skinTexture;
+        SkinModel* nskin = nullptr;
+        for (auto i = 0; i < newSkins.size(); i++) {
+            if (newSkins[i].getURL() == skin.url) {
+                nskin = &newSkins[i];
+                break;
+            }
+        }
+        if (!nskin) {
+            auto name = m_acct->profileName() + ".png";
+            if (QFileInfo(m_dir.absoluteFilePath(name)).exists()) {
+                name = QUrl(skin.url).fileName() + ".png";
+            }
+            auto path = m_dir.absoluteFilePath(name);
+            if (skinTexture.loadFromData(skin.data, "PNG") && skinTexture.save(path)) {
+                SkinModel s(path);
+                s.setModel(skin.variant.toUpper() == "SLIM" ? SkinModel::SLIM : SkinModel::CLASSIC);
+                s.setCapeId(m_acct->accountData()->minecraftProfile.currentCape);
+                s.setURL(skin.url);
+                newSkins << s;
+                needsSave = true;
+            }
+        } else {
+            nskin->setCapeId(m_acct->accountData()->minecraftProfile.currentCape);
+            nskin->setModel(skin.variant.toUpper() == "SLIM" ? SkinModel::SLIM : SkinModel::CLASSIC);
+        }
+    }
+
+    auto folderContents = m_dir.entryInfoList();
+    // if there are any untracked files...
+    for (QFileInfo entry : folderContents) {
+        if (!entry.isFile() && entry.suffix() != "png")
+            continue;
+
+        SkinModel w(entry.absoluteFilePath());
+        if (w.isValid()) {
+            auto add = true;
+            for (auto s : newSkins) {
+                if (s.name() == w.name()) {
+                    add = false;
+                    break;
+                }
+            }
+            if (add) {
+                newSkins.append(w);
+                needsSave = true;
+            }
+        }
+    }
+    std::sort(newSkins.begin(), newSkins.end(),
+              [](const SkinModel& a, const SkinModel& b) { return a.getPath().localeAwareCompare(b.getPath()) < 0; });
+    beginResetModel();
+    m_skin_list.swap(newSkins);
+    endResetModel();
+    if (needsSave)
+        save();
+    return true;
+}
+
+void SkinList::directoryChanged(const QString& path)
+{
+    QDir new_dir(path);
+    if (!new_dir.exists())
+        if (!FS::ensureFolderPathExists(new_dir.absolutePath()))
+            return;
+    if (m_dir.absolutePath() != new_dir.absolutePath()) {
+        m_dir.setPath(path);
+        m_dir.refresh();
+        if (is_watching)
+            stopWatching();
+        startWatching();
+    }
+    update();
+}
+
+void SkinList::fileChanged(const QString& path)
+{
+    qDebug() << "Checking " << path;
+    QFileInfo checkfile(path);
+    if (!checkfile.exists())
+        return;
+
+    for (int i = 0; i < m_skin_list.count(); i++) {
+        if (m_skin_list[i].getPath() == checkfile.absoluteFilePath()) {
+            m_skin_list[i].refresh();
+            dataChanged(index(i), index(i));
+            break;
+        }
+    }
+}
+
+QStringList SkinList::mimeTypes() const
+{
+    return { "text/uri-list" };
+}
+
+Qt::DropActions SkinList::supportedDropActions() const
+{
+    return Qt::CopyAction;
+}
+
+bool SkinList::dropMimeData(const QMimeData* data,
+                            Qt::DropAction action,
+                            [[maybe_unused]] int row,
+                            [[maybe_unused]] int column,
+                            [[maybe_unused]] const QModelIndex& parent)
+{
+    if (action == Qt::IgnoreAction)
+        return true;
+    // check if the action is supported
+    if (!data || !(action & supportedDropActions()))
+        return false;
+
+    // files dropped from outside?
+    if (data->hasUrls()) {
+        auto urls = data->urls();
+        QStringList skinFiles;
+        for (auto url : urls) {
+            // only local files may be dropped...
+            if (!url.isLocalFile())
+                continue;
+            skinFiles << url.toLocalFile();
+        }
+        installSkins(skinFiles);
+        return true;
+    }
+    return false;
+}
+
+Qt::ItemFlags SkinList::flags(const QModelIndex& index) const
+{
+    Qt::ItemFlags f = Qt::ItemIsDropEnabled | QAbstractListModel::flags(index);
+    if (index.isValid()) {
+        f |= (Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable);
+    }
+    return f;
+}
+
+QVariant SkinList::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    int row = index.row();
+
+    if (row < 0 || row >= m_skin_list.size())
+        return QVariant();
+    auto skin = m_skin_list[row];
+    switch (role) {
+        case Qt::DecorationRole:
+            return skin.getTexture();
+        case Qt::DisplayRole:
+            return skin.name();
+        case Qt::UserRole:
+            return skin.name();
+        case Qt::EditRole:
+            return skin.name();
+        default:
+            return QVariant();
+    }
+}
+
+int SkinList::rowCount(const QModelIndex& parent) const
+{
+    return parent.isValid() ? 0 : m_skin_list.size();
+}
+
+void SkinList::installSkins(const QStringList& iconFiles)
+{
+    for (QString file : iconFiles)
+        installSkin(file);
+}
+
+QString SkinList::installSkin(const QString& file, const QString& name)
+{
+    if (file.isEmpty())
+        return tr("Path is empty.");
+    QFileInfo fileinfo(file);
+    if (!fileinfo.exists())
+        return tr("File doesn't exist.");
+    if (!fileinfo.isFile())
+        return tr("Not a file.");
+    if (!fileinfo.isReadable())
+        return tr("File is not readable.");
+    if (fileinfo.suffix() != "png" && !SkinModel(fileinfo.absoluteFilePath()).isValid())
+        return tr("Skin images must be 64x64 or 64x32 pixel PNG files.");
+
+    QString target = FS::PathCombine(m_dir.absolutePath(), name.isEmpty() ? fileinfo.fileName() : name);
+
+    return QFile::copy(file, target) ? "" : tr("Unable to copy file");
+}
+
+int SkinList::getSkinIndex(const QString& key) const
+{
+    for (int i = 0; i < m_skin_list.count(); i++) {
+        if (m_skin_list[i].name() == key) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+const SkinModel* SkinList::skin(const QString& key) const
+{
+    int idx = getSkinIndex(key);
+    if (idx == -1)
+        return nullptr;
+    return &m_skin_list[idx];
+}
+
+SkinModel* SkinList::skin(const QString& key)
+{
+    int idx = getSkinIndex(key);
+    if (idx == -1)
+        return nullptr;
+    return &m_skin_list[idx];
+}
+
+bool SkinList::deleteSkin(const QString& key, const bool trash)
+{
+    int idx = getSkinIndex(key);
+    if (idx != -1) {
+        auto s = m_skin_list[idx];
+        if (trash) {
+            if (FS::trash(s.getPath(), nullptr)) {
+                m_skin_list.remove(idx);
+                save();
+                return true;
+            }
+        } else if (QFile::remove(s.getPath())) {
+            m_skin_list.remove(idx);
+            save();
+            return true;
+        }
+    }
+    return false;
+}
+
+void SkinList::save()
+{
+    QJsonObject doc;
+    QJsonArray arr;
+    for (auto s : m_skin_list) {
+        arr << s.toJSON();
+    }
+    doc["skins"] = arr;
+    try {
+        Json::write(doc, m_dir.absoluteFilePath("index.json"));
+    } catch (const FS::FileSystemException& e) {
+        qCritical() << "Failed to write skin index file :" << e.cause();
+    }
+}
+
+int SkinList::getSelectedAccountSkin()
+{
+    const auto& skin = m_acct->accountData()->minecraftProfile.skin;
+    for (int i = 0; i < m_skin_list.count(); i++) {
+        if (m_skin_list[i].getURL() == skin.url) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+bool SkinList::setData(const QModelIndex& idx, const QVariant& value, int role)
+{
+    if (!idx.isValid() || role != Qt::EditRole) {
+        return false;
+    }
+
+    int row = idx.row();
+    if (row < 0 || row >= m_skin_list.size())
+        return false;
+    auto& skin = m_skin_list[row];
+    auto newName = value.toString();
+    if (skin.name() != newName) {
+        skin.rename(newName);
+        save();
+    }
+    return true;
+}
+
+void SkinList::updateSkin(SkinModel* s)
+{
+    auto done = false;
+    for (auto i = 0; i < m_skin_list.size(); i++) {
+        if (m_skin_list[i].getPath() == s->getPath()) {
+            m_skin_list[i].setCapeId(s->getCapeId());
+            m_skin_list[i].setModel(s->getModel());
+            m_skin_list[i].setURL(s->getURL());
+            done = true;
+            break;
+        }
+    }
+    if (!done) {
+        beginInsertRows(QModelIndex(), m_skin_list.count(), m_skin_list.count() + 1);
+        m_skin_list.append(*s);
+        endInsertRows();
+    }
+    save();
+}
diff --git a/launcher/minecraft/skins/SkinList.h b/launcher/minecraft/skins/SkinList.h
new file mode 100644
index 000000000..66af6a17b
--- /dev/null
+++ b/launcher/minecraft/skins/SkinList.h
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QDir>
+#include <QFileSystemWatcher>
+
+#include "QObjectPtr.h"
+#include "SkinModel.h"
+#include "minecraft/auth/MinecraftAccount.h"
+
+class SkinList : public QAbstractListModel {
+    Q_OBJECT
+   public:
+    explicit SkinList(QObject* parent, QString path, MinecraftAccountPtr acct);
+    virtual ~SkinList() { save(); };
+
+    int getSkinIndex(const QString& key) const;
+
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    bool setData(const QModelIndex& idx, const QVariant& value, int role) override;
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    virtual QStringList mimeTypes() const override;
+    virtual Qt::DropActions supportedDropActions() const override;
+    virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
+    virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
+
+    bool deleteSkin(const QString& key, const bool trash);
+
+    void installSkins(const QStringList& iconFiles);
+    QString installSkin(const QString& file, const QString& name = {});
+
+    const SkinModel* skin(const QString& key) const;
+    SkinModel* skin(const QString& key);
+
+    void startWatching();
+    void stopWatching();
+
+    QString getDir() const { return m_dir.absolutePath(); }
+    void save();
+    int getSelectedAccountSkin();
+
+    void updateSkin(SkinModel* s);
+
+   private:
+    // hide copy constructor
+    SkinList(const SkinList&) = delete;
+    // hide assign op
+    SkinList& operator=(const SkinList&) = delete;
+
+   protected slots:
+    void directoryChanged(const QString& path);
+    void fileChanged(const QString& path);
+    bool update();
+
+   private:
+    shared_qobject_ptr<QFileSystemWatcher> m_watcher;
+    bool is_watching;
+    QVector<SkinModel> m_skin_list;
+    QDir m_dir;
+    MinecraftAccountPtr m_acct;
+};
\ No newline at end of file
diff --git a/launcher/minecraft/skins/SkinModel.cpp b/launcher/minecraft/skins/SkinModel.cpp
new file mode 100644
index 000000000..937864e2c
--- /dev/null
+++ b/launcher/minecraft/skins/SkinModel.cpp
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "SkinModel.h"
+#include <QFileInfo>
+#include <QImage>
+#include <QPainter>
+#include <QTransform>
+
+#include "FileSystem.h"
+#include "Json.h"
+
+SkinModel::SkinModel(QString path) : m_path(path), m_texture(path), m_model(Model::CLASSIC) {}
+
+SkinModel::SkinModel(QDir skinDir, QJsonObject obj)
+    : m_cape_id(Json::ensureString(obj, "capeId")), m_model(Model::CLASSIC), m_url(Json::ensureString(obj, "url"))
+{
+    auto name = Json::ensureString(obj, "name");
+
+    if (auto model = Json::ensureString(obj, "model"); model == "SLIM") {
+        m_model = Model::SLIM;
+    }
+    m_path = skinDir.absoluteFilePath(name) + ".png";
+    m_texture = QPixmap(m_path);
+}
+
+QString SkinModel::name() const
+{
+    return QFileInfo(m_path).completeBaseName();
+}
+
+bool SkinModel::rename(QString newName)
+{
+    auto info = QFileInfo(m_path);
+    m_path = FS::PathCombine(info.absolutePath(), newName + ".png");
+    return FS::move(info.absoluteFilePath(), m_path);
+}
+
+QJsonObject SkinModel::toJSON() const
+{
+    QJsonObject obj;
+    obj["name"] = name();
+    obj["capeId"] = m_cape_id;
+    obj["url"] = m_url;
+    obj["model"] = getModelString();
+    return obj;
+}
+
+QString SkinModel::getModelString() const
+{
+    switch (m_model) {
+        case CLASSIC:
+            return "CLASSIC";
+        case SLIM:
+            return "SLIM";
+    }
+    return {};
+}
+
+bool SkinModel::isValid() const
+{
+    return !m_texture.isNull() && (m_texture.size().height() == 32 || m_texture.size().height() == 64) && m_texture.size().width() == 64;
+}
diff --git a/launcher/minecraft/skins/SkinModel.h b/launcher/minecraft/skins/SkinModel.h
new file mode 100644
index 000000000..46e9d6cf1
--- /dev/null
+++ b/launcher/minecraft/skins/SkinModel.h
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QDir>
+#include <QJsonObject>
+#include <QPixmap>
+
+class SkinModel {
+   public:
+    enum Model { CLASSIC, SLIM };
+
+    SkinModel() = default;
+    SkinModel(QString path);
+    SkinModel(QDir skinDir, QJsonObject obj);
+    virtual ~SkinModel() = default;
+
+    QString name() const;
+    QString getModelString() const;
+    bool isValid() const;
+    QString getPath() const { return m_path; }
+    QPixmap getTexture() const { return m_texture; }
+    QString getCapeId() const { return m_cape_id; }
+    Model getModel() const { return m_model; }
+    QString getURL() const { return m_url; }
+
+    bool rename(QString newName);
+    void setCapeId(QString capeID) { m_cape_id = capeID; }
+    void setModel(Model model) { m_model = model; }
+    void setURL(QString url) { m_url = url; }
+    void refresh() { m_texture = QPixmap(m_path); }
+
+    QJsonObject toJSON() const;
+
+   private:
+    QString m_path;
+    QPixmap m_texture;
+    QString m_cape_id;
+    Model m_model;
+    QString m_url;
+};
\ No newline at end of file
diff --git a/launcher/minecraft/skins/SkinUpload.cpp b/launcher/minecraft/skins/SkinUpload.cpp
new file mode 100644
index 000000000..a0d90c596
--- /dev/null
+++ b/launcher/minecraft/skins/SkinUpload.cpp
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include "SkinUpload.h"
+
+#include <QHttpMultiPart>
+
+#include "FileSystem.h"
+#include "net/ByteArraySink.h"
+#include "net/RawHeaderProxy.h"
+
+SkinUpload::SkinUpload(QString path, QString variant) : NetRequest(), m_path(path), m_variant(variant)
+{
+    logCat = taskMCSkinsLogC;
+}
+
+QNetworkReply* SkinUpload::getReply(QNetworkRequest& request)
+{
+    QHttpMultiPart* multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType, this);
+
+    QHttpPart skin;
+    skin.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/png"));
+    skin.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"file\"; filename=\"skin.png\""));
+
+    skin.setBody(FS::read(m_path));
+
+    QHttpPart model;
+    model.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"variant\""));
+    model.setBody(m_variant.toUtf8());
+
+    multiPart->append(skin);
+    multiPart->append(model);
+    setStatus(tr("Uploading skin"));
+    return m_network->post(request, multiPart);
+}
+
+SkinUpload::Ptr SkinUpload::make(MinecraftAccountPtr account, QString path, QString variant)
+{
+    auto up = makeShared<SkinUpload>(path, variant);
+    QString token = account->accessToken();
+    up->m_url = QUrl(account->servicesServerUrl() + "/minecraft/profile/skins");
+    up->setObjectName(QString("BYTES:") + up->m_url.toString());
+    up->m_sink.reset(new Net::ByteArraySink(std::make_shared<QByteArray>()));
+    up->addHeaderProxy(new Net::RawHeaderProxy(QList<Net::HeaderPair>{
+        { "Authorization", QString("Bearer %1").arg(token).toLocal8Bit() },
+    }));
+    return up;
+}
diff --git a/launcher/minecraft/skins/SkinUpload.h b/launcher/minecraft/skins/SkinUpload.h
new file mode 100644
index 000000000..333e1f8d1
--- /dev/null
+++ b/launcher/minecraft/skins/SkinUpload.h
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <minecraft/auth/MinecraftAccount.h>
+#include "net/NetRequest.h"
+
+class SkinUpload : public Net::NetRequest {
+    Q_OBJECT
+   public:
+    using Ptr = shared_qobject_ptr<SkinUpload>;
+
+    // Note this class takes ownership of the file.
+    SkinUpload(QString path, QString variant);
+    virtual ~SkinUpload() = default;
+
+    static SkinUpload::Ptr make(MinecraftAccountPtr account, QString path, QString variant);
+
+   protected:
+    virtual QNetworkReply* getReply(QNetworkRequest&) override;
+
+   private:
+    QString m_path;
+    QString m_variant;
+};
diff --git a/launcher/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp
index 8af014996..acdddc833 100644
--- a/launcher/minecraft/update/AssetUpdateTask.cpp
+++ b/launcher/minecraft/update/AssetUpdateTask.cpp
@@ -1,5 +1,6 @@
 #include "AssetUpdateTask.h"
 
+#include "launch/LaunchStep.h"
 #include "minecraft/AssetsUtils.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
@@ -14,8 +15,6 @@ AssetUpdateTask::AssetUpdateTask(MinecraftInstance* inst)
     m_inst = inst;
 }
 
-AssetUpdateTask::~AssetUpdateTask() {}
-
 void AssetUpdateTask::executeTask()
 {
     setStatus(tr("Updating assets index..."));
@@ -32,8 +31,7 @@ void AssetUpdateTask::executeTask()
     auto hexSha1 = assets->sha1.toLatin1();
     qDebug() << "Asset index SHA1:" << hexSha1;
     auto dl = Net::ApiDownload::makeCached(indexUrl, entry);
-    auto rawSha1 = QByteArray::fromHex(assets->sha1.toLatin1());
-    dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
+    dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, assets->sha1));
     job->addNetAction(dl);
 
     downloadJob.reset(job);
diff --git a/launcher/minecraft/update/AssetUpdateTask.h b/launcher/minecraft/update/AssetUpdateTask.h
index 6f053a54a..88fac0ac5 100644
--- a/launcher/minecraft/update/AssetUpdateTask.h
+++ b/launcher/minecraft/update/AssetUpdateTask.h
@@ -7,7 +7,7 @@ class AssetUpdateTask : public Task {
     Q_OBJECT
    public:
     AssetUpdateTask(MinecraftInstance* inst);
-    virtual ~AssetUpdateTask();
+    virtual ~AssetUpdateTask() = default;
 
     void executeTask() override;
 
diff --git a/launcher/minecraft/update/FMLLibrariesTask.h b/launcher/minecraft/update/FMLLibrariesTask.h
index 32712d239..4fe2648e8 100644
--- a/launcher/minecraft/update/FMLLibrariesTask.h
+++ b/launcher/minecraft/update/FMLLibrariesTask.h
@@ -9,7 +9,7 @@ class FMLLibrariesTask : public Task {
     Q_OBJECT
    public:
     FMLLibrariesTask(MinecraftInstance* inst);
-    virtual ~FMLLibrariesTask() {};
+    virtual ~FMLLibrariesTask() = default;
 
     void executeTask() override;
 
diff --git a/launcher/minecraft/update/FoldersTask.cpp b/launcher/minecraft/update/FoldersTask.cpp
index c74e8d2ef..7d6fc4394 100644
--- a/launcher/minecraft/update/FoldersTask.cpp
+++ b/launcher/minecraft/update/FoldersTask.cpp
@@ -37,7 +37,7 @@
 #include <QDir>
 #include "minecraft/MinecraftInstance.h"
 
-FoldersTask::FoldersTask(MinecraftInstance* inst) : Task()
+FoldersTask::FoldersTask(MinecraftInstance* inst)
 {
     m_inst = inst;
 }
diff --git a/launcher/minecraft/update/FoldersTask.h b/launcher/minecraft/update/FoldersTask.h
index be4e33eb7..7df7ef81d 100644
--- a/launcher/minecraft/update/FoldersTask.h
+++ b/launcher/minecraft/update/FoldersTask.h
@@ -7,7 +7,7 @@ class FoldersTask : public Task {
     Q_OBJECT
    public:
     FoldersTask(MinecraftInstance* inst);
-    virtual ~FoldersTask() {};
+    virtual ~FoldersTask() = default;
 
     void executeTask() override;
 
diff --git a/launcher/minecraft/update/LibrariesTask.h b/launcher/minecraft/update/LibrariesTask.h
index 441191154..838f9d9b4 100644
--- a/launcher/minecraft/update/LibrariesTask.h
+++ b/launcher/minecraft/update/LibrariesTask.h
@@ -7,7 +7,7 @@ class LibrariesTask : public Task {
     Q_OBJECT
    public:
     LibrariesTask(MinecraftInstance* inst);
-    virtual ~LibrariesTask() {};
+    virtual ~LibrariesTask() = default;
 
     void executeTask() override;
 
diff --git a/launcher/modplatform/CheckUpdateTask.h b/launcher/modplatform/CheckUpdateTask.h
index 44bb0c74e..24b82c28e 100644
--- a/launcher/modplatform/CheckUpdateTask.h
+++ b/launcher/modplatform/CheckUpdateTask.h
@@ -3,7 +3,6 @@
 #include "minecraft/mod/Mod.h"
 #include "minecraft/mod/tasks/GetModDependenciesTask.h"
 #include "modplatform/ModIndex.h"
-#include "modplatform/ResourceAPI.h"
 #include "tasks/Task.h"
 
 class ResourceDownloadTask;
@@ -15,9 +14,9 @@ class CheckUpdateTask : public Task {
    public:
     CheckUpdateTask(QList<Mod*>& mods,
                     std::list<Version>& mcVersions,
-                    std::optional<ModPlatform::ModLoaderTypes> loaders,
+                    QList<ModPlatform::ModLoaderType> loadersList,
                     std::shared_ptr<ModFolderModel> mods_folder)
-        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder) {};
+        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders_list(loadersList), m_mods_folder(mods_folder) {};
 
     struct UpdatableMod {
         QString name;
@@ -28,6 +27,7 @@ class CheckUpdateTask : public Task {
         QString changelog;
         ModPlatform::ResourceProvider provider;
         shared_qobject_ptr<ResourceDownloadTask> download;
+        bool enabled = true;
 
        public:
         UpdatableMod(QString name,
@@ -37,7 +37,8 @@ class CheckUpdateTask : public Task {
                      std::optional<ModPlatform::IndexedVersionType> new_v_type,
                      QString changelog,
                      ModPlatform::ResourceProvider p,
-                     shared_qobject_ptr<ResourceDownloadTask> t)
+                     shared_qobject_ptr<ResourceDownloadTask> t,
+                     bool enabled = true)
             : name(name)
             , old_hash(old_h)
             , old_version(old_v)
@@ -46,6 +47,7 @@ class CheckUpdateTask : public Task {
             , changelog(changelog)
             , provider(p)
             , download(t)
+            , enabled(enabled)
         {}
     };
 
@@ -64,7 +66,7 @@ class CheckUpdateTask : public Task {
    protected:
     QList<Mod*>& m_mods;
     std::list<Version>& m_game_versions;
-    std::optional<ModPlatform::ModLoaderTypes> m_loaders;
+    QList<ModPlatform::ModLoaderType> m_loaders_list;
     std::shared_ptr<ModFolderModel> m_mods_folder;
 
     std::vector<UpdatableMod> m_updatable;
diff --git a/launcher/modplatform/EnsureMetadataTask.cpp b/launcher/modplatform/EnsureMetadataTask.cpp
index ce53ee62d..f6f49f38d 100644
--- a/launcher/modplatform/EnsureMetadataTask.cpp
+++ b/launcher/modplatform/EnsureMetadataTask.cpp
@@ -15,8 +15,6 @@
 #include "modplatform/modrinth/ModrinthAPI.h"
 #include "modplatform/modrinth/ModrinthPackIndex.h"
 
-static ModPlatform::ProviderCapabilities ProviderCaps;
-
 static ModrinthAPI modrinth_api;
 static FlameAPI flame_api;
 
@@ -44,6 +42,9 @@ EnsureMetadataTask::EnsureMetadataTask(QList<Mod*>& mods, QDir dir, ModPlatform:
         m_hashing_task->addTask(hash_task);
     }
 }
+EnsureMetadataTask::EnsureMetadataTask(QHash<QString, Mod*>& mods, QDir dir, ModPlatform::ResourceProvider prov)
+    : Task(nullptr), m_mods(mods), m_index_dir(dir), m_provider(prov), m_current_task(nullptr)
+{}
 
 Hashing::Hasher::Ptr EnsureMetadataTask::createNewHash(Mod* mod)
 {
@@ -162,10 +163,10 @@ void EnsureMetadataTask::executeTask()
     });
 
     if (m_mods.size() > 1)
-        setStatus(tr("Requesting metadata information from %1...").arg(ProviderCaps.readableName(m_provider)));
+        setStatus(tr("Requesting metadata information from %1...").arg(ModPlatform::ProviderCapabilities::readableName(m_provider)));
     else if (!m_mods.empty())
         setStatus(tr("Requesting metadata information from %1 for '%2'...")
-                      .arg(ProviderCaps.readableName(m_provider), m_mods.begin().value()->name()));
+                      .arg(ModPlatform::ProviderCapabilities::readableName(m_provider), m_mods.begin().value()->name()));
 
     m_current_task = version_task;
     version_task->start();
@@ -215,7 +216,7 @@ void EnsureMetadataTask::emitFail(Mod* m, QString key, RemoveFromList remove)
 
 Task::Ptr EnsureMetadataTask::modrinthVersionsTask()
 {
-    auto hash_type = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH).first();
+    auto hash_type = ModPlatform::ProviderCapabilities::hashType(ModPlatform::ResourceProvider::MODRINTH).first();
 
     auto response = std::make_shared<QByteArray>();
     auto ver_task = modrinth_api.currentVersions(m_mods.keys(), hash_type, response);
diff --git a/launcher/modplatform/EnsureMetadataTask.h b/launcher/modplatform/EnsureMetadataTask.h
index 2f276e5a0..631b32ae7 100644
--- a/launcher/modplatform/EnsureMetadataTask.h
+++ b/launcher/modplatform/EnsureMetadataTask.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include "ModIndex.h"
-#include "net/NetJob.h"
 
 #include "modplatform/helpers/HashUtils.h"
 
 #include "tasks/ConcurrentTask.h"
 
+#include <QDir>
+
 class Mod;
-class QDir;
 
 class EnsureMetadataTask : public Task {
     Q_OBJECT
@@ -16,6 +16,7 @@ class EnsureMetadataTask : public Task {
    public:
     EnsureMetadataTask(Mod*, QDir, ModPlatform::ResourceProvider = ModPlatform::ResourceProvider::MODRINTH);
     EnsureMetadataTask(QList<Mod*>&, QDir, ModPlatform::ResourceProvider = ModPlatform::ResourceProvider::MODRINTH);
+    EnsureMetadataTask(QHash<QString, Mod*>&, QDir, ModPlatform::ResourceProvider = ModPlatform::ResourceProvider::MODRINTH);
 
     ~EnsureMetadataTask() = default;
 
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index fc79dff15..8c85ae122 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -58,7 +59,7 @@ IndexedVersionType::VersionType IndexedVersionType::enumFromString(const QString
     return s_indexed_version_type_names.value(type, IndexedVersionType::VersionType::Unknown);
 }
 
-auto ProviderCapabilities::name(ResourceProvider p) -> const char*
+const char* ProviderCapabilities::name(ResourceProvider p)
 {
     switch (p) {
         case ResourceProvider::MODRINTH:
@@ -68,7 +69,8 @@ auto ProviderCapabilities::name(ResourceProvider p) -> const char*
     }
     return {};
 }
-auto ProviderCapabilities::readableName(ResourceProvider p) -> QString
+
+QString ProviderCapabilities::readableName(ResourceProvider p)
 {
     switch (p) {
         case ResourceProvider::MODRINTH:
@@ -78,7 +80,8 @@ auto ProviderCapabilities::readableName(ResourceProvider p) -> QString
     }
     return {};
 }
-auto ProviderCapabilities::hashType(ResourceProvider p) -> QStringList
+
+QStringList ProviderCapabilities::hashType(ResourceProvider p)
 {
     switch (p) {
         case ResourceProvider::MODRINTH:
@@ -90,34 +93,13 @@ auto ProviderCapabilities::hashType(ResourceProvider p) -> QStringList
     return {};
 }
 
-auto ProviderCapabilities::hash(ResourceProvider p, QIODevice* device, QString type) -> QString
-{
-    QCryptographicHash::Algorithm algo = QCryptographicHash::Sha1;
-    switch (p) {
-        case ResourceProvider::MODRINTH: {
-            algo = (type == "sha1") ? QCryptographicHash::Sha1 : QCryptographicHash::Sha512;
-            break;
-        }
-        case ResourceProvider::FLAME:
-            algo = (type == "sha1") ? QCryptographicHash::Sha1 : QCryptographicHash::Md5;
-            break;
-    }
-
-    QCryptographicHash hash(algo);
-    if (!hash.addData(device))
-        qCritical() << "Failed to read JAR to create hash!";
-
-    Q_ASSERT(hash.result().length() == hash.hashLength(algo));
-    return { hash.result().toHex() };
-}
-
 QString getMetaURL(ResourceProvider provider, QVariant projectID)
 {
     return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/projects/" : "https://modrinth.com/mod/") +
            projectID.toString();
 }
 
-auto getModLoaderString(ModLoaderType type) -> const QString
+auto getModLoaderAsString(ModLoaderType type) -> const QString
 {
     switch (type) {
         case NeoForge:
@@ -138,4 +120,21 @@ auto getModLoaderString(ModLoaderType type) -> const QString
     return "";
 }
 
+auto getModLoaderFromString(QString type) -> ModLoaderType
+{
+    if (type == "neoforge")
+        return NeoForge;
+    if (type == "forge")
+        return Forge;
+    if (type == "cauldron")
+        return Cauldron;
+    if (type == "liteloader")
+        return LiteLoader;
+    if (type == "fabric")
+        return Fabric;
+    if (type == "quilt")
+        return Quilt;
+    return {};
+}
+
 }  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index eff7e7f9f..d5ee12473 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -25,7 +25,6 @@
 #include <QVariant>
 #include <QVector>
 #include <memory>
-#include <optional>
 
 class QIODevice;
 
@@ -36,17 +35,15 @@ Q_DECLARE_FLAGS(ModLoaderTypes, ModLoaderType)
 
 enum class ResourceProvider { MODRINTH, FLAME };
 
-enum class ResourceType { MOD, RESOURCE_PACK, SHADER_PACK };
+enum class ResourceType { MOD, RESOURCE_PACK, SHADER_PACK, MODPACK };
 
 enum class DependencyType { REQUIRED, OPTIONAL, INCOMPATIBLE, EMBEDDED, TOOL, INCLUDE, UNKNOWN };
 
-class ProviderCapabilities {
-   public:
-    auto name(ResourceProvider) -> const char*;
-    auto readableName(ResourceProvider) -> QString;
-    auto hashType(ResourceProvider) -> QStringList;
-    auto hash(ResourceProvider, QIODevice*, QString type = "") -> QString;
-};
+namespace ProviderCapabilities {
+const char* name(ResourceProvider);
+QString readableName(ResourceProvider);
+QStringList hashType(ResourceProvider);
+}  // namespace ProviderCapabilities
 
 struct ModpackAuthor {
     QString name;
@@ -109,6 +106,7 @@ struct IndexedVersion {
     bool is_preferred = true;
     QString changelog;
     QList<Dependency> dependencies;
+    QString side;  // this is for flame API
 
     // For internal use, not provided by APIs
     bool is_currently_selected = false;
@@ -183,7 +181,8 @@ inline auto getOverrideDeps() -> QList<OverrideDep>
 
 QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
-auto getModLoaderString(ModLoaderType type) -> const QString;
+auto getModLoaderAsString(ModLoaderType type) -> const QString;
+auto getModLoaderFromString(QString type) -> ModLoaderType;
 
 constexpr bool hasSingleModLoaderSelected(ModLoaderTypes l) noexcept
 {
@@ -191,6 +190,11 @@ constexpr bool hasSingleModLoaderSelected(ModLoaderTypes l) noexcept
     return x && !(x & (x - 1));
 }
 
+struct Category {
+    QString name;
+    QString id;
+};
+
 }  // namespace ModPlatform
 
 Q_DECLARE_METATYPE(ModPlatform::IndexedPack)
diff --git a/launcher/modplatform/ResourceAPI.h b/launcher/modplatform/ResourceAPI.h
index 2c7bec5d4..b7364d9ab 100644
--- a/launcher/modplatform/ResourceAPI.h
+++ b/launcher/modplatform/ResourceAPI.h
@@ -4,6 +4,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -73,6 +74,8 @@ class ResourceAPI {
         std::optional<SortingMethod> sorting;
         std::optional<ModPlatform::ModLoaderTypes> loaders;
         std::optional<std::list<Version> > versions;
+        std::optional<QString> side;
+        std::optional<QStringList> categoryIds;
     };
     struct SearchCallbacks {
         std::function<void(QJsonDocument&)> on_succeed;
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 01de88b04..abe7d0177 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -282,7 +282,7 @@ void PackInstallTask::deleteExistingFiles()
 
     // Delete the files
     for (const auto& item : filesToDelete) {
-        QFile::remove(item);
+        FS::deletePath(item);
     }
 }
 
@@ -343,9 +343,7 @@ QString PackInstallTask::getVersionForLoader(QString uid)
             return Q_NULLPTR;
         }
 
-        if (!vlist->isLoaded()) {
-            vlist->load(Net::Mode::Online);
-        }
+        vlist->waitToLoad();
 
         if (m_version.loader.recommended || m_version.loader.latest) {
             for (int i = 0; i < vlist->versions().size(); i++) {
@@ -638,8 +636,7 @@ void PackInstallTask::installConfigs()
 
     auto dl = Net::ApiDownload::makeCached(url, entry);
     if (!m_version.configs.sha1.isEmpty()) {
-        auto rawSha1 = QByteArray::fromHex(m_version.configs.sha1.toLatin1());
-        dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
+        dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, m_version.configs.sha1));
     }
     jobPtr->addNetAction(dl);
     archivePath = entry->getFullPath();
@@ -758,8 +755,7 @@ void PackInstallTask::downloadMods()
 
             auto dl = Net::ApiDownload::makeCached(url, entry);
             if (!mod.md5.isEmpty()) {
-                auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
-                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
+                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, mod.md5));
             }
             jobPtr->addNetAction(dl);
         } else if (mod.type == ModType::Decomp) {
@@ -769,8 +765,7 @@ void PackInstallTask::downloadMods()
 
             auto dl = Net::ApiDownload::makeCached(url, entry);
             if (!mod.md5.isEmpty()) {
-                auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
-                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
+                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, mod.md5));
             }
             jobPtr->addNetAction(dl);
         } else {
@@ -783,8 +778,7 @@ void PackInstallTask::downloadMods()
 
             auto dl = Net::ApiDownload::makeCached(url, entry);
             if (!mod.md5.isEmpty()) {
-                auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
-                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
+                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, mod.md5));
             }
             jobPtr->addNetAction(dl);
 
@@ -987,7 +981,7 @@ bool PackInstallTask::extractMods(const QMap<QString, VersionMod>& toExtract,
         // the copy from the Configs.zip
         QFileInfo fileInfo(to);
         if (fileInfo.exists()) {
-            if (!QFile::remove(to)) {
+            if (!FS::deletePath(to)) {
                 qWarning() << "Failed to delete" << to;
                 return false;
             }
@@ -1075,36 +1069,7 @@ void PackInstallTask::install()
 
 static Meta::Version::Ptr getComponentVersion(const QString& uid, const QString& version)
 {
-    auto vlist = APPLICATION->metadataIndex()->get(uid);
-    if (!vlist)
-        return {};
-
-    if (!vlist->isLoaded()) {
-        QEventLoop loadVersionLoop;
-        auto task = vlist->getLoadTask();
-        QObject::connect(task.get(), &Task::finished, &loadVersionLoop, &QEventLoop::quit);
-        if (!task->isRunning())
-            task->start();
-
-        loadVersionLoop.exec();
-    }
-
-    auto ver = vlist->getVersion(version);
-    if (!ver)
-        return {};
-
-    if (!ver->isLoaded()) {
-        QEventLoop loadVersionLoop;
-        ver->load(Net::Mode::Online);
-        auto task = ver->getCurrentTask();
-        QObject::connect(task.get(), &Task::finished, &loadVersionLoop, &QEventLoop::quit);
-        if (!task->isRunning())
-            task->start();
-
-        loadVersionLoop.exec();
-    }
-
-    return ver;
+    return APPLICATION->metadataIndex()->getLoadedVersion(uid, version);
 }
 
 }  // namespace ATLauncher
diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 8d23896d9..4c2f3d69e 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -1,86 +1,101 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #include "FileResolvingTask.h"
+#include <algorithm>
 
 #include "Json.h"
+#include "QObjectPtr.h"
 #include "modplatform/ModIndex.h"
-#include "net/ApiDownload.h"
-#include "net/ApiUpload.h"
-#include "net/Upload.h"
+#include "modplatform/flame/FlameAPI.h"
+#include "modplatform/flame/FlameModIndex.h"
+#include "modplatform/modrinth/ModrinthAPI.h"
 
 #include "modplatform/modrinth/ModrinthPackIndex.h"
+#include "net/NetJob.h"
+#include "tasks/Task.h"
+
+static const FlameAPI flameAPI;
+static ModrinthAPI modrinthAPI;
 
 Flame::FileResolvingTask::FileResolvingTask(const shared_qobject_ptr<QNetworkAccessManager>& network, Flame::Manifest& toProcess)
-    : m_network(network), m_toProcess(toProcess)
+    : m_network(network), m_manifest(toProcess)
 {}
 
 bool Flame::FileResolvingTask::abort()
 {
     bool aborted = true;
-    if (m_dljob)
-        aborted &= m_dljob->abort();
-    if (m_checkJob)
-        aborted &= m_checkJob->abort();
+    if (m_task) {
+        aborted = m_task->abort();
+    }
     return aborted ? Task::abort() : false;
 }
 
 void Flame::FileResolvingTask::executeTask()
 {
-    if (m_toProcess.files.isEmpty()) {  // no file to resolve so leave it empty and emit success immediately
+    if (m_manifest.files.isEmpty()) {  // no file to resolve so leave it empty and emit success immediately
         emitSucceeded();
         return;
     }
     setStatus(tr("Resolving mod IDs..."));
     setProgress(0, 3);
-    m_dljob.reset(new NetJob("Mod id resolver", m_network));
-    result.reset(new QByteArray());
-    // build json data to send
-    QJsonObject object;
-
-    object["fileIds"] = QJsonArray::fromVariantList(
-        std::accumulate(m_toProcess.files.begin(), m_toProcess.files.end(), QVariantList(), [](QVariantList& l, const File& s) {
-            l.push_back(s.fileId);
-            return l;
-        }));
-    QByteArray data = Json::toText(object);
-    auto dl = Net::ApiUpload::makeByteArray(QUrl("https://api.curseforge.com/v1/mods/files"), result, data);
-    m_dljob->addNetAction(dl);
+    m_result.reset(new QByteArray());
+
+    QStringList fileIds;
+    for (auto file : m_manifest.files) {
+        fileIds.push_back(QString::number(file.fileId));
+    }
+    m_task = flameAPI.getFiles(fileIds, m_result);
 
     auto step_progress = std::make_shared<TaskStepProgress>();
-    connect(m_dljob.get(), &NetJob::finished, this, [this, step_progress]() {
+    connect(m_task.get(), &Task::finished, this, [this, step_progress]() {
         step_progress->state = TaskStepState::Succeeded;
         stepProgress(*step_progress);
         netJobFinished();
     });
-    connect(m_dljob.get(), &NetJob::failed, this, [this, step_progress](QString reason) {
+    connect(m_task.get(), &Task::failed, this, [this, step_progress](QString reason) {
         step_progress->state = TaskStepState::Failed;
         stepProgress(*step_progress);
         emitFailed(reason);
     });
-    connect(m_dljob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propagateStepProgress);
-    connect(m_dljob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {
+    connect(m_task.get(), &Task::stepProgress, this, &FileResolvingTask::propagateStepProgress);
+    connect(m_task.get(), &Task::progress, this, [this, step_progress](qint64 current, qint64 total) {
         qDebug() << "Resolve slug progress" << current << total;
         step_progress->update(current, total);
         stepProgress(*step_progress);
     });
-    connect(m_dljob.get(), &NetJob::status, this, [this, step_progress](QString status) {
+    connect(m_task.get(), &Task::status, this, [this, step_progress](QString status) {
         step_progress->status = status;
         stepProgress(*step_progress);
     });
 
-    m_dljob->start();
+    m_task->start();
 }
 
 void Flame::FileResolvingTask::netJobFinished()
 {
     setProgress(1, 3);
     // job to check modrinth for blocked projects
-    m_checkJob.reset(new NetJob("Modrinth check", m_network));
-    blockedProjects = QMap<File*, std::shared_ptr<QByteArray>>();
-
     QJsonDocument doc;
     QJsonArray array;
 
     try {
-        doc = Json::requireDocument(*result);
+        doc = Json::requireDocument(*m_result);
         array = Json::requireArray(doc.object()["data"]);
     } catch (Json::JsonException& e) {
         qCritical() << "Non-JSON data returned from the CF API";
@@ -91,125 +106,157 @@ void Flame::FileResolvingTask::netJobFinished()
         return;
     }
 
+    QStringList hashes;
     for (QJsonValueRef file : array) {
-        auto fileid = Json::requireInteger(Json::requireObject(file)["id"]);
-        auto& out = m_toProcess.files[fileid];
         try {
-            out.parseFromObject(Json::requireObject(file));
-        } catch ([[maybe_unused]] const JSONValidationError& e) {
-            qDebug() << "Blocked mod on curseforge" << out.fileName;
-            auto hash = out.hash;
-            if (!hash.isEmpty()) {
-                auto url = QString("https://api.modrinth.com/v2/version_file/%1?algorithm=sha1").arg(hash);
-                auto output = std::make_shared<QByteArray>();
-                auto dl = Net::ApiDownload::makeByteArray(QUrl(url), output);
-                QObject::connect(dl.get(), &Net::ApiDownload::succeeded, [&out]() { out.resolved = true; });
-
-                m_checkJob->addNetAction(dl);
-                blockedProjects.insert(&out, output);
+            auto obj = Json::requireObject(file);
+            auto version = FlameMod::loadIndexedPackVersion(obj);
+            auto fileid = version.fileId.toInt();
+            m_manifest.files[fileid].version = version;
+            auto url = QUrl(version.downloadUrl, QUrl::TolerantMode);
+            if (!url.isValid() && "sha1" == version.hash_type && !version.hash.isEmpty()) {
+                hashes.push_back(version.hash);
             }
+        } catch (Json::JsonException& e) {
+            qCritical() << "Non-JSON data returned from the CF API";
+            qCritical() << e.cause();
+
+            emitFailed(tr("Invalid data returned from the API."));
+
+            return;
         }
     }
+    if (hashes.isEmpty()) {
+        getFlameProjects();
+        return;
+    }
+    m_result.reset(new QByteArray());
+    m_task = modrinthAPI.currentVersions(hashes, "sha1", m_result);
+    (dynamic_cast<NetJob*>(m_task.get()))->setAskRetry(false);
     auto step_progress = std::make_shared<TaskStepProgress>();
-    connect(m_checkJob.get(), &NetJob::finished, this, [this, step_progress]() {
+    connect(m_task.get(), &Task::finished, this, [this, step_progress]() {
         step_progress->state = TaskStepState::Succeeded;
         stepProgress(*step_progress);
-        modrinthCheckFinished();
+        QJsonParseError parse_error{};
+        QJsonDocument doc = QJsonDocument::fromJson(*m_result, &parse_error);
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Modrinth::CurrentVersions at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
+            qWarning() << *m_result;
+
+            failed(parse_error.errorString());
+            return;
+        }
+
+        try {
+            auto entries = Json::requireObject(doc);
+            for (auto& out : m_manifest.files) {
+                auto url = QUrl(out.version.downloadUrl, QUrl::TolerantMode);
+                if (!url.isValid() && "sha1" == out.version.hash_type && !out.version.hash.isEmpty()) {
+                    try {
+                        auto entry = Json::requireObject(entries, out.version.hash);
+
+                        auto file = Modrinth::loadIndexedPackVersion(entry);
+
+                        // If there's more than one mod loader for this version, we can't know for sure
+                        // which file is relative to each loader, so it's best to not use any one and
+                        // let the user download it manually.
+                        if (!file.loaders || hasSingleModLoaderSelected(file.loaders)) {
+                            out.version.downloadUrl = file.downloadUrl;
+                            qDebug() << "Found alternative on modrinth " << out.version.fileName;
+                        }
+                    } catch (Json::JsonException& e) {
+                        qDebug() << e.cause();
+                        qDebug() << entries;
+                    }
+                }
+            }
+        } catch (Json::JsonException& e) {
+            qDebug() << e.cause();
+            qDebug() << doc;
+        }
+        getFlameProjects();
     });
-    connect(m_checkJob.get(), &NetJob::failed, this, [this, step_progress](QString reason) {
+    connect(m_task.get(), &Task::failed, this, [this, step_progress](QString reason) {
         step_progress->state = TaskStepState::Failed;
         stepProgress(*step_progress);
     });
-    connect(m_checkJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propagateStepProgress);
-    connect(m_checkJob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {
+    connect(m_task.get(), &Task::stepProgress, this, &FileResolvingTask::propagateStepProgress);
+    connect(m_task.get(), &Task::progress, this, [this, step_progress](qint64 current, qint64 total) {
         qDebug() << "Resolve slug progress" << current << total;
         step_progress->update(current, total);
         stepProgress(*step_progress);
     });
-    connect(m_checkJob.get(), &NetJob::status, this, [this, step_progress](QString status) {
+    connect(m_task.get(), &Task::status, this, [this, step_progress](QString status) {
         step_progress->status = status;
         stepProgress(*step_progress);
     });
 
-    m_checkJob->start();
+    m_task->start();
 }
 
-void Flame::FileResolvingTask::modrinthCheckFinished()
+void Flame::FileResolvingTask::getFlameProjects()
 {
     setProgress(2, 3);
-    qDebug() << "Finished with blocked mods : " << blockedProjects.size();
+    m_result.reset(new QByteArray());
+    QStringList addonIds;
+    for (auto file : m_manifest.files) {
+        addonIds.push_back(QString::number(file.projectId));
+    }
 
-    for (auto it = blockedProjects.keyBegin(); it != blockedProjects.keyEnd(); it++) {
-        auto& out = *it;
-        auto bytes = blockedProjects[out];
-        if (!out->resolved) {
-            continue;
-        }
+    m_task = flameAPI.getProjects(addonIds, m_result);
 
-        QJsonDocument doc = QJsonDocument::fromJson(*bytes);
-        auto obj = doc.object();
-        auto file = Modrinth::loadIndexedPackVersion(obj);
-
-        // If there's more than one mod loader for this version, we can't know for sure
-        // which file is relative to each loader, so it's best to not use any one and
-        // let the user download it manually.
-        if (!file.loaders || hasSingleModLoaderSelected(file.loaders)) {
-            out->url = file.downloadUrl;
-            qDebug() << "Found alternative on modrinth " << out->fileName;
-        } else {
-            out->resolved = false;
+    auto step_progress = std::make_shared<TaskStepProgress>();
+    connect(m_task.get(), &Task::succeeded, this, [this, step_progress] {
+        QJsonParseError parse_error{};
+        auto doc = QJsonDocument::fromJson(*m_result, &parse_error);
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Modrinth projects task at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
+            qWarning() << *m_result;
+            return;
         }
-    }
-    // copy to an output list and filter out projects found on modrinth
-    auto block = std::make_shared<QList<File*>>();
-    auto it = blockedProjects.keys();
-    std::copy_if(it.begin(), it.end(), std::back_inserter(*block), [](File* f) { return !f->resolved; });
-    // Display not found mods early
-    if (!block->empty()) {
-        // blocked mods found, we need the slug for displaying.... we need another job :D !
-        m_slugJob.reset(new NetJob("Slug Job", m_network));
-        int index = 0;
-        for (auto mod : *block) {
-            auto projectId = mod->projectId;
-            auto output = std::make_shared<QByteArray>();
-            auto url = QString("https://api.curseforge.com/v1/mods/%1").arg(projectId);
-            auto dl = Net::ApiDownload::makeByteArray(url, output);
-            qDebug() << "Fetching url slug for file:" << mod->fileName;
-            QObject::connect(dl.get(), &Net::ApiDownload::succeeded, [block, index, output]() {
-                auto mod = block->at(index);  // use the shared_ptr so it is captured and only freed when we are done
-                auto json = QJsonDocument::fromJson(*output);
-                auto base =
-                    Json::requireString(Json::requireObject(Json::requireObject(Json::requireObject(json), "data"), "links"), "websiteUrl");
-                auto link = QString("%1/download/%2").arg(base, QString::number(mod->fileId));
-                mod->websiteUrl = link;
-            });
-            m_slugJob->addNetAction(dl);
-            index++;
+
+        try {
+            QJsonArray entries;
+            entries = Json::requireArray(Json::requireObject(doc), "data");
+
+            for (auto entry : entries) {
+                auto entry_obj = Json::requireObject(entry);
+                auto id = Json::requireInteger(entry_obj, "id");
+                auto file = std::find_if(m_manifest.files.begin(), m_manifest.files.end(),
+                                         [id](const Flame::File& file) { return file.projectId == id; });
+                if (file == m_manifest.files.end()) {
+                    continue;
+                }
+
+                setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(file->version.fileName));
+                FlameMod::loadIndexedPack(file->pack, entry_obj);
+            }
+        } catch (Json::JsonException& e) {
+            qDebug() << e.cause();
+            qDebug() << doc;
         }
-        auto step_progress = std::make_shared<TaskStepProgress>();
-        connect(m_slugJob.get(), &NetJob::succeeded, this, [this, step_progress]() {
-            step_progress->state = TaskStepState::Succeeded;
-            stepProgress(*step_progress);
-            emitSucceeded();
-        });
-        connect(m_slugJob.get(), &NetJob::failed, this, [this, step_progress](QString reason) {
-            step_progress->state = TaskStepState::Failed;
-            stepProgress(*step_progress);
-            emitFailed(reason);
-        });
-        connect(m_slugJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propagateStepProgress);
-        connect(m_slugJob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {
-            qDebug() << "Resolve slug progress" << current << total;
-            step_progress->update(current, total);
-            stepProgress(*step_progress);
-        });
-        connect(m_slugJob.get(), &NetJob::status, this, [this, step_progress](QString status) {
-            step_progress->status = status;
-            stepProgress(*step_progress);
-        });
-
-        m_slugJob->start();
-    } else {
+        step_progress->state = TaskStepState::Succeeded;
+        stepProgress(*step_progress);
         emitSucceeded();
-    }
+    });
+
+    connect(m_task.get(), &Task::failed, this, [this, step_progress](QString reason) {
+        step_progress->state = TaskStepState::Failed;
+        stepProgress(*step_progress);
+        emitFailed(reason);
+    });
+    connect(m_task.get(), &Task::stepProgress, this, &FileResolvingTask::propagateStepProgress);
+    connect(m_task.get(), &Task::progress, this, [this, step_progress](qint64 current, qint64 total) {
+        qDebug() << "Resolve slug progress" << current << total;
+        step_progress->update(current, total);
+        stepProgress(*step_progress);
+    });
+    connect(m_task.get(), &Task::status, this, [this, step_progress](QString status) {
+        step_progress->status = status;
+        stepProgress(*step_progress);
+    });
+
+    m_task->start();
 }
diff --git a/launcher/modplatform/flame/FileResolvingTask.h b/launcher/modplatform/flame/FileResolvingTask.h
index cfa53cb22..edd9fce9a 100644
--- a/launcher/modplatform/flame/FileResolvingTask.h
+++ b/launcher/modplatform/flame/FileResolvingTask.h
@@ -1,7 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 #pragma once
 
+#include <QNetworkAccessManager>
+
 #include "PackManifest.h"
-#include "net/NetJob.h"
 #include "tasks/Task.h"
 
 namespace Flame {
@@ -9,12 +27,12 @@ class FileResolvingTask : public Task {
     Q_OBJECT
    public:
     explicit FileResolvingTask(const shared_qobject_ptr<QNetworkAccessManager>& network, Flame::Manifest& toProcess);
-    virtual ~FileResolvingTask() {};
+    virtual ~FileResolvingTask() = default;
 
     bool canAbort() const override { return true; }
     bool abort() override;
 
-    const Flame::Manifest& getResults() const { return m_toProcess; }
+    const Flame::Manifest& getResults() const { return m_manifest; }
 
    protected:
     virtual void executeTask() override;
@@ -22,16 +40,13 @@ class FileResolvingTask : public Task {
    protected slots:
     void netJobFinished();
 
+   private:
+    void getFlameProjects();
+
    private: /* data */
     shared_qobject_ptr<QNetworkAccessManager> m_network;
-    Flame::Manifest m_toProcess;
-    std::shared_ptr<QByteArray> result;
-    NetJob::Ptr m_dljob;
-    NetJob::Ptr m_checkJob;
-    NetJob::Ptr m_slugJob;
-
-    void modrinthCheckFinished();
-
-    QMap<File*, std::shared_ptr<QByteArray>> blockedProjects;
+    Flame::Manifest m_manifest;
+    std::shared_ptr<QByteArray> m_result;
+    Task::Ptr m_task;
 };
 }  // namespace Flame
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index bb4f18983..ddd48c2b1 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -3,14 +3,16 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "FlameAPI.h"
+#include <memory>
+#include <optional>
 #include "FlameModIndex.h"
 
 #include "Application.h"
 #include "Json.h"
+#include "modplatform/ModIndex.h"
 #include "net/ApiDownload.h"
 #include "net/ApiUpload.h"
 #include "net/NetJob.h"
-#include "net/Upload.h"
 
 Task::Ptr FlameAPI::matchFingerprints(const QList<uint>& fingerprints, std::shared_ptr<QByteArray> response)
 {
@@ -32,7 +34,7 @@ Task::Ptr FlameAPI::matchFingerprints(const QList<uint>& fingerprints, std::shar
     return netJob;
 }
 
-auto FlameAPI::getModFileChangelog(int modId, int fileId) -> QString
+QString FlameAPI::getModFileChangelog(int modId, int fileId)
 {
     QEventLoop lock;
     QString changelog;
@@ -67,7 +69,7 @@ auto FlameAPI::getModFileChangelog(int modId, int fileId) -> QString
     return changelog;
 }
 
-auto FlameAPI::getModDescription(int modId) -> QString
+QString FlameAPI::getModDescription(int modId)
 {
     QEventLoop lock;
     QString description;
@@ -100,7 +102,7 @@ auto FlameAPI::getModDescription(int modId) -> QString
     return description;
 }
 
-auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::IndexedVersion
+QList<ModPlatform::IndexedVersion> FlameAPI::getLatestVersions(VersionSearchArgs&& args)
 {
     auto versions_url_optional = getVersionsURL(args);
     if (!versions_url_optional.has_value())
@@ -112,7 +114,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
 
     auto netJob = makeShared<NetJob>(QString("Flame::GetLatestVersion(%1)").arg(args.pack.name), APPLICATION->network());
     auto response = std::make_shared<QByteArray>();
-    ModPlatform::IndexedVersion ver;
+    QList<ModPlatform::IndexedVersion> ver;
 
     netJob->addNetAction(Net::ApiDownload::makeByteArray(versions_url, response));
 
@@ -132,9 +134,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
 
             for (auto file : arr) {
                 auto file_obj = Json::requireObject(file);
-                auto file_tmp = FlameMod::loadIndexedPackVersion(file_obj);
-                if (file_tmp.date > ver.date && (!args.loaders.has_value() || !file_tmp.loaders || args.loaders.value() & file_tmp.loaders))
-                    ver = file_tmp;
+                ver.append(FlameMod::loadIndexedPackVersion(file_obj));
             }
 
         } catch (Json::JsonException& e) {
@@ -144,7 +144,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
         }
     });
 
-    QObject::connect(netJob.get(), &NetJob::finished, [&loop] { loop.quit(); });
+    QObject::connect(netJob.get(), &NetJob::finished, &loop, &QEventLoop::quit);
 
     netJob->start();
 
@@ -220,3 +220,71 @@ QList<ResourceAPI::SortingMethod> FlameAPI::getSortingMethods() const
              { 7, "Category", QObject::tr("Sort by Category") },
              { 8, "GameVersion", QObject::tr("Sort by Game Version") } };
 }
+
+Task::Ptr FlameAPI::getCategories(std::shared_ptr<QByteArray> response, ModPlatform::ResourceType type)
+{
+    auto netJob = makeShared<NetJob>(QString("Flame::GetCategories"), APPLICATION->network());
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(
+        QUrl(QString("https://api.curseforge.com/v1/categories?gameId=432&classId=%1").arg(getClassId(type))), response));
+    QObject::connect(netJob.get(), &Task::failed, [](QString msg) { qDebug() << "Flame failed to get categories:" << msg; });
+    return netJob;
+}
+
+Task::Ptr FlameAPI::getModCategories(std::shared_ptr<QByteArray> response)
+{
+    return getCategories(response, ModPlatform::ResourceType::MOD);
+}
+
+QList<ModPlatform::Category> FlameAPI::loadModCategories(std::shared_ptr<QByteArray> response)
+{
+    QList<ModPlatform::Category> categories;
+    QJsonParseError parse_error{};
+    QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+    if (parse_error.error != QJsonParseError::NoError) {
+        qWarning() << "Error while parsing JSON response from categories at " << parse_error.offset
+                   << " reason: " << parse_error.errorString();
+        qWarning() << *response;
+        return categories;
+    }
+
+    try {
+        auto obj = Json::requireObject(doc);
+        auto arr = Json::requireArray(obj, "data");
+
+        for (auto val : arr) {
+            auto cat = Json::requireObject(val);
+            auto id = Json::requireInteger(cat, "id");
+            auto name = Json::requireString(cat, "name");
+            categories.push_back({ name, QString::number(id) });
+        }
+
+    } catch (Json::JsonException& e) {
+        qCritical() << "Failed to parse response from a version request.";
+        qCritical() << e.what();
+        qDebug() << doc;
+    }
+    return categories;
+};
+
+std::optional<ModPlatform::IndexedVersion> FlameAPI::getLatestVersion(QList<ModPlatform::IndexedVersion> versions,
+                                                                      QList<ModPlatform::ModLoaderType> instanceLoaders,
+                                                                      ModPlatform::ModLoaderTypes modLoaders)
+{
+    // edge case: mod has installed for forge but the instance is fabric => fabric version will be prioritizated on update
+    auto bestVersion = [&versions](ModPlatform::ModLoaderTypes loader) {
+        std::optional<ModPlatform::IndexedVersion> ver;
+        for (auto file_tmp : versions) {
+            if (file_tmp.loaders & loader && (!ver.has_value() || file_tmp.date > ver->date)) {
+                ver = file_tmp;
+            }
+        }
+        return ver;
+    };
+    for (auto l : instanceLoaders) {
+        auto ver = bestVersion(l);
+        if (ver.has_value()) {
+            return ver;
+        }
+    }
+    return bestVersion(modLoaders);
+}
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index e22d8f0d8..3ca0d5448 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <algorithm>
+#include <QList>
 #include <memory>
 #include "modplatform/ModIndex.h"
 #include "modplatform/ResourceAPI.h"
@@ -12,19 +12,26 @@
 
 class FlameAPI : public NetworkResourceAPI {
    public:
-    auto getModFileChangelog(int modId, int fileId) -> QString;
-    auto getModDescription(int modId) -> QString;
+    QString getModFileChangelog(int modId, int fileId);
+    QString getModDescription(int modId);
 
-    auto getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::IndexedVersion;
+    QList<ModPlatform::IndexedVersion> getLatestVersions(VersionSearchArgs&& args);
+    std::optional<ModPlatform::IndexedVersion> getLatestVersion(QList<ModPlatform::IndexedVersion> versions,
+                                                                QList<ModPlatform::ModLoaderType> instanceLoaders,
+                                                                ModPlatform::ModLoaderTypes fallback);
 
     Task::Ptr getProjects(QStringList addonIds, std::shared_ptr<QByteArray> response) const override;
     Task::Ptr matchFingerprints(const QList<uint>& fingerprints, std::shared_ptr<QByteArray> response);
     Task::Ptr getFiles(const QStringList& fileIds, std::shared_ptr<QByteArray> response) const;
     Task::Ptr getFile(const QString& addonId, const QString& fileId, std::shared_ptr<QByteArray> response) const;
 
-    [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
+    static Task::Ptr getCategories(std::shared_ptr<QByteArray> response, ModPlatform::ResourceType type);
+    static Task::Ptr getModCategories(std::shared_ptr<QByteArray> response);
+    static QList<ModPlatform::Category> loadModCategories(std::shared_ptr<QByteArray> response);
 
-    static inline auto validateModLoaders(ModPlatform::ModLoaderTypes loaders) -> bool
+    [[nodiscard]] QList<ResourceAPI::SortingMethod> getSortingMethods() const override;
+
+    static inline bool validateModLoaders(ModPlatform::ModLoaderTypes loaders)
     {
         return loaders & (ModPlatform::NeoForge | ModPlatform::Forge | ModPlatform::Fabric | ModPlatform::Quilt);
     }
@@ -40,6 +47,8 @@ class FlameAPI : public NetworkResourceAPI {
                 return 12;
             case ModPlatform::ResourceType::SHADER_PACK:
                 return 6552;
+            case ModPlatform::ResourceType::MODPACK:
+                return 4471;
         }
     }
 
@@ -63,7 +72,7 @@ class FlameAPI : public NetworkResourceAPI {
         return 0;
     }
 
-    static auto getModLoaderStrings(const ModPlatform::ModLoaderTypes types) -> const QStringList
+    static const QStringList getModLoaderStrings(const ModPlatform::ModLoaderTypes types)
     {
         QStringList l;
         for (auto loader : { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Fabric, ModPlatform::Quilt }) {
@@ -74,17 +83,11 @@ class FlameAPI : public NetworkResourceAPI {
         return l;
     }
 
-    static auto getModLoaderFilters(ModPlatform::ModLoaderTypes types) -> const QString
-    {
-        return "[" + getModLoaderStrings(types).join(',') + "]";
-    }
+    static const QString getModLoaderFilters(ModPlatform::ModLoaderTypes types) { return "[" + getModLoaderStrings(types).join(',') + "]"; }
 
-   private:
+   public:
     [[nodiscard]] std::optional<QString> getSearchURL(SearchArgs const& args) const override
     {
-        auto gameVersionStr =
-            args.versions.has_value() ? QString("gameVersion=%1").arg(args.versions.value().front().toString()) : QString();
-
         QStringList get_arguments;
         get_arguments.append(QString("classId=%1").arg(getClassId(args.type)));
         get_arguments.append(QString("index=%1").arg(args.offset));
@@ -94,17 +97,22 @@ class FlameAPI : public NetworkResourceAPI {
         if (args.sorting.has_value())
             get_arguments.append(QString("sortField=%1").arg(args.sorting.value().index));
         get_arguments.append("sortOrder=desc");
-        if (args.loaders.has_value())
+        if (args.loaders.has_value() && args.loaders.value() != 0)
             get_arguments.append(QString("modLoaderTypes=%1").arg(getModLoaderFilters(args.loaders.value())));
-        get_arguments.append(gameVersionStr);
+        if (args.categoryIds.has_value() && !args.categoryIds->empty())
+            get_arguments.append(QString("categoryIds=[%1]").arg(args.categoryIds->join(",")));
+
+        if (args.versions.has_value() && !args.versions.value().empty())
+            get_arguments.append(QString("gameVersion=%1").arg(args.versions.value().front().toString()));
 
         return "https://api.curseforge.com/v1/mods/search?gameId=432&" + get_arguments.join('&');
-    };
+    }
 
+   private:
     [[nodiscard]] std::optional<QString> getInfoURL(QString const& id) const override
     {
         return QString("https://api.curseforge.com/v1/mods/%1").arg(id);
-    };
+    }
 
     [[nodiscard]] std::optional<QString> getVersionsURL(VersionSearchArgs const& args) const override
     {
@@ -119,7 +127,7 @@ class FlameAPI : public NetworkResourceAPI {
             url += QString("&modLoaderType=%1").arg(mappedModLoader);
         }
         return url;
-    };
+    }
 
     [[nodiscard]] std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
     {
@@ -131,5 +139,5 @@ class FlameAPI : public NetworkResourceAPI {
             url += QString("&modLoaderType=%1").arg(mappedModLoader);
         }
         return url;
-    };
+    }
 };
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.cpp b/launcher/modplatform/flame/FlameCheckUpdate.cpp
index b4eb304f0..370f37c5f 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.cpp
+++ b/launcher/modplatform/flame/FlameCheckUpdate.cpp
@@ -1,4 +1,5 @@
 #include "FlameCheckUpdate.h"
+#include "Application.h"
 #include "FlameAPI.h"
 #include "FlameModIndex.h"
 
@@ -124,33 +125,29 @@ void FlameCheckUpdate::executeTask()
 
     int i = 0;
     for (auto* mod : m_mods) {
-        if (!mod->enabled()) {
-            emit checkFailed(mod, tr("Disabled mods won't be updated, to prevent mod duplication issues!"));
-            continue;
-        }
-
         setStatus(tr("Getting API response from CurseForge for '%1'...").arg(mod->name()));
         setProgress(i++, m_mods.size());
 
-        auto latest_ver = api.getLatestVersion({ { mod->metadata()->project_id.toString() }, m_game_versions, m_loaders });
+        auto latest_vers = api.getLatestVersions({ { mod->metadata()->project_id.toString() }, m_game_versions });
 
         // Check if we were aborted while getting the latest version
         if (m_was_aborted) {
             aborted();
             return;
         }
+        auto latest_ver = api.getLatestVersion(latest_vers, m_loaders_list, mod->loaders());
 
         setStatus(tr("Parsing the API response from CurseForge for '%1'...").arg(mod->name()));
 
-        if (!latest_ver.addonId.isValid()) {
+        if (!latest_ver.has_value() || !latest_ver->addonId.isValid()) {
             emit checkFailed(mod, tr("No valid version found for this mod. It's probably unavailable for the current game "
                                      "version / mod loader."));
             continue;
         }
 
-        if (latest_ver.downloadUrl.isEmpty() && latest_ver.fileId != mod->metadata()->file_id) {
-            auto pack = getProjectInfo(latest_ver);
-            auto recover_url = QString("%1/download/%2").arg(pack.websiteUrl, latest_ver.fileId.toString());
+        if (latest_ver->downloadUrl.isEmpty() && latest_ver->fileId != mod->metadata()->file_id) {
+            auto pack = getProjectInfo(latest_ver.value());
+            auto recover_url = QString("%1/download/%2").arg(pack.websiteUrl, latest_ver->fileId.toString());
             emit checkFailed(mod, tr("Mod has a new update available, but is not downloadable using CurseForge."), recover_url);
 
             continue;
@@ -166,19 +163,19 @@ void FlameCheckUpdate::executeTask()
             pack->authors.append({ author });
         pack->description = mod->description();
         pack->provider = ModPlatform::ResourceProvider::FLAME;
-        if (!latest_ver.hash.isEmpty() && (mod->metadata()->hash != latest_ver.hash || mod->status() == ModStatus::NotInstalled)) {
+        if (!latest_ver->hash.isEmpty() && (mod->metadata()->hash != latest_ver->hash || mod->status() == ModStatus::NotInstalled)) {
             auto old_version = mod->version();
             if (old_version.isEmpty() && mod->status() != ModStatus::NotInstalled) {
-                auto current_ver = getFileInfo(latest_ver.addonId.toInt(), mod->metadata()->file_id.toInt());
+                auto current_ver = getFileInfo(latest_ver->addonId.toInt(), mod->metadata()->file_id.toInt());
                 old_version = current_ver.version;
             }
 
-            auto download_task = makeShared<ResourceDownloadTask>(pack, latest_ver, m_mods_folder);
-            m_updatable.emplace_back(pack->name, mod->metadata()->hash, old_version, latest_ver.version, latest_ver.version_type,
-                                     api.getModFileChangelog(latest_ver.addonId.toInt(), latest_ver.fileId.toInt()),
-                                     ModPlatform::ResourceProvider::FLAME, download_task);
+            auto download_task = makeShared<ResourceDownloadTask>(pack, latest_ver.value(), m_mods_folder);
+            m_updatable.emplace_back(pack->name, mod->metadata()->hash, old_version, latest_ver->version, latest_ver->version_type,
+                                     api.getModFileChangelog(latest_ver->addonId.toInt(), latest_ver->fileId.toInt()),
+                                     ModPlatform::ResourceProvider::FLAME, download_task, mod->enabled());
         }
-        m_deps.append(std::make_shared<GetModDependenciesTask::PackDependency>(pack, latest_ver));
+        m_deps.append(std::make_shared<GetModDependenciesTask::PackDependency>(pack, latest_ver.value()));
     }
 
     emitSucceeded();
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.h b/launcher/modplatform/flame/FlameCheckUpdate.h
index f5bb1653d..e30ae35b9 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.h
+++ b/launcher/modplatform/flame/FlameCheckUpdate.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Application.h"
 #include "modplatform/CheckUpdateTask.h"
 #include "net/NetJob.h"
 
@@ -10,9 +9,9 @@ class FlameCheckUpdate : public CheckUpdateTask {
    public:
     FlameCheckUpdate(QList<Mod*>& mods,
                      std::list<Version>& mcVersions,
-                     std::optional<ModPlatform::ModLoaderTypes> loaders,
+                     QList<ModPlatform::ModLoaderType> loadersList,
                      std::shared_ptr<ModFolderModel> mods_folder)
-        : CheckUpdateTask(mods, mcVersions, loaders, mods_folder)
+        : CheckUpdateTask(mods, mcVersions, loadersList, mods_folder)
     {}
 
    public slots:
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 003203879..b8c40ee42 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -35,8 +35,11 @@
 
 #include "FlameInstanceCreationTask.h"
 
+#include "QObjectPtr.h"
+#include "minecraft/mod/tasks/LocalModUpdateTask.h"
 #include "modplatform/flame/FileResolvingTask.h"
 #include "modplatform/flame/FlameAPI.h"
+#include "modplatform/flame/FlameModIndex.h"
 #include "modplatform/flame/PackManifest.h"
 
 #include "Application.h"
@@ -51,6 +54,7 @@
 
 #include "settings/INISettingsObject.h"
 
+#include "tasks/ConcurrentTask.h"
 #include "ui/dialogs/BlockedModsDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
 
@@ -58,7 +62,6 @@
 #include <QFileInfo>
 
 #include "meta/Index.h"
-#include "meta/VersionList.h"
 #include "minecraft/World.h"
 #include "minecraft/mod/tasks/LocalResourceParse.h"
 #include "net/ApiDownload.h"
@@ -208,8 +211,7 @@ bool FlameCreationTask::updateInstance()
 
                     Flame::File file;
                     // We don't care about blocked mods, we just need local data to delete the file
-                    file.parseFromObject(entry_obj, false);
-
+                    file.version = FlameMod::loadIndexedPackVersion(entry_obj);
                     auto id = Json::requireInteger(entry_obj, "id");
                     old_files.insert(id, file);
                 }
@@ -219,10 +221,10 @@ bool FlameCreationTask::updateInstance()
 
             // Delete the files
             for (auto& file : old_files) {
-                if (file.fileName.isEmpty() || file.targetFolder.isEmpty())
+                if (file.version.fileName.isEmpty() || file.targetFolder.isEmpty())
                     continue;
 
-                QString relative_path(FS::PathCombine(file.targetFolder, file.fileName));
+                QString relative_path(FS::PathCombine(file.targetFolder, file.version.fileName));
                 qDebug() << "Scheduling" << relative_path << "for removal";
                 m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(relative_path));
             }
@@ -322,7 +324,7 @@ bool FlameCreationTask::createInstance()
         // Keep index file in case we need it some other time (like when changing versions)
         QString new_index_place(FS::PathCombine(parent_folder, "manifest.json"));
         FS::ensureFilePathExists(new_index_place);
-        QFile::rename(index_path, new_index_place);
+        FS::move(index_path, new_index_place);
 
     } catch (const JSONValidationError& e) {
         setError(tr("Could not understand pack manifest:\n") + e.cause());
@@ -336,7 +338,7 @@ bool FlameCreationTask::createInstance()
             Override::createOverrides("overrides", parent_folder, overridePath);
 
             QString mcPath = FS::PathCombine(m_stagingPath, "minecraft");
-            if (!QFile::rename(overridePath, mcPath)) {
+            if (!FS::move(overridePath, mcPath)) {
                 setError(tr("Could not rename the overrides folder:\n") + m_pack.overrides);
                 return false;
             }
@@ -471,15 +473,15 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
     QList<BlockedMod> blocked_mods;
     auto anyBlocked = false;
     for (const auto& result : results.files.values()) {
-        if (result.fileName.endsWith(".zip")) {
-            m_ZIP_resources.append(std::make_pair(result.fileName, result.targetFolder));
+        if (result.version.fileName.endsWith(".zip")) {
+            m_ZIP_resources.append(std::make_pair(result.version.fileName, result.targetFolder));
         }
 
-        if (!result.resolved || result.url.isEmpty()) {
+        if (result.version.downloadUrl.isEmpty()) {
             BlockedMod blocked_mod;
-            blocked_mod.name = result.fileName;
-            blocked_mod.websiteUrl = result.websiteUrl;
-            blocked_mod.hash = result.hash;
+            blocked_mod.name = result.version.fileName;
+            blocked_mod.websiteUrl = QString("%1/download/%2").arg(result.pack.websiteUrl, QString::number(result.fileId));
+            blocked_mod.hash = result.version.hash;
             blocked_mod.matched = false;
             blocked_mod.localPath = "";
             blocked_mod.targetFolder = result.targetFolder;
@@ -521,7 +523,7 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
     QStringList optionalFiles;
     for (auto& result : results) {
         if (!result.required) {
-            optionalFiles << FS::PathCombine(result.targetFolder, result.fileName);
+            optionalFiles << FS::PathCombine(result.targetFolder, result.version.fileName);
         }
     }
 
@@ -537,7 +539,7 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
         selectedOptionalMods = optionalModDialog.getResult();
     }
     for (const auto& result : results) {
-        auto fileName = result.fileName;
+        auto fileName = result.version.fileName;
         fileName = FS::RemoveInvalidPathChars(fileName);
         auto relpath = FS::PathCombine(result.targetFolder, fileName);
 
@@ -548,36 +550,16 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
         relpath = FS::PathCombine("minecraft", relpath);
         auto path = FS::PathCombine(m_stagingPath, relpath);
 
-        switch (result.type) {
-            case Flame::File::Type::Folder: {
-                logWarning(tr("This 'Folder' may need extracting: %1").arg(relpath));
-                // fallthrough intentional, we treat these as plain old mods and dump them wherever.
-            }
-            /* fallthrough */
-            case Flame::File::Type::SingleFile:
-            case Flame::File::Type::Mod: {
-                if (!result.url.isEmpty()) {
-                    qDebug() << "Will download" << result.url << "to" << path;
-                    auto dl = Net::ApiDownload::makeFile(result.url, path);
-                    m_files_job->addNetAction(dl);
-                }
-                break;
-            }
-            case Flame::File::Type::Modpack:
-                logWarning(tr("Nesting modpacks in modpacks is not implemented, nothing was downloaded: %1").arg(relpath));
-                break;
-            case Flame::File::Type::Cmod2:
-            case Flame::File::Type::Ctoc:
-            case Flame::File::Type::Unknown:
-                logWarning(tr("Unrecognized/unhandled PackageType for: %1").arg(relpath));
-                break;
+        if (!result.version.downloadUrl.isEmpty()) {
+            qDebug() << "Will download" << result.version.downloadUrl << "to" << path;
+            auto dl = Net::ApiDownload::makeFile(result.version.downloadUrl, path);
+            m_files_job->addNetAction(dl);
         }
     }
 
-    m_mod_id_resolver.reset();
-    connect(m_files_job.get(), &NetJob::succeeded, this, [&]() {
+    connect(m_files_job.get(), &NetJob::finished, this, [this, &loop]() {
         m_files_job.reset();
-        validateZIPResources();
+        validateZIPResources(loop);
     });
     connect(m_files_job.get(), &NetJob::failed, [&](QString reason) {
         m_files_job.reset();
@@ -588,7 +570,6 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
         setProgress(current, total);
     });
     connect(m_files_job.get(), &NetJob::stepProgress, this, &FlameCreationTask::propagateStepProgress);
-    connect(m_files_job.get(), &NetJob::finished, &loop, &QEventLoop::quit);
 
     setStatus(tr("Downloading mods..."));
     m_files_job->start();
@@ -626,9 +607,10 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
     setAbortable(true);
 }
 
-void FlameCreationTask::validateZIPResources()
+void FlameCreationTask::validateZIPResources(QEventLoop& loop)
 {
     qDebug() << "Validating whether resources stored as .zip are in the right place";
+    QStringList zipMods;
     for (auto [fileName, targetFolder] : m_ZIP_resources) {
         qDebug() << "Checking" << fileName << "...";
         auto localPath = FS::PathCombine(m_stagingPath, "minecraft", targetFolder, fileName);
@@ -668,6 +650,7 @@ void FlameCreationTask::validateZIPResources()
         switch (type) {
             case PackedResourceType::Mod:
                 validatePath(fileName, targetFolder, "mods");
+                zipMods.push_back(fileName);
                 break;
             case PackedResourceType::ResourcePack:
                 validatePath(fileName, targetFolder, "resourcepacks");
@@ -693,4 +676,16 @@ void FlameCreationTask::validateZIPResources()
                 break;
         }
     }
+    auto task = makeShared<ConcurrentTask>(this, "CreateModMetadata", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
+    auto results = m_mod_id_resolver->getResults().files;
+    auto folder = FS::PathCombine(m_stagingPath, "minecraft", "mods", ".index");
+    for (auto file : results) {
+        if (file.targetFolder != "mods" || (file.version.fileName.endsWith(".zip") && !zipMods.contains(file.version.fileName))) {
+            continue;
+        }
+        task->addTask(makeShared<LocalModUpdateTask>(folder, file.pack, file.version));
+    }
+    connect(task.get(), &Task::finished, &loop, &QEventLoop::quit);
+    m_process_update_file_info_job = task;
+    task->start();
 }
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.h b/launcher/modplatform/flame/FlameInstanceCreationTask.h
index 02ad48f2e..28ab176c2 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.h
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.h
@@ -74,7 +74,7 @@ class FlameCreationTask final : public InstanceCreationTask {
     void idResolverSucceeded(QEventLoop&);
     void setupDownloadJob(QEventLoop&);
     void copyBlockedMods(QList<BlockedMod> const& blocked_mods);
-    void validateZIPResources();
+    void validateZIPResources(QEventLoop& loop);
     QString getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion);
 
    private:
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 1ca9237f4..7de05f177 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -7,7 +7,6 @@
 #include "modplatform/flame/FlameAPI.h"
 
 static FlameAPI api;
-static ModPlatform::ProviderCapabilities ProviderCaps;
 
 void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
 {
@@ -21,6 +20,9 @@ void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
     QJsonObject logo = Json::ensureObject(obj, "logo");
     pack.logoName = Json::ensureString(logo, "title");
     pack.logoUrl = Json::ensureString(logo, "thumbnailUrl");
+    if (pack.logoUrl.isEmpty()) {
+        pack.logoUrl = Json::ensureString(logo, "url");
+    }
 
     auto authors = Json::ensureArray(obj, "authors");
     for (auto authorIter : authors) {
@@ -80,10 +82,6 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                                        const BaseInstance* inst)
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
-    QString mcVersion = profile->getComponentVersion("net.minecraft");
-    auto loaders = profile->getSupportedModLoaders();
-
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
 
@@ -91,8 +89,7 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
         if (!file.addonId.isValid())
             file.addonId = pack.addonId;
 
-        if (file.fileId.isValid() &&
-            (!loaders.has_value() || !file.loaders || loaders.value() & file.loaders))  // Heuristic to check if the returned value is valid
+        if (file.fileId.isValid())  // Heuristic to check if the returned value is valid
             unsortedVersions.append(file);
     }
 
@@ -118,19 +115,25 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
 
         if (str.contains('.'))
             file.mcVersion.append(str);
-        auto loader = str.toLower();
-        if (loader == "neoforge")
+
+        if (auto loader = str.toLower(); loader == "neoforge")
             file.loaders |= ModPlatform::NeoForge;
-        if (loader == "forge")
+        else if (loader == "forge")
             file.loaders |= ModPlatform::Forge;
-        if (loader == "cauldron")
+        else if (loader == "cauldron")
             file.loaders |= ModPlatform::Cauldron;
-        if (loader == "liteloader")
+        else if (loader == "liteloader")
             file.loaders |= ModPlatform::LiteLoader;
-        if (loader == "fabric")
+        else if (loader == "fabric")
             file.loaders |= ModPlatform::Fabric;
-        if (loader == "quilt")
+        else if (loader == "quilt")
             file.loaders |= ModPlatform::Quilt;
+        else if (loader == "server" || loader == "client") {
+            if (file.side.isEmpty())
+                file.side = loader;
+            else if (file.side != loader)
+                file.side = "both";
+        }
     }
 
     file.addonId = Json::requireInteger(obj, "modId");
@@ -160,7 +163,7 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
     auto hash_list = Json::ensureArray(obj, "hashes");
     for (auto h : hash_list) {
         auto hash_entry = Json::ensureObject(h);
-        auto hash_types = ProviderCaps.hashType(ModPlatform::ResourceProvider::FLAME);
+        auto hash_types = ModPlatform::ProviderCapabilities::hashType(ModPlatform::ResourceProvider::FLAME);
         auto hash_algo = enumToString(Json::ensureInteger(hash_entry, "algo", 1, "algorithm"));
         if (hash_types.contains(hash_algo)) {
             file.hash = Json::requireString(hash_entry, "value");
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 569181732..e52282492 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -116,7 +116,7 @@ void FlamePackExportTask::collectHashes()
 
         if (relative.startsWith("resourcepacks/") &&
             (relative.endsWith(".zip") || relative.endsWith(".zip.disabled"))) {  // is resourcepack
-            auto hashTask = Hashing::createFlameHasher(file.absoluteFilePath());
+            auto hashTask = Hashing::createHasher(file.absoluteFilePath(), ModPlatform::ResourceProvider::FLAME);
             connect(hashTask.get(), &Hashing::Hasher::resultsReady, [this, relative, file](QString hash) {
                 if (m_state == Task::State::Running) {
                     pendingHashes.insert(hash, { relative, file.absoluteFilePath(), relative.endsWith(".zip") });
@@ -140,7 +140,7 @@ void FlamePackExportTask::collectHashes()
                 continue;
             }
 
-            auto hashTask = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
+            auto hashTask = Hashing::createHasher(mod->fileinfo().absoluteFilePath(), ModPlatform::ResourceProvider::FLAME);
             connect(hashTask.get(), &Hashing::Hasher::resultsReady, [this, mod](QString hash) {
                 if (m_state == Task::State::Running) {
                     pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
@@ -246,7 +246,7 @@ void FlamePackExportTask::makeApiRequest()
         pendingHashes.clear();
         getProjectsInfo();
     });
-    connect(task.get(), &NetJob::failed, this, &FlamePackExportTask::getProjectsInfo);
+    connect(task.get(), &Task::failed, this, &FlamePackExportTask::getProjectsInfo);
     task->start();
 }
 
@@ -441,4 +441,4 @@ QByteArray FlamePackExportTask::generateHTML()
     }
     content = "<ul>" + content + "</ul>";
     return content.toUtf8();
-}
\ No newline at end of file
+}
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 78b46e91f..b11eb17fa 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -26,6 +26,7 @@
 #include "tasks/Task.h"
 
 class FlamePackExportTask : public Task {
+    Q_OBJECT
    public:
     FlamePackExportTask(const QString& name,
                         const QString& version,
diff --git a/launcher/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp
index ca8e0a853..8c25b0482 100644
--- a/launcher/modplatform/flame/FlamePackIndex.cpp
+++ b/launcher/modplatform/flame/FlamePackIndex.cpp
@@ -3,6 +3,7 @@
 #include <QUrl>
 
 #include "Json.h"
+#include "modplatform/ModIndex.h"
 
 void Flame::loadIndexedPack(Flame::IndexedPack& pack, QJsonObject& obj)
 {
@@ -88,8 +89,27 @@ void Flame::loadIndexedPackVersions(Flame::IndexedPack& pack, QJsonArray& arr)
             continue;
         }
 
+        for (auto mcVer : versionArray) {
+            auto str = mcVer.toString();
+
+            if (str.contains('.'))
+                file.mcVersion.append(str);
+
+            if (auto loader = str.toLower(); loader == "neoforge")
+                file.loaders |= ModPlatform::NeoForge;
+            else if (loader == "forge")
+                file.loaders |= ModPlatform::Forge;
+            else if (loader == "cauldron")
+                file.loaders |= ModPlatform::Cauldron;
+            else if (loader == "liteloader")
+                file.loaders |= ModPlatform::LiteLoader;
+            else if (loader == "fabric")
+                file.loaders |= ModPlatform::Fabric;
+            else if (loader == "quilt")
+                file.loaders |= ModPlatform::Quilt;
+        }
+
         // pick the latest version supported
-        file.mcVersion = versionArray[0].toString();
         file.version = Json::requireString(version, "displayName");
 
         ModPlatform::IndexedVersionType::VersionType ver_type;
diff --git a/launcher/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h
index b2a12a67f..11633deee 100644
--- a/launcher/modplatform/flame/FlamePackIndex.h
+++ b/launcher/modplatform/flame/FlamePackIndex.h
@@ -18,6 +18,7 @@ struct IndexedVersion {
     int fileId;
     QString version;
     ModPlatform::IndexedVersionType version_type;
+    ModPlatform::ModLoaderTypes loaders = {};
     QString mcVersion;
     QString downloadUrl;
 };
diff --git a/launcher/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp
index 40a523d31..e576a6a84 100644
--- a/launcher/modplatform/flame/PackManifest.cpp
+++ b/launcher/modplatform/flame/PackManifest.cpp
@@ -68,35 +68,3 @@ void Flame::loadManifest(Flame::Manifest& m, const QString& filepath)
     }
     loadManifestV1(m, obj);
 }
-
-bool Flame::File::parseFromObject(const QJsonObject& obj, bool throw_on_blocked)
-{
-    fileName = Json::requireString(obj, "fileName");
-    // This is a piece of a Flame project JSON pulled out into the file metadata (here) for convenience
-    // It is also optional
-    type = File::Type::SingleFile;
-
-    targetFolder = "mods";
-
-    // get the hash
-    hash = QString();
-    auto hashes = Json::ensureArray(obj, "hashes");
-    for (QJsonValueRef item : hashes) {
-        auto hobj = Json::requireObject(item);
-        auto algo = Json::requireInteger(hobj, "algo");
-        auto value = Json::requireString(hobj, "value");
-        if (algo == 1) {
-            hash = value;
-        }
-    }
-
-    // may throw, if the project is blocked
-    QString rawUrl = Json::ensureString(obj, "downloadUrl");
-    url = QUrl(rawUrl, QUrl::TolerantMode);
-    if (!url.isValid() && throw_on_blocked) {
-        throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
-    }
-
-    resolved = true;
-    return true;
-}
diff --git a/launcher/modplatform/flame/PackManifest.h b/launcher/modplatform/flame/PackManifest.h
index 4417c2430..49a0b2d68 100644
--- a/launcher/modplatform/flame/PackManifest.h
+++ b/launcher/modplatform/flame/PackManifest.h
@@ -40,26 +40,20 @@
 #include <QString>
 #include <QUrl>
 #include <QVector>
+#include "modplatform/ModIndex.h"
 
 namespace Flame {
 struct File {
-    // NOTE: throws JSONValidationError
-    bool parseFromObject(const QJsonObject& object, bool throw_on_blocked = true);
-
     int projectId = 0;
     int fileId = 0;
     // NOTE: the opposite to 'optional'
     bool required = true;
-    QString hash;
-    // NOTE: only set on blocked files ! Empty otherwise.
-    QString websiteUrl;
+
+    ModPlatform::IndexedPack pack;
+    ModPlatform::IndexedVersion version;
 
     // our
-    bool resolved = false;
-    QString fileName;
-    QUrl url;
     QString targetFolder = QStringLiteral("mods");
-    enum class Type { Unknown, Folder, Ctoc, SingleFile, Cmod2, Modpack, Mod } type = Type::Mod;
 };
 
 struct Modloader {
diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index 1f01c4a89..aea16ab50 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -42,17 +42,28 @@ QString toHTML(QList<Mod*> mods, OptionalData extraData)
         }
         if (extraData & Authors && !mod->authors().isEmpty())
             line += " by " + mod->authors().join(", ").toHtmlEscaped();
+        if (extraData & FileName)
+            line += QString(" (%1)").arg(mod->fileinfo().fileName().toHtmlEscaped());
+
         lines.append(QString("<li>%1</li>").arg(line));
     }
     return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
 }
 
+QString toMarkdownEscaped(QString src)
+{
+    for (auto ch : "\\`*_{}[]<>()#+-.!|")
+        src.replace(ch, QString("\\%1").arg(ch));
+    return src;
+}
+
 QString toMarkdown(QList<Mod*> mods, OptionalData extraData)
 {
     QStringList lines;
+
     for (auto mod : mods) {
         auto meta = mod->metadata();
-        auto modName = mod->name();
+        auto modName = toMarkdownEscaped(mod->name());
         if (extraData & Url) {
             auto url = mod->metaurl();
             if (!url.isEmpty())
@@ -60,14 +71,16 @@ QString toMarkdown(QList<Mod*> mods, OptionalData extraData)
         }
         auto line = modName;
         if (extraData & Version) {
-            auto ver = mod->version();
+            auto ver = toMarkdownEscaped(mod->version());
             if (ver.isEmpty() && meta != nullptr)
-                ver = meta->version().toString();
+                ver = toMarkdownEscaped(meta->version().toString());
             if (!ver.isEmpty())
                 line += QString(" [%1]").arg(ver);
         }
         if (extraData & Authors && !mod->authors().isEmpty())
-            line += " by " + mod->authors().join(", ");
+            line += " by " + toMarkdownEscaped(mod->authors().join(", "));
+        if (extraData & FileName)
+            line += QString(" (%1)").arg(toMarkdownEscaped(mod->fileinfo().fileName()));
         lines << "- " + line;
     }
     return lines.join("\n");
@@ -95,6 +108,8 @@ QString toPlainTXT(QList<Mod*> mods, OptionalData extraData)
         }
         if (extraData & Authors && !mod->authors().isEmpty())
             line += " by " + mod->authors().join(", ");
+        if (extraData & FileName)
+            line += QString(" (%1)").arg(mod->fileinfo().fileName());
         lines << line;
     }
     return lines.join("\n");
@@ -122,6 +137,8 @@ QString toJSON(QList<Mod*> mods, OptionalData extraData)
         }
         if (extraData & Authors && !mod->authors().isEmpty())
             line["authors"] = QJsonArray::fromStringList(mod->authors());
+        if (extraData & FileName)
+            line["filename"] = mod->fileinfo().fileName();
         lines << line;
     }
     QJsonDocument doc;
@@ -154,6 +171,8 @@ QString toCSV(QList<Mod*> mods, OptionalData extraData)
                 authors = QString("\"%1\"").arg(mod->authors().join(","));
             data << authors;
         }
+        if (extraData & FileName)
+            data << mod->fileinfo().fileName();
         lines << data.join(",");
     }
     return lines.join("\n");
@@ -189,11 +208,13 @@ QString exportToModList(QList<Mod*> mods, QString lineTemplate)
         if (ver.isEmpty() && meta != nullptr)
             ver = meta->version().toString();
         auto authors = mod->authors().join(", ");
+        auto filename = mod->fileinfo().fileName();
         lines << QString(lineTemplate)
                      .replace("{name}", modName)
                      .replace("{url}", url)
                      .replace("{version}", ver)
-                     .replace("{authors}", authors);
+                     .replace("{authors}", authors)
+                     .replace("{filename}", filename);
     }
     return lines.join("\n");
 }
diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
index 7ea4ba9c2..ab7797fe6 100644
--- a/launcher/modplatform/helpers/ExportToModList.h
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -23,11 +23,7 @@
 namespace ExportToModList {
 
 enum Formats { HTML, MARKDOWN, PLAINTXT, JSON, CSV, CUSTOM };
-enum OptionalData {
-    Authors = 1 << 0,
-    Url = 1 << 1,
-    Version = 1 << 2,
-};
+enum OptionalData { Authors = 1 << 0, Url = 1 << 1, Version = 1 << 2, FileName = 1 << 3 };
 QString exportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
 QString exportToModList(QList<Mod*> mods, QString lineTemplate);
 }  // namespace ExportToModList
diff --git a/launcher/modplatform/helpers/HashUtils.cpp b/launcher/modplatform/helpers/HashUtils.cpp
index 6ff1d1710..a3b8d904c 100644
--- a/launcher/modplatform/helpers/HashUtils.cpp
+++ b/launcher/modplatform/helpers/HashUtils.cpp
@@ -1,144 +1,165 @@
 #include "HashUtils.h"
 
+#include <QBuffer>
 #include <QDebug>
 #include <QFile>
-
-#include "FileSystem.h"
-#include "StringUtils.h"
+#include <QtConcurrentRun>
 
 #include <MurmurHash2.h>
 
 namespace Hashing {
 
-static ModPlatform::ProviderCapabilities ProviderCaps;
-
 Hasher::Ptr createHasher(QString file_path, ModPlatform::ResourceProvider provider)
 {
     switch (provider) {
         case ModPlatform::ResourceProvider::MODRINTH:
-            return createModrinthHasher(file_path);
+            return makeShared<Hasher>(file_path,
+                                      ModPlatform::ProviderCapabilities::hashType(ModPlatform::ResourceProvider::MODRINTH).first());
         case ModPlatform::ResourceProvider::FLAME:
-            return createFlameHasher(file_path);
+            return makeShared<Hasher>(file_path, Algorithm::Murmur2);
         default:
-            qCritical() << "[Hashing]"
-                        << "Unrecognized mod platform!";
+            qCritical() << "[Hashing]" << "Unrecognized mod platform!";
             return nullptr;
     }
 }
 
-Hasher::Ptr createModrinthHasher(QString file_path)
+Hasher::Ptr createHasher(QString file_path, QString type)
 {
-    return makeShared<ModrinthHasher>(file_path);
+    return makeShared<Hasher>(file_path, type);
 }
 
-Hasher::Ptr createFlameHasher(QString file_path)
-{
-    return makeShared<FlameHasher>(file_path);
-}
+class QIODeviceReader : public Murmur2::Reader {
+   public:
+    QIODeviceReader(QIODevice* device) : m_device(device) {}
+    virtual ~QIODeviceReader() = default;
+    virtual int read(char* s, int n) { return m_device->read(s, n); }
+    virtual bool eof() { return m_device->atEnd(); }
+    virtual void goToBeginning() { m_device->seek(0); }
+    virtual void close() { m_device->close(); }
+
+   private:
+    QIODevice* m_device;
+};
 
-Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider)
+QString algorithmToString(Algorithm type)
 {
-    return makeShared<BlockedModHasher>(file_path, provider);
+    switch (type) {
+        case Algorithm::Md4:
+            return "md4";
+        case Algorithm::Md5:
+            return "md5";
+        case Algorithm::Sha1:
+            return "sha1";
+        case Algorithm::Sha256:
+            return "sha256";
+        case Algorithm::Sha512:
+            return "sha512";
+        case Algorithm::Murmur2:
+            return "murmur2";
+        // case Algorithm::Unknown:
+        default:
+            break;
+    }
+    return "unknown";
 }
 
-Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider, QString type)
+Algorithm algorithmFromString(QString type)
 {
-    auto hasher = makeShared<BlockedModHasher>(file_path, provider);
-    hasher->useHashType(type);
-    return hasher;
+    if (type == "md4")
+        return Algorithm::Md4;
+    if (type == "md5")
+        return Algorithm::Md5;
+    if (type == "sha1")
+        return Algorithm::Sha1;
+    if (type == "sha256")
+        return Algorithm::Sha256;
+    if (type == "sha512")
+        return Algorithm::Sha512;
+    if (type == "murmur2")
+        return Algorithm::Murmur2;
+    return Algorithm::Unknown;
 }
 
-void ModrinthHasher::executeTask()
+QString hash(QIODevice* device, Algorithm type)
 {
-    QFile file(m_path);
-
-    try {
-        file.open(QFile::ReadOnly);
-    } catch (FS::FileSystemException& e) {
-        qCritical() << QString("Failed to open JAR file in %1").arg(m_path);
-        qCritical() << QString("Reason: ") << e.cause();
-
-        emitFailed("Failed to open file for hashing.");
-        return;
+    if (!device->isOpen() && !device->open(QFile::ReadOnly))
+        return "";
+    QCryptographicHash::Algorithm alg = QCryptographicHash::Sha1;
+    switch (type) {
+        case Algorithm::Md4:
+            alg = QCryptographicHash::Algorithm::Md4;
+            break;
+        case Algorithm::Md5:
+            alg = QCryptographicHash::Algorithm::Md5;
+            break;
+        case Algorithm::Sha1:
+            alg = QCryptographicHash::Algorithm::Sha1;
+            break;
+        case Algorithm::Sha256:
+            alg = QCryptographicHash::Algorithm::Sha256;
+            break;
+        case Algorithm::Sha512:
+            alg = QCryptographicHash::Algorithm::Sha512;
+            break;
+        case Algorithm::Murmur2: {  // CF-specific
+            auto should_filter_out = [](char c) { return (c == 9 || c == 10 || c == 13 || c == 32); };
+            auto reader = std::make_unique<QIODeviceReader>(device);
+            auto result = QString::number(Murmur2::hash(reader.get(), 4 * MiB, should_filter_out));
+            device->close();
+            return result;
+        }
+        case Algorithm::Unknown:
+            device->close();
+            return "";
     }
 
-    auto hash_type = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH).first();
-    m_hash = ProviderCaps.hash(ModPlatform::ResourceProvider::MODRINTH, &file, hash_type);
+    QCryptographicHash hash(alg);
+    if (!hash.addData(device))
+        qCritical() << "Failed to read JAR to create hash!";
 
-    file.close();
-
-    if (m_hash.isEmpty()) {
-        emitFailed("Empty hash!");
-    } else {
-        emitSucceeded();
-        emit resultsReady(m_hash);
-    }
+    Q_ASSERT(hash.result().length() == hash.hashLength(alg));
+    auto result = hash.result().toHex();
+    device->close();
+    return result;
 }
 
-void FlameHasher::executeTask()
+QString hash(QString fileName, Algorithm type)
 {
-    // CF-specific
-    auto should_filter_out = [](char c) { return (c == 9 || c == 10 || c == 13 || c == 32); };
-
-    std::ifstream file_stream(StringUtils::toStdString(m_path).c_str(), std::ifstream::binary);
-    // TODO: This is very heavy work, but apparently QtConcurrent can't use move semantics, so we can't boop this to another thread.
-    // How do we make this non-blocking then?
-    m_hash = QString::number(MurmurHash2(std::move(file_stream), 4 * MiB, should_filter_out));
-
-    if (m_hash.isEmpty()) {
-        emitFailed("Empty hash!");
-    } else {
-        emitSucceeded();
-        emit resultsReady(m_hash);
-    }
+    QFile file(fileName);
+    return hash(&file, type);
 }
 
-BlockedModHasher::BlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider) : Hasher(file_path), provider(provider)
+QString hash(QByteArray data, Algorithm type)
 {
-    setObjectName(QString("BlockedModHasher: %1").arg(file_path));
-    hash_type = ProviderCaps.hashType(provider).first();
+    QBuffer buff(&data);
+    return hash(&buff, type);
 }
 
-void BlockedModHasher::executeTask()
+void Hasher::executeTask()
 {
-    QFile file(m_path);
-
-    try {
-        file.open(QFile::ReadOnly);
-    } catch (FS::FileSystemException& e) {
-        qCritical() << QString("Failed to open JAR file in %1").arg(m_path);
-        qCritical() << QString("Reason: ") << e.cause();
-
-        emitFailed("Failed to open file for hashing.");
-        return;
-    }
-
-    m_hash = ProviderCaps.hash(provider, &file, hash_type);
-
-    file.close();
-
-    if (m_hash.isEmpty()) {
-        emitFailed("Empty hash!");
-    } else {
-        emitSucceeded();
-        emit resultsReady(m_hash);
-    }
+    m_future = QtConcurrent::run(
+        QThreadPool::globalInstance(), [](QString fileName, Algorithm type) { return hash(fileName, type); }, m_path, m_alg);
+    connect(&m_watcher, &QFutureWatcher<QString>::finished, this, [this] {
+        if (m_future.isCanceled()) {
+            emitAborted();
+        } else if (m_result = m_future.result(); m_result.isEmpty()) {
+            emitFailed("Empty hash!");
+        } else {
+            emitSucceeded();
+            emit resultsReady(m_result);
+        }
+    });
+    m_watcher.setFuture(m_future);
 }
 
-QStringList BlockedModHasher::getHashTypes()
+bool Hasher::abort()
 {
-    return ProviderCaps.hashType(provider);
-}
-
-bool BlockedModHasher::useHashType(QString type)
-{
-    auto types = ProviderCaps.hashType(provider);
-    if (types.contains(type)) {
-        hash_type = type;
+    if (m_future.isRunning()) {
+        m_future.cancel();
+        // NOTE: Here we don't do `emitAborted()` because it will be done when `m_build_zip_future` actually cancels, which may not
+        // occur immediately.
         return true;
     }
-    qDebug() << "Bad hash type " << type << " for provider";
     return false;
 }
-
 }  // namespace Hashing
diff --git a/launcher/modplatform/helpers/HashUtils.h b/launcher/modplatform/helpers/HashUtils.h
index 73a2435a2..5d8b7d132 100644
--- a/launcher/modplatform/helpers/HashUtils.h
+++ b/launcher/modplatform/helpers/HashUtils.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <QCryptographicHash>
+#include <QFuture>
+#include <QFutureWatcher>
 #include <QString>
 
 #include "modplatform/ModIndex.h"
@@ -7,61 +10,42 @@
 
 namespace Hashing {
 
+enum class Algorithm { Md4, Md5, Sha1, Sha256, Sha512, Murmur2, Unknown };
+
+QString algorithmToString(Algorithm type);
+Algorithm algorithmFromString(QString type);
+QString hash(QIODevice* device, Algorithm type);
+QString hash(QString fileName, Algorithm type);
+QString hash(QByteArray data, Algorithm type);
+
 class Hasher : public Task {
     Q_OBJECT
    public:
     using Ptr = shared_qobject_ptr<Hasher>;
 
-    Hasher(QString file_path) : m_path(std::move(file_path)) {}
+    Hasher(QString file_path, Algorithm alg) : m_path(file_path), m_alg(alg) {}
+    Hasher(QString file_path, QString alg) : Hasher(file_path, algorithmFromString(alg)) {}
 
-    /* We can't really abort this task, but we can say we aborted and finish our thing quickly :) */
-    bool abort() override { return true; }
+    bool abort() override;
 
-    void executeTask() override = 0;
+    void executeTask() override;
 
-    QString getResult() const { return m_hash; };
+    QString getResult() const { return m_result; };
     QString getPath() const { return m_path; };
 
    signals:
     void resultsReady(QString hash);
 
-   protected:
-    QString m_hash;
+   private:
+    QString m_result;
     QString m_path;
-};
+    Algorithm m_alg;
 
-class FlameHasher : public Hasher {
-   public:
-    FlameHasher(QString file_path) : Hasher(file_path) { setObjectName(QString("FlameHasher: %1").arg(file_path)); }
-
-    void executeTask() override;
-};
-
-class ModrinthHasher : public Hasher {
-   public:
-    ModrinthHasher(QString file_path) : Hasher(file_path) { setObjectName(QString("ModrinthHasher: %1").arg(file_path)); }
-
-    void executeTask() override;
-};
-
-class BlockedModHasher : public Hasher {
-   public:
-    BlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider);
-
-    void executeTask() override;
-
-    QStringList getHashTypes();
-    bool useHashType(QString type);
-
-   private:
-    ModPlatform::ResourceProvider provider;
-    QString hash_type;
+    QFuture<QString> m_future;
+    QFutureWatcher<QString> m_watcher;
 };
 
 Hasher::Ptr createHasher(QString file_path, ModPlatform::ResourceProvider provider);
-Hasher::Ptr createFlameHasher(QString file_path);
-Hasher::Ptr createModrinthHasher(QString file_path);
-Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider);
-Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider, QString type);
+Hasher::Ptr createHasher(QString file_path, QString type);
 
 }  // namespace Hashing
diff --git a/launcher/modplatform/helpers/NetworkResourceAPI.cpp b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
index 225583764..974e732a7 100644
--- a/launcher/modplatform/helpers/NetworkResourceAPI.cpp
+++ b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
@@ -45,8 +45,8 @@ Task::Ptr NetworkResourceAPI::searchProjects(SearchArgs&& args, SearchCallbacks&
 
     QObject::connect(netJob.get(), &NetJob::failed, [netJob, callbacks](const QString& reason) {
         int network_error_code = -1;
-        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action && failed_action->m_reply)
-            network_error_code = failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
+            network_error_code = failed_action->replyStatusCode();
 
         callbacks.on_fail(reason, network_error_code);
     });
@@ -104,8 +104,8 @@ Task::Ptr NetworkResourceAPI::getProjectVersions(VersionSearchArgs&& args, Versi
     });
     QObject::connect(netJob.get(), &NetJob::failed, [netJob, callbacks](const QString& reason) {
         int network_error_code = -1;
-        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action && failed_action->m_reply)
-            network_error_code = failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
+            network_error_code = failed_action->replyStatusCode();
 
         callbacks.on_fail(reason, network_error_code);
     });
@@ -155,8 +155,8 @@ Task::Ptr NetworkResourceAPI::getDependencyVersion(DependencySearchArgs&& args,
     });
     QObject::connect(netJob.get(), &NetJob::failed, [netJob, callbacks](const QString& reason) {
         int network_error_code = -1;
-        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action && failed_action->m_reply)
-            network_error_code = failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
+            network_error_code = failed_action->replyStatusCode();
 
         callbacks.on_fail(reason, network_error_code);
     });
diff --git a/launcher/modplatform/helpers/OverrideUtils.cpp b/launcher/modplatform/helpers/OverrideUtils.cpp
index 65b5f7603..60983a5cf 100644
--- a/launcher/modplatform/helpers/OverrideUtils.cpp
+++ b/launcher/modplatform/helpers/OverrideUtils.cpp
@@ -10,7 +10,7 @@ void createOverrides(const QString& name, const QString& parent_folder, const QS
 {
     QString file_path(FS::PathCombine(parent_folder, name + ".txt"));
     if (QFile::exists(file_path))
-        QFile::remove(file_path);
+        FS::deletePath(file_path);
 
     FS::ensureFilePathExists(file_path);
 
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index d529dd7e1..8046300e1 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -37,7 +37,7 @@ void PackInstallTask::executeTask()
     progress(1, 2);
 
     m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this] {
-        FS::copy folderCopy(m_pack.path, FS::PathCombine(m_stagingPath, ".minecraft"));
+        FS::copy folderCopy(m_pack.path, FS::PathCombine(m_stagingPath, "minecraft"));
         folderCopy.followSymlinks(true);
         return folderCopy();
     });
diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
index 8f1a6e2ff..a0beeddcc 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
@@ -74,6 +74,7 @@ void PackFetchTask::fetchPrivate(const QStringList& toFetch)
         auto data = std::make_shared<QByteArray>();
         NetJob* job = new NetJob("Fetching private pack", m_network);
         job->addNetAction(Net::ApiDownload::makeByteArray(privatePackBaseUrl.arg(packCode), data));
+        job->setAskRetry(false);
 
         QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode] {
             ModpackList packs;
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index 091296751..7157f7f2d 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -137,7 +137,7 @@ void PackInstallTask::install()
     QDir unzipMcDir(m_stagingPath + "/unzip/minecraft");
     if (unzipMcDir.exists()) {
         // ok, found minecraft dir, move contents to instance dir
-        if (!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft")) {
+        if (!FS::move(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/minecraft")) {
             emitFailed(tr("Failed to move unzipped Minecraft!"));
             return;
         }
@@ -155,7 +155,7 @@ void PackInstallTask::install()
     bool fallback = true;
 
     // handle different versions
-    QFile packJson(m_stagingPath + "/.minecraft/pack.json");
+    QFile packJson(m_stagingPath + "/minecraft/pack.json");
     QDir jarmodDir = QDir(m_stagingPath + "/unzip/instMods");
     if (packJson.exists()) {
         packJson.open(QIODevice::ReadOnly | QIODevice::Text);
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index de133ce7b..d4faf6284 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -139,7 +139,6 @@ void PackInstallTask::resolveMods()
     m_file_id_map.clear();
 
     Flame::Manifest manifest;
-    int index = 0;
 
     for (auto const& file : m_version.files) {
         if (!file.serverOnly && file.url.isEmpty()) {
@@ -151,15 +150,12 @@ void PackInstallTask::resolveMods()
             Flame::File flame_file;
             flame_file.projectId = file.curseforge.project_id;
             flame_file.fileId = file.curseforge.file_id;
-            flame_file.hash = file.sha1;
 
             manifest.files.insert(flame_file.fileId, flame_file);
             m_file_id_map.append(flame_file.fileId);
         } else {
             m_file_id_map.append(-1);
         }
-
-        index++;
     }
 
     m_mod_id_resolver_task.reset(new Flame::FileResolvingTask(APPLICATION->network(), manifest));
@@ -188,11 +184,11 @@ void PackInstallTask::onResolveModsSucceeded()
         VersionFile& local_file = m_version.files[index];
 
         // First check for blocked mods
-        if (!results_file.resolved || results_file.url.isEmpty()) {
+        if (results_file.version.downloadUrl.isEmpty()) {
             BlockedMod blocked_mod;
             blocked_mod.name = local_file.name;
-            blocked_mod.websiteUrl = results_file.websiteUrl;
-            blocked_mod.hash = results_file.hash;
+            blocked_mod.websiteUrl = results_file.pack.websiteUrl;
+            blocked_mod.hash = results_file.version.hash;
             blocked_mod.matched = false;
             blocked_mod.localPath = "";
             blocked_mod.targetFolder = results_file.targetFolder;
@@ -201,7 +197,7 @@ void PackInstallTask::onResolveModsSucceeded()
 
             anyBlocked = true;
         } else {
-            local_file.url = results_file.url.toString();
+            local_file.url = results_file.version.downloadUrl;
         }
     }
 
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.cpp b/launcher/modplatform/modrinth/ModrinthAPI.cpp
index 9777c2cfd..323711e02 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.cpp
+++ b/launcher/modplatform/modrinth/ModrinthAPI.cpp
@@ -120,3 +120,46 @@ QList<ResourceAPI::SortingMethod> ModrinthAPI::getSortingMethods() const
              { 4, "newest", QObject::tr("Sort by Newest") },
              { 5, "updated", QObject::tr("Sort by Last Updated") } };
 }
+
+Task::Ptr ModrinthAPI::getModCategories(std::shared_ptr<QByteArray> response)
+{
+    auto netJob = makeShared<NetJob>(QString("Modrinth::GetCategories"), APPLICATION->network());
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(BuildConfig.MODRINTH_PROD_URL + "/tag/category"), response));
+    QObject::connect(netJob.get(), &Task::failed, [](QString msg) { qDebug() << "Modrinth failed to get categories:" << msg; });
+    return netJob;
+}
+
+QList<ModPlatform::Category> ModrinthAPI::loadCategories(std::shared_ptr<QByteArray> response, QString projectType)
+{
+    QList<ModPlatform::Category> categories;
+    QJsonParseError parse_error{};
+    QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+    if (parse_error.error != QJsonParseError::NoError) {
+        qWarning() << "Error while parsing JSON response from categories at " << parse_error.offset
+                   << " reason: " << parse_error.errorString();
+        qWarning() << *response;
+        return categories;
+    }
+
+    try {
+        auto arr = Json::requireArray(doc);
+
+        for (auto val : arr) {
+            auto cat = Json::requireObject(val);
+            auto name = Json::requireString(cat, "name");
+            if (Json::ensureString(cat, "project_type", "") == projectType)
+                categories.push_back({ name, name });
+        }
+
+    } catch (Json::JsonException& e) {
+        qCritical() << "Failed to parse response from a version request.";
+        qCritical() << e.what();
+        qDebug() << doc;
+    }
+    return categories;
+}
+
+QList<ModPlatform::Category> ModrinthAPI::loadModCategories(std::shared_ptr<QByteArray> response)
+{
+    return loadCategories(response, "mod");
+};
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index d0f0811b2..070f59dad 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -30,6 +30,10 @@ class ModrinthAPI : public NetworkResourceAPI {
 
     Task::Ptr getProjects(QStringList addonIds, std::shared_ptr<QByteArray> response) const override;
 
+    static Task::Ptr getModCategories(std::shared_ptr<QByteArray> response);
+    static QList<ModPlatform::Category> loadCategories(std::shared_ptr<QByteArray> response, QString projectType);
+    static QList<ModPlatform::Category> loadModCategories(std::shared_ptr<QByteArray> response);
+
    public:
     [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
 
@@ -41,7 +45,7 @@ class ModrinthAPI : public NetworkResourceAPI {
         for (auto loader :
              { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Fabric, ModPlatform::Quilt, ModPlatform::LiteLoader }) {
             if (types & loader) {
-                l << getModLoaderString(loader);
+                l << getModLoaderAsString(loader);
             }
         }
         return l;
@@ -56,6 +60,27 @@ class ModrinthAPI : public NetworkResourceAPI {
         return l.join(',');
     }
 
+    static auto getCategoriesFilters(QStringList categories) -> const QString
+    {
+        QStringList l;
+        for (auto cat : categories) {
+            l << QString("\"categories:%1\"").arg(cat);
+        }
+        return l.join(',');
+    }
+
+    static auto getSideFilters(QString side) -> const QString
+    {
+        if (side.isEmpty() || side == "both") {
+            return {};
+        }
+        if (side == "client")
+            return QString("\"client_side:required\",\"client_side:optional\"");
+        if (side == "server")
+            return QString("\"server_side:required\",\"server_side:optional\"");
+        return {};
+    }
+
    private:
     [[nodiscard]] static QString resourceTypeParameter(ModPlatform::ResourceType type)
     {
@@ -66,6 +91,8 @@ class ModrinthAPI : public NetworkResourceAPI {
                 return "resourcepack";
             case ModPlatform::ResourceType::SHADER_PACK:
                 return "shader";
+            case ModPlatform::ResourceType::MODPACK:
+                return "modpack";
             default:
                 qWarning() << "Invalid resource type for Modrinth API!";
                 break;
@@ -73,14 +100,23 @@ class ModrinthAPI : public NetworkResourceAPI {
 
         return "";
     }
+
     [[nodiscard]] QString createFacets(SearchArgs const& args) const
     {
         QStringList facets_list;
 
-        if (args.loaders.has_value())
+        if (args.loaders.has_value() && args.loaders.value() != 0)
             facets_list.append(QString("[%1]").arg(getModLoaderFilters(args.loaders.value())));
-        if (args.versions.has_value())
+        if (args.versions.has_value() && !args.versions.value().empty())
             facets_list.append(QString("[%1]").arg(getGameVersionsArray(args.versions.value())));
+        if (args.side.has_value()) {
+            auto side = getSideFilters(args.side.value());
+            if (!side.isEmpty())
+                facets_list.append(QString("[%1]").arg(side));
+        }
+        if (args.categoryIds.has_value() && !args.categoryIds->empty())
+            facets_list.append(QString("[%1]").arg(getCategoriesFilters(args.categoryIds.value())));
+
         facets_list.append(QString("[\"project_type:%1\"]").arg(resourceTypeParameter(args.type)));
 
         return QString("[%1]").arg(facets_list.join(','));
@@ -89,7 +125,7 @@ class ModrinthAPI : public NetworkResourceAPI {
    public:
     [[nodiscard]] inline auto getSearchURL(SearchArgs const& args) const -> std::optional<QString> override
     {
-        if (args.loaders.has_value()) {
+        if (args.loaders.has_value() && args.loaders.value() != 0) {
             if (!validateModLoaders(args.loaders.value())) {
                 qWarning() << "Modrinth - or our interface - does not support any the provided mod loaders!";
                 return {};
@@ -130,7 +166,7 @@ class ModrinthAPI : public NetworkResourceAPI {
             .arg(BuildConfig.MODRINTH_PROD_URL, args.pack.addonId.toString(), get_arguments.isEmpty() ? "" : "?", get_arguments.join('&'));
     };
 
-    auto getGameVersionsArray(std::list<Version> mcVersions) const -> QString
+    QString getGameVersionsArray(std::list<Version> mcVersions) const
     {
         QString s;
         for (auto& ver : mcVersions) {
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
index e78061f27..70bf138a8 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
@@ -1,24 +1,31 @@
 #include "ModrinthCheckUpdate.h"
+#include "Application.h"
 #include "ModrinthAPI.h"
 #include "ModrinthPackIndex.h"
 
 #include "Json.h"
 
+#include "QObjectPtr.h"
 #include "ResourceDownloadTask.h"
 
 #include "modplatform/helpers/HashUtils.h"
 
 #include "tasks/ConcurrentTask.h"
 
-#include "minecraft/mod/ModFolderModel.h"
-
 static ModrinthAPI api;
-static ModPlatform::ProviderCapabilities ProviderCaps;
+
+ModrinthCheckUpdate::ModrinthCheckUpdate(QList<Mod*>& mods,
+                                         std::list<Version>& mcVersions,
+                                         QList<ModPlatform::ModLoaderType> loadersList,
+                                         std::shared_ptr<ModFolderModel> mods_folder)
+    : CheckUpdateTask(mods, mcVersions, loadersList, mods_folder)
+    , m_hash_type(ModPlatform::ProviderCapabilities::hashType(ModPlatform::ResourceProvider::MODRINTH).first())
+{}
 
 bool ModrinthCheckUpdate::abort()
 {
-    if (m_net_job)
-        return m_net_job->abort();
+    if (m_job)
+        return m_job->abort();
     return true;
 }
 
@@ -30,152 +37,185 @@ bool ModrinthCheckUpdate::abort()
 void ModrinthCheckUpdate::executeTask()
 {
     setStatus(tr("Preparing mods for Modrinth..."));
-    setProgress(0, 3);
+    setProgress(0, 9);
 
-    QHash<QString, Mod*> mappings;
-
-    // Create all hashes
-    QStringList hashes;
-    auto best_hash_type = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH).first();
-
-    ConcurrentTask hashing_task(this, "MakeModrinthHashesTask", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
+    auto hashing_task =
+        makeShared<ConcurrentTask>(this, "MakeModrinthHashesTask", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
     for (auto* mod : m_mods) {
-        if (!mod->enabled()) {
-            emit checkFailed(mod, tr("Disabled mods won't be updated, to prevent mod duplication issues!"));
-            continue;
-        }
-
         auto hash = mod->metadata()->hash;
 
         // Sadly the API can only handle one hash type per call, se we
         // need to generate a new hash if the current one is innadequate
         // (though it will rarely happen, if at all)
-        if (mod->metadata()->hash_format != best_hash_type) {
-            auto hash_task = Hashing::createModrinthHasher(mod->fileinfo().absoluteFilePath());
-            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [&hashes, &mappings, mod](QString hash) {
-                hashes.append(hash);
-                mappings.insert(hash, mod);
-            });
+        if (mod->metadata()->hash_format != m_hash_type) {
+            auto hash_task = Hashing::createHasher(mod->fileinfo().absoluteFilePath(), ModPlatform::ResourceProvider::MODRINTH);
+            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod](QString hash) { m_mappings.insert(hash, mod); });
             connect(hash_task.get(), &Task::failed, [this] { failed("Failed to generate hash"); });
-            hashing_task.addTask(hash_task);
+            hashing_task->addTask(hash_task);
         } else {
-            hashes.append(hash);
-            mappings.insert(hash, mod);
+            m_mappings.insert(hash, mod);
         }
     }
 
-    QEventLoop loop;
-    connect(&hashing_task, &Task::finished, [&loop] { loop.quit(); });
-    hashing_task.start();
-    loop.exec();
-
-    auto response = std::make_shared<QByteArray>();
-    auto job = api.latestVersions(hashes, best_hash_type, m_game_versions, m_loaders, response);
-
-    connect(job.get(), &Task::succeeded, this, [this, response, mappings, best_hash_type, job] {
-        QJsonParseError parse_error{};
-        QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
-        if (parse_error.error != QJsonParseError::NoError) {
-            qWarning() << "Error while parsing JSON response from ModrinthCheckUpdate at " << parse_error.offset
-                       << " reason: " << parse_error.errorString();
-            qWarning() << *response;
-
-            emitFailed(parse_error.errorString());
-            return;
-        }
+    connect(hashing_task.get(), &Task::finished, this, &ModrinthCheckUpdate::checkNextLoader);
+    m_job = hashing_task;
+    hashing_task->start();
+}
 
-        setStatus(tr("Parsing the API response from Modrinth..."));
-        setProgress(2, 3);
+void ModrinthCheckUpdate::checkVersionsResponse(std::shared_ptr<QByteArray> response,
+                                                ModPlatform::ModLoaderTypes loader,
+                                                bool forceModLoaderCheck)
+{
+    QJsonParseError parse_error{};
+    QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+    if (parse_error.error != QJsonParseError::NoError) {
+        qWarning() << "Error while parsing JSON response from ModrinthCheckUpdate at " << parse_error.offset
+                   << " reason: " << parse_error.errorString();
+        qWarning() << *response;
+
+        emitFailed(parse_error.errorString());
+        return;
+    }
 
-        try {
-            for (auto hash : mappings.keys()) {
-                auto project_obj = doc[hash].toObject();
+    setStatus(tr("Parsing the API response from Modrinth..."));
+    setProgress(m_next_loader_idx * 2, 9);
 
-                // If the returned project is empty, but we have Modrinth metadata,
-                // it means this specific version is not available
-                if (project_obj.isEmpty()) {
-                    qDebug() << "Mod " << mappings.find(hash).value()->name() << " got an empty response.";
-                    qDebug() << "Hash: " << hash;
+    try {
+        for (auto hash : m_mappings.keys()) {
+            if (forceModLoaderCheck && !(m_mappings[hash]->loaders() & loader)) {
+                continue;
+            }
+            auto project_obj = doc[hash].toObject();
 
-                    emit checkFailed(
-                        mappings.find(hash).value(),
-                        tr("No valid version found for this mod. It's probably unavailable for the current game version / mod loader."));
+            // If the returned project is empty, but we have Modrinth metadata,
+            // it means this specific version is not available
+            if (project_obj.isEmpty()) {
+                qDebug() << "Mod " << m_mappings.find(hash).value()->name() << " got an empty response." << "Hash: " << hash;
 
-                    continue;
-                }
+                continue;
+            }
 
-                // Sometimes a version may have multiple files, one with "forge" and one with "fabric",
-                // so we may want to filter it
-                QString loader_filter;
-                if (m_loaders.has_value()) {
-                    static auto flags = { ModPlatform::ModLoaderType::NeoForge, ModPlatform::ModLoaderType::Forge,
-                                          ModPlatform::ModLoaderType::Fabric, ModPlatform::ModLoaderType::Quilt };
-                    for (auto flag : flags) {
-                        if (m_loaders.value().testFlag(flag)) {
-                            loader_filter = ModPlatform::getModLoaderString(flag);
-                            break;
-                        }
-                    }
+            // Sometimes a version may have multiple files, one with "forge" and one with "fabric",
+            // so we may want to filter it
+            QString loader_filter;
+            static auto flags = { ModPlatform::ModLoaderType::NeoForge, ModPlatform::ModLoaderType::Forge,
+                                  ModPlatform::ModLoaderType::Quilt, ModPlatform::ModLoaderType::Fabric };
+            for (auto flag : flags) {
+                if (loader.testFlag(flag)) {
+                    loader_filter = ModPlatform::getModLoaderAsString(flag);
+                    break;
                 }
+            }
 
-                // Currently, we rely on a couple heuristics to determine whether an update is actually available or not:
-                // - The file needs to be preferred: It is either the primary file, or the one found via (explicit) usage of the
-                // loader_filter
-                // - The version reported by the JAR is different from the version reported by the indexed version (it's usually the case)
-                // Such is the pain of having arbitrary files for a given version .-.
+            // Currently, we rely on a couple heuristics to determine whether an update is actually available or not:
+            // - The file needs to be preferred: It is either the primary file, or the one found via (explicit) usage of the
+            // loader_filter
+            // - The version reported by the JAR is different from the version reported by the indexed version (it's usually the case)
+            // Such is the pain of having arbitrary files for a given version .-.
 
-                auto project_ver = Modrinth::loadIndexedPackVersion(project_obj, best_hash_type, loader_filter);
-                if (project_ver.downloadUrl.isEmpty()) {
-                    qCritical() << "Modrinth mod without download url!";
-                    qCritical() << project_ver.fileName;
+            auto project_ver = Modrinth::loadIndexedPackVersion(project_obj, m_hash_type, loader_filter);
+            if (project_ver.downloadUrl.isEmpty()) {
+                qCritical() << "Modrinth mod without download url!" << project_ver.fileName;
 
-                    emit checkFailed(mappings.find(hash).value(), tr("Mod has an empty download URL"));
+                continue;
+            }
 
+            auto mod_iter = m_mappings.find(hash);
+            if (mod_iter == m_mappings.end()) {
+                qCritical() << "Failed to remap mod from Modrinth!";
+                continue;
+            }
+            auto mod = *mod_iter;
+            m_mappings.remove(hash);
+
+            auto key = project_ver.hash;
+
+            // Fake pack with the necessary info to pass to the download task :)
+            auto pack = std::make_shared<ModPlatform::IndexedPack>();
+            pack->name = mod->name();
+            pack->slug = mod->metadata()->slug;
+            pack->addonId = mod->metadata()->project_id;
+            pack->websiteUrl = mod->homeurl();
+            for (auto& author : mod->authors())
+                pack->authors.append({ author });
+            pack->description = mod->description();
+            pack->provider = ModPlatform::ResourceProvider::MODRINTH;
+            if ((key != hash && project_ver.is_preferred) || (mod->status() == ModStatus::NotInstalled)) {
+                if (mod->version() == project_ver.version_number)
                     continue;
-                }
 
-                auto mod_iter = mappings.find(hash);
-                if (mod_iter == mappings.end()) {
-                    qCritical() << "Failed to remap mod from Modrinth!";
-                    continue;
-                }
-                auto mod = *mod_iter;
-
-                auto key = project_ver.hash;
-
-                // Fake pack with the necessary info to pass to the download task :)
-                auto pack = std::make_shared<ModPlatform::IndexedPack>();
-                pack->name = mod->name();
-                pack->slug = mod->metadata()->slug;
-                pack->addonId = mod->metadata()->project_id;
-                pack->websiteUrl = mod->homeurl();
-                for (auto& author : mod->authors())
-                    pack->authors.append({ author });
-                pack->description = mod->description();
-                pack->provider = ModPlatform::ResourceProvider::MODRINTH;
-                if ((key != hash && project_ver.is_preferred) || (mod->status() == ModStatus::NotInstalled)) {
-                    if (mod->version() == project_ver.version_number)
-                        continue;
-
-                    auto download_task = makeShared<ResourceDownloadTask>(pack, project_ver, m_mods_folder);
-
-                    m_updatable.emplace_back(pack->name, hash, mod->version(), project_ver.version_number, project_ver.version_type,
-                                             project_ver.changelog, ModPlatform::ResourceProvider::MODRINTH, download_task);
-                }
-                m_deps.append(std::make_shared<GetModDependenciesTask::PackDependency>(pack, project_ver));
+                auto download_task = makeShared<ResourceDownloadTask>(pack, project_ver, m_mods_folder);
+
+                m_updatable.emplace_back(pack->name, hash, mod->version(), project_ver.version_number, project_ver.version_type,
+                                         project_ver.changelog, ModPlatform::ResourceProvider::MODRINTH, download_task, mod->enabled());
             }
-        } catch (Json::JsonException& e) {
-            emitFailed(e.cause() + " : " + e.what());
-            return;
+            m_deps.append(std::make_shared<GetModDependenciesTask::PackDependency>(pack, project_ver));
         }
-        emitSucceeded();
-    });
+    } catch (Json::JsonException& e) {
+        emitFailed(e.cause() + " : " + e.what());
+        return;
+    }
+    checkNextLoader();
+}
+
+void ModrinthCheckUpdate::getUpdateModsForLoader(ModPlatform::ModLoaderTypes loader, bool forceModLoaderCheck)
+{
+    auto response = std::make_shared<QByteArray>();
+    QStringList hashes;
+    if (forceModLoaderCheck) {
+        for (auto hash : m_mappings.keys()) {
+            if (m_mappings[hash]->loaders() & loader) {
+                hashes.append(hash);
+            }
+        }
+    } else {
+        hashes = m_mappings.keys();
+    }
+    auto job = api.latestVersions(hashes, m_hash_type, m_game_versions, loader, response);
 
-    connect(job.get(), &Task::failed, this, &ModrinthCheckUpdate::emitFailed);
+    connect(job.get(), &Task::succeeded, this,
+            [this, response, loader, forceModLoaderCheck] { checkVersionsResponse(response, loader, forceModLoaderCheck); });
+
+    connect(job.get(), &Task::failed, this, &ModrinthCheckUpdate::checkNextLoader);
 
     setStatus(tr("Waiting for the API response from Modrinth..."));
-    setProgress(1, 3);
+    setProgress(m_next_loader_idx * 2 - 1, 9);
 
-    m_net_job = qSharedPointerObjectCast<NetJob, Task>(job);
+    m_job = job;
     job->start();
 }
+
+void ModrinthCheckUpdate::checkNextLoader()
+{
+    if (m_mappings.isEmpty()) {
+        emitSucceeded();
+        return;
+    }
+    if (m_next_loader_idx < m_loaders_list.size()) {
+        getUpdateModsForLoader(m_loaders_list.at(m_next_loader_idx));
+        m_next_loader_idx++;
+        return;
+    }
+    static auto flags = { ModPlatform::ModLoaderType::NeoForge, ModPlatform::ModLoaderType::Forge, ModPlatform::ModLoaderType::Quilt,
+                          ModPlatform::ModLoaderType::Fabric };
+    for (auto flag : flags) {
+        if (!m_loaders_list.contains(flag)) {
+            m_loaders_list.append(flag);
+            m_next_loader_idx++;
+            setProgress(m_next_loader_idx * 2 - 1, 9);
+            for (auto m : m_mappings) {
+                if (m->loaders() & flag) {
+                    getUpdateModsForLoader(flag, true);
+                    return;
+                }
+            }
+            setProgress(m_next_loader_idx * 2, 9);
+        }
+    }
+    for (auto m : m_mappings) {
+        emit checkFailed(m,
+                         tr("No valid version found for this mod. It's probably unavailable for the current game version / mod loader."));
+    }
+    emitSucceeded();
+    return;
+}
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.h b/launcher/modplatform/modrinth/ModrinthCheckUpdate.h
index f2f2c7e92..dab4bda2f 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.h
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "Application.h"
 #include "modplatform/CheckUpdateTask.h"
-#include "net/NetJob.h"
 
 class ModrinthCheckUpdate : public CheckUpdateTask {
     Q_OBJECT
@@ -10,17 +8,21 @@ class ModrinthCheckUpdate : public CheckUpdateTask {
    public:
     ModrinthCheckUpdate(QList<Mod*>& mods,
                         std::list<Version>& mcVersions,
-                        std::optional<ModPlatform::ModLoaderTypes> loaders,
-                        std::shared_ptr<ModFolderModel> mods_folder)
-        : CheckUpdateTask(mods, mcVersions, loaders, mods_folder)
-    {}
+                        QList<ModPlatform::ModLoaderType> loadersList,
+                        std::shared_ptr<ModFolderModel> mods_folder);
 
    public slots:
     bool abort() override;
 
    protected slots:
     void executeTask() override;
+    void getUpdateModsForLoader(ModPlatform::ModLoaderTypes loader, bool forceModLoaderCheck = false);
+    void checkVersionsResponse(std::shared_ptr<QByteArray> response, ModPlatform::ModLoaderTypes loader, bool forceModLoaderCheck = false);
+    void checkNextLoader();
 
    private:
-    NetJob::Ptr m_net_job = nullptr;
+    Task::Ptr m_job = nullptr;
+    QHash<QString, Mod*> m_mappings;
+    QString m_hash_type;
+    int m_next_loader_idx = 0;
 };
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
index c55581b79..994dd774f 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
@@ -5,8 +5,12 @@
 #include "InstanceList.h"
 #include "Json.h"
 
+#include "QObjectPtr.h"
+#include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
 
+#include "minecraft/mod/Mod.h"
+#include "modplatform/EnsureMetadataTask.h"
 #include "modplatform/helpers/OverrideUtils.h"
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
@@ -20,6 +24,8 @@
 #include "ui/pages/modplatform/OptionalModDialog.h"
 
 #include <QAbstractButton>
+#include <QFileInfo>
+#include <QHash>
 #include <vector>
 
 bool ModrinthCreationTask::abort()
@@ -28,8 +34,8 @@ bool ModrinthCreationTask::abort()
         return false;
 
     m_abort = true;
-    if (m_files_job)
-        m_files_job->abort();
+    if (m_task)
+        m_task->abort();
     return Task::abort();
 }
 
@@ -58,6 +64,7 @@ bool ModrinthCreationTask::updateInstance()
         return false;
 
     auto version_name = inst->getManagedPackVersionName();
+    m_root_path = QFileInfo(inst->gameRoot()).fileName();
     auto version_str = !version_name.isEmpty() ? tr(" (version %1)").arg(version_name) : "";
 
     if (shouldConfirmUpdate()) {
@@ -129,7 +136,7 @@ bool ModrinthCreationTask::updateInstance()
         }
 
         auto old_client_overrides = Override::readOverrides("client-overrides", old_index_folder);
-        for (const auto& entry : old_overrides) {
+        for (const auto& entry : old_client_overrides) {
             if (entry.isEmpty())
                 continue;
             qDebug() << "Scheduling" << entry << "for removal";
@@ -171,9 +178,9 @@ bool ModrinthCreationTask::createInstance()
     // Keep index file in case we need it some other time (like when changing versions)
     QString new_index_place(FS::PathCombine(parent_folder, "modrinth.index.json"));
     FS::ensureFilePathExists(new_index_place);
-    QFile::rename(index_path, new_index_place);
+    FS::move(index_path, new_index_place);
 
-    auto mcPath = FS::PathCombine(m_stagingPath, ".minecraft");
+    auto mcPath = FS::PathCombine(m_stagingPath, m_root_path);
 
     auto override_path = FS::PathCombine(m_stagingPath, "overrides");
     if (QFile::exists(override_path)) {
@@ -181,7 +188,7 @@ bool ModrinthCreationTask::createInstance()
         Override::createOverrides("overrides", parent_folder, override_path);
 
         // Apply the overrides
-        if (!QFile::rename(override_path, mcPath)) {
+        if (!FS::move(override_path, mcPath)) {
             setError(tr("Could not rename the overrides folder:\n") + "overrides");
             return false;
         }
@@ -232,11 +239,11 @@ bool ModrinthCreationTask::createInstance()
     instance.setName(name());
     instance.saveNow();
 
-    m_files_job.reset(new NetJob(tr("Mod Download Modrinth"), APPLICATION->network()));
+    auto downloadMods = makeShared<NetJob>(tr("Mod Download Modrinth"), APPLICATION->network());
 
-    auto root_modpack_path = FS::PathCombine(m_stagingPath, ".minecraft");
+    auto root_modpack_path = FS::PathCombine(m_stagingPath, m_root_path);
     auto root_modpack_url = QUrl::fromLocalFile(root_modpack_path);
-
+    QHash<QString, Mod*> mods;
     for (auto file : m_files) {
         auto fileName = file.path;
         fileName = FS::RemoveInvalidPathChars(fileName);
@@ -247,20 +254,27 @@ bool ModrinthCreationTask::createInstance()
                          .arg(fileName));
             return false;
         }
+        if (fileName.startsWith("mods/")) {
+            auto mod = new Mod(file_path);
+            ModDetails d;
+            d.mod_id = file_path;
+            mod->setDetails(d);
+            mods[file.hash.toHex()] = mod;
+        }
 
         qDebug() << "Will try to download" << file.downloads.front() << "to" << file_path;
         auto dl = Net::ApiDownload::makeFile(file.downloads.dequeue(), file_path);
         dl->addValidator(new Net::ChecksumValidator(file.hashAlgorithm, file.hash));
-        m_files_job->addNetAction(dl);
+        downloadMods->addNetAction(dl);
 
         if (!file.downloads.empty()) {
             // FIXME: This really needs to be put into a ConcurrentTask of
             // MultipleOptionsTask's , once those exist :)
             auto param = dl.toWeakRef();
-            connect(dl.get(), &NetAction::failed, [this, &file, file_path, param] {
+            connect(dl.get(), &Task::failed, [&file, file_path, param, downloadMods] {
                 auto ndl = Net::ApiDownload::makeFile(file.downloads.dequeue(), file_path);
                 ndl->addValidator(new Net::ChecksumValidator(file.hashAlgorithm, file.hash));
-                m_files_job->addNetAction(ndl);
+                downloadMods->addNetAction(ndl);
                 if (auto shared = param.lock())
                     shared->succeeded();
             });
@@ -269,23 +283,51 @@ bool ModrinthCreationTask::createInstance()
 
     bool ended_well = false;
 
-    connect(m_files_job.get(), &NetJob::succeeded, this, [&]() { ended_well = true; });
-    connect(m_files_job.get(), &NetJob::failed, [&](const QString& reason) {
+    connect(downloadMods.get(), &NetJob::succeeded, this, [&]() { ended_well = true; });
+    connect(downloadMods.get(), &NetJob::failed, [&](const QString& reason) {
         ended_well = false;
         setError(reason);
     });
-    connect(m_files_job.get(), &NetJob::finished, &loop, &QEventLoop::quit);
-    connect(m_files_job.get(), &NetJob::progress, [&](qint64 current, qint64 total) {
+    connect(downloadMods.get(), &NetJob::finished, &loop, &QEventLoop::quit);
+    connect(downloadMods.get(), &NetJob::progress, [&](qint64 current, qint64 total) {
         setDetails(tr("%1 out of %2 complete").arg(current).arg(total));
         setProgress(current, total);
     });
-    connect(m_files_job.get(), &NetJob::stepProgress, this, &ModrinthCreationTask::propagateStepProgress);
+    connect(downloadMods.get(), &NetJob::stepProgress, this, &ModrinthCreationTask::propagateStepProgress);
 
     setStatus(tr("Downloading mods..."));
-    m_files_job->start();
+    downloadMods->start();
+    m_task = downloadMods;
 
     loop.exec();
 
+    if (!ended_well) {
+        for (auto m : mods) {
+            delete m;
+        }
+        return ended_well;
+    }
+
+    QEventLoop ensureMetaLoop;
+    QDir folder = FS::PathCombine(instance.modsRoot(), ".index");
+    auto ensureMetadataTask = makeShared<EnsureMetadataTask>(mods, folder, ModPlatform::ResourceProvider::MODRINTH);
+    connect(ensureMetadataTask.get(), &Task::succeeded, this, [&]() { ended_well = true; });
+    connect(ensureMetadataTask.get(), &Task::finished, &ensureMetaLoop, &QEventLoop::quit);
+    connect(ensureMetadataTask.get(), &Task::progress, [&](qint64 current, qint64 total) {
+        setDetails(tr("%1 out of %2 complete").arg(current).arg(total));
+        setProgress(current, total);
+    });
+    connect(ensureMetadataTask.get(), &Task::stepProgress, this, &ModrinthCreationTask::propagateStepProgress);
+
+    ensureMetadataTask->start();
+    m_task = ensureMetadataTask;
+
+    ensureMetaLoop.exec();
+    for (auto m : mods) {
+        delete m;
+    }
+    mods.clear();
+
     // Update information of the already installed instance, if any.
     if (m_instance && ended_well) {
         setAbortable(false);
@@ -344,23 +386,8 @@ bool ModrinthCreationTask::parseManifest(const QString& index_path,
                 }
 
                 QJsonObject hashes = Json::requireObject(modInfo, "hashes");
-                QString hash;
-                QCryptographicHash::Algorithm hashAlgorithm;
-                hash = Json::ensureString(hashes, "sha1");
-                hashAlgorithm = QCryptographicHash::Sha1;
-                if (hash.isEmpty()) {
-                    hash = Json::ensureString(hashes, "sha512");
-                    hashAlgorithm = QCryptographicHash::Sha512;
-                    if (hash.isEmpty()) {
-                        hash = Json::ensureString(hashes, "sha256");
-                        hashAlgorithm = QCryptographicHash::Sha256;
-                        if (hash.isEmpty()) {
-                            throw JSONValidationError("No hash found for: " + file.path);
-                        }
-                    }
-                }
-                file.hash = QByteArray::fromHex(hash.toLatin1());
-                file.hashAlgorithm = hashAlgorithm;
+                file.hash = QByteArray::fromHex(Json::requireString(hashes, "sha512").toLatin1());
+                file.hashAlgorithm = QCryptographicHash::Sha512;
 
                 // Do not use requireUrl, which uses StrictMode, instead use QUrl's default TolerantMode
                 // (as Modrinth seems to incorrectly handle spaces)
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h
index 1bd5b7de9..ddfa7ae95 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h
@@ -1,15 +1,11 @@
 #pragma once
 
-#include "InstanceCreationTask.h"
-
 #include <optional>
-
-#include "minecraft/MinecraftInstance.h"
+#include "BaseInstance.h"
+#include "InstanceCreationTask.h"
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
 
-#include "net/NetJob.h"
-
 class ModrinthCreationTask final : public InstanceCreationTask {
     Q_OBJECT
 
@@ -43,7 +39,9 @@ class ModrinthCreationTask final : public InstanceCreationTask {
     QString m_managed_id, m_managed_version_id, m_managed_name;
 
     std::vector<Modrinth::File> m_files;
-    NetJob::Ptr m_files_job;
+    Task::Ptr m_task;
 
     std::optional<InstancePtr> m_instance;
+
+    QString m_root_path = "minecraft";
 };
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index 7e52153b9..b7c2757e5 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -18,6 +18,7 @@
 
 #include "ModrinthPackExportTask.h"
 
+#include <QCoreApplication>
 #include <QCryptographicHash>
 #include <QFileInfo>
 #include <QMessageBox>
@@ -27,6 +28,8 @@
 #include "minecraft/PackProfile.h"
 #include "minecraft/mod/MetadataHandler.h"
 #include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/helpers/HashUtils.h"
+#include "tasks/Task.h"
 
 const QStringList ModrinthPackExportTask::PREFIXES({ "mods/", "coremods/", "resourcepacks/", "texturepacks/", "shaderpacks/" });
 const QStringList ModrinthPackExportTask::FILE_EXTENSIONS({ "jar", "litemod", "zip" });
@@ -102,8 +105,6 @@ void ModrinthPackExportTask::collectHashes()
             }))
             continue;
 
-        QCryptographicHash sha512(QCryptographicHash::Algorithm::Sha512);
-
         QFile openFile(file.absoluteFilePath());
         if (!openFile.open(QFile::ReadOnly)) {
             qWarning() << "Could not open" << file << "for hashing";
@@ -115,7 +116,7 @@ void ModrinthPackExportTask::collectHashes()
             qWarning() << "Could not read" << file;
             continue;
         }
-        sha512.addData(data);
+        auto sha512 = Hashing::hash(data, Hashing::Algorithm::Sha512);
 
         auto allMods = mcInstance->loaderModList()->allMods();
         if (auto modIter = std::find_if(allMods.begin(), allMods.end(), [&file](Mod* mod) { return mod->fileinfo() == file; });
@@ -127,11 +128,9 @@ void ModrinthPackExportTask::collectHashes()
                 if (!url.isEmpty() && BuildConfig.MODRINTH_MRPACK_HOSTS.contains(url.host())) {
                     qDebug() << "Resolving" << relative << "from index";
 
-                    QCryptographicHash sha1(QCryptographicHash::Algorithm::Sha1);
-                    sha1.addData(data);
+                    auto sha1 = Hashing::hash(data, Hashing::Algorithm::Sha1);
 
-                    ResolvedFile resolvedFile{ sha1.result().toHex(), sha512.result().toHex(), url.toEncoded(), openFile.size(),
-                                               mod->metadata()->side };
+                    ResolvedFile resolvedFile{ sha1, sha512, url.toEncoded(), openFile.size(), mod->metadata()->side };
                     resolvedFiles[relative] = resolvedFile;
 
                     // nice! we've managed to resolve based on local metadata!
@@ -142,7 +141,7 @@ void ModrinthPackExportTask::collectHashes()
         }
 
         qDebug() << "Enqueueing" << relative << "for Modrinth query";
-        pendingHashes[relative] = sha512.result().toHex();
+        pendingHashes[relative] = sha512;
     }
 
     setAbortable(true);
@@ -157,8 +156,8 @@ void ModrinthPackExportTask::makeApiRequest()
         setStatus(tr("Finding versions for hashes..."));
         auto response = std::make_shared<QByteArray>();
         task = api.currentVersions(pendingHashes.values(), "sha512", response);
-        connect(task.get(), &NetJob::succeeded, [this, response]() { parseApiResponse(response); });
-        connect(task.get(), &NetJob::failed, this, &ModrinthPackExportTask::emitFailed);
+        connect(task.get(), &Task::succeeded, [this, response]() { parseApiResponse(response); });
+        connect(task.get(), &Task::failed, this, &ModrinthPackExportTask::emitFailed);
         task->start();
     }
 }
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.h b/launcher/modplatform/modrinth/ModrinthPackExportTask.h
index 81c2f25bf..ee740a456 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.h
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.h
@@ -27,6 +27,7 @@
 #include "tasks/Task.h"
 
 class ModrinthPackExportTask : public Task {
+    Q_OBJECT
    public:
     ModrinthPackExportTask(const QString& name,
                            const QString& version,
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 983d1caf4..48b27a597 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,7 +27,6 @@
 #include "modplatform/ModIndex.h"
 
 static ModrinthAPI api;
-static ModPlatform::ProviderCapabilities ProviderCaps;
 
 bool shouldDownloadOnSide(QString side)
 {
@@ -115,16 +115,11 @@ void Modrinth::loadExtraPackData(ModPlatform::IndexedPack& pack, QJsonObject& ob
 void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr, const BaseInstance* inst)
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
-    QString mcVersion = profile->getComponentVersion("net.minecraft");
-    auto loaders = profile->getSupportedModLoaders();
-
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
         auto file = loadIndexedPackVersion(obj);
 
-        if (file.fileId.isValid() &&
-            (!loaders.has_value() || !file.loaders || loaders.value() & file.loaders))  // Heuristic to check if the returned value is valid
+        if (file.fileId.isValid())  // Heuristic to check if the returned value is valid
             unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
@@ -156,15 +151,15 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj,
     for (auto loader : loaders) {
         if (loader == "neoforge")
             file.loaders |= ModPlatform::NeoForge;
-        if (loader == "forge")
+        else if (loader == "forge")
             file.loaders |= ModPlatform::Forge;
-        if (loader == "cauldron")
+        else if (loader == "cauldron")
             file.loaders |= ModPlatform::Cauldron;
-        if (loader == "liteloader")
+        else if (loader == "liteloader")
             file.loaders |= ModPlatform::LiteLoader;
-        if (loader == "fabric")
+        else if (loader == "fabric")
             file.loaders |= ModPlatform::Fabric;
-        if (loader == "quilt")
+        else if (loader == "quilt")
             file.loaders |= ModPlatform::Quilt;
     }
     file.version = Json::requireString(obj, "name");
@@ -236,7 +231,7 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj,
             file.hash = Json::requireString(hash_list, preferred_hash_type);
             file.hash_type = preferred_hash_type;
         } else {
-            auto hash_types = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH);
+            auto hash_types = ModPlatform::ProviderCapabilities::hashType(ModPlatform::ResourceProvider::MODRINTH);
             for (auto& hash_type : hash_types) {
                 if (hash_list.contains(hash_type)) {
                     file.hash = Json::requireString(hash_list, hash_type);
diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
index 7846e966d..c52a1743b 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
@@ -131,6 +131,25 @@ auto loadIndexedVersion(QJsonObject& obj) -> ModpackVersion
 
     file.name = Json::requireString(obj, "name");
     file.version = Json::requireString(obj, "version_number");
+    auto gameVersions = Json::ensureArray(obj, "game_versions");
+    if (!gameVersions.isEmpty()) {
+        file.gameVersion = Json::ensureString(gameVersions[0]);
+    }
+    auto loaders = Json::requireArray(obj, "loaders");
+    for (auto loader : loaders) {
+        if (loader == "neoforge")
+            file.loaders |= ModPlatform::NeoForge;
+        else if (loader == "forge")
+            file.loaders |= ModPlatform::Forge;
+        else if (loader == "cauldron")
+            file.loaders |= ModPlatform::Cauldron;
+        else if (loader == "liteloader")
+            file.loaders |= ModPlatform::LiteLoader;
+        else if (loader == "fabric")
+            file.loaders |= ModPlatform::Fabric;
+        else if (loader == "quilt")
+            file.loaders |= ModPlatform::Quilt;
+    }
     file.version_type = ModPlatform::IndexedVersionType(Json::requireString(obj, "version_type"));
     file.changelog = Json::ensureString(obj, "changelog");
 
diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.h b/launcher/modplatform/modrinth/ModrinthPackManifest.h
index 1ffd31d83..2e5e2da84 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.h
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.h
@@ -84,8 +84,10 @@ struct ModpackExtra {
 struct ModpackVersion {
     QString name;
     QString version;
+    QString gameVersion;
     ModPlatform::IndexedVersionType version_type;
     QString changelog;
+    ModPlatform::ModLoaderTypes loaders = {};
 
     QString id;
     QString project_id;
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index f6e0936b4..325b0a6e4 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -66,8 +67,6 @@ static inline auto indexFileName(QString const& mod_slug) -> QString
     return QString("%1.pw.toml").arg(mod_slug);
 }
 
-static ModPlatform::ProviderCapabilities ProviderCaps;
-
 // Helper functions for extracting data from the TOML file
 auto stringEntry(toml::table table, QString entry_name) -> QString
 {
@@ -114,7 +113,11 @@ auto V1::createModFormat([[maybe_unused]] QDir& index_dir,
     mod.provider = mod_pack.provider;
     mod.file_id = mod_version.fileId;
     mod.project_id = mod_pack.addonId;
-    mod.side = stringToSide(mod_pack.side);
+    mod.side = stringToSide(mod_version.side.isEmpty() ? mod_pack.side : mod_version.side);
+    mod.loaders = mod_version.loaders;
+    mod.mcVersions = mod_version.mcVersion;
+    mod.mcVersions.sort();
+    mod.releaseType = mod_version.version_type;
 
     return mod;
 }
@@ -182,6 +185,18 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
             break;
     }
 
+    toml::array loaders;
+    for (auto loader : { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Cauldron, ModPlatform::LiteLoader, ModPlatform::Fabric,
+                         ModPlatform::Quilt }) {
+        if (mod.loaders & loader) {
+            loaders.push_back(getModLoaderAsString(loader).toStdString());
+        }
+    }
+    toml::array mcVersions;
+    for (auto version : mod.mcVersions) {
+        mcVersions.push_back(version.toStdString());
+    }
+
     if (!index_file.open(QIODevice::ReadWrite)) {
         qCritical() << QString("Could not open file %1!").arg(normalized_fname);
         return;
@@ -193,6 +208,9 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
         auto tbl = toml::table{ { "name", mod.name.toStdString() },
                                 { "filename", mod.filename.toStdString() },
                                 { "side", sideToString(mod.side).toStdString() },
+                                { "x-prismlauncher-loaders", loaders },
+                                { "x-prismlauncher-mc-versions", mcVersions },
+                                { "x-prismlauncher-release-type", mod.releaseType.toString().toStdString() },
                                 { "download",
                                   toml::table{
                                       { "mode", mod.mode.toStdString() },
@@ -200,7 +218,7 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
                                       { "hash-format", mod.hash_format.toStdString() },
                                       { "hash", mod.hash.toStdString() },
                                   } },
-                                { "update", toml::table{ { ProviderCaps.name(mod.provider), update } } } };
+                                { "update", toml::table{ { ModPlatform::ProviderCapabilities::name(mod.provider), update } } } };
         std::stringstream ss;
         ss << tbl;
         in_stream << QString::fromStdString(ss.str());
@@ -277,6 +295,25 @@ auto V1::getIndexForMod(QDir& index_dir, QString slug) -> Mod
         mod.name = stringEntry(table, "name");
         mod.filename = stringEntry(table, "filename");
         mod.side = stringToSide(stringEntry(table, "side"));
+        mod.releaseType = ModPlatform::IndexedVersionType(stringEntry(table, "x-prismlauncher-release-type"));
+        if (auto loaders = table["x-prismlauncher-loaders"]; loaders && loaders.is_array()) {
+            for (auto&& loader : *loaders.as_array()) {
+                if (loader.is_string()) {
+                    mod.loaders |= ModPlatform::getModLoaderFromString(QString::fromStdString(loader.as_string()->value_or("")));
+                }
+            }
+        }
+        if (auto versions = table["x-prismlauncher-mc-versions"]; versions && versions.is_array()) {
+            for (auto&& version : *versions.as_array()) {
+                if (version.is_string()) {
+                    auto ver = QString::fromStdString(version.as_string()->value_or(""));
+                    if (!ver.isEmpty()) {
+                        mod.mcVersions << ver;
+                    }
+                }
+            }
+            mod.mcVersions.sort();
+        }
     }
 
     {  // [download] info
@@ -302,11 +339,11 @@ auto V1::getIndexForMod(QDir& index_dir, QString slug) -> Mod
         }
 
         toml::table* mod_provider_table = nullptr;
-        if ((mod_provider_table = update_table[ProviderCaps.name(Provider::FLAME)].as_table())) {
+        if ((mod_provider_table = update_table[ModPlatform::ProviderCapabilities::name(Provider::FLAME)].as_table())) {
             mod.provider = Provider::FLAME;
             mod.file_id = intEntry(*mod_provider_table, "file-id");
             mod.project_id = intEntry(*mod_provider_table, "project-id");
-        } else if ((mod_provider_table = update_table[ProviderCaps.name(Provider::MODRINTH)].as_table())) {
+        } else if ((mod_provider_table = update_table[ModPlatform::ProviderCapabilities::name(Provider::MODRINTH)].as_table())) {
             mod.provider = Provider::MODRINTH;
             mod.mod_id() = stringEntry(*mod_provider_table, "mod-id");
             mod.version() = stringEntry(*mod_provider_table, "version");
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index dce198b0e..95362bbfe 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -41,6 +42,9 @@ class V1 {
         QString name{};
         QString filename{};
         Side side{ Side::UniversalSide };
+        ModPlatform::ModLoaderTypes loaders;
+        QStringList mcVersions;
+        ModPlatform::IndexedVersionType releaseType;
 
         // [download]
         QString mode{};
diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
index ad08d72d4..cc9ced10b 100644
--- a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
@@ -62,7 +62,7 @@ void Technic::SingleZipPackInstallTask::downloadSucceeded()
     m_abortable = false;
 
     setStatus(tr("Extracting modpack"));
-    QDir extractDir(FS::PathCombine(m_stagingPath, ".minecraft"));
+    QDir extractDir(FS::PathCombine(m_stagingPath, "minecraft"));
     qDebug() << "Attempting to create instance from" << m_archivePath;
 
     // open the zip and find relevant files in it
diff --git a/launcher/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp
index c162d6253..ffda05ee9 100644
--- a/launcher/modplatform/technic/SolderPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SolderPackInstallTask.cpp
@@ -114,8 +114,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
 
         auto dl = Net::ApiDownload::makeFile(mod.url, path);
         if (!mod.md5.isEmpty()) {
-            auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
-            dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
+            dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, mod.md5));
         }
         m_filesNetJob->addNetAction(dl);
 
@@ -140,7 +139,7 @@ void Technic::SolderPackInstallTask::downloadSucceeded()
     m_filesNetJob.reset();
     m_extractFuture = QtConcurrent::run([this]() {
         int i = 0;
-        QString extractDir = FS::PathCombine(m_stagingPath, ".minecraft");
+        QString extractDir = FS::PathCombine(m_stagingPath, "minecraft");
         FS::ensureFolderPathExists(extractDir);
 
         while (m_modCount > i) {
diff --git a/launcher/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp
index a548820e8..9050e14d8 100644
--- a/launcher/modplatform/technic/TechnicPackProcessor.cpp
+++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp
@@ -33,7 +33,7 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings,
                                         const QString& minecraftVersion,
                                         [[maybe_unused]] const bool isSolder)
 {
-    QString minecraftPath = FS::PathCombine(stagingPath, ".minecraft");
+    QString minecraftPath = FS::PathCombine(stagingPath, "minecraft");
     QString configPath = FS::PathCombine(stagingPath, "instance.cfg");
     auto instanceSettings = std::make_shared<INISettingsObject>(configPath);
     MinecraftInstance instance(globalSettings, instanceSettings, stagingPath);
diff --git a/launcher/net/ApiDownload.cpp b/launcher/net/ApiDownload.cpp
index aaa8ff650..78eb1f851 100644
--- a/launcher/net/ApiDownload.cpp
+++ b/launcher/net/ApiDownload.cpp
@@ -18,49 +18,29 @@
  */
 
 #include "net/ApiDownload.h"
-#include "ByteArraySink.h"
-#include "ChecksumValidator.h"
-#include "MetaCacheSink.h"
-#include "net/NetAction.h"
+#include "net/ApiHeaderProxy.h"
 
 namespace Net {
 
-auto ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Download::Ptr
+Download::Ptr ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Download::Options options)
 {
-    auto dl = makeShared<ApiDownload>();
-    dl->m_url = url;
-    dl->setObjectName(QString("CACHE:") + url.toString());
-    dl->m_options = options;
-    auto md5Node = new ChecksumValidator(QCryptographicHash::Md5);
-    auto cachedNode = new MetaCacheSink(entry, md5Node, options.testFlag(Option::MakeEternal));
-    dl->m_sink.reset(cachedNode);
+    auto dl = Download::makeCached(url, entry, options);
+    dl->addHeaderProxy(new ApiHeaderProxy());
     return dl;
 }
 
-auto ApiDownload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options) -> Download::Ptr
+Download::Ptr ApiDownload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Download::Options options)
 {
-    auto dl = makeShared<ApiDownload>();
-    dl->m_url = url;
-    dl->setObjectName(QString("BYTES:") + url.toString());
-    dl->m_options = options;
-    dl->m_sink.reset(new ByteArraySink(output));
+    auto dl = Download::makeByteArray(url, output, options);
+    dl->addHeaderProxy(new ApiHeaderProxy());
     return dl;
 }
 
-auto ApiDownload::makeFile(QUrl url, QString path, Options options) -> Download::Ptr
+Download::Ptr ApiDownload::makeFile(QUrl url, QString path, Download::Options options)
 {
-    auto dl = makeShared<ApiDownload>();
-    dl->m_url = url;
-    dl->setObjectName(QString("FILE:") + url.toString());
-    dl->m_options = options;
-    dl->m_sink.reset(new FileSink(path));
+    auto dl = Download::makeFile(url, path, options);
+    dl->addHeaderProxy(new ApiHeaderProxy());
     return dl;
 }
 
-void ApiDownload::init()
-{
-    qDebug() << "Setting up api download";
-    auto api_headers = new ApiHeaderProxy();
-    addHeaderProxy(api_headers);
-}
 }  // namespace Net
diff --git a/launcher/net/ApiDownload.h b/launcher/net/ApiDownload.h
index 638c94e11..842c25c56 100644
--- a/launcher/net/ApiDownload.h
+++ b/launcher/net/ApiDownload.h
@@ -19,20 +19,14 @@
 
 #pragma once
 
-#include "ApiHeaderProxy.h"
 #include "Download.h"
 
 namespace Net {
 
-class ApiDownload : public Download {
-   public:
-    virtual ~ApiDownload() = default;
-
-    static auto makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions) -> Download::Ptr;
-    static auto makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options = Option::NoOptions) -> Download::Ptr;
-    static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
-
-    void init() override;
-};
+namespace ApiDownload {
+Download::Ptr makeCached(QUrl url, MetaEntryPtr entry, Download::Options options = Download::Option::NoOptions);
+Download::Ptr makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Download::Options options = Download::Option::NoOptions);
+Download::Ptr makeFile(QUrl url, QString path, Download::Options options = Download::Option::NoOptions);
+};  // namespace ApiDownload
 
 }  // namespace Net
diff --git a/launcher/net/ApiUpload.cpp b/launcher/net/ApiUpload.cpp
index c1221b764..a2b8f357b 100644
--- a/launcher/net/ApiUpload.cpp
+++ b/launcher/net/ApiUpload.cpp
@@ -18,26 +18,15 @@
  */
 
 #include "net/ApiUpload.h"
-#include "ByteArraySink.h"
-#include "ChecksumValidator.h"
-#include "MetaCacheSink.h"
-#include "net/NetAction.h"
+#include "net/ApiHeaderProxy.h"
 
 namespace Net {
 
 Upload::Ptr ApiUpload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data)
 {
-    auto up = makeShared<ApiUpload>();
-    up->m_url = std::move(url);
-    up->m_sink.reset(new ByteArraySink(output));
-    up->m_post_data = std::move(m_post_data);
+    auto up = Upload::makeByteArray(url, output, m_post_data);
+    up->addHeaderProxy(new ApiHeaderProxy());
     return up;
 }
 
-void ApiUpload::init()
-{
-    qDebug() << "Setting up api upload";
-    auto api_headers = new ApiHeaderProxy();
-    addHeaderProxy(api_headers);
-}
 }  // namespace Net
diff --git a/launcher/net/ApiUpload.h b/launcher/net/ApiUpload.h
index b12842b05..674a3b93f 100644
--- a/launcher/net/ApiUpload.h
+++ b/launcher/net/ApiUpload.h
@@ -19,18 +19,12 @@
 
 #pragma once
 
-#include "ApiHeaderProxy.h"
 #include "Upload.h"
 
 namespace Net {
 
-class ApiUpload : public Upload {
-   public:
-    virtual ~ApiUpload() = default;
-
-    static Upload::Ptr makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data);
-
-    void init() override;
+namespace ApiUpload {
+Upload::Ptr makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data);
 };
 
 }  // namespace Net
diff --git a/launcher/net/ByteArraySink.h b/launcher/net/ByteArraySink.h
index 411262128..ac64052b9 100644
--- a/launcher/net/ByteArraySink.h
+++ b/launcher/net/ByteArraySink.h
@@ -74,10 +74,6 @@ class ByteArraySink : public Sink {
 
     auto abort() -> Task::State override
     {
-        if (m_output)
-            m_output->clear();
-        else
-            qWarning() << "ByteArraySink did not clear the buffer because it's not addressable";
         failAllValidators();
         return Task::State::Failed;
     }
diff --git a/launcher/net/ChecksumValidator.h b/launcher/net/ChecksumValidator.h
index 34ee5f856..7663d5d12 100644
--- a/launcher/net/ChecksumValidator.h
+++ b/launcher/net/ChecksumValidator.h
@@ -43,6 +43,9 @@
 namespace Net {
 class ChecksumValidator : public Validator {
    public:
+    ChecksumValidator(QCryptographicHash::Algorithm algorithm, QString expectedHex)
+        : Net::ChecksumValidator(algorithm, QByteArray::fromHex(expectedHex.toLatin1()))
+    {}
     ChecksumValidator(QCryptographicHash::Algorithm algorithm, QByteArray expected = QByteArray())
         : m_checksum(algorithm), m_expected(expected) {};
     virtual ~ChecksumValidator() = default;
@@ -60,7 +63,11 @@ class ChecksumValidator : public Validator {
         return true;
     }
 
-    auto abort() -> bool override { return true; }
+    auto abort() -> bool override
+    {
+        m_checksum.reset();
+        return true;
+    }
 
     auto validate(QNetworkReply&) -> bool override
     {
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index bae364f12..49686db98 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -47,8 +47,6 @@
 #include "ChecksumValidator.h"
 #include "MetaCacheSink.h"
 
-#include "net/NetAction.h"
-
 namespace Net {
 
 #if defined(LAUNCHER_APPLICATION)
diff --git a/launcher/net/HttpMetaCache.cpp b/launcher/net/HttpMetaCache.cpp
index d8b1c7636..4985ad080 100644
--- a/launcher/net/HttpMetaCache.cpp
+++ b/launcher/net/HttpMetaCache.cpp
@@ -175,6 +175,8 @@ void HttpMetaCache::evictAll()
             if (!evictEntry(entry))
                 qCWarning(taskHttpMetaCacheLogC) << "Unexpected missing cache entry" << entry->m_basePath;
         }
+        map.entry_list.clear();
+        FS::deletePath(map.base_path);
     }
 }
 
diff --git a/launcher/net/Logging.cpp b/launcher/net/Logging.cpp
index a9b9db7cf..cd0c88d3c 100644
--- a/launcher/net/Logging.cpp
+++ b/launcher/net/Logging.cpp
@@ -22,5 +22,6 @@
 Q_LOGGING_CATEGORY(taskNetLogC, "launcher.task.net")
 Q_LOGGING_CATEGORY(taskDownloadLogC, "launcher.task.net.download")
 Q_LOGGING_CATEGORY(taskUploadLogC, "launcher.task.net.upload")
+Q_LOGGING_CATEGORY(taskMCSkinsLogC, "launcher.task.minecraft.skins")
 Q_LOGGING_CATEGORY(taskMetaCacheLogC, "launcher.task.net.metacache")
 Q_LOGGING_CATEGORY(taskHttpMetaCacheLogC, "launcher.task.net.metacache.http")
diff --git a/launcher/net/Logging.h b/launcher/net/Logging.h
index 4deed2b49..2536f31aa 100644
--- a/launcher/net/Logging.h
+++ b/launcher/net/Logging.h
@@ -24,5 +24,6 @@
 Q_DECLARE_LOGGING_CATEGORY(taskNetLogC)
 Q_DECLARE_LOGGING_CATEGORY(taskDownloadLogC)
 Q_DECLARE_LOGGING_CATEGORY(taskUploadLogC)
+Q_DECLARE_LOGGING_CATEGORY(taskMCSkinsLogC)
 Q_DECLARE_LOGGING_CATEGORY(taskMetaCacheLogC)
 Q_DECLARE_LOGGING_CATEGORY(taskHttpMetaCacheLogC)
diff --git a/launcher/net/NetAction.h b/launcher/net/NetAction.h
deleted file mode 100644
index b66b91941..000000000
--- a/launcher/net/NetAction.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#pragma once
-
-#include <QNetworkReply>
-#include <QUrl>
-
-#include "QObjectPtr.h"
-#include "tasks/Task.h"
-
-#include "HeaderProxy.h"
-
-class NetAction : public Task {
-    Q_OBJECT
-   protected:
-    explicit NetAction() : Task() {}
-
-   public:
-    using Ptr = shared_qobject_ptr<NetAction>;
-
-    virtual ~NetAction() = default;
-
-    QUrl url() { return m_url; }
-
-    void setNetwork(shared_qobject_ptr<QNetworkAccessManager> network) { m_network = network; }
-
-    void addHeaderProxy(Net::HeaderProxy* proxy) { m_headerProxies.push_back(std::shared_ptr<Net::HeaderProxy>(proxy)); }
-    virtual void init() = 0;
-
-   protected slots:
-    virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) = 0;
-    virtual void downloadError(QNetworkReply::NetworkError error) = 0;
-    virtual void downloadFinished() = 0;
-    virtual void downloadReadyRead() = 0;
-
-    virtual void sslErrors(const QList<QSslError>& errors)
-    {
-        int i = 1;
-        for (auto error : errors) {
-            qCritical() << "Network SSL Error #" << i << " : " << error.errorString();
-            auto cert = error.certificate();
-            qCritical() << "Certificate in question:\n" << cert.toText();
-            i++;
-        }
-    }
-
-   public slots:
-    void startAction(shared_qobject_ptr<QNetworkAccessManager> network)
-    {
-        m_network = network;
-        executeTask();
-    }
-
-   protected:
-    void executeTask() override {}
-
-   public:
-    shared_qobject_ptr<QNetworkAccessManager> m_network;
-
-    /// the network reply
-    unique_qobject_ptr<QNetworkReply> m_reply;
-
-    /// source URL
-    QUrl m_url;
-    std::vector<std::shared_ptr<Net::HeaderProxy>> m_headerProxies;
-};
diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp
index d027e31c9..38b73c6d9 100644
--- a/launcher/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
@@ -36,19 +36,26 @@
  */
 
 #include "NetJob.h"
+#include <QNetworkReply>
+#include "net/NetRequest.h"
 #include "tasks/ConcurrentTask.h"
 #if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #endif
 
-NetJob::NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network) : ConcurrentTask(nullptr, job_name), m_network(network)
+NetJob::NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network, int max_concurrent)
+    : ConcurrentTask(nullptr, job_name), m_network(network)
 {
 #if defined(LAUNCHER_APPLICATION)
-    setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
+    if (APPLICATION_DYN && max_concurrent < 0)
+        max_concurrent = APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt();
 #endif
+    if (max_concurrent > 0)
+        setMaxConcurrent(max_concurrent);
 }
 
-auto NetJob::addNetAction(NetAction::Ptr action) -> bool
+auto NetJob::addNetAction(Net::NetRequest::Ptr action) -> bool
 {
     action->setNetwork(m_network);
 
@@ -59,11 +66,14 @@ auto NetJob::addNetAction(NetAction::Ptr action) -> bool
 
 void NetJob::executeNextSubTask()
 {
-    // We're finished, check for failures and retry if we can (up to 3 times)
-    if (isRunning() && m_queue.isEmpty() && m_doing.isEmpty() && !m_failed.isEmpty() && m_try < 3) {
+    // We're finished, check for failures and retry if we can (up to m_auto_retry_limit times)
+    if (isRunning() && m_queue.isEmpty() && m_doing.isEmpty() && !m_failed.isEmpty() && m_try < m_auto_retry_limit) {
         m_try += 1;
-        while (!m_failed.isEmpty())
-            m_queue.enqueue(m_failed.take(*m_failed.keyBegin()));
+        while (!m_failed.isEmpty()) {
+            auto task = m_failed.take(*m_failed.keyBegin());
+            m_done.remove(task.get());
+            m_queue.enqueue(task);
+        }
     }
     ConcurrentTask::executeNextSubTask();
 }
@@ -111,11 +121,11 @@ auto NetJob::abort() -> bool
     return fullyAborted;
 }
 
-auto NetJob::getFailedActions() -> QList<NetAction*>
+auto NetJob::getFailedActions() -> QList<Net::NetRequest*>
 {
-    QList<NetAction*> failed;
+    QList<Net::NetRequest*> failed;
     for (auto index : m_failed) {
-        failed.push_back(dynamic_cast<NetAction*>(index.get()));
+        failed.push_back(dynamic_cast<Net::NetRequest*>(index.get()));
     }
     return failed;
 }
@@ -124,7 +134,7 @@ auto NetJob::getFailedFiles() -> QList<QString>
 {
     QList<QString> failed;
     for (auto index : m_failed) {
-        failed.append(static_cast<NetAction*>(index.get())->url().toString());
+        failed.append(static_cast<Net::NetRequest*>(index.get())->url().toString());
     }
     return failed;
 }
@@ -135,3 +145,51 @@ void NetJob::updateState()
     setStatus(tr("Executing %1 task(s) (%2 out of %3 are done)")
                   .arg(QString::number(m_doing.count()), QString::number(m_done.count()), QString::number(totalSize())));
 }
+
+bool NetJob::isOnline()
+{
+    // check some errors that are ussually associated with the lack of internet
+    for (auto job : getFailedActions()) {
+        auto err = job->error();
+        if (err != QNetworkReply::HostNotFoundError && err != QNetworkReply::NetworkSessionFailedError) {
+            return true;
+        }
+    }
+    return false;
+};
+
+void NetJob::emitFailed(QString reason)
+{
+#if defined(LAUNCHER_APPLICATION)
+
+    if (APPLICATION_DYN && m_ask_retry && m_manual_try < APPLICATION->settings()->get("NumberOfManualRetries").toInt() && isOnline()) {
+        m_manual_try++;
+        auto response = CustomMessageBox::selectable(nullptr, "Confirm retry",
+                                                     "The tasks failed.\n"
+                                                     "Failed urls\n" +
+                                                         getFailedFiles().join("\n\t") +
+                                                         ".\n"
+                                                         "If this continues to happen please check the logs of the application.\n"
+                                                         "Do you want to retry?",
+                                                     QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                            ->exec();
+
+        if (response == QMessageBox::Yes) {
+            m_try = 0;
+            executeNextSubTask();
+            return;
+        }
+    }
+#endif
+    ConcurrentTask::emitFailed(reason);
+}
+
+void NetJob::setAskRetry(bool askRetry)
+{
+    m_ask_retry = askRetry;
+}
+
+void NetJob::setAutoRetryLimit(int autoRetryLimit)
+{
+    m_auto_retry_limit = autoRetryLimit;
+}
diff --git a/launcher/net/NetJob.h b/launcher/net/NetJob.h
index f6c005809..7366fe26a 100644
--- a/launcher/net/NetJob.h
+++ b/launcher/net/NetJob.h
@@ -39,7 +39,7 @@
 #include <QtNetwork>
 
 #include <QObject>
-#include "NetAction.h"
+#include "net/NetRequest.h"
 #include "tasks/ConcurrentTask.h"
 
 // Those are included so that they are also included by anyone using NetJob
@@ -52,29 +52,36 @@ class NetJob : public ConcurrentTask {
    public:
     using Ptr = shared_qobject_ptr<NetJob>;
 
-    explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network);
+    explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network, int max_concurrent = -1);
     ~NetJob() override = default;
 
     auto size() const -> int;
 
     auto canAbort() const -> bool override;
-    auto addNetAction(NetAction::Ptr action) -> bool;
+    auto addNetAction(Net::NetRequest::Ptr action) -> bool;
 
-    auto getFailedActions() -> QList<NetAction*>;
+    auto getFailedActions() -> QList<Net::NetRequest*>;
     auto getFailedFiles() -> QList<QString>;
+    void setAskRetry(bool askRetry);
+    void setAutoRetryLimit(int autoRetryLimit);
 
    public slots:
     // Qt can't handle auto at the start for some reason?
     bool abort() override;
+    void emitFailed(QString reason) override;
 
    protected slots:
     void executeNextSubTask() override;
 
    protected:
     void updateState() override;
+    bool isOnline();
 
    private:
     shared_qobject_ptr<QNetworkAccessManager> m_network;
 
     int m_try = 1;
+    bool m_ask_retry = true;
+    int m_auto_retry_limit = 3;
+    int m_manual_try = 0;
 };
diff --git a/launcher/net/NetRequest.cpp b/launcher/net/NetRequest.cpp
index 526fe77a5..cf2e72858 100644
--- a/launcher/net/NetRequest.cpp
+++ b/launcher/net/NetRequest.cpp
@@ -5,6 +5,7 @@
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,10 +38,11 @@
  */
 
 #include "NetRequest.h"
-#include <QUrl>
 
 #include <QDateTime>
 #include <QFileInfo>
+#include <QNetworkReply>
+#include <QUrl>
 #include <memory>
 
 #if defined(LAUNCHER_APPLICATION)
@@ -48,8 +50,6 @@
 #endif
 #include "BuildConfig.h"
 
-#include "net/NetAction.h"
-
 #include "MMCTime.h"
 #include "StringUtils.h"
 
@@ -62,8 +62,6 @@ void NetRequest::addValidator(Validator* v)
 
 void NetRequest::executeTask()
 {
-    init();
-
     setStatus(tr("Requesting %1").arg(StringUtils::truncateUrlHumanFriendly(m_url, 80)));
 
     if (getState() == Task::State::AbortedByUser) {
@@ -86,7 +84,7 @@ void NetRequest::executeTask()
             break;
         case State::Inactive:
         case State::Failed:
-            emit failed("Failed to initilize sink");
+            emit failed("Failed to initialize sink");
             emit finished();
             return;
         case State::AbortedByUser:
@@ -105,20 +103,24 @@ void NetRequest::executeTask()
     for (auto& header_proxy : m_headerProxies) {
         header_proxy->writeHeaders(request);
     }
-    // TODO remove duplication
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+#if defined(LAUNCHER_APPLICATION)
+    request.setTransferTimeout(APPLICATION->settings()->get("RequestTimeout").toInt() * 1000);
+#else
     request.setTransferTimeout();
+#endif
 #endif
 
     m_last_progress_time = m_clock.now();
     m_last_progress_bytes = 0;
 
-    QNetworkReply* rep = getReply(request);
+    auto rep = getReply(request);
     if (rep == nullptr)  // it failed
         return;
     m_reply.reset(rep);
-    connect(rep, &QNetworkReply::downloadProgress, this, &NetRequest::downloadProgress);
+    connect(rep, &QNetworkReply::uploadProgress, this, &NetRequest::onProgress);
+    connect(rep, &QNetworkReply::downloadProgress, this, &NetRequest::onProgress);
     connect(rep, &QNetworkReply::finished, this, &NetRequest::downloadFinished);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
     connect(rep, &QNetworkReply::errorOccurred, this, &NetRequest::downloadError);
@@ -129,7 +131,7 @@ void NetRequest::executeTask()
     connect(rep, &QNetworkReply::readyRead, this, &NetRequest::downloadReadyRead);
 }
 
-void NetRequest::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+void NetRequest::onProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
     auto now = m_clock.now();
     auto elapsed = now - m_last_progress_time;
@@ -172,7 +174,9 @@ void NetRequest::downloadError(QNetworkReply::NetworkError error)
             }
         }
         // error happened during download.
-        qCCritical(logCat) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
+        qCCritical(logCat) << getUid().toString() << "Failed" << m_url.toString() << "with reason" << error;
+        if (m_reply)
+            qCCritical(logCat) << getUid().toString() << "HTTP Status" << replyStatusCode() << ";error" << errorString();
         m_state = State::Failed;
     }
 }
@@ -237,7 +241,7 @@ auto NetRequest::handleRedirect() -> bool
 
     m_url = QUrl(redirect.toString());
     qCDebug(logCat) << getUid().toString() << "Following redirect to " << m_url.toString();
-    startAction(m_network);
+    executeTask();
 
     return true;
 }
@@ -255,21 +259,18 @@ void NetRequest::downloadFinished()
     {
         qCDebug(logCat) << getUid().toString() << "Request failed but we are allowed to proceed:" << m_url.toString();
         m_sink->abort();
-        m_reply.reset();
         emit succeeded();
         emit finished();
         return;
     } else if (m_state == State::Failed) {
         qCDebug(logCat) << getUid().toString() << "Request failed in previous step:" << m_url.toString();
         m_sink->abort();
-        m_reply.reset();
-        emit failed("");
+        emit failed(m_reply->errorString());
         emit finished();
         return;
     } else if (m_state == State::AbortedByUser) {
         qCDebug(logCat) << getUid().toString() << "Request aborted in previous step:" << m_url.toString();
         m_sink->abort();
-        m_reply.reset();
         emit aborted();
         emit finished();
         return;
@@ -283,7 +284,7 @@ void NetRequest::downloadFinished()
         if (m_state != State::Succeeded) {
             qCDebug(logCat) << getUid().toString() << "Request failed to write:" << m_url.toString();
             m_sink->abort();
-            emit failed("");
+            emit failed("failed to write in sink");
             emit finished();
             return;
         }
@@ -294,13 +295,11 @@ void NetRequest::downloadFinished()
     if (m_state != State::Succeeded) {
         qCDebug(logCat) << getUid().toString() << "Request failed to finalize:" << m_url.toString();
         m_sink->abort();
-        m_reply.reset();
-        emit failed("");
+        emit failed("failed to finalize the request");
         emit finished();
         return;
     }
 
-    m_reply.reset();
     qCDebug(logCat) << getUid().toString() << "Request succeeded:" << m_url.toString();
     emit succeeded();
     emit finished();
@@ -334,4 +333,23 @@ auto NetRequest::abort() -> bool
     return true;
 }
 
+int NetRequest::replyStatusCode() const
+{
+    return m_reply ? m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() : -1;
+}
+
+QNetworkReply::NetworkError NetRequest::error() const
+{
+    return m_reply ? m_reply->error() : QNetworkReply::NoError;
+}
+
+QUrl NetRequest::url() const
+{
+    return m_url;
+}
+
+QString NetRequest::errorString() const
+{
+    return m_reply ? m_reply->errorString() : "";
+}
 }  // namespace Net
diff --git a/launcher/net/NetRequest.h b/launcher/net/NetRequest.h
index 0b307b4f6..6b3f643d6 100644
--- a/launcher/net/NetRequest.h
+++ b/launcher/net/NetRequest.h
@@ -4,6 +4,7 @@
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,20 +40,23 @@
 #pragma once
 
 #include <qloggingcategory.h>
+#include <QNetworkReply>
+#include <QUrl>
 #include <chrono>
 
-#include "NetAction.h"
+#include "HeaderProxy.h"
 #include "Sink.h"
 #include "Validator.h"
 
 #include "QObjectPtr.h"
 #include "net/Logging.h"
+#include "tasks/Task.h"
 
 namespace Net {
-class NetRequest : public NetAction {
+class NetRequest : public Task {
     Q_OBJECT
    protected:
-    explicit NetRequest() : NetAction() {}
+    explicit NetRequest() : Task() {}
 
    public:
     using Ptr = shared_qobject_ptr<class NetRequest>;
@@ -61,26 +65,29 @@ class NetRequest : public NetAction {
 
    public:
     ~NetRequest() override = default;
-
-    void init() override {}
-
-   public:
     void addValidator(Validator* v);
     auto abort() -> bool override;
     auto canAbort() const -> bool override { return true; }
 
+    void setNetwork(shared_qobject_ptr<QNetworkAccessManager> network) { m_network = network; }
+    void addHeaderProxy(Net::HeaderProxy* proxy) { m_headerProxies.push_back(std::shared_ptr<Net::HeaderProxy>(proxy)); }
+
+    QUrl url() const;
+    void setUrl(QUrl url) { m_url = url; }
+    int replyStatusCode() const;
+    QNetworkReply::NetworkError error() const;
+    QString errorString() const;
+
    private:
     auto handleRedirect() -> bool;
     virtual QNetworkReply* getReply(QNetworkRequest&) = 0;
 
    protected slots:
-    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
-    void downloadError(QNetworkReply::NetworkError error) override;
-    void sslErrors(const QList<QSslError>& errors) override;
-    void downloadFinished() override;
-    void downloadReadyRead() override;
-
-   public slots:
+    void onProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void downloadError(QNetworkReply::NetworkError error);
+    void sslErrors(const QList<QSslError>& errors);
+    void downloadFinished();
+    void downloadReadyRead();
     void executeTask() override;
 
    protected:
@@ -93,6 +100,15 @@ class NetRequest : public NetAction {
     std::chrono::steady_clock m_clock;
     std::chrono::time_point<std::chrono::steady_clock> m_last_progress_time;
     qint64 m_last_progress_bytes;
+
+    shared_qobject_ptr<QNetworkAccessManager> m_network;
+
+    /// the network reply
+    unique_qobject_ptr<QNetworkReply> m_reply;
+
+    /// source URL
+    QUrl m_url;
+    std::vector<std::shared_ptr<Net::HeaderProxy>> m_headerProxies;
 };
 }  // namespace Net
 
diff --git a/launcher/net/RawHeaderProxy.h b/launcher/net/RawHeaderProxy.h
index 09b3d4d02..9de18efc7 100644
--- a/launcher/net/RawHeaderProxy.h
+++ b/launcher/net/RawHeaderProxy.h
@@ -4,6 +4,7 @@
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,7 +28,7 @@ namespace Net {
 
 class RawHeaderProxy : public HeaderProxy {
    public:
-    RawHeaderProxy() : HeaderProxy() {}
+    RawHeaderProxy(QList<HeaderPair> headers = {}) : HeaderProxy(), m_headers(std::move(headers)) {};
     virtual ~RawHeaderProxy() = default;
 
    public:
@@ -36,6 +37,7 @@ class RawHeaderProxy : public HeaderProxy {
     void addHeader(const HeaderPair& header) { m_headers.append(header); }
     void addHeader(const QByteArray& headerName, const QByteArray& headerValue) { m_headers.append({ headerName, headerValue }); }
     void addHeaders(const QList<HeaderPair>& headers) { m_headers.append(headers); }
+    void setHeaders(QList<HeaderPair> headers) { m_headers = headers; };
 
    private:
     QList<HeaderPair> m_headers;
diff --git a/launcher/net/Sink.h b/launcher/net/Sink.h
index fcdabf372..d1fd9de10 100644
--- a/launcher/net/Sink.h
+++ b/launcher/net/Sink.h
@@ -35,9 +35,8 @@
 
 #pragma once
 
-#include "net/NetAction.h"
-
 #include "Validator.h"
+#include "tasks/Task.h"
 
 namespace Net {
 class Sink {
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 726572e52..623ec80f4 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -46,7 +46,8 @@ namespace Net {
 
 QNetworkReply* Upload::getReply(QNetworkRequest& request)
 {
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    if (!request.hasRawHeader("Content-Type"))
+        request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     return m_network->post(request, m_post_data);
 }
 
diff --git a/launcher/net/Validator.h b/launcher/net/Validator.h
index 92ac6ea15..6d1945ee6 100644
--- a/launcher/net/Validator.h
+++ b/launcher/net/Validator.h
@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include "net/NetAction.h"
+#include <QNetworkReply>
 
 namespace Net {
 class Validator {
diff --git a/launcher/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp
index 33fb7eceb..169589f78 100644
--- a/launcher/news/NewsChecker.cpp
+++ b/launcher/news/NewsChecker.cpp
@@ -58,6 +58,7 @@ void NewsChecker::reloadNews()
 
     NetJob::Ptr job{ new NetJob("News RSS Feed", m_network) };
     job->addNetAction(Net::Download::makeByteArray(m_feedUrl, newsData));
+    job->setAskRetry(false);
     QObject::connect(job.get(), &NetJob::succeeded, this, &NewsChecker::rssDownloadFinished);
     QObject::connect(job.get(), &NetJob::failed, this, &NewsChecker::rssDownloadFailed);
     m_newsNetJob.reset(job);
diff --git a/launcher/qtlogging.ini b/launcher/qtlogging.ini
index 5266de59b..c12d1e109 100644
--- a/launcher/qtlogging.ini
+++ b/launcher/qtlogging.ini
@@ -5,7 +5,6 @@
 qt.*.debug=false
 # don't log credentials by default
 launcher.auth.credentials.debug=false
-katabasis.*.debug=false
 # remove the debug lines, other log levels still get through
 launcher.task.net.download.debug=false
 # enable or disable whole catageries
diff --git a/launcher/resources/documents/documents.qrc b/launcher/resources/documents/documents.qrc
index 007efcde3..489d1d5a2 100644
--- a/launcher/resources/documents/documents.qrc
+++ b/launcher/resources/documents/documents.qrc
@@ -2,6 +2,7 @@
 <RCC version="1.0">
     <qresource prefix="/documents">
         <file>../../../COPYING.md</file>
+        <file>login-qr.svg</file>
     </qresource>
 </RCC>
 
diff --git a/launcher/resources/documents/login-qr.svg b/launcher/resources/documents/login-qr.svg
new file mode 100644
index 000000000..1b88e3c83
--- /dev/null
+++ b/launcher/resources/documents/login-qr.svg
@@ -0,0 +1,8 @@
+<svg width="33" height="33" version="1.1" viewBox="0 0 8.7312 8.7312" xmlns="http://www.w3.org/2000/svg">
+ <g transform="scale(.26458)">
+  <rect width="33" height="33" fill="#fff"/>
+  <g>
+   <path d="m29 29h-6v-1h1v-3h-1v2h-1v-1h-1v1h-2v-1h1v-2h-1v-1h1v-1h-1v-1h1v-1h1v-1h1v1h1v-1h1v-1h-5v3h-2v-1h1v-1h-1v1h-2v-1h1v-1h1v-1h-1v1h-1v1h-1v-2h1v-2h2v-2h1v2h2v1h-1v1h2v-2h-1v-3h-1v-1h1v-2h-2v-1h-1v-1h-1v2h-2v1h-1v-1h-1v-3h1v1h1v1h1v-2h2v-2h1v3h3v5h1v1h-1v1h2v-1h1v1h1v1h2v1h2v2h-1v-1h-2v-1h-1v4h3v-1h1v7h-1v1h-1v1h2zm-10 0h-5v-1h3v-1h1v1h1zm-6 0h-1v-4h3v-1h1v2h1v1h-2v-1h-2zm-2 0h-7v-7h7zm15-1v-2h-1v2zm-16 0v-5h-5v5zm-1-1h-3v-3h3zm9-1h-1v-1h1zm10-1v-1h-1v-1h-1v-2h-1v3h1v1zm-9 0h-1v-1h1zm5-1v-3h-3v3zm-7 0h-1v-2h-1v1h-2v-1h-1v-1h-3v-1h6v1h2v1h2v1h-2zm6-1h-1v-1h1zm5-1v-1h-1v1zm-21-1h-1v-2h1zm-2-1h-1v-1h1zm23-1h-2v-1h2zm-17 0h-4v-1h1v-1h1v1h2zm-5 0h-1v-3h1v-1h1v-1h-1v1h-2v-3h4v1h2v1h-2v1h2v1h2v-1h1v1h1v1h-5v-1h-1v1h-2zm18-2v-2h-2v1h1v1zm-13-2h-1v-1h1zm17-1h-1v-1h1zm-14 0h-1v-1h1zm-2 0h-1v-1h1zm17-1h-1v-1h1zm-2 0h-3v-1h3zm-8 0h-1v-1h1zm-6 0h-1v-1h1zm-2 0h-1v-1h1zm5-1h-1v-1h1zm-2 0h-1v-1h1zm15-1h-7v-7h7zm-10 0h-1v-1h1zm-2 0h-1v-2h1zm-2 0h-1v-1h1zm-2 0h-1v-1h1zm-2 0h-7v-7h7zm17-1v-5h-5v5zm-18 0v-5h-5v5zm17-1h-3v-3h3zm-18 0h-3v-3h3zm5-4h-2v-1h2z"/>
+  </g>
+ </g>
+</svg>
diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index eeba32186..25edd09e0 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -353,5 +353,11 @@
         <file>scalable/instances/neoforged.svg</file>
         <file>128x128/instances/forge.png</file>  <!-- LGPL3 Forge Development LLC -->
         <file>128x128/instances/liteloader.png</file>  <!-- CC-BY-SA 4.0 LiteLoader -->
+
+        <!-- java providers -->
+        <file>scalable/adoptium.svg</file>  <!-- The Adoptium Logo is a registered trademark of the Eclipse Foundation. -->
+        <file>scalable/azul.svg</file>  <!-- Azul, Zulu, Azul Systems, the Azul Systems logo, Azul Zulu are either registered trademarks or trademarks of Azul Systems, registered in the U.S. and elsewhere. -->
+        <file>scalable/mojang.svg</file>  <!-- The Mojang Logo is a registered trademark of Mojang AB. -->
+
     </qresource>
 </RCC>
diff --git a/launcher/resources/multimc/scalable/adoptium.svg b/launcher/resources/multimc/scalable/adoptium.svg
new file mode 100644
index 000000000..d48f8b7d9
--- /dev/null
+++ b/launcher/resources/multimc/scalable/adoptium.svg
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="Eclipse_Adoptium_Logo_A_only_no_outline.svg"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 800 800"
+   height="800"
+   width="800"
+   inkscape:export-filename="Eclipse_Adoptium_Logo.png"
+   inkscape:export-xdpi="61.439999"
+   inkscape:export-ydpi="61.439999"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath242">
+      <path
+         d="m 987.855,678.469 -0.019,-0.008 -107.453,233.098 -81.121,-175.989 235.718,-106.09 0.01,0.02 c -21.01,10.078 -37.838,27.52 -47.135,48.969 z"
+         id="path240" />
+    </clipPath>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-481.882,253.823,253.823,481.882,1152.35,658.95)"
+       spreadMethod="pad"
+       id="linearGradient248">
+      <stop
+         style="stop-opacity:1;stop-color:#421644"
+         offset="0"
+         id="stop244" />
+      <stop
+         style="stop-opacity:1;stop-color:#151530"
+         offset="1"
+         id="stop246" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath258">
+      <path
+         d="m 1164.62,758.102 0.08,0.039 -194.618,422.029 c -0.547,1.32 -1.184,2.59 -1.789,3.88 l -1.453,3.16 -0.059,-0.03 c -0.324,0.65 -0.703,1.27 -1.054,1.9 7.382,-13.68 11.589,-29.34 11.589,-45.98 0,-14.34 -3.191,-27.91 -8.777,-40.15 l 0.059,-0.03 -88.215,-191.361 107.453,-233.098 0.019,0.008 c 14.915,-34.387 49.125,-58.457 89.005,-58.457 53.57,0 96.99,43.429 96.99,97 0,14.707 -3.37,28.597 -9.23,41.09 z"
+         id="path256" />
+    </clipPath>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(265.274,-595.434,-595.434,-265.274,846.292,1230.46)"
+       spreadMethod="pad"
+       id="linearGradient264">
+      <stop
+         style="stop-opacity:1;stop-color:#a21058"
+         offset="0"
+         id="stop260" />
+      <stop
+         style="stop-opacity:1;stop-color:#421644"
+         offset="1"
+         id="stop262" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath274">
+      <path
+         d="m 880.316,1240.11 c -37.687,0 -70.273,-21.54 -86.328,-52.93 l -0.058,0.03 -1.457,-3.16 c -0.606,-1.29 -1.239,-2.56 -1.785,-3.88 l -194.622,-422.029 0.079,-0.039 c -5.86,-12.493 -9.227,-26.383 -9.227,-41.09 0,-53.571 43.418,-97 96.992,-97 39.871,0 74.09,24.07 89.004,58.457 l 0.02,-0.008 195.664,424.459 -0.059,0.03 c 5.586,12.24 8.777,25.81 8.777,40.15 0,53.58 -43.425,97.01 -97,97.01 z"
+         id="path272" />
+    </clipPath>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(259.548,595.434,595.434,-259.548,649.304,625.36)"
+       spreadMethod="pad"
+       id="linearGradient280">
+      <stop
+         style="stop-opacity:1;stop-color:#ee1a6d"
+         offset="0"
+         id="stop276" />
+      <stop
+         style="stop-opacity:1;stop-color:#a21058"
+         offset="1"
+         id="stop278" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     height="100mm"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="1912"
+     inkscape:window-height="1057"
+     inkscape:window-width="1920"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="g216"
+     inkscape:document-units="px"
+     inkscape:cy="396.88538"
+     inkscape:cx="322.07976"
+     inkscape:zoom="0.72187089"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#494949"
+     id="base"
+     inkscape:showpageshadow="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:deskcolor="#505050" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       transform="matrix(0.0826697,0,0,-0.0826697,-36.864228,126.62103)"
+       id="g216">
+      <g
+         id="g236"
+         transform="matrix(13.679999,0,0,13.679976,-6760.5652,-16025.746)">
+        <g
+           clip-path="url(#clipPath242)"
+           id="g238">
+          <path
+             id="path250"
+             style="fill:url(#linearGradient248);fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 987.855,678.469 -0.019,-0.008 -107.453,233.098 -81.121,-175.989 235.718,-106.09 0.01,0.02 c -21.01,10.078 -37.838,27.52 -47.135,48.969" />
+        </g>
+      </g>
+      <g
+         id="g252"
+         transform="matrix(13.679999,0,0,13.679976,-6760.5652,-16025.746)">
+        <g
+           clip-path="url(#clipPath258)"
+           id="g254">
+          <path
+             id="path266"
+             style="fill:url(#linearGradient264);fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 1164.62,758.102 0.08,0.039 -194.618,422.029 c -0.547,1.32 -1.184,2.59 -1.789,3.88 l -1.453,3.16 -0.059,-0.03 c -0.324,0.65 -0.703,1.27 -1.054,1.9 7.382,-13.68 11.589,-29.34 11.589,-45.98 0,-14.34 -3.191,-27.91 -8.777,-40.15 l 0.059,-0.03 -88.215,-191.361 107.453,-233.098 0.019,0.008 c 14.915,-34.387 49.125,-58.457 89.005,-58.457 53.57,0 96.99,43.429 96.99,97 0,14.707 -3.37,28.597 -9.23,41.09" />
+        </g>
+      </g>
+      <g
+         id="g268"
+         transform="matrix(1.2000009,0,0,1.1999989,-853.84911,665.71675)">
+        <g
+           clip-path="url(#clipPath274)"
+           id="g270"
+           transform="matrix(11.39999,0,0,11.39999,-4922.2595,-13909.564)">
+          <path
+             id="path282"
+             style="fill:url(#linearGradient280);fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 880.316,1240.11 c -37.687,0 -70.273,-21.54 -86.328,-52.93 l -0.058,0.03 -1.457,-3.16 c -0.606,-1.29 -1.239,-2.56 -1.785,-3.88 l -194.622,-422.029 0.079,-0.039 c -5.86,-12.493 -9.227,-26.383 -9.227,-41.09 0,-53.571 43.418,-97 96.992,-97 39.871,0 74.09,24.07 89.004,58.457 l 0.02,-0.008 195.664,424.459 -0.059,0.03 c 5.586,12.24 8.777,25.81 8.777,40.15 0,53.58 -43.425,97.01 -97,97.01" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/launcher/resources/multimc/scalable/azul.svg b/launcher/resources/multimc/scalable/azul.svg
new file mode 100644
index 000000000..1c4356eb7
--- /dev/null
+++ b/launcher/resources/multimc/scalable/azul.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" fill="none" style="scroll-behavior: auto !important;">
+  <path d="M26.792 4.49429L7.62244 44.4309C7.20797 45.2944 8.12743 46.1903 8.97988 45.7536L28.26 35.8772C28.6557 35.6745 29.1376 35.7574 29.4429 36.0805L53.2128 61.2399C53.994 62.0668 55.3295 61.1553 54.844 60.1264L28.5979 4.50031C28.2386 3.73874 27.1564 3.73514 26.792 4.49429Z" fill="#00374A"/>
+  <path d="M26.792 4.49429L7.62244 44.4309C7.20797 45.2944 8.12743 46.1903 8.97988 45.7536L28.26 35.8772C28.6557 35.6745 29.1376 35.7574 29.4429 36.0805L53.2128 61.2399C53.994 62.0668 55.3295 61.1553 54.844 60.1264L28.5979 4.50031C28.2386 3.73874 27.1564 3.73514 26.792 4.49429Z" fill="url(#paint0_linear_3578_2134)" fill-opacity="0.7" style="mix-blend-mode:overlay"/>
+  <path d="M34.0172 15.5765L60.9237 19.1042C61.9046 19.2329 62.1231 20.5555 61.2357 20.9928L33.4872 34.6659L9.3254 45.9918C8.34481 46.4514 7.43514 45.2419 8.14881 44.4273L33.135 15.909C33.3551 15.6578 33.686 15.5331 34.0172 15.5765Z" fill="#006588"/>
+  <path d="M34.0172 15.5765L60.9237 19.1042C61.9046 19.2329 62.1231 20.5555 61.2357 20.9928L33.4872 34.6659L9.3254 45.9918C8.34481 46.4514 7.43514 45.2419 8.14881 44.4273L33.135 15.909C33.3551 15.6578 33.686 15.5331 34.0172 15.5765Z" fill="url(#paint1_linear_3578_2134)" fill-opacity="0.7" style="mix-blend-mode:overlay"/>
+  <defs>
+    <linearGradient id="paint0_linear_3578_2134" x1="31.2618" y1="2.59998" x2="31.2618" y2="65.8" gradientUnits="userSpaceOnUse">
+      <stop stop-color="white" stop-opacity="0"/>
+      <stop offset="1" stop-color="white"/>
+    </linearGradient>
+    <linearGradient id="paint1_linear_3578_2134" x1="46.2268" y1="4.17812" x2="31.5574" y2="56.1518" gradientUnits="userSpaceOnUse">
+      <stop stop-color="white" stop-opacity="0"/>
+      <stop offset="1" stop-color="white"/>
+    </linearGradient>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/launcher/resources/multimc/scalable/mojang.svg b/launcher/resources/multimc/scalable/mojang.svg
new file mode 100644
index 000000000..0c1f48d3d
--- /dev/null
+++ b/launcher/resources/multimc/scalable/mojang.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="800"
+   height="800"
+   viewBox="0 0 800 800"
+   xml:space="preserve"
+   style="scroll-behavior: auto !important;"
+   id="svg4"
+   sodipodi:docname="Mojang_Studios_Logo_(2020,_icon).svg"
+   inkscape:export-filename="Mojang_Studios_Logo_(2020,_icon).png"
+   inkscape:export-xdpi="61.439999"
+   inkscape:export-ydpi="61.439999"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+   id="namedview4"
+   pagecolor="#505050"
+   bordercolor="#ffffff"
+   borderopacity="1"
+   inkscape:showpageshadow="0"
+   inkscape:pageopacity="0"
+   inkscape:pagecheckerboard="1"
+   inkscape:deskcolor="#505050"
+   inkscape:zoom="1.46625"
+   inkscape:cx="374.08355"
+   inkscape:cy="369.30946"
+   inkscape:window-width="2560"
+   inkscape:window-height="1369"
+   inkscape:window-x="6392"
+   inkscape:window-y="802"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g3" />&#10;<desc
+   id="desc1">Created with Fabric.js 3.6.3</desc>&#10;<defs
+   id="defs1">&#10;</defs>&#10;<g
+   transform="matrix(2 0 0 2 399.75 399.75)"
+   id="g4">&#10;<g
+   style=""
+   id="g3">&#10;		<g
+   transform="matrix(3.37 0 0 3.37 0 0)"
+   id="g1">&#10;<polygon
+   style="display:inline;opacity:1;fill:#f0313b;fill-rule:nonzero;stroke:#f0313b;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0"
+   vector-effect="non-scaling-stroke"
+   points="50,50 50,-50 -50,-50 -50,50 "
+   id="polygon1" />&#10;</g>&#10;		<g
+   transform="matrix(3.78 0 0 3.78 0.01 0)"
+   id="g2">&#10;<path
+   style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(255,255,255); fill-rule: nonzero; opacity: 1;"
+   vector-effect="non-scaling-stroke"
+   transform=" translate(-44.68, -41.16)"
+   d="M 13.51988 41.11152 q 0 -12.31086 0.0047 -24.62173 c 0.00469 -2.87722 0.16418 -3.03875 3.01027 -3.04146 q 21.527 -0.02051 43.054 -0.01353 c 2.06114 0.0004 2.36366 0.32134 2.39718 2.42144 c 0.0238 1.49194 -0.01523 2.98567 0.03993 4.47616 a 6.77817 6.77817 0 0 0 6.69647 6.91868 c 1.65784 0.11443 3.328 0.04044 4.99213 0.07612 c 1.797 0.03852 2.04939 0.30467 2.12207 2.13943 c 0.01137 0.28664 0.01239 0.57383 0.01247 0.86076 q 0.00432 17.64834 0.00423 35.29668 c -0.00158 3.2118 -0.0499 3.24957 -3.28974 3.26017 q -3.78871 0.01236 -7.57745 -0.01166 c -2.96088 -0.02069 -3.03087 -0.09046 -3.032 -2.98084 q -0.00659 -16.87367 -0.00343 -33.74735 c 0 -0.40175 0.01018 -0.80387 -0.00321 -1.20519 a 3.329 3.329 0 0 0 -3.548 -3.56756 c -1.08962 -0.032 -2.18238 -0.03167 -3.27158 0.01034 a 3.34773 3.34773 0 0 0 -3.482 3.47659 c -0.03516 0.62965 -0.02128 1.26231 -0.02172 1.8936 q -0.00641 9.21165 -0.01056 18.42326 c -0.00046 0.68869 0.01794 1.37909 -0.02307 2.06567 c -0.075 1.25525 -0.44257 1.71282 -1.65149 1.72825 q -5.25132 0.06705 -10.50391 -0.00754 c -1.2165 -0.01879 -1.58169 -0.48679 -1.66785 -1.72683 c -0.03575 -0.51435 -0.01843 -1.03265 -0.019 -1.54914 q -0.0112 -9.81428 -0.0222 -19.62854 a 13.12088 13.12088 0 0 0 -0.05025 -1.71908 a 3.25128 3.25128 0 0 0 -3.10179 -2.93609 a 33.39881 33.39881 0 0 0 -3.95853 0.00271 a 3.1568 3.1568 0 0 0 -3.15611 3.21043 c -0.05842 1.26029 -0.03349 2.52474 -0.03457 3.78735 q -0.01343 15.66842 -0.02277 31.33681 c -0.00035 0.45913 0.01748 0.92 -0.01557 1.377 c -0.09 1.24451 -0.45629 1.713 -1.67232 1.72878 q -5.25117 0.06813 -10.50381 -0.01831 c -1.23915 -0.02079 -1.58295 -0.457 -1.6812 -1.71692 c -0.04454 -0.5709 -0.02489 -1.1472 -0.025 -1.72107 q -0.00183 -12.13872 -0.00083 -24.27744 Z"
+   stroke-linecap="round"
+   id="path1" />&#10;</g>&#10;</g>&#10;</g>&#10;</svg>
diff --git a/launcher/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp
index c63c8b39b..6875af2bf 100644
--- a/launcher/screenshots/ImgurAlbumCreation.cpp
+++ b/launcher/screenshots/ImgurAlbumCreation.cpp
@@ -46,7 +46,7 @@
 #include <memory>
 
 #include "BuildConfig.h"
-#include "net/StaticHeaderProxy.h"
+#include "net/RawHeaderProxy.h"
 
 Net::NetRequest::Ptr ImgurAlbumCreation::make(std::shared_ptr<ImgurAlbumCreation::Result> output, QList<ScreenShot::Ptr> screenshots)
 {
@@ -54,6 +54,10 @@ Net::NetRequest::Ptr ImgurAlbumCreation::make(std::shared_ptr<ImgurAlbumCreation
     up->m_url = BuildConfig.IMGUR_BASE_URL + "album";
     up->m_sink.reset(new Sink(output));
     up->m_screenshots = screenshots;
+    up->addHeaderProxy(new Net::RawHeaderProxy(
+        QList<Net::HeaderPair>{ { "Content-Type", "application/x-www-form-urlencoded" },
+                                { "Authorization", QString("Client-ID %1").arg(BuildConfig.IMGUR_CLIENT_ID).toUtf8() },
+                                { "Accept", "application/json" } }));
     return up;
 }
 
@@ -65,23 +69,13 @@ QNetworkReply* ImgurAlbumCreation::getReply(QNetworkRequest& request)
     }
     const QByteArray data = "deletehashes=" + hashes.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden";
     return m_network->post(request, data);
-};
-
-void ImgurAlbumCreation::init()
-{
-    qDebug() << "Setting up imgur upload";
-    auto api_headers = new Net::StaticHeaderProxy(
-        QList<Net::HeaderPair>{ { "Content-Type", "application/x-www-form-urlencoded" },
-                                { "Authorization", QString("Client-ID %1").arg(BuildConfig.IMGUR_CLIENT_ID).toUtf8() },
-                                { "Accept", "application/json" } });
-    addHeaderProxy(api_headers);
 }
 
 auto ImgurAlbumCreation::Sink::init(QNetworkRequest& request) -> Task::State
 {
     m_output.clear();
     return Task::State::Running;
-};
+}
 
 auto ImgurAlbumCreation::Sink::write(QByteArray& data) -> Task::State
 {
@@ -111,4 +105,4 @@ auto ImgurAlbumCreation::Sink::finalize(QNetworkReply&) -> Task::State
     m_result->deleteHash = object.value("data").toObject().value("deletehash").toString();
     m_result->id = object.value("data").toObject().value("id").toString();
     return Task::State::Succeeded;
-}
\ No newline at end of file
+}
diff --git a/launcher/screenshots/ImgurAlbumCreation.h b/launcher/screenshots/ImgurAlbumCreation.h
index ecb225394..f10409b20 100644
--- a/launcher/screenshots/ImgurAlbumCreation.h
+++ b/launcher/screenshots/ImgurAlbumCreation.h
@@ -67,8 +67,6 @@ class ImgurAlbumCreation : public Net::NetRequest {
     static NetRequest::Ptr make(std::shared_ptr<Result> output, QList<ScreenShot::Ptr> screenshots);
     QNetworkReply* getReply(QNetworkRequest& request) override;
 
-    void init() override;
-
    private:
     QList<ScreenShot::Ptr> m_screenshots;
 };
diff --git a/launcher/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp
index 941b92ce6..8b4ef5327 100644
--- a/launcher/screenshots/ImgurUpload.cpp
+++ b/launcher/screenshots/ImgurUpload.cpp
@@ -36,7 +36,7 @@
 
 #include "ImgurUpload.h"
 #include "BuildConfig.h"
-#include "net/StaticHeaderProxy.h"
+#include "net/RawHeaderProxy.h"
 
 #include <QDebug>
 #include <QFile>
@@ -47,14 +47,6 @@
 #include <QNetworkRequest>
 #include <QUrl>
 
-void ImgurUpload::init()
-{
-    qDebug() << "Setting up imgur upload";
-    auto api_headers = new Net::StaticHeaderProxy(QList<Net::HeaderPair>{
-        { "Authorization", QString("Client-ID %1").arg(BuildConfig.IMGUR_CLIENT_ID).toUtf8() }, { "Accept", "application/json" } });
-    addHeaderProxy(api_headers);
-}
-
 QNetworkReply* ImgurUpload::getReply(QNetworkRequest& request)
 {
     auto file = new QFile(m_fileInfo.absoluteFilePath(), this);
@@ -81,13 +73,13 @@ QNetworkReply* ImgurUpload::getReply(QNetworkRequest& request)
     multipart->append(namePart);
 
     return m_network->post(request, multipart);
-};
+}
 
 auto ImgurUpload::Sink::init(QNetworkRequest& request) -> Task::State
 {
     m_output.clear();
     return Task::State::Running;
-};
+}
 
 auto ImgurUpload::Sink::write(QByteArray& data) -> Task::State
 {
@@ -125,5 +117,7 @@ Net::NetRequest::Ptr ImgurUpload::make(ScreenShot::Ptr m_shot)
     auto up = makeShared<ImgurUpload>(m_shot->m_file);
     up->m_url = std::move(BuildConfig.IMGUR_BASE_URL + "image");
     up->m_sink.reset(new Sink(m_shot));
+    up->addHeaderProxy(new Net::RawHeaderProxy(QList<Net::HeaderPair>{
+        { "Authorization", QString("Client-ID %1").arg(BuildConfig.IMGUR_CLIENT_ID).toUtf8() }, { "Accept", "application/json" } }));
     return up;
 }
diff --git a/launcher/screenshots/ImgurUpload.h b/launcher/screenshots/ImgurUpload.h
index 5a58ad2b5..f4f71859d 100644
--- a/launcher/screenshots/ImgurUpload.h
+++ b/launcher/screenshots/ImgurUpload.h
@@ -62,8 +62,6 @@ class ImgurUpload : public Net::NetRequest {
 
     static NetRequest::Ptr make(ScreenShot::Ptr m_shot);
 
-    void init() override;
-
    private:
     virtual QNetworkReply* getReply(QNetworkRequest&) override;
     const QFileInfo m_fileInfo;
diff --git a/launcher/settings/INIFile.cpp b/launcher/settings/INIFile.cpp
index e97741f20..2c7620e65 100644
--- a/launcher/settings/INIFile.cpp
+++ b/launcher/settings/INIFile.cpp
@@ -39,7 +39,6 @@
 
 #include <QDebug>
 #include <QFile>
-#include <QSaveFile>
 #include <QStringList>
 #include <QTemporaryFile>
 #include <QTextStream>
diff --git a/launcher/settings/OverrideSetting.h b/launcher/settings/OverrideSetting.h
index faa3e7948..3763b5717 100644
--- a/launcher/settings/OverrideSetting.h
+++ b/launcher/settings/OverrideSetting.h
@@ -29,7 +29,7 @@
 class OverrideSetting : public Setting {
     Q_OBJECT
    public:
-    explicit OverrideSetting(std::shared_ptr<Setting> overriden, std::shared_ptr<Setting> gate);
+    explicit OverrideSetting(std::shared_ptr<Setting> overridden, std::shared_ptr<Setting> gate);
 
     virtual QVariant defValue() const;
     virtual QVariant get() const;
diff --git a/launcher/settings/PassthroughSetting.h b/launcher/settings/PassthroughSetting.h
index c776ca951..3f3474003 100644
--- a/launcher/settings/PassthroughSetting.h
+++ b/launcher/settings/PassthroughSetting.h
@@ -28,7 +28,7 @@
 class PassthroughSetting : public Setting {
     Q_OBJECT
    public:
-    explicit PassthroughSetting(std::shared_ptr<Setting> overriden, std::shared_ptr<Setting> gate);
+    explicit PassthroughSetting(std::shared_ptr<Setting> overridden, std::shared_ptr<Setting> gate);
 
     virtual QVariant defValue() const;
     virtual QVariant get() const;
diff --git a/launcher/tasks/ConcurrentTask.cpp b/launcher/tasks/ConcurrentTask.cpp
index 6f4a94e7f..f2ee40c31 100644
--- a/launcher/tasks/ConcurrentTask.cpp
+++ b/launcher/tasks/ConcurrentTask.cpp
@@ -38,8 +38,7 @@
 #include <QDebug>
 #include "tasks/Task.h"
 
-ConcurrentTask::ConcurrentTask(QObject* parent, QString task_name, int max_concurrent)
-    : Task(parent), m_name(task_name), m_total_max_size(max_concurrent)
+ConcurrentTask::ConcurrentTask(QObject* parent, QString task_name, int max_concurrent) : Task(parent), m_total_max_size(max_concurrent)
 {
     setObjectName(task_name);
 }
@@ -104,9 +103,9 @@ void ConcurrentTask::clear()
     m_done.clear();
     m_failed.clear();
     m_queue.clear();
+    m_task_progress.clear();
 
     m_progress = 0;
-    m_stepProgress = 0;
 }
 
 void ConcurrentTask::executeNextSubTask()
@@ -139,7 +138,7 @@ void ConcurrentTask::startSubTask(Task::Ptr next)
 
     connect(next.get(), &Task::status, this, [this, next](QString msg) { subTaskStatus(next, msg); });
     connect(next.get(), &Task::details, this, [this, next](QString msg) { subTaskDetails(next, msg); });
-    connect(next.get(), &Task::stepProgress, this, [this, next](TaskStepProgress const& tp) { subTaskStepProgress(next, tp); });
+    connect(next.get(), &Task::stepProgress, this, &ConcurrentTask::stepProgress);
 
     connect(next.get(), &Task::progress, this, [this, next](qint64 current, qint64 total) { subTaskProgress(next, current, total); });
 
@@ -149,7 +148,6 @@ void ConcurrentTask::startSubTask(Task::Ptr next)
     m_task_progress.insert(next->getUid(), task_progress);
 
     updateState();
-    updateStepProgress(*task_progress.get(), Operation::ADDED);
 
     QMetaObject::invokeMethod(next.get(), &Task::start, Qt::QueuedConnection);
 }
@@ -161,14 +159,14 @@ void ConcurrentTask::subTaskFinished(Task::Ptr task, TaskStepState state)
 
     m_doing.remove(task.get());
 
-    auto task_progress = m_task_progress.value(task->getUid());
-    task_progress->state = state;
+    auto task_progress = *m_task_progress.value(task->getUid());
+    task_progress.state = state;
+    m_task_progress.remove(task->getUid());
 
     disconnect(task.get(), 0, this, 0);
 
-    emit stepProgress(*task_progress);
+    emit stepProgress(task_progress);
     updateState();
-    updateStepProgress(*task_progress, Operation::REMOVED);
     QMetaObject::invokeMethod(this, &ConcurrentTask::executeNextSubTask, Qt::QueuedConnection);
 }
 
@@ -215,7 +213,6 @@ void ConcurrentTask::subTaskProgress(Task::Ptr task, qint64 current, qint64 tota
     task_progress->update(current, total);
 
     emit stepProgress(*task_progress);
-    updateStepProgress(*task_progress, Operation::CHANGED);
     updateState();
 
     if (totalSize() == 1) {
@@ -223,52 +220,6 @@ void ConcurrentTask::subTaskProgress(Task::Ptr task, qint64 current, qint64 tota
     }
 }
 
-void ConcurrentTask::subTaskStepProgress(Task::Ptr task, TaskStepProgress const& task_progress)
-{
-    Operation op = Operation::ADDED;
-
-    if (!m_task_progress.contains(task_progress.uid)) {
-        m_task_progress.insert(task_progress.uid, std::make_shared<TaskStepProgress>(task_progress));
-        op = Operation::ADDED;
-        emit stepProgress(task_progress);
-        updateStepProgress(task_progress, op);
-    } else {
-        auto tp = m_task_progress.value(task_progress.uid);
-
-        tp->old_current = tp->current;
-        tp->old_total = tp->total;
-
-        tp->current = task_progress.current;
-        tp->total = task_progress.total;
-        tp->status = task_progress.status;
-        tp->details = task_progress.details;
-
-        op = Operation::CHANGED;
-        emit stepProgress(*tp.get());
-        updateStepProgress(*tp.get(), op);
-    }
-}
-
-void ConcurrentTask::updateStepProgress(TaskStepProgress const& changed_progress, Operation op)
-{
-    switch (op) {
-        case Operation::ADDED:
-            m_stepProgress += changed_progress.current;
-            m_stepTotalProgress += changed_progress.total;
-            break;
-        case Operation::REMOVED:
-            m_stepProgress -= changed_progress.current;
-            m_stepTotalProgress -= changed_progress.total;
-            break;
-        case Operation::CHANGED:
-            m_stepProgress -= changed_progress.old_current;
-            m_stepTotalProgress -= changed_progress.old_total;
-            m_stepProgress += changed_progress.current;
-            m_stepTotalProgress += changed_progress.total;
-            break;
-    }
-}
-
 void ConcurrentTask::updateState()
 {
     if (totalSize() > 1) {
@@ -276,7 +227,6 @@ void ConcurrentTask::updateState()
         setStatus(tr("Executing %1 task(s) (%2 out of %3 are done)")
                       .arg(QString::number(m_doing.count()), QString::number(m_done.count()), QString::number(totalSize())));
     } else {
-        setProgress(m_stepProgress, m_stepTotalProgress);
         QString status = tr("Please wait...");
         if (m_queue.size() > 0) {
             status = tr("Waiting for a task to start...");
diff --git a/launcher/tasks/ConcurrentTask.h b/launcher/tasks/ConcurrentTask.h
index 07ea58575..0d6709940 100644
--- a/launcher/tasks/ConcurrentTask.h
+++ b/launcher/tasks/ConcurrentTask.h
@@ -80,23 +80,16 @@ class ConcurrentTask : public Task {
     void subTaskStatus(Task::Ptr task, const QString& msg);
     void subTaskDetails(Task::Ptr task, const QString& msg);
     void subTaskProgress(Task::Ptr task, qint64 current, qint64 total);
-    void subTaskStepProgress(Task::Ptr task, TaskStepProgress const& task_step_progress);
 
    protected:
     // NOTE: This is not thread-safe.
     [[nodiscard]] unsigned int totalSize() const { return static_cast<unsigned int>(m_queue.size() + m_doing.size() + m_done.size()); }
 
-    enum class Operation { ADDED, REMOVED, CHANGED };
-    void updateStepProgress(TaskStepProgress const& changed_progress, Operation);
-
     virtual void updateState();
 
     void startSubTask(Task::Ptr task);
 
    protected:
-    QString m_name;
-    QString m_step_status;
-
     QQueue<Task::Ptr> m_queue;
 
     QHash<Task*, Task::Ptr> m_doing;
@@ -107,7 +100,4 @@ class ConcurrentTask : public Task {
     QHash<QUuid, std::shared_ptr<TaskStepProgress>> m_task_progress;
 
     int m_total_max_size;
-
-    qint64 m_stepProgress = 0;
-    qint64 m_stepTotalProgress = 100;
 };
diff --git a/launcher/tools/GenericProfiler.cpp b/launcher/tools/GenericProfiler.cpp
new file mode 100644
index 000000000..594024a7d
--- /dev/null
+++ b/launcher/tools/GenericProfiler.cpp
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "GenericProfiler.h"
+
+#include "BaseInstance.h"
+#include "launch/LaunchTask.h"
+#include "settings/SettingsObject.h"
+
+class GenericProfiler : public BaseProfiler {
+    Q_OBJECT
+   public:
+    GenericProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
+
+   protected:
+    void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process);
+};
+
+GenericProfiler::GenericProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent)
+    : BaseProfiler(settings, instance, parent)
+{}
+
+void GenericProfiler::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
+{
+    emit readyToLaunch(tr("Started process: %1").arg(process->pid()));
+}
+
+BaseExternalTool* GenericProfilerFactory::createTool(InstancePtr instance, QObject* parent)
+{
+    return new GenericProfiler(globalSettings, instance, parent);
+}
+#include "GenericProfiler.moc"
\ No newline at end of file
diff --git a/launcher/tools/GenericProfiler.h b/launcher/tools/GenericProfiler.h
new file mode 100644
index 000000000..7868990ea
--- /dev/null
+++ b/launcher/tools/GenericProfiler.h
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "BaseProfiler.h"
+
+class GenericProfilerFactory : public BaseProfilerFactory {
+   public:
+    QString name() const override { return "Generic"; }
+    void registerSettings([[maybe_unused]] SettingsObjectPtr settings) override {};
+    BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) override;
+    bool check([[maybe_unused]] QString* error) override { return true; };
+    bool check([[maybe_unused]] const QString& path, [[maybe_unused]] QString* error) override { return true; };
+};
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
index 56ade8e32..d03469b78 100644
--- a/launcher/translations/TranslationsModel.cpp
+++ b/launcher/translations/TranslationsModel.cpp
@@ -550,9 +550,10 @@ void TranslationsModel::downloadIndex()
     d->m_index_job.reset(new NetJob("Translations Index", APPLICATION->network()));
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("translations", "index_v2.json");
     entry->setStale(true);
-    auto task = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATIONS_BASE_URL + "index_v2.json"), entry);
+    auto task = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATION_FILES_URL + "index_v2.json"), entry);
     d->m_index_task = task.get();
     d->m_index_job->addNetAction(task);
+    d->m_index_job->setAskRetry(false);
     connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed);
     connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexReceived);
     d->m_index_job->start();
@@ -590,13 +591,13 @@ void TranslationsModel::downloadTranslation(QString key)
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("translations", "mmc_" + key + ".qm");
     entry->setStale(true);
 
-    auto dl = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATIONS_BASE_URL + lang->file_name), entry);
-    auto rawHash = QByteArray::fromHex(lang->file_sha1.toLatin1());
-    dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawHash));
+    auto dl = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATION_FILES_URL + lang->file_name), entry);
+    dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, lang->file_sha1));
     dl->setProgress(dl->getProgress(), lang->file_size);
 
     d->m_dl_job.reset(new NetJob("Translation for " + key, APPLICATION->network()));
     d->m_dl_job->addNetAction(dl);
+    d->m_dl_job->setAskRetry(false);
 
     connect(d->m_dl_job.get(), &NetJob::succeeded, this, &TranslationsModel::dlGood);
     connect(d->m_dl_job.get(), &NetJob::failed, this, &TranslationsModel::dlFailed);
diff --git a/launcher/ui/ColorCache.cpp b/launcher/ui/ColorCache.cpp
deleted file mode 100644
index f941a6093..000000000
--- a/launcher/ui/ColorCache.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "ColorCache.h"
-
-/**
- * Blend the color with the front color, adapting to the back color
- */
-QColor ColorCache::blend(QColor color)
-{
-    if (Rainbow::luma(m_front) > Rainbow::luma(m_back)) {
-        // for dark color schemes, produce a fitting color first
-        color = Rainbow::tint(m_front, color, 0.5);
-    }
-    // adapt contrast
-    return Rainbow::mix(m_front, color, m_bias);
-}
-
-/**
- * Blend the color with the back color
- */
-QColor ColorCache::blendBackground(QColor color)
-{
-    // adapt contrast
-    return Rainbow::mix(m_back, color, m_bias);
-}
-
-void ColorCache::recolorAll()
-{
-    auto iter = m_colors.begin();
-    while (iter != m_colors.end()) {
-        iter->front = blend(iter->original);
-        iter->back = blendBackground(iter->original);
-    }
-}
diff --git a/launcher/ui/ColorCache.h b/launcher/ui/ColorCache.h
deleted file mode 100644
index 1cf292c13..000000000
--- a/launcher/ui/ColorCache.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#pragma once
-#include <MessageLevel.h>
-#include <rainbow.h>
-#include <QMap>
-#include <QtGui/QColor>
-
-class ColorCache {
-   public:
-    ColorCache(QColor front, QColor back, qreal bias)
-    {
-        m_front = front;
-        m_back = back;
-        m_bias = bias;
-    };
-
-    void addColor(int key, QColor color) { m_colors[key] = { color, blend(color), blendBackground(color) }; }
-
-    void setForeground(QColor front)
-    {
-        if (m_front != front) {
-            m_front = front;
-            recolorAll();
-        }
-    }
-
-    void setBackground(QColor back)
-    {
-        if (m_back != back) {
-            m_back = back;
-            recolorAll();
-        }
-    }
-
-    QColor getFront(int key)
-    {
-        auto iter = m_colors.find(key);
-        if (iter == m_colors.end()) {
-            return QColor();
-        }
-        return (*iter).front;
-    }
-
-    QColor getBack(int key)
-    {
-        auto iter = m_colors.find(key);
-        if (iter == m_colors.end()) {
-            return QColor();
-        }
-        return (*iter).back;
-    }
-
-    /**
-     * Blend the color with the front color, adapting to the back color
-     */
-    QColor blend(QColor color);
-
-    /**
-     * Blend the color with the back color
-     */
-    QColor blendBackground(QColor color);
-
-   protected:
-    void recolorAll();
-
-   protected:
-    struct ColorEntry {
-        QColor original;
-        QColor front;
-        QColor back;
-    };
-
-   protected:
-    qreal m_bias;
-    QColor m_front;
-    QColor m_back;
-    QMap<int, ColorEntry> m_colors;
-};
-
-class LogColorCache : public ColorCache {
-   public:
-    LogColorCache(QColor front, QColor back) : ColorCache(front, back, 1.0)
-    {
-        addColor((int)MessageLevel::Launcher, QColor("purple"));
-        addColor((int)MessageLevel::Debug, QColor("green"));
-        addColor((int)MessageLevel::Warning, QColor("orange"));
-        addColor((int)MessageLevel::Error, QColor("red"));
-        addColor((int)MessageLevel::Fatal, QColor("red"));
-        addColor((int)MessageLevel::Message, front);
-    }
-
-    QColor getFront(MessageLevel::Enum level)
-    {
-        if (!m_colors.contains((int)level)) {
-            return ColorCache::getFront((int)MessageLevel::Message);
-        }
-        return ColorCache::getFront((int)level);
-    }
-
-    QColor getBack(MessageLevel::Enum level)
-    {
-        if (level == MessageLevel::Fatal) {
-            return QColor(Qt::black);
-        }
-        return QColor(Qt::transparent);
-    }
-};
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 6610e197b..712404746 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -77,7 +77,6 @@
 #include <DesktopServices.h>
 #include <InstanceList.h>
 #include <MMCZip.h>
-#include <SkinUtils.h>
 #include <icons/IconList.h>
 #include <java/JavaInstallList.h>
 #include <java/JavaUtils.h>
@@ -95,7 +94,6 @@
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/ExportInstanceDialog.h"
 #include "ui/dialogs/ExportPackDialog.h"
-#include "ui/dialogs/ExportToModListDialog.h"
 #include "ui/dialogs/IconPickerDialog.h"
 #include "ui/dialogs/ImportResourceDialog.h"
 #include "ui/dialogs/NewInstanceDialog.h"
@@ -183,6 +181,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         ui->instanceToolBar->setVisibilityState(instanceToolbarSetting->get().toByteArray());
 
         ui->instanceToolBar->addContextMenuAction(ui->instanceToolBar->toggleViewAction());
+        ui->instanceToolBar->addContextMenuAction(ui->actionToggleStatusBar);
         ui->instanceToolBar->addContextMenuAction(ui->actionLockToolbars);
     }
 
@@ -205,7 +204,6 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         exportInstanceMenu->addAction(ui->actionExportInstanceZip);
         exportInstanceMenu->addAction(ui->actionExportInstanceMrPack);
         exportInstanceMenu->addAction(ui->actionExportInstanceFlamePack);
-        exportInstanceMenu->addAction(ui->actionExportInstanceToModList);
         ui->actionExportInstance->setMenu(exportInstanceMenu);
     }
 
@@ -227,10 +225,13 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         setInstanceActionsEnabled(false);
 
         // add a close button at the end of the main toolbar when running on gamescope / steam deck
-        // FIXME: detect if we don't have server side decorations instead
+        // this is only needed on gamescope because it defaults to an X11/XWayland session and
+        // does not implement decorations
         if (qgetenv("XDG_CURRENT_DESKTOP") == "gamescope") {
             ui->mainToolBar->addAction(ui->actionCloseWindow);
         }
+
+        ui->actionViewJavaFolder->setEnabled(BuildConfig.JAVA_DOWNLOADER_ENABLED);
     }
 
     // add the toolbar toggles to the view menu
@@ -300,6 +301,14 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         setCatBackground(cat_enable);
     }
 
+    // Togglable status bar
+    {
+        bool statusBarVisible = APPLICATION->settings()->get("StatusBarVisible").toBool();
+        ui->actionToggleStatusBar->setChecked(statusBarVisible);
+        connect(ui->actionToggleStatusBar, &QAction::toggled, this, &MainWindow::setStatusBarVisibility);
+        setStatusBarVisibility(statusBarVisible);
+    }
+
     // Lock toolbars
     {
         bool toolbarsLocked = APPLICATION->settings()->get("ToolbarsLocked").toBool();
@@ -426,10 +435,16 @@ QMenu* MainWindow::createPopupMenu()
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
     filteredMenu->removeAction(ui->mainToolBar->toggleViewAction());
 
+    filteredMenu->addAction(ui->actionToggleStatusBar);
     filteredMenu->addAction(ui->actionLockToolbars);
 
     return filteredMenu;
 }
+void MainWindow::setStatusBarVisibility(bool state)
+{
+    statusBar()->setVisible(state);
+    APPLICATION->settings()->set("StatusBarVisible", state);
+}
 void MainWindow::lockToolbars(bool state)
 {
     ui->mainToolBar->setMovable(!state);
@@ -807,30 +822,6 @@ void MainWindow::on_actionCopyInstance_triggered()
     runModalTask(task.get());
 }
 
-void MainWindow::finalizeInstance(InstancePtr inst)
-{
-    view->updateGeometries();
-    setSelectedInstanceById(inst->id());
-    if (APPLICATION->accounts()->anyAccountIsValid()) {
-        ProgressDialog loadDialog(this);
-        auto update = inst->createUpdateTask(Net::Mode::Online);
-        connect(update.get(), &Task::failed, [this](QString reason) {
-            QString error = QString("Instance load failed: %1").arg(reason);
-            CustomMessageBox::selectable(this, tr("Error"), error, QMessageBox::Warning)->show();
-        });
-        if (update) {
-            loadDialog.setSkipButton(true, tr("Abort"));
-            loadDialog.execWithTask(update.get());
-        }
-    } else {
-        CustomMessageBox::selectable(this, tr("Error"),
-                                     tr("The launcher cannot download Minecraft or update instances unless you have at least "
-                                        "one account added.\nPlease add a Microsoft account."),
-                                     QMessageBox::Warning)
-            ->show();
-    }
-}
-
 void MainWindow::addInstance(const QString& url, const QMap<QString, QString>& extra_info)
 {
     QString groupName;
@@ -935,6 +926,14 @@ void MainWindow::processURLs(QList<QUrl> urls)
                     dlUrlDialod.execWithTask(job.get());
                 }
 
+            } else if (url.scheme() == BuildConfig.LAUNCHER_APP_BINARY_NAME) {
+                QVariantMap receivedData;
+                const QUrlQuery query(url.query());
+                const auto items = query.queryItems();
+                for (auto it = items.begin(), end = items.end(); it != end; ++it)
+                    receivedData.insert(it->first, it->second);
+                emit APPLICATION->oauthReplyRecieved(receivedData);
+                continue;
             } else {
                 dl_url = url;
             }
@@ -1148,6 +1147,11 @@ void MainWindow::on_actionViewCentralModsFolder_triggered()
     DesktopServices::openPath(APPLICATION->settings()->get("CentralModsDir").toString(), true);
 }
 
+void MainWindow::on_actionViewSkinsFolder_triggered()
+{
+    DesktopServices::openPath(APPLICATION->settings()->get("SkinsDir").toString(), true);
+}
+
 void MainWindow::on_actionViewIconThemeFolder_triggered()
 {
     DesktopServices::openPath(APPLICATION->themeManager()->getIconThemesFolder().path(), true);
@@ -1173,6 +1177,11 @@ void MainWindow::on_actionViewLogsFolder_triggered()
     DesktopServices::openPath("logs", true);
 }
 
+void MainWindow::on_actionViewJavaFolder_triggered()
+{
+    DesktopServices::openPath(APPLICATION->javaPath(), true);
+}
+
 void MainWindow::refreshInstances()
 {
     APPLICATION->instances()->loadList();
@@ -1337,14 +1346,6 @@ void MainWindow::on_actionExportInstanceMrPack_triggered()
     }
 }
 
-void MainWindow::on_actionExportInstanceToModList_triggered()
-{
-    if (m_selectedInstance) {
-        ExportToModListDialog dlg(m_selectedInstance, this);
-        dlg.exec();
-    }
-}
-
 void MainWindow::on_actionExportInstanceFlamePack_triggered()
 {
     if (m_selectedInstance) {
@@ -1511,7 +1512,7 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
         QFileDialog fileDialog;
         // workaround to make sure the portal file dialog opens in the desktop directory
         fileDialog.setDirectoryUrl(desktopPath);
-        desktopFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), desktopFilePath, tr("Desktop Entries (*.desktop)"));
+        desktopFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), desktopFilePath, tr("Desktop Entries") + " (*.desktop)");
         if (desktopFilePath.isEmpty())
             return;  // file dialog canceled by user
         appPath = "flatpak";
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 21c16a74b..9e501d30a 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -48,7 +48,6 @@
 
 #include "BaseInstance.h"
 #include "minecraft/auth/MinecraftAccount.h"
-#include "net/NetJob.h"
 
 class LaunchController;
 class QToolButton;
@@ -118,6 +117,9 @@ class MainWindow : public QMainWindow {
     void on_actionViewCatPackFolder_triggered();
     void on_actionViewIconsFolder_triggered();
     void on_actionViewLogsFolder_triggered();
+    void on_actionViewJavaFolder_triggered();
+
+    void on_actionViewSkinsFolder_triggered();
 
     void on_actionViewSelectedInstFolder_triggered();
 
@@ -153,7 +155,6 @@ class MainWindow : public QMainWindow {
     void on_actionExportInstanceZip_triggered();
     void on_actionExportInstanceMrPack_triggered();
     void on_actionExportInstanceFlamePack_triggered();
-    void on_actionExportInstanceToModList_triggered();
 
     void on_actionRenameInstance_triggered();
 
@@ -198,6 +199,8 @@ class MainWindow : public QMainWindow {
 
     void globalSettingsClosed();
 
+    void setStatusBarVisibility(bool);
+
     void lockToolbars(bool);
 
 #ifndef Q_OS_MAC
@@ -219,7 +222,6 @@ class MainWindow : public QMainWindow {
 
     void runModalTask(Task* task);
     void instanceFromInstanceTask(InstanceTask* task);
-    void finalizeInstance(InstancePtr inst);
 
    private:
     Ui::MainWindow* ui;
diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index 722befb9e..8cba2a4da 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -104,7 +104,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>20</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="fileMenu">
@@ -149,6 +149,7 @@
     <addaction name="actionChangeTheme"/>
     <addaction name="separator"/>
     <addaction name="actionCAT"/>
+    <addaction name="actionToggleStatusBar"/>
     <addaction name="actionLockToolbars"/>
     <addaction name="separator"/>
    </widget>
@@ -163,6 +164,8 @@
     <addaction name="separator"/>
     <addaction name="actionViewInstanceFolder"/>
     <addaction name="actionViewCentralModsFolder"/>
+    <addaction name="actionViewSkinsFolder"/>
+    <addaction name="actionViewJavaFolder"/>
     <addaction name="separator"/>
     <addaction name="actionViewIconThemeFolder"/>
     <addaction name="actionViewWidgetThemeFolder"/>
@@ -230,6 +233,14 @@
     <string>It's a fluffy kitty :3</string>
    </property>
   </action>
+  <action name="actionToggleStatusBar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Status Bar</string>
+   </property>
+  </action>
   <action name="actionLockToolbars">
    <property name="checkable">
     <bool>true</bool>
@@ -455,15 +466,6 @@
     <string>CurseForge (zip)</string>
    </property>
   </action>
-  <action name="actionExportInstanceToModList">
-   <property name="icon">
-    <iconset theme="new">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
-   <property name="text">
-    <string>Mod List</string>
-   </property>
-  </action>
   <action name="actionCreateInstanceShortcut">
    <property name="icon">
     <iconset theme="shortcut">
@@ -551,6 +553,18 @@
     <string>Open the central mods folder in a file browser.</string>
    </property>
   </action>
+  <action name="actionViewSkinsFolder">
+   <property name="icon">
+    <iconset theme="viewfolder">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Skins</string>
+   </property>
+   <property name="toolTip">
+    <string>Open the skins folder in a file browser.</string>
+   </property>
+  </action>
   <action name="actionViewIconsFolder">
    <property name="icon">
     <iconset theme="viewfolder">
@@ -748,6 +762,18 @@
     <string>Open the cat packs folder in a file browser.</string>
    </property>
   </action>
+  <action name="actionViewJavaFolder">
+   <property name="icon">
+    <iconset theme="viewfolder">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Java</string>
+   </property>
+   <property name="toolTip">
+    <string>Open the Java folder in a file browser. Only available if the built-in Java downloader is used.</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/launcher/ui/dialogs/AuthlibInjectorLoginDialog.cpp b/launcher/ui/dialogs/AuthlibInjectorLoginDialog.cpp
index 5f7ba4af8..b6d3b3f75 100644
--- a/launcher/ui/dialogs/AuthlibInjectorLoginDialog.cpp
+++ b/launcher/ui/dialogs/AuthlibInjectorLoginDialog.cpp
@@ -20,15 +20,17 @@
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui_AuthlibInjectorLoginDialog.h"
 
-#include "CreateAuthlibInjectorAccount.h"
-#include "minecraft/auth/AccountTask.h"
+#include "Application.h"
+#include "GetAuthlibInjectorApiLocation.h"
 
 #include <QtWidgets/QPushButton>
 
 AuthlibInjectorLoginDialog::AuthlibInjectorLoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AuthlibInjectorLoginDialog)
 {
     ui->setupUi(this);
-    ui->progressBar->setVisible(false);
+    ui->userTextBox->setFocus();
+    ui->loadingLabel->setVisible(false);
+    ui->errorMessage->setVisible(false);
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     setAcceptDrops(true);
 
@@ -89,6 +91,7 @@ void AuthlibInjectorLoginDialog::dropEvent(QDropEvent* event)
 // Stage 1: User interaction
 void AuthlibInjectorLoginDialog::accept()
 {
+    ui->errorMessage->setVisible(false);
     auto fixedAuthlibInjectorUrl = AuthlibInjectorLoginDialog::fixUrl(ui->authlibInjectorTextBox->text());
 
     auto response = CustomMessageBox::selectable(this, QObject::tr("Confirm account creation"),
@@ -104,18 +107,21 @@ void AuthlibInjectorLoginDialog::accept()
         return;
 
     setUserInputsEnabled(false);
-    ui->progressBar->setVisible(true);
+    ui->loadingLabel->setVisible(true);
 
     // Get the authlib-injector API root
     auto netJob = NetJob::Ptr(new NetJob("Get authlib-injector API root", APPLICATION->network()));
+    netJob->setAskRetry(false);
+    netJob->setAutoRetryLimit(0);
+
     auto username = ui->userTextBox->text();
-    m_createAuthlibInjectorAccountTask = CreateAuthlibInjectorAccount::make(fixedAuthlibInjectorUrl, m_account, username);
-    netJob->addNetAction(m_createAuthlibInjectorAccountTask);
+    m_apiLocationRequest = GetAuthlibInjectorApiLocation::make(fixedAuthlibInjectorUrl, m_account, username);
+    netJob->addNetAction(m_apiLocationRequest);
 
-    m_createAuthlibInjectorAccountNetJob.reset(netJob);
-    connect(netJob.get(), &NetJob::succeeded, this, &AuthlibInjectorLoginDialog::onUrlTaskSucceeded);
-    connect(netJob.get(), &NetJob::failed, this, &AuthlibInjectorLoginDialog::onTaskFailed);
-    m_createAuthlibInjectorAccountNetJob->start();
+    m_apiLocationTask.reset(netJob);
+    connect(netJob.get(), &NetJob::succeeded, this, &AuthlibInjectorLoginDialog::onApiLocationTaskSucceeded);
+    connect(netJob.get(), &NetJob::failed, this, &AuthlibInjectorLoginDialog::onApiLocationTaskFailed);
+    m_apiLocationTask->start();
 }
 
 void AuthlibInjectorLoginDialog::setUserInputsEnabled(bool enable)
@@ -143,6 +149,11 @@ void AuthlibInjectorLoginDialog::on_authlibInjectorTextBox_textEdited(const QStr
         ->setEnabled(!newText.isEmpty() && !ui->passTextBox->text().isEmpty() && !ui->authlibInjectorTextBox->text().isEmpty());
 }
 
+void AuthlibInjectorLoginDialog::onApiLocationTaskFailed(const QString& reason)
+{
+    onTaskFailed(m_apiLocationRequest->errorString());
+}
+
 void AuthlibInjectorLoginDialog::onTaskFailed(const QString& reason)
 {
     // Set message
@@ -155,21 +166,21 @@ void AuthlibInjectorLoginDialog::onTaskFailed(const QString& reason)
             processed += "<br />";
         }
     }
-    ui->label->setText(processed);
+    ui->errorMessage->setText(processed);
+    ui->errorMessage->setVisible(true);
 
     // Re-enable user-interaction
     setUserInputsEnabled(true);
-    ui->progressBar->setVisible(false);
+    ui->loadingLabel->setVisible(false);
 }
 
-void AuthlibInjectorLoginDialog::onUrlTaskSucceeded()
+void AuthlibInjectorLoginDialog::onApiLocationTaskSucceeded()
 {
-    m_account = m_createAuthlibInjectorAccountTask->getAccount();
-    m_loginTask = m_account->loginAuthlibInjector(ui->passTextBox->text());
+    m_account = m_apiLocationRequest->getAccount();
+    m_loginTask = m_account->login(false, ui->passTextBox->text());
     connect(m_loginTask.get(), &Task::failed, this, &AuthlibInjectorLoginDialog::onTaskFailed);
     connect(m_loginTask.get(), &Task::succeeded, this, &AuthlibInjectorLoginDialog::onTaskSucceeded);
     connect(m_loginTask.get(), &Task::status, this, &AuthlibInjectorLoginDialog::onTaskStatus);
-    connect(m_loginTask.get(), &Task::progress, this, &AuthlibInjectorLoginDialog::onTaskProgress);
     m_loginTask->start();
 }
 
@@ -180,13 +191,7 @@ void AuthlibInjectorLoginDialog::onTaskSucceeded()
 
 void AuthlibInjectorLoginDialog::onTaskStatus(const QString& status)
 {
-    ui->label->setText(status);
-}
-
-void AuthlibInjectorLoginDialog::onTaskProgress(qint64 current, qint64 total)
-{
-    ui->progressBar->setMaximum(total);
-    ui->progressBar->setValue(current);
+    ui->errorMessage->setText(status);
 }
 
 // Public interface
diff --git a/launcher/ui/dialogs/AuthlibInjectorLoginDialog.h b/launcher/ui/dialogs/AuthlibInjectorLoginDialog.h
index 24998bc41..55082a602 100644
--- a/launcher/ui/dialogs/AuthlibInjectorLoginDialog.h
+++ b/launcher/ui/dialogs/AuthlibInjectorLoginDialog.h
@@ -22,8 +22,7 @@
 #include <QtWidgets/QDialog>
 
 #include <net/NetJob.h>
-#include "Application.h"
-#include "CreateAuthlibInjectorAccount.h"
+#include "GetAuthlibInjectorApiLocation.h"
 #include "minecraft/auth/MinecraftAccount.h"
 #include "tasks/Task.h"
 
@@ -47,11 +46,11 @@ class AuthlibInjectorLoginDialog : public QDialog {
    protected slots:
     void accept();
 
+    void onApiLocationTaskSucceeded();
+    void onApiLocationTaskFailed(const QString&);
     void onTaskFailed(const QString& reason);
-    void onUrlTaskSucceeded();
     void onTaskSucceeded();
     void onTaskStatus(const QString& status);
-    void onTaskProgress(qint64 current, qint64 total);
 
     void on_userTextBox_textEdited(const QString& newText);
     void on_passTextBox_textEdited(const QString& newText);
@@ -66,6 +65,6 @@ class AuthlibInjectorLoginDialog : public QDialog {
     Ui::AuthlibInjectorLoginDialog* ui;
     MinecraftAccountPtr m_account;
     Task::Ptr m_loginTask;
-    Task::Ptr m_createAuthlibInjectorAccountNetJob;
-    CreateAuthlibInjectorAccountPtr m_createAuthlibInjectorAccountTask;
+    Task::Ptr m_apiLocationTask;
+    GetAuthlibInjectorApiLocation::Ptr m_apiLocationRequest;
 };
diff --git a/launcher/ui/dialogs/AuthlibInjectorLoginDialog.ui b/launcher/ui/dialogs/AuthlibInjectorLoginDialog.ui
index b6e157f37..5965b8d3a 100644
--- a/launcher/ui/dialogs/AuthlibInjectorLoginDialog.ui
+++ b/launcher/ui/dialogs/AuthlibInjectorLoginDialog.ui
@@ -59,14 +59,40 @@
        <string>https://example.com/authlib-injector</string>
      </property>
     </widget>
+   </item>
+    <item>
+    <widget class="QLabel" name="loadingLabel">
+      <property name="font">
+      <font>
+        <pointsize>16</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+      </font>
+      </property>
+      <property name="text">
+      <string>Please wait...</string>
+      </property>
+      <property name="alignment">
+      <set>Qt::AlignCenter</set>
+      </property>
+      <property name="wordWrap">
+      <bool>true</bool>
+      </property>
+    </widget>
    </item>
    <item>
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>24</number>
+    <widget class="QLabel" name="errorMessage">
+     <property name="text">
+      <string notr="true">Error message label placeholder.</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
      </property>
-     <property name="textVisible">
-      <bool>false</bool>
+     <property name="openExternalLinks">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 2b415c2d9..5c93053d1 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -266,7 +266,7 @@ void BlockedModsDialog::addHashTask(QString path)
 /// @param path the path to the local file being hashed
 void BlockedModsDialog::buildHashTask(QString path)
 {
-    auto hash_task = Hashing::createBlockedModHasher(path, ModPlatform::ResourceProvider::FLAME, m_hash_type);
+    auto hash_task = Hashing::createHasher(path, m_hash_type);
 
     qDebug() << "[Blocked Mods Dialog] Creating Hash task for path: " << path;
 
diff --git a/launcher/ui/dialogs/ChooseProviderDialog.cpp b/launcher/ui/dialogs/ChooseProviderDialog.cpp
index 83748e1e2..68457802d 100644
--- a/launcher/ui/dialogs/ChooseProviderDialog.cpp
+++ b/launcher/ui/dialogs/ChooseProviderDialog.cpp
@@ -6,8 +6,6 @@
 
 #include "modplatform/ModIndex.h"
 
-static ModPlatform::ProviderCapabilities ProviderCaps;
-
 ChooseProviderDialog::ChooseProviderDialog(QWidget* parent, bool single_choice, bool allow_skipping)
     : QDialog(parent), ui(new Ui::ChooseProviderDialog)
 {
@@ -78,7 +76,7 @@ void ChooseProviderDialog::addProviders()
     QRadioButton* btn;
 
     for (auto& provider : { ModPlatform::ResourceProvider::MODRINTH, ModPlatform::ResourceProvider::FLAME }) {
-        btn = new QRadioButton(ProviderCaps.readableName(provider), this);
+        btn = new QRadioButton(ModPlatform::ProviderCapabilities::readableName(provider), this);
         m_providers.addButton(btn, btn_index++);
         ui->providersLayout->addWidget(btn);
     }
diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index 73e44efb1..0278c6cb0 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -129,14 +129,14 @@ void ExportPackDialog::done(int result)
         QString output;
         if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
             output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + ".mrpack"),
-                                                  "Modrinth pack (*.mrpack *.zip)", nullptr);
+                                                  tr("Modrinth pack") + " (*.mrpack *.zip)", nullptr);
             if (output.isEmpty())
                 return;
             if (!(output.endsWith(".zip") || output.endsWith(".mrpack")))
                 output.append(".mrpack");
         } else {
             output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + ".zip"),
-                                                  "CurseForge pack (*.zip)", nullptr);
+                                                  tr("CurseForge pack") + " (*.zip)", nullptr);
             if (output.isEmpty())
                 return;
             if (!output.endsWith(".zip"))
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index 7debf0cd8..908743ab0 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -23,8 +23,6 @@
 #include "FileSystem.h"
 #include "Markdown.h"
 #include "StringUtils.h"
-#include "minecraft/MinecraftInstance.h"
-#include "minecraft/mod/ModFolderModel.h"
 #include "modplatform/helpers/ExportToModList.h"
 #include "ui_ExportToModListDialog.h"
 
@@ -42,38 +40,31 @@ const QHash<ExportToModList::Formats, QString> ExportToModListDialog::exampleLin
     { ExportToModList::CSV, "{name},{url},{version},\"{authors}\"" },
 };
 
-ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* parent)
-    : QDialog(parent), m_template_changed(false), name(instance->name()), ui(new Ui::ExportToModListDialog)
+ExportToModListDialog::ExportToModListDialog(QString name, QList<Mod*> mods, QWidget* parent)
+    : QDialog(parent), m_mods(mods), m_template_changed(false), m_name(name), ui(new Ui::ExportToModListDialog)
 {
     ui->setupUi(this);
     enableCustom(false);
 
-    MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
-    if (mcInstance) {
-        mcInstance->loaderModList()->update();
-        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this, mcInstance]() {
-            m_allMods = mcInstance->loaderModList()->allMods();
-            triggerImp();
-        });
-    }
-
     connect(ui->formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ExportToModListDialog::formatChanged);
     connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->urlCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
+    connect(ui->filenameCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->authorsButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Authors); });
     connect(ui->versionButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Version); });
     connect(ui->urlButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Url); });
+    connect(ui->filenameButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::FileName); });
     connect(ui->templateText, &QTextEdit::textChanged, this, [this] {
-        if (ui->templateText->toPlainText() != exampleLines[format])
+        if (ui->templateText->toPlainText() != exampleLines[m_format])
             ui->formatComboBox->setCurrentIndex(5);
-        else
-            triggerImp();
+        triggerImp();
     });
     connect(ui->copyButton, &QPushButton::clicked, this, [this](bool) {
         this->ui->finalText->selectAll();
         this->ui->finalText->copy();
     });
+    triggerImp();
 }
 
 ExportToModListDialog::~ExportToModListDialog()
@@ -87,38 +78,38 @@ void ExportToModListDialog::formatChanged(int index)
         case 0: {
             enableCustom(false);
             ui->resultText->show();
-            format = ExportToModList::HTML;
+            m_format = ExportToModList::HTML;
             break;
         }
         case 1: {
             enableCustom(false);
             ui->resultText->show();
-            format = ExportToModList::MARKDOWN;
+            m_format = ExportToModList::MARKDOWN;
             break;
         }
         case 2: {
             enableCustom(false);
             ui->resultText->hide();
-            format = ExportToModList::PLAINTXT;
+            m_format = ExportToModList::PLAINTXT;
             break;
         }
         case 3: {
             enableCustom(false);
             ui->resultText->hide();
-            format = ExportToModList::JSON;
+            m_format = ExportToModList::JSON;
             break;
         }
         case 4: {
             enableCustom(false);
             ui->resultText->hide();
-            format = ExportToModList::CSV;
+            m_format = ExportToModList::CSV;
             break;
         }
         case 5: {
             m_template_changed = true;
             enableCustom(true);
             ui->resultText->hide();
-            format = ExportToModList::CUSTOM;
+            m_format = ExportToModList::CUSTOM;
             break;
         }
     }
@@ -127,8 +118,8 @@ void ExportToModListDialog::formatChanged(int index)
 
 void ExportToModListDialog::triggerImp()
 {
-    if (format == ExportToModList::CUSTOM) {
-        ui->finalText->setPlainText(ExportToModList::exportToModList(m_allMods, ui->templateText->toPlainText()));
+    if (m_format == ExportToModList::CUSTOM) {
+        ui->finalText->setPlainText(ExportToModList::exportToModList(m_mods, ui->templateText->toPlainText()));
         return;
     }
     auto opt = 0;
@@ -138,9 +129,11 @@ void ExportToModListDialog::triggerImp()
         opt |= ExportToModList::Version;
     if (ui->urlCheckBox->isChecked())
         opt |= ExportToModList::Url;
-    auto txt = ExportToModList::exportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
+    if (ui->filenameCheckBox->isChecked())
+        opt |= ExportToModList::FileName;
+    auto txt = ExportToModList::exportToModList(m_mods, m_format, static_cast<ExportToModList::OptionalData>(opt));
     ui->finalText->setPlainText(txt);
-    switch (format) {
+    switch (m_format) {
         case ExportToModList::CUSTOM:
             return;
         case ExportToModList::HTML:
@@ -156,7 +149,7 @@ void ExportToModListDialog::triggerImp()
         case ExportToModList::CSV:
             break;
     }
-    auto exampleLine = exampleLines[format];
+    auto exampleLine = exampleLines[m_format];
     if (!m_template_changed && ui->templateText->toPlainText() != exampleLine)
         ui->templateText->setPlainText(exampleLine);
 }
@@ -164,14 +157,19 @@ void ExportToModListDialog::triggerImp()
 void ExportToModListDialog::done(int result)
 {
     if (result == Accepted) {
-        const QString filename = FS::RemoveInvalidFilenameChars(name);
+        const QString filename = FS::RemoveInvalidFilenameChars(m_name);
         const QString output =
-            QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + extension()),
-                                         "File (*.txt *.html *.md *.json *.csv)", nullptr);
+            QFileDialog::getSaveFileName(this, tr("Export %1").arg(m_name), FS::PathCombine(QDir::homePath(), filename + extension()),
+                                         tr("File") + " (*.txt *.html *.md *.json *.csv)", nullptr);
 
         if (output.isEmpty())
             return;
-        FS::write(output, ui->finalText->toPlainText().toUtf8());
+
+        try {
+            FS::write(output, ui->finalText->toPlainText().toUtf8());
+        } catch (const FS::FileSystemException& e) {
+            qCritical() << "Failed to save mod list file :" << e.cause();
+        }
     }
 
     QDialog::done(result);
@@ -179,7 +177,7 @@ void ExportToModListDialog::done(int result)
 
 QString ExportToModListDialog::extension()
 {
-    switch (format) {
+    switch (m_format) {
         case ExportToModList::HTML:
             return ".html";
         case ExportToModList::MARKDOWN:
@@ -198,7 +196,7 @@ QString ExportToModListDialog::extension()
 
 void ExportToModListDialog::addExtra(ExportToModList::OptionalData option)
 {
-    if (format != ExportToModList::CUSTOM)
+    if (m_format != ExportToModList::CUSTOM)
         return;
     switch (option) {
         case ExportToModList::Authors:
@@ -210,6 +208,9 @@ void ExportToModListDialog::addExtra(ExportToModList::OptionalData option)
         case ExportToModList::Version:
             ui->templateText->insertPlainText("{version}");
             break;
+        case ExportToModList::FileName:
+            ui->templateText->insertPlainText("{filename}");
+            break;
     }
 }
 void ExportToModListDialog::enableCustom(bool enabled)
@@ -222,4 +223,7 @@ void ExportToModListDialog::enableCustom(bool enabled)
 
     ui->urlCheckBox->setHidden(enabled);
     ui->urlButton->setHidden(!enabled);
+
+    ui->filenameCheckBox->setHidden(enabled);
+    ui->filenameButton->setHidden(!enabled);
 }
diff --git a/launcher/ui/dialogs/ExportToModListDialog.h b/launcher/ui/dialogs/ExportToModListDialog.h
index 9886ae5a0..4ebe203f7 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.h
+++ b/launcher/ui/dialogs/ExportToModListDialog.h
@@ -20,7 +20,6 @@
 
 #include <QDialog>
 #include <QList>
-#include "BaseInstance.h"
 #include "minecraft/mod/Mod.h"
 #include "modplatform/helpers/ExportToModList.h"
 
@@ -32,7 +31,7 @@ class ExportToModListDialog : public QDialog {
     Q_OBJECT
 
    public:
-    explicit ExportToModListDialog(InstancePtr instance, QWidget* parent = nullptr);
+    explicit ExportToModListDialog(QString name, QList<Mod*> mods, QWidget* parent = nullptr);
     ~ExportToModListDialog();
 
     void done(int result) override;
@@ -46,10 +45,11 @@ class ExportToModListDialog : public QDialog {
    private:
     QString extension();
     void enableCustom(bool enabled);
-    QList<Mod*> m_allMods;
+
+    QList<Mod*> m_mods;
     bool m_template_changed;
-    QString name;
-    ExportToModList::Formats format = ExportToModList::Formats::HTML;
+    QString m_name;
+    ExportToModList::Formats m_format = ExportToModList::Formats::HTML;
     Ui::ExportToModListDialog* ui;
     static const QHash<ExportToModList::Formats, QString> exampleLines;
 };
diff --git a/launcher/ui/dialogs/ExportToModListDialog.ui b/launcher/ui/dialogs/ExportToModListDialog.ui
index 4f8ab52b5..3afda2fa8 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.ui
+++ b/launcher/ui/dialogs/ExportToModListDialog.ui
@@ -117,6 +117,13 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QCheckBox" name="filenameCheckBox">
+             <property name="text">
+              <string>Filename</string>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QPushButton" name="versionButton">
              <property name="text">
@@ -138,6 +145,13 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QPushButton" name="filenameButton">
+             <property name="text">
+              <string>Filename</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
diff --git a/launcher/ui/dialogs/InstallLoaderDialog.cpp b/launcher/ui/dialogs/InstallLoaderDialog.cpp
index 541119d10..8e5463b31 100644
--- a/launcher/ui/dialogs/InstallLoaderDialog.cpp
+++ b/launcher/ui/dialogs/InstallLoaderDialog.cpp
@@ -31,6 +31,7 @@
 #include "ui/widgets/VersionSelectWidget.h"
 
 class InstallLoaderPage : public VersionSelectWidget, public BasePage {
+    Q_OBJECT
    public:
     InstallLoaderPage(const QString& id,
                       const QString& iconName,
@@ -164,3 +165,4 @@ void InstallLoaderDialog::done(int result)
 
     QDialog::done(result);
 }
+#include "InstallLoaderDialog.moc"
\ No newline at end of file
diff --git a/launcher/ui/dialogs/LoginDialog.cpp b/launcher/ui/dialogs/LoginDialog.cpp
deleted file mode 100644
index 7296a13ef..000000000
--- a/launcher/ui/dialogs/LoginDialog.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LoginDialog.h"
-#include "ui_LoginDialog.h"
-
-#include "minecraft/auth/AccountTask.h"
-
-#include <QtWidgets/QPushButton>
-
-LoginDialog::LoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::LoginDialog)
-{
-    ui->setupUi(this);
-    ui->progressBar->setVisible(false);
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-LoginDialog::~LoginDialog()
-{
-    delete ui;
-}
-
-// Stage 1: User interaction
-void LoginDialog::accept()
-{
-    setUserInputsEnabled(false);
-    ui->progressBar->setVisible(true);
-
-    // Setup the login task and start it
-    m_account = MinecraftAccount::createFromUsername(ui->userTextBox->text());
-    m_loginTask = m_account->login(ui->passTextBox->text());
-    connect(m_loginTask.get(), &Task::failed, this, &LoginDialog::onTaskFailed);
-    connect(m_loginTask.get(), &Task::succeeded, this, &LoginDialog::onTaskSucceeded);
-    connect(m_loginTask.get(), &Task::status, this, &LoginDialog::onTaskStatus);
-    connect(m_loginTask.get(), &Task::progress, this, &LoginDialog::onTaskProgress);
-    m_loginTask->start();
-}
-
-void LoginDialog::setUserInputsEnabled(bool enable)
-{
-    ui->userTextBox->setEnabled(enable);
-    ui->passTextBox->setEnabled(enable);
-    ui->buttonBox->setEnabled(enable);
-}
-
-// Enable the OK button only when both textboxes contain something.
-void LoginDialog::on_userTextBox_textEdited(const QString& newText)
-{
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!newText.isEmpty() && !ui->passTextBox->text().isEmpty());
-}
-void LoginDialog::on_passTextBox_textEdited(const QString& newText)
-{
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!newText.isEmpty() && !ui->userTextBox->text().isEmpty());
-}
-
-void LoginDialog::onTaskFailed(const QString& reason)
-{
-    // Set message
-    auto lines = reason.split('\n');
-    QString processed;
-    for (auto line : lines) {
-        if (line.size()) {
-            processed += "<font color='red'>" + line + "</font><br />";
-        } else {
-            processed += "<br />";
-        }
-    }
-    ui->label->setText(processed);
-
-    // Re-enable user-interaction
-    setUserInputsEnabled(true);
-    ui->progressBar->setVisible(false);
-}
-
-void LoginDialog::onTaskSucceeded()
-{
-    QDialog::accept();
-}
-
-void LoginDialog::onTaskStatus(const QString& status)
-{
-    ui->label->setText(status);
-}
-
-void LoginDialog::onTaskProgress(qint64 current, qint64 total)
-{
-    ui->progressBar->setMaximum(total);
-    ui->progressBar->setValue(current);
-}
-
-// Public interface
-MinecraftAccountPtr LoginDialog::newAccount(QWidget* parent, QString msg)
-{
-    LoginDialog dlg(parent);
-    dlg.ui->label->setText(msg);
-    if (dlg.exec() == QDialog::Accepted) {
-        return dlg.m_account;
-    }
-    return nullptr;
-}
diff --git a/launcher/ui/dialogs/LoginDialog.h b/launcher/ui/dialogs/LoginDialog.h
deleted file mode 100644
index e8e449019..000000000
--- a/launcher/ui/dialogs/LoginDialog.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 Evan Goode <mail@evangoo.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QtCore/QEventLoop>
-#include <QtWidgets/QDialog>
-
-#include "minecraft/auth/MinecraftAccount.h"
-#include "tasks/Task.h"
-
-namespace Ui {
-class LoginDialog;
-}
-
-class LoginDialog : public QDialog {
-    Q_OBJECT
-
-   public:
-    ~LoginDialog();
-
-    static MinecraftAccountPtr newAccount(QWidget* parent, QString message);
-
-   private:
-    explicit LoginDialog(QWidget* parent = 0);
-
-    void setUserInputsEnabled(bool enable);
-
-   protected slots:
-    void accept();
-
-    void onTaskFailed(const QString& reason);
-    void onTaskSucceeded();
-    void onTaskStatus(const QString& status);
-    void onTaskProgress(qint64 current, qint64 total);
-
-    void on_userTextBox_textEdited(const QString& newText);
-    void on_passTextBox_textEdited(const QString& newText);
-
-   private:
-    Ui::LoginDialog* ui;
-    MinecraftAccountPtr m_account;
-    Task::Ptr m_loginTask;
-};
diff --git a/launcher/ui/dialogs/LoginDialog.ui b/launcher/ui/dialogs/LoginDialog.ui
deleted file mode 100644
index 8fa4a45d2..000000000
--- a/launcher/ui/dialogs/LoginDialog.ui
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>LoginDialog</class>
- <widget class="QDialog" name="LoginDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>421</width>
-    <height>198</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Add Account</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string notr="true">Message label placeholder.</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="userTextBox">
-     <property name="placeholderText">
-      <string>Email</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="passTextBox">
-     <property name="echoMode">
-      <enum>QLineEdit::Password</enum>
-     </property>
-     <property name="placeholderText">
-      <string>Password</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="textVisible">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index 7df423412..1490cc158 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -34,43 +34,65 @@
  */
 
 #include "MSALoginDialog.h"
+#include "Application.h"
+
 #include "ui_MSALoginDialog.h"
 
 #include "DesktopServices.h"
-#include "minecraft/auth/AccountTask.h"
+#include "minecraft/auth/AuthFlow.h"
 
 #include <QApplication>
 #include <QClipboard>
+#include <QPixmap>
 #include <QUrl>
 #include <QtWidgets/QPushButton>
 
 MSALoginDialog::MSALoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::MSALoginDialog)
 {
     ui->setupUi(this);
-    ui->progressBar->setVisible(false);
-    ui->actionButton->setVisible(false);
-    // ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
 
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    // make font monospace
+    QFont font;
+    font.setPixelSize(ui->code->fontInfo().pixelSize());
+    font.setFamily(APPLICATION->settings()->get("ConsoleFont").toString());
+    font.setStyleHint(QFont::Monospace);
+    font.setFixedPitch(true);
+    ui->code->setFont(font);
+
+    connect(ui->copyCode, &QPushButton::clicked, this, [this] { QApplication::clipboard()->setText(ui->code->text()); });
+    ui->qr->setPixmap(QIcon((":/documents/login-qr.svg")).pixmap(QSize(150, 150)));
+    connect(ui->loginButton, &QPushButton::clicked, this, [this] {
+        if (m_url.isValid()) {
+            if (!DesktopServices::openUrl(m_url)) {
+                QApplication::clipboard()->setText(m_url.toString());
+            }
+        }
+    });
 }
 
 int MSALoginDialog::exec()
 {
-    setUserInputsEnabled(false);
-    ui->progressBar->setVisible(true);
-
     // Setup the login task and start it
     m_account = MinecraftAccount::createBlankMSA();
-    m_loginTask = m_account->loginMSA();
-    connect(m_loginTask.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
-    connect(m_loginTask.get(), &Task::succeeded, this, &MSALoginDialog::onTaskSucceeded);
-    connect(m_loginTask.get(), &Task::status, this, &MSALoginDialog::onTaskStatus);
-    connect(m_loginTask.get(), &Task::progress, this, &MSALoginDialog::onTaskProgress);
-    connect(m_loginTask.get(), &AccountTask::showVerificationUriAndCode, this, &MSALoginDialog::showVerificationUriAndCode);
-    connect(m_loginTask.get(), &AccountTask::hideVerificationUriAndCode, this, &MSALoginDialog::hideVerificationUriAndCode);
-    connect(&m_externalLoginTimer, &QTimer::timeout, this, &MSALoginDialog::externalLoginTick);
-    m_loginTask->start();
+    m_authflow_task = m_account->login(false);
+    connect(m_authflow_task.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
+    connect(m_authflow_task.get(), &Task::succeeded, this, &QDialog::accept);
+    connect(m_authflow_task.get(), &Task::aborted, this, &MSALoginDialog::reject);
+    connect(m_authflow_task.get(), &Task::status, this, &MSALoginDialog::onAuthFlowStatus);
+    connect(m_authflow_task.get(), &AuthFlow::authorizeWithBrowser, this, &MSALoginDialog::authorizeWithBrowser);
+    connect(m_authflow_task.get(), &AuthFlow::authorizeWithBrowserWithExtra, this, &MSALoginDialog::authorizeWithBrowserWithExtra);
+    connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_authflow_task.get(), &Task::abort);
+
+    m_devicecode_task.reset(new AuthFlow(m_account->accountData(), AuthFlow::Action::DeviceCode, this));
+    connect(m_devicecode_task.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
+    connect(m_devicecode_task.get(), &Task::succeeded, this, &QDialog::accept);
+    connect(m_devicecode_task.get(), &Task::aborted, this, &MSALoginDialog::reject);
+    connect(m_devicecode_task.get(), &Task::status, this, &MSALoginDialog::onDeviceFlowStatus);
+    connect(m_devicecode_task.get(), &AuthFlow::authorizeWithBrowser, this, &MSALoginDialog::authorizeWithBrowser);
+    connect(m_devicecode_task.get(), &AuthFlow::authorizeWithBrowserWithExtra, this, &MSALoginDialog::authorizeWithBrowserWithExtra);
+    connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_devicecode_task.get(), &Task::abort);
+    QMetaObject::invokeMethod(m_authflow_task.get(), &Task::start, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(m_devicecode_task.get(), &Task::start, Qt::QueuedConnection);
 
     return QDialog::exec();
 }
@@ -80,63 +102,12 @@ MSALoginDialog::~MSALoginDialog()
     delete ui;
 }
 
-void MSALoginDialog::externalLoginTick()
-{
-    m_externalLoginElapsed++;
-    ui->progressBar->setValue(m_externalLoginElapsed);
-    ui->progressBar->repaint();
-
-    if (m_externalLoginElapsed >= m_externalLoginTimeout) {
-        m_externalLoginTimer.stop();
-    }
-}
-
-void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn)
-{
-    m_externalLoginElapsed = 0;
-    m_externalLoginTimeout = expiresIn;
-
-    m_externalLoginTimer.setInterval(1000);
-    m_externalLoginTimer.setSingleShot(false);
-    m_externalLoginTimer.start();
-
-    ui->progressBar->setMaximum(expiresIn);
-    ui->progressBar->setValue(m_externalLoginElapsed);
-
-    QString urlString = uri.toString();
-    QString linkString = QString("<a href=\"%1\">%2</a>").arg(urlString, urlString);
-    if (urlString == "https://www.microsoft.com/link" && !code.isEmpty()) {
-        urlString += QString("?otc=%1").arg(code);
-        DesktopServices::openUrl(urlString);
-        ui->label->setText(tr("<p>Please login in the opened browser. If no browser was opened, please open up %1 in "
-                              "a browser and put in the code <b>%2</b> to proceed with login.</p>")
-                               .arg(linkString, code));
-    } else {
-        ui->label->setText(
-            tr("<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>").arg(linkString, code));
-    }
-    ui->actionButton->setVisible(true);
-    connect(ui->actionButton, &QPushButton::clicked, [=]() {
-        DesktopServices::openUrl(uri);
-        QClipboard* cb = QApplication::clipboard();
-        cb->setText(code);
-    });
-}
-
-void MSALoginDialog::hideVerificationUriAndCode()
-{
-    m_externalLoginTimer.stop();
-    ui->actionButton->setVisible(false);
-}
-
-void MSALoginDialog::setUserInputsEnabled(bool enable)
-{
-    ui->buttonBox->setEnabled(enable);
-}
-
-void MSALoginDialog::onTaskFailed(const QString& reason)
+void MSALoginDialog::onTaskFailed(QString reason)
 {
     // Set message
+    m_authflow_task->disconnect();
+    m_devicecode_task->disconnect();
+    ui->stackedWidget->setCurrentIndex(0);
     auto lines = reason.split('\n');
     QString processed;
     for (auto line : lines) {
@@ -146,35 +117,53 @@ void MSALoginDialog::onTaskFailed(const QString& reason)
             processed += "<br />";
         }
     }
-    ui->label->setText(processed);
+    ui->status->setText(processed);
+    auto task = m_authflow_task;
+    if (task->failReason().isEmpty()) {
+        task = m_devicecode_task;
+    }
+    if (task) {
+        ui->loadingLabel->setText(task->getStatus());
+    }
+    disconnect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_authflow_task.get(), &Task::abort);
+    disconnect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_devicecode_task.get(), &Task::abort);
+    connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &MSALoginDialog::reject);
+}
 
-    // Re-enable user-interaction
-    setUserInputsEnabled(true);
-    ui->progressBar->setVisible(false);
-    ui->actionButton->setVisible(false);
+void MSALoginDialog::authorizeWithBrowser(const QUrl& url)
+{
+    ui->stackedWidget2->setCurrentIndex(1);
+    ui->loginButton->setToolTip(QString("<div style='width: 200px;'>%1</div>").arg(url.toString()));
+    m_url = url;
 }
 
-void MSALoginDialog::onTaskSucceeded()
+void MSALoginDialog::authorizeWithBrowserWithExtra(QString url, QString code, int expiresIn)
 {
-    QDialog::accept();
+    ui->stackedWidget->setCurrentIndex(1);
+
+    const auto linkString = QString("<a href=\"%1\">%2</a>").arg(url, url);
+    ui->code->setText(code);
+    auto isDefaultUrl = url == "https://www.microsoft.com/link";
+    ui->qr->setVisible(isDefaultUrl);
+    ui->qrMessage->setText(tr("Open %1 and enter the above code.").arg(linkString));
 }
 
-void MSALoginDialog::onTaskStatus(const QString& status)
+void MSALoginDialog::onDeviceFlowStatus(QString status)
 {
-    ui->label->setText(status);
+    ui->stackedWidget->setCurrentIndex(0);
+    ui->status->setText(status);
 }
 
-void MSALoginDialog::onTaskProgress(qint64 current, qint64 total)
+void MSALoginDialog::onAuthFlowStatus(QString status)
 {
-    ui->progressBar->setMaximum(total);
-    ui->progressBar->setValue(current);
+    ui->stackedWidget2->setCurrentIndex(0);
+    ui->status2->setText(status);
 }
 
 // Public interface
-MinecraftAccountPtr MSALoginDialog::newAccount(QWidget* parent, QString msg)
+MinecraftAccountPtr MSALoginDialog::newAccount(QWidget* parent)
 {
     MSALoginDialog dlg(parent);
-    dlg.ui->label->setText(msg);
     if (dlg.exec() == QDialog::Accepted) {
         return dlg.m_account;
     }
diff --git a/launcher/ui/dialogs/MSALoginDialog.h b/launcher/ui/dialogs/MSALoginDialog.h
index 03e276bc0..375ccc57a 100644
--- a/launcher/ui/dialogs/MSALoginDialog.h
+++ b/launcher/ui/dialogs/MSALoginDialog.h
@@ -19,6 +19,7 @@
 #include <QtCore/QEventLoop>
 #include <QtWidgets/QDialog>
 
+#include "minecraft/auth/AuthFlow.h"
 #include "minecraft/auth/MinecraftAccount.h"
 
 namespace Ui {
@@ -31,29 +32,24 @@ class MSALoginDialog : public QDialog {
    public:
     ~MSALoginDialog();
 
-    static MinecraftAccountPtr newAccount(QWidget* parent, QString message);
+    static MinecraftAccountPtr newAccount(QWidget* parent);
     int exec() override;
 
    private:
     explicit MSALoginDialog(QWidget* parent = 0);
 
-    void setUserInputsEnabled(bool enable);
-
    protected slots:
-    void onTaskFailed(const QString& reason);
-    void onTaskSucceeded();
-    void onTaskStatus(const QString& status);
-    void onTaskProgress(qint64 current, qint64 total);
-    void showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn);
-    void hideVerificationUriAndCode();
-
-    void externalLoginTick();
+    void onTaskFailed(QString reason);
+    void onDeviceFlowStatus(QString status);
+    void onAuthFlowStatus(QString status);
+    void authorizeWithBrowser(const QUrl& url);
+    void authorizeWithBrowserWithExtra(QString url, QString code, int expiresIn);
 
    private:
     Ui::MSALoginDialog* ui;
     MinecraftAccountPtr m_account;
-    shared_qobject_ptr<AccountTask> m_loginTask;
-    QTimer m_externalLoginTimer;
-    int m_externalLoginElapsed = 0;
-    int m_externalLoginTimeout = 0;
+    shared_qobject_ptr<AuthFlow> m_devicecode_task;
+    shared_qobject_ptr<AuthFlow> m_authflow_task;
+
+    QUrl m_url;
 };
diff --git a/launcher/ui/dialogs/MSALoginDialog.ui b/launcher/ui/dialogs/MSALoginDialog.ui
index c18d01a16..4989184ec 100644
--- a/launcher/ui/dialogs/MSALoginDialog.ui
+++ b/launcher/ui/dialogs/MSALoginDialog.ui
@@ -6,68 +6,379 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>491</width>
-    <height>143</height>
+    <width>440</width>
+    <height>447</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>430</height>
+   </size>
   </property>
   <property name="windowTitle">
    <string>Add Microsoft Account</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_6">
    <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string notr="true">Message label placeholder.
-
-aaaaa</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
+    <widget class="QStackedWidget" name="stackedWidget2">
+     <property name="visible">
+      <bool>false</bool>
      </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     <property name="currentIndex">
+      <number>1</number>
      </property>
+     <widget class="QWidget" name="loadingPage2">
+      <layout class="QVBoxLayout" name="verticalLayout_31">
+       <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="loadingLabel2">
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Please wait...</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="status2">
+         <property name="text">
+          <string>Status</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_31">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="mpPage1">
+      <layout class="QVBoxLayout" name="verticalLayout_21" stretch="0">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <spacer name="horizontalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="loginButton">
+           <property name="minimumSize">
+            <size>
+             <width>250</width>
+             <height>40</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Sign in with Microsoft</string>
+           </property>
+           <property name="default">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_6">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="textVisible">
-      <bool>false</bool>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>1</number>
      </property>
+     <widget class="QWidget" name="loadingPage">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <spacer name="verticalSpacer_41">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="loadingLabel">
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Please wait...</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="status">
+         <property name="text">
+          <string>Status</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="mpPage">
+      <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="qr">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>150</width>
+             <height>150</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>150</width>
+             <height>150</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <spacer name="horizontalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="code">
+           <property name="font">
+            <font>
+             <pointsize>30</pointsize>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="cursor">
+            <cursorShape>IBeamCursor</cursorShape>
+           </property>
+           <property name="text">
+            <string>CODE</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::TextBrowserInteraction</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="copyCode">
+           <property name="toolTip">
+            <string>Copy code to clipboard</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset theme="copy">
+             <normaloff>.</normaloff>.</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>22</width>
+             <height>22</height>
+            </size>
+           </property>
+           <property name="flat">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QLabel" name="qrMessage">
+         <property name="text">
+          <string>Info</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::TextBrowserInteraction</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="actionButton">
-       <property name="text">
-        <string>Open page and copy code</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 2a5f901b3..f906cfcea 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -1,4 +1,5 @@
 #include "ModUpdateDialog.h"
+#include "Application.h"
 #include "ChooseProviderDialog.h"
 #include "CustomMessageBox.h"
 #include "ProgressDialog.h"
@@ -25,16 +26,14 @@
 
 #include <optional>
 
-static ModPlatform::ProviderCapabilities ProviderCaps;
-
 static std::list<Version> mcVersions(BaseInstance* inst)
 {
     return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getComponent("net.minecraft")->getVersion() };
 }
 
-static std::optional<ModPlatform::ModLoaderTypes> mcLoaders(BaseInstance* inst)
+static QList<ModPlatform::ModLoaderType> mcLoadersList(BaseInstance* inst)
 {
-    return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getSupportedModLoaders() };
+    return static_cast<MinecraftInstance*>(inst)->getPackProfile()->getModLoadersList();
 }
 
 ModUpdateDialog::ModUpdateDialog(QWidget* parent,
@@ -88,19 +87,19 @@ void ModUpdateDialog::checkCandidates()
     }
 
     auto versions = mcVersions(m_instance);
-    auto loaders = mcLoaders(m_instance);
+    auto loadersList = mcLoadersList(m_instance);
 
     SequentialTask check_task(m_parent, tr("Checking for updates"));
 
     if (!m_modrinth_to_update.empty()) {
-        m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model));
+        m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loadersList, m_mod_model));
         connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this,
                 [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({ mod, reason, recover_url }); });
         check_task.addTask(m_modrinth_check_task);
     }
 
     if (!m_flame_to_update.empty()) {
-        m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model));
+        m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loadersList, m_mod_model));
         connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this,
                 [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({ mod, reason, recover_url }); });
         check_task.addTask(m_flame_check_task);
@@ -213,19 +212,25 @@ void ModUpdateDialog::checkCandidates()
         }
         static FlameAPI api;
 
-        auto getRequiredBy = depTask->getRequiredBy();
+        auto dependencyExtraInfo = depTask->getExtraInfo();
 
         for (auto dep : depTask->getDependecies()) {
             auto changelog = dep->version.changelog;
             if (dep->pack->provider == ModPlatform::ResourceProvider::FLAME)
                 changelog = api.getModFileChangelog(dep->version.addonId.toInt(), dep->version.fileId.toInt());
             auto download_task = makeShared<ResourceDownloadTask>(dep->pack, dep->version, m_mod_model);
-            CheckUpdateTask::UpdatableMod updatable = {
-                dep->pack->name, dep->version.hash,   "",           dep->version.version, dep->version.version_type,
-                changelog,       dep->pack->provider, download_task
-            };
-
-            appendMod(updatable, getRequiredBy.value(dep->version.addonId.toString()));
+            auto extraInfo = dependencyExtraInfo.value(dep->version.addonId.toString());
+            CheckUpdateTask::UpdatableMod updatable = { dep->pack->name,
+                                                        dep->version.hash,
+                                                        "",
+                                                        dep->version.version,
+                                                        dep->version.version_type,
+                                                        changelog,
+                                                        dep->pack->provider,
+                                                        download_task,
+                                                        !extraInfo.maybe_installed };
+
+            appendMod(updatable, extraInfo.required_by);
             m_tasks.insert(updatable.name, updatable.download);
         }
     }
@@ -411,12 +416,15 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
 void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info, QStringList requiredBy)
 {
     auto item_top = new QTreeWidgetItem(ui->modTreeWidget);
-    item_top->setCheckState(0, Qt::CheckState::Checked);
+    item_top->setCheckState(0, info.enabled ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+    if (!info.enabled) {
+        item_top->setToolTip(0, tr("Mod was disabled as it may be already instaled."));
+    }
     item_top->setText(0, info.name);
     item_top->setExpanded(true);
 
     auto provider_item = new QTreeWidgetItem(item_top);
-    provider_item->setText(0, tr("Provider: %1").arg(ProviderCaps.readableName(info.provider)));
+    provider_item->setText(0, tr("Provider: %1").arg(ModPlatform::ProviderCapabilities::readableName(info.provider)));
 
     auto old_version_item = new QTreeWidgetItem(item_top);
     old_version_item->setText(0, tr("Old version: %1").arg(info.old_version.isEmpty() ? tr("Not installed") : info.old_version));
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index 6d3199731..8477721f0 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -36,6 +36,7 @@
 
 #include "NewInstanceDialog.h"
 #include "Application.h"
+#include "ui/pages/modplatform/ModpackProviderBasePage.h"
 #include "ui/pages/modplatform/import_ftb/ImportFTBPage.h"
 #include "ui_NewInstanceDialog.h"
 
@@ -100,6 +101,9 @@ NewInstanceDialog::NewInstanceDialog(const QString& initialGroup,
     ui->verticalLayout->insertWidget(2, m_container);
 
     m_container->addButtons(m_buttons);
+    connect(m_container, &PageContainer::selectedPageChanged, this, [this](BasePage* previous, BasePage* selected) {
+        m_buttons->button(QDialogButtonBox::Ok)->setEnabled(creationTask && !instName().isEmpty());
+    });
 
     // Bonk Qt over its stupid head and make sure it understands which button is the default one...
     // See: https://stackoverflow.com/questions/24556831/qbuttonbox-set-default-button
@@ -138,6 +142,8 @@ NewInstanceDialog::NewInstanceDialog(const QString& initialGroup,
         auto geometry = screen->availableSize();
         resize(width(), qMin(geometry.height() - 50, 710));
     }
+
+    connect(m_container, &PageContainer::selectedPageChanged, this, &NewInstanceDialog::selectedPageChanged);
 }
 
 void NewInstanceDialog::reject()
@@ -199,7 +205,7 @@ void NewInstanceDialog::setSuggestedPack(const QString& name, InstanceTask* task
     importVersion.clear();
 
     if (!task) {
-        ui->iconButton->setIcon(APPLICATION->icons()->getIcon("default"));
+        ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
         importIcon = false;
     }
 
@@ -215,7 +221,7 @@ void NewInstanceDialog::setSuggestedPack(const QString& name, QString version, I
     importVersion = std::move(version);
 
     if (!task) {
-        ui->iconButton->setIcon(APPLICATION->icons()->getIcon("default"));
+        ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
         importIcon = false;
     }
 
@@ -235,6 +241,9 @@ void NewInstanceDialog::setSuggestedIconFromFile(const QString& path, const QStr
 
 void NewInstanceDialog::setSuggestedIcon(const QString& key)
 {
+    if (key == "default")
+        return;
+
     auto icon = APPLICATION->icons()->getIcon(key);
     importIcon = false;
 
@@ -312,3 +321,16 @@ void NewInstanceDialog::importIconNow()
     }
     APPLICATION->settings()->set("NewInstanceGeometry", saveGeometry().toBase64());
 }
+
+void NewInstanceDialog::selectedPageChanged(BasePage* previous, BasePage* selected)
+{
+    auto prevPage = dynamic_cast<ModpackProviderBasePage*>(previous);
+    if (prevPage) {
+        m_searchTerm = prevPage->getSerachTerm();
+    }
+
+    auto nextPage = dynamic_cast<ModpackProviderBasePage*>(selected);
+    if (nextPage) {
+        nextPage->setSearchTerm(m_searchTerm);
+    }
+}
diff --git a/launcher/ui/dialogs/NewInstanceDialog.h b/launcher/ui/dialogs/NewInstanceDialog.h
index 923579567..e97c9f543 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.h
+++ b/launcher/ui/dialogs/NewInstanceDialog.h
@@ -82,6 +82,7 @@ class NewInstanceDialog : public QDialog, public BasePageProvider {
    private slots:
     void on_iconButton_clicked();
     void on_instNameTextBox_textChanged(const QString& arg1);
+    void selectedPageChanged(BasePage* previous, BasePage* selected);
 
    private:
     Ui::NewInstanceDialog* ui = nullptr;
@@ -98,5 +99,7 @@ class NewInstanceDialog : public QDialog, public BasePageProvider {
 
     QString importVersion;
 
+    QString m_searchTerm;
+
     void importIconNow();
 };
diff --git a/launcher/ui/dialogs/OfflineLoginDialog.cpp b/launcher/ui/dialogs/OfflineLoginDialog.cpp
index 137620be4..b9d1c2915 100644
--- a/launcher/ui/dialogs/OfflineLoginDialog.cpp
+++ b/launcher/ui/dialogs/OfflineLoginDialog.cpp
@@ -1,8 +1,6 @@
 #include "OfflineLoginDialog.h"
 #include "ui_OfflineLoginDialog.h"
 
-#include "minecraft/auth/AccountTask.h"
-
 #include <QtWidgets/QPushButton>
 
 OfflineLoginDialog::OfflineLoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::OfflineLoginDialog)
@@ -28,7 +26,7 @@ void OfflineLoginDialog::accept()
 
     // Setup the login task and start it
     m_account = MinecraftAccount::createOffline(ui->userTextBox->text());
-    m_loginTask = m_account->loginOffline();
+    m_loginTask = m_account->login();
     connect(m_loginTask.get(), &Task::failed, this, &OfflineLoginDialog::onTaskFailed);
     connect(m_loginTask.get(), &Task::succeeded, this, &OfflineLoginDialog::onTaskSucceeded);
     connect(m_loginTask.get(), &Task::status, this, &OfflineLoginDialog::onTaskStatus);
diff --git a/launcher/ui/dialogs/ProfileSelectDialog.cpp b/launcher/ui/dialogs/ProfileSelectDialog.cpp
index a62238bdb..fe03e1b6b 100644
--- a/launcher/ui/dialogs/ProfileSelectDialog.cpp
+++ b/launcher/ui/dialogs/ProfileSelectDialog.cpp
@@ -20,7 +20,6 @@
 #include <QItemSelectionModel>
 
 #include "Application.h"
-#include "SkinUtils.h"
 
 #include "ui/dialogs/ProgressDialog.h"
 
diff --git a/launcher/ui/dialogs/ProfileSetupDialog.cpp b/launcher/ui/dialogs/ProfileSetupDialog.cpp
index 4b0c5b768..385094e23 100644
--- a/launcher/ui/dialogs/ProfileSetupDialog.cpp
+++ b/launcher/ui/dialogs/ProfileSetupDialog.cpp
@@ -34,6 +34,7 @@
  */
 
 #include "ProfileSetupDialog.h"
+#include "net/RawHeaderProxy.h"
 #include "ui_ProfileSetupDialog.h"
 
 #include <QAction>
@@ -45,8 +46,8 @@
 #include "ui/dialogs/ProgressDialog.h"
 
 #include <Application.h>
-#include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
+#include "net/Upload.h"
 
 ProfileSetupDialog::ProfileSetupDialog(MinecraftAccountPtr accountToSetup, QWidget* parent)
     : QDialog(parent), m_accountToSetup(accountToSetup), ui(new Ui::ProfileSetupDialog)
@@ -150,28 +151,27 @@ void ProfileSetupDialog::checkName(const QString& name)
     currentCheck = name;
     isChecking = true;
 
-    auto token = m_accountToSetup->accessToken();
+    QUrl url(QString("https://api.minecraftservices.com/minecraft/profile/name/%1/available").arg(name));
+    auto headers = QList<Net::HeaderPair>{ { "Content-Type", "application/json" },
+                                           { "Accept", "application/json" },
+                                           { "Authorization", QString("Bearer %1").arg(m_accountToSetup->accessToken()).toUtf8() } };
 
-    auto url = QString("https://api.minecraftservices.com/minecraft/profile/name/%1/available").arg(name);
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Accept", "application/json");
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toUtf8());
+    m_check_response.reset(new QByteArray());
+    if (m_check_task)
+        disconnect(m_check_task.get(), nullptr, this, nullptr);
+    m_check_task = Net::Download::makeByteArray(url, m_check_response);
+    m_check_task->addHeaderProxy(new Net::RawHeaderProxy(headers));
 
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &ProfileSetupDialog::checkFinished);
-    requestor->get(request);
+    connect(m_check_task.get(), &Task::finished, this, &ProfileSetupDialog::checkFinished);
+
+    m_check_task->setNetwork(APPLICATION->network());
+    m_check_task->start();
 }
 
-void ProfileSetupDialog::checkFinished(QNetworkReply::NetworkError error,
-                                       QByteArray profileData,
-                                       [[maybe_unused]] QList<QNetworkReply::RawHeaderPair> headers)
+void ProfileSetupDialog::checkFinished()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    if (error == QNetworkReply::NoError) {
-        auto doc = QJsonDocument::fromJson(profileData);
+    if (m_check_task->error() == QNetworkReply::NoError) {
+        auto doc = QJsonDocument::fromJson(*m_check_response);
         auto root = doc.object();
         auto statusValue = root.value("status").toString("INVALID");
         if (statusValue == "AVAILABLE") {
@@ -195,20 +195,22 @@ void ProfileSetupDialog::setupProfile(const QString& profileName)
         return;
     }
 
-    auto token = m_accountToSetup->accessToken();
+    QString payloadTemplate("{\"profileName\":\"%1\"}");
 
-    auto url = QString("https://api.minecraftservices.com/minecraft/profile");
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Accept", "application/json");
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(token).toUtf8());
+    QUrl url("https://api.minecraftservices.com/minecraft/profile");
+    auto headers = QList<Net::HeaderPair>{ { "Content-Type", "application/json" },
+                                           { "Accept", "application/json" },
+                                           { "Authorization", QString("Bearer %1").arg(m_accountToSetup->accessToken()).toUtf8() } };
 
-    QString payloadTemplate("{\"profileName\":\"%1\"}");
-    auto profileData = payloadTemplate.arg(profileName).toUtf8();
+    m_profile_response.reset(new QByteArray());
+    m_profile_task = Net::Upload::makeByteArray(url, m_profile_response, payloadTemplate.arg(profileName).toUtf8());
+    m_profile_task->addHeaderProxy(new Net::RawHeaderProxy(headers));
+
+    connect(m_profile_task.get(), &Task::finished, this, &ProfileSetupDialog::setupProfileFinished);
+
+    m_profile_task->setNetwork(APPLICATION->network());
+    m_profile_task->start();
 
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &ProfileSetupDialog::setupProfileFinished);
-    requestor->post(request, profileData);
     isWorking = true;
 
     auto button = ui->buttonBox->button(QDialogButtonBox::Cancel);
@@ -244,22 +246,17 @@ struct MojangError {
 
 }  // namespace
 
-void ProfileSetupDialog::setupProfileFinished(QNetworkReply::NetworkError error,
-                                              QByteArray errorData,
-                                              [[maybe_unused]] QList<QNetworkReply::RawHeaderPair> headers)
+void ProfileSetupDialog::setupProfileFinished()
 {
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
     isWorking = false;
-    if (error == QNetworkReply::NoError) {
+    if (m_profile_task->error() == QNetworkReply::NoError) {
         /*
          * data contains the profile in the response
          * ... we could parse it and update the account, but let's just return back to the normal login flow instead...
          */
         accept();
     } else {
-        auto parsedError = MojangError::fromJSON(errorData);
+        auto parsedError = MojangError::fromJSON(*m_profile_response);
         ui->errorLabel->setVisible(true);
         ui->errorLabel->setText(tr("The server returned the following error:") + "\n\n" + parsedError.errorMessage);
         qDebug() << parsedError.rawError;
diff --git a/launcher/ui/dialogs/ProfileSetupDialog.h b/launcher/ui/dialogs/ProfileSetupDialog.h
index 09f8124e2..c005a4138 100644
--- a/launcher/ui/dialogs/ProfileSetupDialog.h
+++ b/launcher/ui/dialogs/ProfileSetupDialog.h
@@ -22,6 +22,8 @@
 
 #include <minecraft/auth/MinecraftAccount.h>
 #include <memory>
+#include "net/Download.h"
+#include "net/Upload.h"
 
 namespace Ui {
 class ProfileSetupDialog;
@@ -40,10 +42,10 @@ class ProfileSetupDialog : public QDialog {
     void on_buttonBox_rejected();
 
     void nameEdited(const QString& name);
-    void checkFinished(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers);
     void startCheck();
 
-    void setupProfileFinished(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers);
+    void checkFinished();
+    void setupProfileFinished();
 
    protected:
     void scheduleCheck(const QString& name);
@@ -67,4 +69,10 @@ class ProfileSetupDialog : public QDialog {
     QString currentCheck;
 
     QTimer checkStartTimer;
+
+    std::shared_ptr<QByteArray> m_check_response;
+    Net::Download::Ptr m_check_task;
+
+    std::shared_ptr<QByteArray> m_profile_response;
+    Net::Upload::Ptr m_profile_task;
 };
diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp
index 0ca3a1bd9..9897687e3 100644
--- a/launcher/ui/dialogs/ProgressDialog.cpp
+++ b/launcher/ui/dialogs/ProgressDialog.cpp
@@ -90,6 +90,9 @@ void ProgressDialog::on_skipButton_clicked(bool checked)
 
 ProgressDialog::~ProgressDialog()
 {
+    for (auto conn : this->m_taskConnections) {
+        disconnect(conn);
+    }   
     delete ui;
 }
 
@@ -140,15 +143,15 @@ int ProgressDialog::execWithTask(Task* task)
     }
 
     // Connect signals.
-    connect(task, &Task::started, this, &ProgressDialog::onTaskStarted);
-    connect(task, &Task::failed, this, &ProgressDialog::onTaskFailed);
-    connect(task, &Task::succeeded, this, &ProgressDialog::onTaskSucceeded);
-    connect(task, &Task::status, this, &ProgressDialog::changeStatus);
-    connect(task, &Task::details, this, &ProgressDialog::changeStatus);
-    connect(task, &Task::stepProgress, this, &ProgressDialog::changeStepProgress);
-    connect(task, &Task::progress, this, &ProgressDialog::changeProgress);
-    connect(task, &Task::aborted, this, &ProgressDialog::hide);
-    connect(task, &Task::abortStatusChanged, ui->skipButton, &QPushButton::setEnabled);
+    this->m_taskConnections.push_back(connect(task, &Task::started, this, &ProgressDialog::onTaskStarted));
+    this->m_taskConnections.push_back(connect(task, &Task::failed, this, &ProgressDialog::onTaskFailed));
+    this->m_taskConnections.push_back(connect(task, &Task::succeeded, this, &ProgressDialog::onTaskSucceeded));
+    this->m_taskConnections.push_back(connect(task, &Task::status, this, &ProgressDialog::changeStatus));
+    this->m_taskConnections.push_back(connect(task, &Task::details, this, &ProgressDialog::changeStatus));
+    this->m_taskConnections.push_back(connect(task, &Task::stepProgress, this, &ProgressDialog::changeStepProgress));
+    this->m_taskConnections.push_back(connect(task, &Task::progress, this, &ProgressDialog::changeProgress));
+    this->m_taskConnections.push_back(connect(task, &Task::aborted, this, &ProgressDialog::hide));
+    this->m_taskConnections.push_back(connect(task, &Task::abortStatusChanged, ui->skipButton, &QPushButton::setEnabled));
 
     m_is_multi_step = task->isMultiStep();
     ui->taskProgressScrollArea->setHidden(!m_is_multi_step);
diff --git a/launcher/ui/dialogs/ProgressDialog.h b/launcher/ui/dialogs/ProgressDialog.h
index 15eadf4e7..4a696a49d 100644
--- a/launcher/ui/dialogs/ProgressDialog.h
+++ b/launcher/ui/dialogs/ProgressDialog.h
@@ -93,6 +93,8 @@ class ProgressDialog : public QDialog {
     Ui::ProgressDialog* ui;
 
     Task* m_task;
+    
+    QList<QMetaObject::Connection> m_taskConnections;
 
     bool m_is_multi_step = false;
     QHash<QUuid, SubTaskProgressBar*> taskProgress;
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
index 1431ea92c..02a8454b4 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -27,6 +27,7 @@
 #include "Application.h"
 #include "ResourceDownloadTask.h"
 
+#include "minecraft/PackProfile.h"
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourcePackFolderModel.h"
 #include "minecraft/mod/ShaderPackFolderModel.h"
@@ -91,6 +92,19 @@ void ResourceDownloadDialog::accept()
 
 void ResourceDownloadDialog::reject()
 {
+    auto selected = getTasks();
+    if (selected.count() > 0) {
+        auto reply = CustomMessageBox::selectable(this, tr("Confirmation Needed"),
+                                                  tr("You have %1 selected resources.\n"
+                                                     "Are you sure you want to close this dialog?")
+                                                      .arg(selected.count()),
+                                                  QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                         ->exec();
+        if (reply != QMessageBox::Yes) {
+            return;
+        }
+    }
+
     if (!geometrySaveKey().isEmpty())
         APPLICATION->settings()->set(geometrySaveKey(), saveGeometry().toBase64());
 
@@ -125,14 +139,13 @@ void ResourceDownloadDialog::connectButtons()
     connect(HelpButton, &QPushButton::clicked, m_container, &PageContainer::help);
 }
 
-static ModPlatform::ProviderCapabilities ProviderCaps;
-
 void ResourceDownloadDialog::confirm()
 {
     auto confirm_dialog = ReviewMessageBox::create(this, tr("Confirm %1 to download").arg(resourcesString()));
     confirm_dialog->retranslateUi(resourcesString());
 
-    QHash<QString, QStringList> getRequiredBy;
+    QHash<QString, GetModDependenciesTask::PackDependencyExtraInfo> dependencyExtraInfo;
+    QStringList depNames;
     if (auto task = getModDependenciesTask(); task) {
         connect(task.get(), &Task::failed, this,
                 [&](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
@@ -155,9 +168,11 @@ void ResourceDownloadDialog::confirm()
             QMetaObject::invokeMethod(this, "reject", Qt::QueuedConnection);
             return;
         } else {
-            for (auto dep : task->getDependecies())
+            for (auto dep : task->getDependecies()) {
                 addResource(dep->pack, dep->version);
-            getRequiredBy = task->getRequiredBy();
+                depNames << dep->pack->name;
+            }
+            dependencyExtraInfo = task->getExtraInfo();
         }
     }
 
@@ -166,9 +181,10 @@ void ResourceDownloadDialog::confirm()
         return QString::compare(a->getName(), b->getName(), Qt::CaseInsensitive) < 0;
     });
     for (auto& task : selected) {
+        auto extraInfo = dependencyExtraInfo.value(task->getPack()->addonId.toString());
         confirm_dialog->appendResource({ task->getName(), task->getFilename(), task->getCustomPath(),
-                                         ProviderCaps.name(task->getProvider()), getRequiredBy.value(task->getPack()->addonId.toString()),
-                                         task->getVersion().version_type.toString() });
+                                         ModPlatform::ProviderCapabilities::name(task->getProvider()), extraInfo.required_by,
+                                         task->getVersion().version_type.toString(), !extraInfo.maybe_installed });
     }
 
     if (confirm_dialog->exec()) {
@@ -180,6 +196,9 @@ void ResourceDownloadDialog::confirm()
         }
 
         this->accept();
+    } else {
+        for (auto name : depNames)
+            removeResource(name);
     }
 }
 
@@ -239,7 +258,9 @@ void ResourceDownloadDialog::selectedPageChanged(BasePage* previous, BasePage* s
     }
 
     // Same effect as having a global search bar
-    selectedPage()->setSearchTerm(prev_page->getSearchTerm());
+    ResourcePage* result = dynamic_cast<ResourcePage*>(selected);
+    Q_ASSERT(result != nullptr);
+    result->setSearchTerm(prev_page->getSearchTerm());
 }
 
 ModDownloadDialog::ModDownloadDialog(QWidget* parent, const std::shared_ptr<ModFolderModel>& mods, BaseInstance* instance)
@@ -356,4 +377,20 @@ QList<BasePage*> ShaderPackDownloadDialog::getPages()
     return pages;
 }
 
+void ModDownloadDialog::setModMetadata(std::shared_ptr<Metadata::ModStruct> meta)
+{
+    switch (meta->provider) {
+        case ModPlatform::ResourceProvider::MODRINTH:
+            selectPage(Modrinth::id());
+            break;
+        case ModPlatform::ResourceProvider::FLAME:
+            selectPage(Flame::id());
+            break;
+    }
+    setWindowTitle(tr("Change %1 version").arg(meta->name));
+    m_container->hidePageList();
+    m_buttons.hide();
+    auto page = selectedPage();
+    page->openProject(meta->project_id);
+}
 }  // namespace ResourceDownload
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.h b/launcher/ui/dialogs/ResourceDownloadDialog.h
index a6efca138..7a0d6e895 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.h
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.h
@@ -107,6 +107,8 @@ class ModDownloadDialog final : public ResourceDownloadDialog {
     QList<BasePage*> getPages() override;
     GetModDependenciesTask::Ptr getModDependenciesTask() override;
 
+    void setModMetadata(std::shared_ptr<Metadata::ModStruct>);
+
    private:
     BaseInstance* m_instance;
 };
diff --git a/launcher/ui/dialogs/ReviewMessageBox.cpp b/launcher/ui/dialogs/ReviewMessageBox.cpp
index 41b832e03..66c36d400 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.cpp
+++ b/launcher/ui/dialogs/ReviewMessageBox.cpp
@@ -35,8 +35,11 @@ auto ReviewMessageBox::create(QWidget* parent, QString&& title, QString&& icon)
 void ReviewMessageBox::appendResource(ResourceInformation&& info)
 {
     auto itemTop = new QTreeWidgetItem(ui->modTreeWidget);
-    itemTop->setCheckState(0, Qt::CheckState::Checked);
+    itemTop->setCheckState(0, info.enabled ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
     itemTop->setText(0, info.name);
+    if (!info.enabled) {
+        itemTop->setToolTip(0, tr("Mod was disabled as it may be already instaled."));
+    }
 
     auto filenameItem = new QTreeWidgetItem(itemTop);
     filenameItem->setText(0, tr("Filename: %1").arg(info.filename));
diff --git a/launcher/ui/dialogs/ReviewMessageBox.h b/launcher/ui/dialogs/ReviewMessageBox.h
index 7dd2732a0..82a43bc11 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.h
+++ b/launcher/ui/dialogs/ReviewMessageBox.h
@@ -20,6 +20,7 @@ class ReviewMessageBox : public QDialog {
         QString provider;
         QStringList required_by;
         QString version_type;
+        bool enabled = true;
     };
 
     void appendResource(ResourceInformation&& info);
diff --git a/launcher/ui/dialogs/SkinUploadDialog.cpp b/launcher/ui/dialogs/SkinUploadDialog.cpp
deleted file mode 100644
index 52fc302ac..000000000
--- a/launcher/ui/dialogs/SkinUploadDialog.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QPainter>
-
-#include <FileSystem.h>
-
-#include <minecraft/services/CapeChange.h>
-#include <minecraft/services/SkinUpload.h>
-#include <tasks/SequentialTask.h>
-
-#include "CustomMessageBox.h"
-#include "ProgressDialog.h"
-#include "SkinUploadDialog.h"
-#include "ui_SkinUploadDialog.h"
-
-void SkinUploadDialog::on_buttonBox_rejected()
-{
-    close();
-}
-
-void SkinUploadDialog::on_buttonBox_accepted()
-{
-    QString fileName;
-    QString input = ui->skinPathTextBox->text();
-    ProgressDialog prog(this);
-    SequentialTask skinUpload;
-
-    if (!input.isEmpty()) {
-        QRegularExpression urlPrefixMatcher(QRegularExpression::anchoredPattern("^([a-z]+)://.+$"));
-        bool isLocalFile = false;
-        // it has an URL prefix -> it is an URL
-        if (urlPrefixMatcher.match(input).hasMatch()) {
-            QUrl fileURL = input;
-            if (fileURL.isValid()) {
-                // local?
-                if (fileURL.isLocalFile()) {
-                    isLocalFile = true;
-                    fileName = fileURL.toLocalFile();
-                } else {
-                    CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Using remote URLs for setting skins is not implemented yet."),
-                                                 QMessageBox::Warning)
-                        ->exec();
-                    close();
-                    return;
-                }
-            } else {
-                CustomMessageBox::selectable(this, tr("Skin Upload"), tr("You cannot use an invalid URL for uploading skins."),
-                                             QMessageBox::Warning)
-                    ->exec();
-                close();
-                return;
-            }
-        } else {
-            // just assume it's a path then
-            isLocalFile = true;
-            fileName = ui->skinPathTextBox->text();
-        }
-        if (isLocalFile && !QFile::exists(fileName)) {
-            CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Skin file does not exist!"), QMessageBox::Warning)->exec();
-            close();
-            return;
-        }
-        SkinUpload::Model model = SkinUpload::STEVE;
-        if (ui->steveBtn->isChecked()) {
-            model = SkinUpload::STEVE;
-        } else if (ui->alexBtn->isChecked()) {
-            model = SkinUpload::ALEX;
-        }
-        skinUpload.addTask(shared_qobject_ptr<SkinUpload>(new SkinUpload(this, m_account, FS::read(fileName), model)));
-    }
-
-    auto selectedCape = ui->capeCombo->currentData().toString();
-    if (selectedCape != m_account->accountData()->minecraftProfile.currentCape) {
-        skinUpload.addTask(shared_qobject_ptr<CapeChange>(new CapeChange(this, m_account, selectedCape)));
-    }
-    if (prog.execWithTask(&skinUpload) != QDialog::Accepted) {
-        CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Failed to upload skin!"), QMessageBox::Warning)->exec();
-        close();
-        return;
-    }
-    CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Success"), QMessageBox::Information)->exec();
-    close();
-}
-
-void SkinUploadDialog::on_skinBrowseBtn_clicked()
-{
-    auto filter = QMimeDatabase().mimeTypeForName("image/png").filterString();
-    QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), filter);
-    if (raw_path.isEmpty() || !QFileInfo::exists(raw_path)) {
-        return;
-    }
-    QString cooked_path = FS::NormalizePath(raw_path);
-    ui->skinPathTextBox->setText(cooked_path);
-}
-
-SkinUploadDialog::SkinUploadDialog(MinecraftAccountPtr account, QWidget* parent)
-    : QDialog(parent), m_account(account), ui(new Ui::SkinUploadDialog)
-{
-    ui->setupUi(this);
-
-    // FIXME: add a model for this, download/refresh the capes on demand
-    auto& accountData = *account->accountData();
-    int index = 0;
-    ui->capeCombo->addItem(tr("No Cape"), QVariant());
-    auto currentCape = accountData.minecraftProfile.currentCape;
-    if (currentCape.isEmpty()) {
-        ui->capeCombo->setCurrentIndex(index);
-    }
-
-    for (auto& cape : accountData.minecraftProfile.capes) {
-        index++;
-        if (cape.data.size()) {
-            QPixmap capeImage;
-            if (capeImage.loadFromData(cape.data, "PNG")) {
-                QPixmap preview = QPixmap(10, 16);
-                QPainter painter(&preview);
-                painter.drawPixmap(0, 0, capeImage.copy(1, 1, 10, 16));
-                ui->capeCombo->addItem(capeImage, cape.alias, cape.id);
-                if (currentCape == cape.id) {
-                    ui->capeCombo->setCurrentIndex(index);
-                }
-                continue;
-            }
-        }
-        ui->capeCombo->addItem(cape.alias, cape.id);
-        if (currentCape == cape.id) {
-            ui->capeCombo->setCurrentIndex(index);
-        }
-    }
-}
diff --git a/launcher/ui/dialogs/SkinUploadDialog.h b/launcher/ui/dialogs/SkinUploadDialog.h
deleted file mode 100644
index c66296b09..000000000
--- a/launcher/ui/dialogs/SkinUploadDialog.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <minecraft/auth/MinecraftAccount.h>
-#include <QDialog>
-
-namespace Ui {
-class SkinUploadDialog;
-}
-
-class SkinUploadDialog : public QDialog {
-    Q_OBJECT
-   public:
-    explicit SkinUploadDialog(MinecraftAccountPtr acct, QWidget* parent = 0);
-    virtual ~SkinUploadDialog() {};
-
-   public slots:
-    void on_buttonBox_accepted();
-
-    void on_buttonBox_rejected();
-
-    void on_skinBrowseBtn_clicked();
-
-   protected:
-    MinecraftAccountPtr m_account;
-
-   private:
-    Ui::SkinUploadDialog* ui;
-};
diff --git a/launcher/ui/dialogs/SkinUploadDialog.ui b/launcher/ui/dialogs/SkinUploadDialog.ui
deleted file mode 100644
index c6df92df3..000000000
--- a/launcher/ui/dialogs/SkinUploadDialog.ui
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SkinUploadDialog</class>
- <widget class="QDialog" name="SkinUploadDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>394</width>
-    <height>360</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Skin Upload</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="fileBox">
-     <property name="title">
-      <string>Skin File</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QLineEdit" name="skinPathTextBox">
-        <property name="placeholderText">
-         <string>Leave empty to keep current skin</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="skinBrowseBtn">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Browse</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="modelBox">
-     <property name="title">
-      <string>Player Model</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_1">
-      <item>
-       <widget class="QRadioButton" name="steveBtn">
-        <property name="text">
-         <string>Steve Model</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="alexBtn">
-        <property name="text">
-         <string>Alex Model</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="capeBox">
-     <property name="title">
-      <string>Cape</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QComboBox" name="capeCombo"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/launcher/ui/dialogs/VersionSelectDialog.cpp b/launcher/ui/dialogs/VersionSelectDialog.cpp
index c61d10578..876d7470e 100644
--- a/launcher/ui/dialogs/VersionSelectDialog.cpp
+++ b/launcher/ui/dialogs/VersionSelectDialog.cpp
@@ -121,7 +121,7 @@ void VersionSelectDialog::setResizeOn(int column)
 int VersionSelectDialog::exec()
 {
     QDialog::open();
-    m_versionWidget->initialize(m_vlist);
+    m_versionWidget->initialize(m_vlist, true);
     m_versionWidget->selectSearch();
     if (resizeOnColumn != -1) {
         m_versionWidget->setResizeOn(resizeOnColumn);
diff --git a/launcher/ui/dialogs/VersionSelectDialog.h b/launcher/ui/dialogs/VersionSelectDialog.h
index 34c5e66f8..ed1de607b 100644
--- a/launcher/ui/dialogs/VersionSelectDialog.h
+++ b/launcher/ui/dialogs/VersionSelectDialog.h
@@ -26,10 +26,6 @@ class QDialogButtonBox;
 class VersionSelectWidget;
 class QPushButton;
 
-namespace Ui {
-class VersionSelectDialog;
-}
-
 class VersionProxyModel;
 
 class VersionSelectDialog : public QDialog {
@@ -37,7 +33,7 @@ class VersionSelectDialog : public QDialog {
 
    public:
     explicit VersionSelectDialog(BaseVersionList* vlist, QString title, QWidget* parent = 0, bool cancelable = true);
-    virtual ~VersionSelectDialog() {};
+    virtual ~VersionSelectDialog() = default;
 
     int exec() override;
 
diff --git a/launcher/ui/dialogs/skins/SkinManageDialog.cpp b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
new file mode 100644
index 000000000..f992429fe
--- /dev/null
+++ b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
@@ -0,0 +1,520 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "SkinManageDialog.h"
+#include "ui_SkinManageDialog.h"
+
+#include <FileSystem.h>
+#include <QAction>
+#include <QDialog>
+#include <QEventLoop>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QKeyEvent>
+#include <QListView>
+#include <QMimeDatabase>
+#include <QPainter>
+#include <QUrl>
+
+#include "Application.h"
+#include "DesktopServices.h"
+#include "Json.h"
+#include "QObjectPtr.h"
+
+#include "minecraft/auth/Parsers.h"
+#include "minecraft/skins/CapeChange.h"
+#include "minecraft/skins/SkinDelete.h"
+#include "minecraft/skins/SkinList.h"
+#include "minecraft/skins/SkinModel.h"
+#include "minecraft/skins/SkinUpload.h"
+
+#include "net/Download.h"
+#include "net/NetJob.h"
+#include "tasks/Task.h"
+
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ProgressDialog.h"
+#include "ui/instanceview/InstanceDelegate.h"
+
+SkinManageDialog::SkinManageDialog(QWidget* parent, MinecraftAccountPtr acct)
+    : QDialog(parent), m_acct(acct), ui(new Ui::SkinManageDialog), m_list(this, APPLICATION->settings()->get("SkinsDir").toString(), acct)
+{
+    ui->setupUi(this);
+
+    setWindowModality(Qt::WindowModal);
+
+    auto contentsWidget = ui->listView;
+    contentsWidget->setViewMode(QListView::IconMode);
+    contentsWidget->setFlow(QListView::LeftToRight);
+    contentsWidget->setIconSize(QSize(48, 48));
+    contentsWidget->setMovement(QListView::Static);
+    contentsWidget->setResizeMode(QListView::Adjust);
+    contentsWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+    contentsWidget->setSpacing(5);
+    contentsWidget->setWordWrap(false);
+    contentsWidget->setWrapping(true);
+    contentsWidget->setUniformItemSizes(true);
+    contentsWidget->setTextElideMode(Qt::ElideRight);
+    contentsWidget->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+    contentsWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    contentsWidget->installEventFilter(this);
+    contentsWidget->setItemDelegate(new ListViewDelegate(this));
+
+    contentsWidget->setAcceptDrops(true);
+    contentsWidget->setDropIndicatorShown(true);
+    contentsWidget->viewport()->setAcceptDrops(true);
+    contentsWidget->setDragDropMode(QAbstractItemView::DropOnly);
+    contentsWidget->setDefaultDropAction(Qt::CopyAction);
+
+    contentsWidget->installEventFilter(this);
+    contentsWidget->setModel(&m_list);
+
+    connect(contentsWidget, SIGNAL(doubleClicked(QModelIndex)), SLOT(activated(QModelIndex)));
+
+    connect(contentsWidget->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+            SLOT(selectionChanged(QItemSelection, QItemSelection)));
+    connect(ui->listView, &QListView::customContextMenuRequested, this, &SkinManageDialog::show_context_menu);
+
+    setupCapes();
+
+    ui->listView->setCurrentIndex(m_list.index(m_list.getSelectedAccountSkin()));
+}
+
+SkinManageDialog::~SkinManageDialog()
+{
+    delete ui;
+}
+
+void SkinManageDialog::activated(QModelIndex index)
+{
+    m_selected_skin = index.data(Qt::UserRole).toString();
+    accept();
+}
+
+void SkinManageDialog::selectionChanged(QItemSelection selected, QItemSelection deselected)
+{
+    if (selected.empty())
+        return;
+
+    QString key = selected.first().indexes().first().data(Qt::UserRole).toString();
+    if (key.isEmpty())
+        return;
+    m_selected_skin = key;
+    auto skin = m_list.skin(key);
+    if (!skin || !skin->isValid())
+        return;
+    ui->selectedModel->setPixmap(skin->getTexture().scaled(size() * (1. / 3), Qt::KeepAspectRatio, Qt::FastTransformation));
+    ui->capeCombo->setCurrentIndex(m_capes_idx.value(skin->getCapeId()));
+    ui->steveBtn->setChecked(skin->getModel() == SkinModel::CLASSIC);
+    ui->alexBtn->setChecked(skin->getModel() == SkinModel::SLIM);
+}
+
+void SkinManageDialog::delayed_scroll(QModelIndex model_index)
+{
+    auto contentsWidget = ui->listView;
+    contentsWidget->scrollTo(model_index);
+}
+
+void SkinManageDialog::on_openDirBtn_clicked()
+{
+    DesktopServices::openPath(m_list.getDir(), true);
+}
+
+void SkinManageDialog::on_fileBtn_clicked()
+{
+    auto filter = QMimeDatabase().mimeTypeForName("image/png").filterString();
+    QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), filter);
+    auto message = m_list.installSkin(raw_path, {});
+    if (!message.isEmpty()) {
+        CustomMessageBox::selectable(this, tr("Selected file is not a valid skin"), message, QMessageBox::Critical)->show();
+        return;
+    }
+}
+
+QPixmap previewCape(QPixmap capeImage)
+{
+    QPixmap preview = QPixmap(10, 16);
+    QPainter painter(&preview);
+    painter.drawPixmap(0, 0, capeImage.copy(1, 1, 10, 16));
+    return preview.scaled(80, 128, Qt::IgnoreAspectRatio, Qt::FastTransformation);
+}
+
+void SkinManageDialog::setupCapes()
+{
+    // FIXME: add a model for this, download/refresh the capes on demand
+    auto& accountData = *m_acct->accountData();
+    int index = 0;
+    ui->capeCombo->addItem(tr("No Cape"), QVariant());
+    auto currentCape = accountData.minecraftProfile.currentCape;
+    if (currentCape.isEmpty()) {
+        ui->capeCombo->setCurrentIndex(index);
+    }
+
+    auto capesDir = FS::PathCombine(m_list.getDir(), "capes");
+    NetJob::Ptr job{ new NetJob(tr("Download capes"), APPLICATION->network()) };
+    bool needsToDownload = false;
+    for (auto& cape : accountData.minecraftProfile.capes) {
+        auto path = FS::PathCombine(capesDir, cape.id + ".png");
+        if (cape.data.size()) {
+            QPixmap capeImage;
+            if (capeImage.loadFromData(cape.data, "PNG") && capeImage.save(path)) {
+                m_capes[cape.id] = previewCape(capeImage);
+                continue;
+            }
+        }
+        if (QFileInfo(path).exists()) {
+            continue;
+        }
+        if (!cape.url.isEmpty()) {
+            needsToDownload = true;
+            job->addNetAction(Net::Download::makeFile(cape.url, path));
+        }
+    }
+    if (needsToDownload) {
+        ProgressDialog dlg(this);
+        dlg.execWithTask(job.get());
+    }
+    for (auto& cape : accountData.minecraftProfile.capes) {
+        index++;
+        QPixmap capeImage;
+        if (!m_capes.contains(cape.id)) {
+            auto path = FS::PathCombine(capesDir, cape.id + ".png");
+            if (QFileInfo(path).exists() && capeImage.load(path)) {
+                capeImage = previewCape(capeImage);
+                m_capes[cape.id] = capeImage;
+            }
+        }
+        if (!capeImage.isNull()) {
+            ui->capeCombo->addItem(capeImage, cape.alias, cape.id);
+        } else {
+            ui->capeCombo->addItem(cape.alias, cape.id);
+        }
+
+        m_capes_idx[cape.id] = index;
+    }
+}
+
+void SkinManageDialog::on_capeCombo_currentIndexChanged(int index)
+{
+    auto id = ui->capeCombo->currentData();
+    auto cape = m_capes.value(id.toString(), {});
+    if (!cape.isNull()) {
+        ui->capeImage->setPixmap(cape.scaled(size() * (1. / 3), Qt::KeepAspectRatio, Qt::FastTransformation));
+    }
+    if (auto skin = m_list.skin(m_selected_skin); skin) {
+        skin->setCapeId(id.toString());
+    }
+}
+
+void SkinManageDialog::on_steveBtn_toggled(bool checked)
+{
+    if (auto skin = m_list.skin(m_selected_skin); skin) {
+        skin->setModel(checked ? SkinModel::CLASSIC : SkinModel::SLIM);
+    }
+}
+
+void SkinManageDialog::accept()
+{
+    auto skin = m_list.skin(m_selected_skin);
+    if (!skin) {
+        reject();
+        return;
+    }
+    auto path = skin->getPath();
+
+    ProgressDialog prog(this);
+    NetJob::Ptr skinUpload{ new NetJob(tr("Change skin"), APPLICATION->network(), 1) };
+
+    if (!QFile::exists(path)) {
+        CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Skin file does not exist!"), QMessageBox::Warning)->exec();
+        reject();
+        return;
+    }
+
+    skinUpload->addNetAction(SkinUpload::make(m_acct, skin->getPath(), skin->getModelString()));
+
+    auto selectedCape = skin->getCapeId();
+    if (selectedCape != m_acct->accountData()->minecraftProfile.currentCape) {
+        skinUpload->addNetAction(CapeChange::make(m_acct, selectedCape));
+    }
+
+    skinUpload->addTask(m_acct->refresh().staticCast<Task>());
+    if (prog.execWithTask(skinUpload.get()) != QDialog::Accepted) {
+        CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Failed to upload skin!"), QMessageBox::Warning)->exec();
+        reject();
+        return;
+    }
+    skin->setURL(m_acct->accountData()->minecraftProfile.skin.url);
+    QDialog::accept();
+}
+
+void SkinManageDialog::on_resetBtn_clicked()
+{
+    ProgressDialog prog(this);
+    NetJob::Ptr skinReset{ new NetJob(tr("Reset skin"), APPLICATION->network(), 1) };
+    skinReset->addNetAction(SkinDelete::make(m_acct));
+    skinReset->addTask(m_acct->refresh().staticCast<Task>());
+    if (prog.execWithTask(skinReset.get()) != QDialog::Accepted) {
+        CustomMessageBox::selectable(this, tr("Skin Delete"), tr("Failed to delete current skin!"), QMessageBox::Warning)->exec();
+        reject();
+        return;
+    }
+    QDialog::accept();
+}
+
+void SkinManageDialog::show_context_menu(const QPoint& pos)
+{
+    QMenu myMenu(tr("Context menu"), this);
+    myMenu.addAction(ui->action_Rename_Skin);
+    myMenu.addAction(ui->action_Delete_Skin);
+
+    myMenu.exec(ui->listView->mapToGlobal(pos));
+}
+
+bool SkinManageDialog::eventFilter(QObject* obj, QEvent* ev)
+{
+    if (obj == ui->listView) {
+        if (ev->type() == QEvent::KeyPress) {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(ev);
+            switch (keyEvent->key()) {
+                case Qt::Key_Delete:
+                    on_action_Delete_Skin_triggered(false);
+                    return true;
+                case Qt::Key_F2:
+                    on_action_Rename_Skin_triggered(false);
+                    return true;
+                default:
+                    break;
+            }
+        }
+    }
+    return QDialog::eventFilter(obj, ev);
+}
+
+void SkinManageDialog::on_action_Rename_Skin_triggered(bool checked)
+{
+    if (!m_selected_skin.isEmpty()) {
+        ui->listView->edit(ui->listView->currentIndex());
+    }
+}
+
+void SkinManageDialog::on_action_Delete_Skin_triggered(bool checked)
+{
+    if (m_selected_skin.isEmpty())
+        return;
+
+    if (m_list.getSkinIndex(m_selected_skin) == m_list.getSelectedAccountSkin()) {
+        CustomMessageBox::selectable(this, tr("Delete error"), tr("Can not delete skin that is in use."), QMessageBox::Warning)->exec();
+        return;
+    }
+
+    auto skin = m_list.skin(m_selected_skin);
+    if (!skin)
+        return;
+
+    auto response = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
+                                                 tr("You are about to delete \"%1\".\n"
+                                                    "Are you sure?")
+                                                     .arg(skin->name()),
+                                                 QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                        ->exec();
+
+    if (response == QMessageBox::Yes) {
+        if (!m_list.deleteSkin(m_selected_skin, true)) {
+            m_list.deleteSkin(m_selected_skin, false);
+        }
+    }
+}
+
+void SkinManageDialog::on_urlBtn_clicked()
+{
+    auto url = QUrl(ui->urlLine->text());
+    if (!url.isValid()) {
+        CustomMessageBox::selectable(this, tr("Invalid url"), tr("Invalid url"), QMessageBox::Critical)->show();
+        return;
+    }
+
+    NetJob::Ptr job{ new NetJob(tr("Download skin"), APPLICATION->network()) };
+    job->setAskRetry(false);
+
+    auto path = FS::PathCombine(m_list.getDir(), url.fileName());
+    job->addNetAction(Net::Download::makeFile(url, path));
+    ProgressDialog dlg(this);
+    dlg.execWithTask(job.get());
+    SkinModel s(path);
+    if (!s.isValid()) {
+        CustomMessageBox::selectable(this, tr("URL is not a valid skin"),
+                                     QFileInfo::exists(path) ? tr("Skin images must be 64x64 or 64x32 pixel PNG files.")
+                                                             : tr("Unable to download the skin: '%1'.").arg(ui->urlLine->text()),
+                                     QMessageBox::Critical)
+            ->show();
+        QFile::remove(path);
+        return;
+    }
+    ui->urlLine->setText("");
+    if (QFileInfo(path).suffix().isEmpty()) {
+        QFile::rename(path, path + ".png");
+    }
+}
+
+class WaitTask : public Task {
+   public:
+    WaitTask() : m_loop(), m_done(false) {};
+    virtual ~WaitTask() = default;
+
+   public slots:
+    void quit()
+    {
+        m_done = true;
+        m_loop.quit();
+    }
+
+   protected:
+    virtual void executeTask()
+    {
+        if (!m_done)
+            m_loop.exec();
+        emitSucceeded();
+    };
+
+   private:
+    QEventLoop m_loop;
+    bool m_done;
+};
+
+void SkinManageDialog::on_userBtn_clicked()
+{
+    auto user = ui->urlLine->text();
+    if (user.isEmpty()) {
+        return;
+    }
+    MinecraftProfile mcProfile;
+    auto path = FS::PathCombine(m_list.getDir(), user + ".png");
+
+    NetJob::Ptr job{ new NetJob(tr("Download user skin"), APPLICATION->network(), 1) };
+    job->setAskRetry(false);
+
+    auto uuidOut = std::make_shared<QByteArray>();
+    auto profileOut = std::make_shared<QByteArray>();
+
+    auto uuidLoop = makeShared<WaitTask>();
+    auto profileLoop = makeShared<WaitTask>();
+
+    auto getUUID = Net::Download::makeByteArray("https://api.mojang.com/users/profiles/minecraft/" + user, uuidOut);
+    auto getProfile = Net::Download::makeByteArray(QUrl(), profileOut);
+    auto downloadSkin = Net::Download::makeFile(QUrl(), path);
+
+    QString failReason;
+
+    connect(getUUID.get(), &Task::aborted, uuidLoop.get(), &WaitTask::quit);
+    connect(getUUID.get(), &Task::failed, this, [&failReason](QString reason) {
+        qCritical() << "Couldn't get user UUID:" << reason;
+        failReason = tr("failed to get user UUID");
+    });
+    connect(getUUID.get(), &Task::failed, uuidLoop.get(), &WaitTask::quit);
+    connect(getProfile.get(), &Task::aborted, profileLoop.get(), &WaitTask::quit);
+    connect(getProfile.get(), &Task::failed, profileLoop.get(), &WaitTask::quit);
+    connect(getProfile.get(), &Task::failed, this, [&failReason](QString reason) {
+        qCritical() << "Couldn't get user profile:" << reason;
+        failReason = tr("failed to get user profile");
+    });
+    connect(downloadSkin.get(), &Task::failed, this, [&failReason](QString reason) {
+        qCritical() << "Couldn't download skin:" << reason;
+        failReason = tr("failed to download skin");
+    });
+
+    connect(getUUID.get(), &Task::succeeded, this, [uuidLoop, uuidOut, job, getProfile, &failReason] {
+        try {
+            QJsonParseError parse_error{};
+            QJsonDocument doc = QJsonDocument::fromJson(*uuidOut, &parse_error);
+            if (parse_error.error != QJsonParseError::NoError) {
+                qWarning() << "Error while parsing JSON response from Minecraft skin service at " << parse_error.offset
+                           << " reason: " << parse_error.errorString();
+                failReason = tr("failed to parse get user UUID response");
+                uuidLoop->quit();
+                return;
+            }
+            const auto root = doc.object();
+            auto id = Json::ensureString(root, "id");
+            if (!id.isEmpty()) {
+                getProfile->setUrl("https://sessionserver.mojang.com/session/minecraft/profile/" + id);
+            } else {
+                failReason = tr("user id is empty");
+                job->abort();
+            }
+        } catch (const Exception& e) {
+            qCritical() << "Couldn't load skin json:" << e.cause();
+            failReason = tr("failed to parse get user UUID response");
+        }
+        uuidLoop->quit();
+    });
+
+    connect(getProfile.get(), &Task::succeeded, this, [profileLoop, profileOut, job, getProfile, &mcProfile, downloadSkin, &failReason] {
+        if (Parsers::parseMinecraftProfileMojang(*profileOut, mcProfile)) {
+            downloadSkin->setUrl(mcProfile.skin.url);
+        } else {
+            failReason = tr("failed to parse get user profile response");
+            job->abort();
+        }
+        profileLoop->quit();
+    });
+
+    job->addNetAction(getUUID);
+    job->addTask(uuidLoop);
+    job->addNetAction(getProfile);
+    job->addTask(profileLoop);
+    job->addNetAction(downloadSkin);
+    ProgressDialog dlg(this);
+    dlg.execWithTask(job.get());
+
+    SkinModel s(path);
+    if (!s.isValid()) {
+        if (failReason.isEmpty()) {
+            failReason = tr("the skin is invalid");
+        }
+        CustomMessageBox::selectable(this, tr("Username not found"),
+                                     tr("Unable to find the skin for '%1'\n because: %2.").arg(user, failReason), QMessageBox::Critical)
+            ->show();
+        QFile::remove(path);
+        return;
+    }
+    ui->urlLine->setText("");
+    s.setModel(mcProfile.skin.variant.toUpper() == "SLIM" ? SkinModel::SLIM : SkinModel::CLASSIC);
+    s.setURL(mcProfile.skin.url);
+    if (m_capes.contains(mcProfile.currentCape)) {
+        s.setCapeId(mcProfile.currentCape);
+    }
+    m_list.updateSkin(&s);
+}
+
+void SkinManageDialog::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    QSize s = size() * (1. / 3);
+
+    if (auto skin = m_list.skin(m_selected_skin); skin) {
+        if (skin->isValid()) {
+            ui->selectedModel->setPixmap(skin->getTexture().scaled(s, Qt::KeepAspectRatio, Qt::FastTransformation));
+        }
+    }
+    auto id = ui->capeCombo->currentData();
+    auto cape = m_capes.value(id.toString(), {});
+    if (!cape.isNull()) {
+        ui->capeImage->setPixmap(cape.scaled(s, Qt::KeepAspectRatio, Qt::FastTransformation));
+    }
+}
diff --git a/launcher/ui/dialogs/skins/SkinManageDialog.h b/launcher/ui/dialogs/skins/SkinManageDialog.h
new file mode 100644
index 000000000..cdb37a513
--- /dev/null
+++ b/launcher/ui/dialogs/skins/SkinManageDialog.h
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QDialog>
+#include <QItemSelection>
+#include <QPixmap>
+
+#include "minecraft/auth/MinecraftAccount.h"
+#include "minecraft/skins/SkinList.h"
+
+namespace Ui {
+class SkinManageDialog;
+}
+
+class SkinManageDialog : public QDialog {
+    Q_OBJECT
+   public:
+    explicit SkinManageDialog(QWidget* parent, MinecraftAccountPtr acct);
+    virtual ~SkinManageDialog();
+    void resizeEvent(QResizeEvent* event) override;
+
+   public slots:
+    void selectionChanged(QItemSelection, QItemSelection);
+    void activated(QModelIndex);
+    void delayed_scroll(QModelIndex);
+    void on_openDirBtn_clicked();
+    void on_fileBtn_clicked();
+    void on_urlBtn_clicked();
+    void on_userBtn_clicked();
+    void accept() override;
+    void on_capeCombo_currentIndexChanged(int index);
+    void on_steveBtn_toggled(bool checked);
+    void on_resetBtn_clicked();
+    void show_context_menu(const QPoint& pos);
+    bool eventFilter(QObject* obj, QEvent* ev) override;
+    void on_action_Rename_Skin_triggered(bool checked);
+    void on_action_Delete_Skin_triggered(bool checked);
+
+   private:
+    void setupCapes();
+
+    MinecraftAccountPtr m_acct;
+    Ui::SkinManageDialog* ui;
+    SkinList m_list;
+    QString m_selected_skin;
+    QHash<QString, QPixmap> m_capes;
+    QHash<QString, int> m_capes_idx;
+};
diff --git a/launcher/ui/dialogs/skins/SkinManageDialog.ui b/launcher/ui/dialogs/skins/SkinManageDialog.ui
new file mode 100644
index 000000000..c77eeaaa3
--- /dev/null
+++ b/launcher/ui/dialogs/skins/SkinManageDialog.ui
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SkinManageDialog</class>
+ <widget class="QDialog" name="SkinManageDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>968</width>
+    <height>757</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Skin Upload</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="mainHlLayout" stretch="3,8">
+     <item>
+      <layout class="QVBoxLayout" name="selectedVLayout" stretch="2,1,3">
+       <item>
+        <widget class="QLabel" name="selectedModel">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="scaledContents">
+          <bool>false</bool>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="modelBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Model</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QRadioButton" name="steveBtn">
+            <property name="text">
+             <string>Classic</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="alexBtn">
+            <property name="text">
+             <string>Slim</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="capeBox">
+         <property name="title">
+          <string>Cape</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QComboBox" name="capeCombo"/>
+          </item>
+          <item>
+           <widget class="QLabel" name="capeImage">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="scaledContents">
+             <bool>false</bool>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QListView" name="listView">
+       <property name="contextMenuPolicy">
+        <enum>Qt::CustomContextMenu</enum>
+       </property>
+       <property name="acceptDrops">
+        <bool>false</bool>
+       </property>
+       <property name="modelColumn">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="buttonsHLayout" stretch="0,0,3,0,0,0,1">
+     <item>
+      <widget class="QPushButton" name="openDirBtn">
+       <property name="text">
+        <string>Open Folder</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="resetBtn">
+       <property name="text">
+        <string>Reset Skin</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="urlLine">
+       <property name="placeholderText">
+        <string extracomment="URL or username"/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="urlBtn">
+       <property name="text">
+        <string>Import URL</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="userBtn">
+       <property name="text">
+        <string>Import user</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="fileBtn">
+       <property name="text">
+        <string>Import File</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+  <action name="action_Delete_Skin">
+   <property name="text">
+    <string>&amp;Delete Skin</string>
+   </property>
+   <property name="toolTip">
+    <string>Deletes selected skin</string>
+   </property>
+   <property name="shortcut">
+    <string>Del</string>
+   </property>
+  </action>
+  <action name="action_Rename_Skin">
+   <property name="text">
+    <string>&amp;Rename Skin</string>
+   </property>
+   <property name="toolTip">
+    <string>Rename selected skin</string>
+   </property>
+   <property name="shortcut">
+    <string>F2</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SkinManageDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>617</x>
+     <y>736</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>483</x>
+     <y>378</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SkinManageDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>617</x>
+     <y>736</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>483</x>
+     <y>378</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/launcher/ui/instanceview/InstanceView.cpp b/launcher/ui/instanceview/InstanceView.cpp
index 4a29ca130..c677f3951 100644
--- a/launcher/ui/instanceview/InstanceView.cpp
+++ b/launcher/ui/instanceview/InstanceView.cpp
@@ -458,16 +458,18 @@ void InstanceView::paintEvent([[maybe_unused]] QPaintEvent* event)
     QPainter painter(this->viewport());
 
     if (m_catVisible) {
+        painter.setOpacity(APPLICATION->settings()->get("CatOpacity").toFloat() / 100);
         int widWidth = this->viewport()->width();
         int widHeight = this->viewport()->height();
         if (m_catPixmap.width() < widWidth)
             widWidth = m_catPixmap.width();
         if (m_catPixmap.height() < widHeight)
             widHeight = m_catPixmap.height();
-        auto pixmap = m_catPixmap.scaled(widWidth, widHeight, Qt::KeepAspectRatio);
+        auto pixmap = m_catPixmap.scaled(widWidth, widHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         QRect rectOfPixmap = pixmap.rect();
         rectOfPixmap.moveBottomRight(this->viewport()->rect().bottomRight());
         painter.drawPixmap(rectOfPixmap.topLeft(), pixmap);
+        painter.setOpacity(1.0);
     }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -846,7 +848,7 @@ QRegion InstanceView::visualRegionForSelection(const QItemSelection& selection)
     return region;
 }
 
-QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorAction, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers)
 {
     auto current = currentIndex();
     if (!current.isValid()) {
@@ -863,6 +865,7 @@ QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorActio
     if (m_currentCursorColumn < 0) {
         m_currentCursorColumn = column;
     }
+    // Handle different movement actions.
     switch (cursorAction) {
         case MoveUp: {
             if (row == 0) {
@@ -923,16 +926,47 @@ QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorActio
             if (column > 0) {
                 m_currentCursorColumn = column - 1;
                 return cat->rows[row][column - 1];
+            } else if (row > 0) {
+                row -= 1;
+                int newRowSize = cat->rows[row].size();
+                m_currentCursorColumn = newRowSize - 1;
+                return cat->rows[row][m_currentCursorColumn];
+            } else {
+                int prevGroupIndex = group_index - 1;
+                while (prevGroupIndex >= 0) {
+                    auto prevGroup = m_groups[prevGroupIndex];
+                    if (prevGroup->collapsed) {
+                        prevGroupIndex--;
+                        continue;
+                    }
+                    int lastRow = prevGroup->numRows() - 1;
+                    int lastCol = prevGroup->rows[lastRow].size() - 1;
+                    m_currentCursorColumn = lastCol;
+                    return prevGroup->rows[lastRow][lastCol];
+                }
             }
-            // TODO: moving to previous line
             return current;
         }
         case MoveRight: {
             if (column < cat->rows[row].size() - 1) {
                 m_currentCursorColumn = column + 1;
                 return cat->rows[row][column + 1];
+            } else if (row < cat->rows.size() - 1) {
+                row += 1;
+                m_currentCursorColumn = 0;
+                return cat->rows[row][m_currentCursorColumn];
+            } else {
+                int nextGroupIndex = group_index + 1;
+                while (nextGroupIndex < m_groups.size()) {
+                    auto nextGroup = m_groups[nextGroupIndex];
+                    if (nextGroup->collapsed) {
+                        nextGroupIndex++;
+                        continue;
+                    }
+                    m_currentCursorColumn = 0;
+                    return nextGroup->rows[0][0];
+                }
             }
-            // TODO: moving to next line
             return current;
         }
         case MoveHome: {
@@ -945,6 +979,7 @@ QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorActio
             return cat->rows[row][last];
         }
         default:
+            // For unsupported cursor actions, return the current index.
             break;
     }
     return current;
diff --git a/launcher/ui/java/InstallJavaDialog.cpp b/launcher/ui/java/InstallJavaDialog.cpp
new file mode 100644
index 000000000..0ece3220b
--- /dev/null
+++ b/launcher/ui/java/InstallJavaDialog.cpp
@@ -0,0 +1,346 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "InstallJavaDialog.h"
+
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QWidget>
+
+#include "Application.h"
+#include "BaseVersionList.h"
+#include "FileSystem.h"
+#include "Filter.h"
+#include "java/download/ArchiveDownloadTask.h"
+#include "java/download/ManifestDownloadTask.h"
+#include "java/download/SymlinkTask.h"
+#include "meta/Index.h"
+#include "meta/VersionList.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/PackProfile.h"
+#include "tasks/SequentialTask.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ProgressDialog.h"
+#include "ui/java/VersionList.h"
+#include "ui/widgets/PageContainer.h"
+#include "ui/widgets/VersionSelectWidget.h"
+
+class InstallJavaPage : public QWidget, public BasePage {
+   public:
+    Q_OBJECT
+   public:
+    explicit InstallJavaPage(const QString& id, const QString& iconName, const QString& name, QWidget* parent = nullptr)
+        : QWidget(parent), uid(id), iconName(iconName), name(name)
+    {
+        setObjectName(QStringLiteral("VersionSelectWidget"));
+        horizontalLayout = new QHBoxLayout(this);
+        horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
+        horizontalLayout->setContentsMargins(0, 0, 0, 0);
+
+        majorVersionSelect = new VersionSelectWidget(this);
+        majorVersionSelect->selectCurrent();
+        majorVersionSelect->setEmptyString(tr("No Java versions are currently available in the meta."));
+        majorVersionSelect->setEmptyErrorString(tr("Couldn't load or download the Java version lists!"));
+        horizontalLayout->addWidget(majorVersionSelect, 1);
+
+        javaVersionSelect = new VersionSelectWidget(this);
+        javaVersionSelect->setEmptyString(tr("No Java versions are currently available for your OS."));
+        javaVersionSelect->setEmptyErrorString(tr("Couldn't load or download the Java version lists!"));
+        horizontalLayout->addWidget(javaVersionSelect, 4);
+        connect(majorVersionSelect, &VersionSelectWidget::selectedVersionChanged, this, &InstallJavaPage::setSelectedVersion);
+        connect(majorVersionSelect, &VersionSelectWidget::selectedVersionChanged, this, &InstallJavaPage::selectionChanged);
+        connect(javaVersionSelect, &VersionSelectWidget::selectedVersionChanged, this, &InstallJavaPage::selectionChanged);
+
+        QMetaObject::connectSlotsByName(this);
+    }
+    ~InstallJavaPage()
+    {
+        delete horizontalLayout;
+        delete majorVersionSelect;
+        delete javaVersionSelect;
+    }
+
+    //! loads the list if needed.
+    void initialize(Meta::VersionList::Ptr vlist)
+    {
+        vlist->setProvidedRoles({ BaseVersionList::JavaMajorRole, BaseVersionList::RecommendedRole, BaseVersionList::VersionPointerRole });
+        majorVersionSelect->initialize(vlist.get());
+    }
+
+    void setSelectedVersion(BaseVersion::Ptr version)
+    {
+        auto dcast = std::dynamic_pointer_cast<Meta::Version>(version);
+        if (!dcast) {
+            return;
+        }
+        javaVersionSelect->initialize(new Java::VersionList(dcast, this));
+        javaVersionSelect->selectCurrent();
+    }
+
+    QString id() const override { return uid; }
+    QString displayName() const override { return name; }
+    QIcon icon() const override { return APPLICATION->getThemedIcon(iconName); }
+
+    void openedImpl() override
+    {
+        if (loaded)
+            return;
+
+        const auto versions = APPLICATION->metadataIndex()->get(uid);
+        if (!versions)
+            return;
+
+        initialize(versions);
+        loaded = true;
+    }
+
+    void setParentContainer(BasePageContainer* container) override
+    {
+        auto dialog = dynamic_cast<QDialog*>(dynamic_cast<PageContainer*>(container)->parent());
+        connect(javaVersionSelect->view(), &QAbstractItemView::doubleClicked, dialog, &QDialog::accept);
+    }
+
+    BaseVersion::Ptr selectedVersion() const { return javaVersionSelect->selectedVersion(); }
+    void selectSearch() { javaVersionSelect->selectSearch(); }
+    void loadList()
+    {
+        majorVersionSelect->loadList();
+        javaVersionSelect->loadList();
+    }
+
+   public slots:
+    void setRecommendedMajors(const QStringList& majors)
+    {
+        m_recommended_majors = majors;
+        recommendedFilterChanged();
+    }
+    void setRecomend(bool recomend)
+    {
+        m_recommend = recomend;
+        recommendedFilterChanged();
+    }
+    void recommendedFilterChanged()
+    {
+        if (m_recommend) {
+            majorVersionSelect->setFilter(BaseVersionList::ModelRoles::JavaMajorRole, new ExactListFilter(m_recommended_majors));
+        } else {
+            majorVersionSelect->setFilter(BaseVersionList::ModelRoles::JavaMajorRole, new ExactListFilter());
+        }
+    }
+
+   signals:
+    void selectionChanged();
+
+   private:
+    const QString uid;
+    const QString iconName;
+    const QString name;
+    bool loaded = false;
+
+    QHBoxLayout* horizontalLayout = nullptr;
+    VersionSelectWidget* majorVersionSelect = nullptr;
+    VersionSelectWidget* javaVersionSelect = nullptr;
+
+    QStringList m_recommended_majors;
+    bool m_recommend;
+};
+
+static InstallJavaPage* pageCast(BasePage* page)
+{
+    auto result = dynamic_cast<InstallJavaPage*>(page);
+    Q_ASSERT(result != nullptr);
+    return result;
+}
+namespace Java {
+QStringList getRecommendedJavaVersionsFromVersionList(Meta::VersionList::Ptr list)
+{
+    QStringList recommendedJavas;
+    for (auto ver : list->versions()) {
+        auto major = ver->version();
+        if (major.startsWith("java")) {
+            major = "Java " + major.mid(4);
+        }
+        recommendedJavas.append(major);
+    }
+    return recommendedJavas;
+}
+
+InstallDialog::InstallDialog(const QString& uid, BaseInstance* instance, QWidget* parent)
+    : QDialog(parent), container(new PageContainer(this, QString(), this)), buttons(new QDialogButtonBox(this))
+{
+    auto layout = new QVBoxLayout(this);
+
+    container->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    layout->addWidget(container);
+
+    auto buttonLayout = new QHBoxLayout(this);
+    auto refreshLayout = new QHBoxLayout(this);
+
+    auto refreshButton = new QPushButton(tr("&Refresh"), this);
+    connect(refreshButton, &QPushButton::clicked, this, [this] { pageCast(container->selectedPage())->loadList(); });
+    refreshLayout->addWidget(refreshButton);
+
+    auto recommendedCheckBox = new QCheckBox("Recommended", this);
+    recommendedCheckBox->setCheckState(Qt::CheckState::Checked);
+    connect(recommendedCheckBox, &QCheckBox::stateChanged, this, [this](int state) {
+        for (BasePage* page : container->getPages()) {
+            pageCast(page)->setRecomend(state == Qt::Checked);
+        }
+    });
+
+    refreshLayout->addWidget(recommendedCheckBox);
+    buttonLayout->addLayout(refreshLayout);
+
+    buttons->setOrientation(Qt::Horizontal);
+    buttons->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+    buttons->button(QDialogButtonBox::Ok)->setText(tr("Download"));
+    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    buttonLayout->addWidget(buttons);
+
+    layout->addLayout(buttonLayout);
+
+    setWindowTitle(dialogTitle());
+    setWindowModality(Qt::WindowModal);
+    resize(840, 480);
+
+    QStringList recommendedJavas;
+    if (auto mcInst = dynamic_cast<MinecraftInstance*>(instance); mcInst) {
+        auto mc = mcInst->getPackProfile()->getComponent("net.minecraft");
+        if (mc) {
+            auto file = mc->getVersionFile();  // no need for load as it should already be loaded
+            if (file) {
+                for (auto major : file->compatibleJavaMajors) {
+                    recommendedJavas.append(QString("Java %1").arg(major));
+                }
+            }
+        }
+    } else {
+        const auto versions = APPLICATION->metadataIndex()->get("net.minecraft.java");
+        if (versions) {
+            if (versions->isLoaded()) {
+                recommendedJavas = getRecommendedJavaVersionsFromVersionList(versions);
+            } else {
+                auto newTask = versions->getLoadTask();
+                if (newTask) {
+                    connect(newTask.get(), &Task::succeeded, this, [this, versions] {
+                        auto recommendedJavas = getRecommendedJavaVersionsFromVersionList(versions);
+                        for (BasePage* page : container->getPages()) {
+                            pageCast(page)->setRecommendedMajors(recommendedJavas);
+                        }
+                    });
+                    if (!newTask->isRunning())
+                        newTask->start();
+                } else {
+                    recommendedJavas = getRecommendedJavaVersionsFromVersionList(versions);
+                }
+            }
+        }
+    }
+    for (BasePage* page : container->getPages()) {
+        if (page->id() == uid)
+            container->selectPage(page->id());
+
+        auto cast = pageCast(page);
+        cast->setRecomend(true);
+        connect(cast, &InstallJavaPage::selectionChanged, this, [this, cast] { validate(cast); });
+        if (!recommendedJavas.isEmpty()) {
+            cast->setRecommendedMajors(recommendedJavas);
+        }
+    }
+    connect(container, &PageContainer::selectedPageChanged, this, [this](BasePage* previous, BasePage* selected) { validate(selected); });
+    pageCast(container->selectedPage())->selectSearch();
+    validate(container->selectedPage());
+}
+
+QList<BasePage*> InstallDialog::getPages()
+{
+    return {
+        // Mojang
+        new InstallJavaPage("net.minecraft.java", "mojang", tr("Mojang")),
+        // Adoptium
+        new InstallJavaPage("net.adoptium.java", "adoptium", tr("Adoptium")),
+        // Azul
+        new InstallJavaPage("com.azul.java", "azul", tr("Azul Zulu")),
+    };
+}
+
+QString InstallDialog::dialogTitle()
+{
+    return tr("Install Java");
+}
+
+void InstallDialog::validate(BasePage* selected)
+{
+    buttons->button(QDialogButtonBox::Ok)->setEnabled(!!std::dynamic_pointer_cast<Java::Metadata>(pageCast(selected)->selectedVersion()));
+}
+
+void InstallDialog::done(int result)
+{
+    if (result == Accepted) {
+        auto* page = pageCast(container->selectedPage());
+        if (page->selectedVersion()) {
+            auto meta = std::dynamic_pointer_cast<Java::Metadata>(page->selectedVersion());
+            if (meta) {
+                Task::Ptr task;
+                auto final_path = FS::PathCombine(APPLICATION->javaPath(), meta->m_name);
+                auto deletePath = [final_path] { FS::deletePath(final_path); };
+                switch (meta->downloadType) {
+                    case Java::DownloadType::Manifest:
+                        task = makeShared<ManifestDownloadTask>(meta->url, final_path, meta->checksumType, meta->checksumHash);
+                        break;
+                    case Java::DownloadType::Archive:
+                        task = makeShared<ArchiveDownloadTask>(meta->url, final_path, meta->checksumType, meta->checksumHash);
+                        break;
+                    case Java::DownloadType::Unknown:
+                        QString error = QString(tr("Could not determine Java download type!"));
+                        CustomMessageBox::selectable(this, tr("Error"), error, QMessageBox::Warning)->show();
+                        deletePath();
+                }
+#if defined(Q_OS_MACOS)
+                auto seq = makeShared<SequentialTask>(this, tr("Install Java"));
+                seq->addTask(task);
+                seq->addTask(makeShared<Java::SymlinkTask>(final_path));
+                task = seq;
+#endif
+                connect(task.get(), &Task::failed, this, [this, &deletePath](QString reason) {
+                    QString error = QString("Java download failed: %1").arg(reason);
+                    CustomMessageBox::selectable(this, tr("Error"), error, QMessageBox::Warning)->show();
+                    deletePath();
+                });
+                connect(task.get(), &Task::aborted, this, deletePath);
+                ProgressDialog pg(this);
+                pg.setSkipButton(true, tr("Abort"));
+                pg.execWithTask(task.get());
+            } else {
+                return;
+            }
+        } else {
+            return;
+        }
+    }
+
+    QDialog::done(result);
+}
+
+}  // namespace Java
+
+#include "InstallJavaDialog.moc"
\ No newline at end of file
diff --git a/launcher/ui/java/InstallJavaDialog.h b/launcher/ui/java/InstallJavaDialog.h
new file mode 100644
index 000000000..7d0edbfdd
--- /dev/null
+++ b/launcher/ui/java/InstallJavaDialog.h
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QDialog>
+#include "BaseInstance.h"
+#include "ui/pages/BasePageProvider.h"
+
+class MinecraftInstance;
+class PageContainer;
+class PackProfile;
+class QDialogButtonBox;
+
+namespace Java {
+class InstallDialog final : public QDialog, private BasePageProvider {
+    Q_OBJECT
+
+   public:
+    explicit InstallDialog(const QString& uid = QString(), BaseInstance* instance = nullptr, QWidget* parent = nullptr);
+
+    QList<BasePage*> getPages() override;
+    QString dialogTitle() override;
+
+    void validate(BasePage* selected);
+    void done(int result) override;
+
+   private:
+    PageContainer* container;
+    QDialogButtonBox* buttons;
+};
+}  // namespace Java
diff --git a/launcher/ui/java/VersionList.cpp b/launcher/ui/java/VersionList.cpp
new file mode 100644
index 000000000..f2c0cb3b9
--- /dev/null
+++ b/launcher/ui/java/VersionList.cpp
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "VersionList.h"
+
+#include <memory>
+
+#include "BaseVersionList.h"
+#include "SysInfo.h"
+#include "java/JavaMetadata.h"
+#include "meta/VersionList.h"
+
+namespace Java {
+
+VersionList::VersionList(Meta::Version::Ptr version, QObject* parent) : BaseVersionList(parent), m_version(version)
+{
+    if (version->isLoaded())
+        sortVersions();
+}
+
+Task::Ptr VersionList::getLoadTask()
+{
+    auto task = m_version->loadTask(Net::Mode::Online);
+    connect(task.get(), &Task::finished, this, &VersionList::sortVersions);
+    return task;
+}
+
+const BaseVersion::Ptr VersionList::at(int i) const
+{
+    return m_vlist.at(i);
+}
+
+bool VersionList::isLoaded()
+{
+    return m_version->isLoaded();
+}
+
+int VersionList::count() const
+{
+    return m_vlist.count();
+}
+
+QVariant VersionList::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (index.row() > count())
+        return QVariant();
+
+    auto version = (m_vlist[index.row()]);
+    switch (role) {
+        case SortRole:
+            return -index.row();
+        case VersionPointerRole:
+            return QVariant::fromValue(std::dynamic_pointer_cast<BaseVersion>(m_vlist[index.row()]));
+        case VersionIdRole:
+            return version->descriptor();
+        case VersionRole:
+            return version->version.toString();
+        case RecommendedRole:
+            return false;  // do not recommend any version
+        case JavaNameRole:
+            return version->name();
+        case JavaMajorRole: {
+            auto major = version->version.toString();
+            if (major.startsWith("java")) {
+                major = "Java " + major.mid(4);
+            }
+            return major;
+        }
+        case TypeRole:
+            return version->packageType;
+        case Meta::VersionList::TimeRole:
+            return version->releaseTime;
+        default:
+            return QVariant();
+    }
+}
+
+BaseVersionList::RoleList VersionList::providesRoles() const
+{
+    return { VersionPointerRole, VersionIdRole, VersionRole, RecommendedRole, JavaNameRole, TypeRole, Meta::VersionList::TimeRole };
+}
+
+bool sortJavas(BaseVersion::Ptr left, BaseVersion::Ptr right)
+{
+    auto rleft = std::dynamic_pointer_cast<Java::Metadata>(right);
+    auto rright = std::dynamic_pointer_cast<Java::Metadata>(left);
+    return (*rleft) < (*rright);
+}
+
+void VersionList::sortVersions()
+{
+    if (!m_version || !m_version->data())
+        return;
+    QString versionStr = SysInfo::getSupportedJavaArchitecture();
+    beginResetModel();
+    auto runtimes = m_version->data()->runtimes;
+    m_vlist = {};
+    if (!versionStr.isEmpty() && !runtimes.isEmpty()) {
+        std::copy_if(runtimes.begin(), runtimes.end(), std::back_inserter(m_vlist),
+                     [versionStr](Java::MetadataPtr val) { return val->runtimeOS == versionStr; });
+        std::sort(m_vlist.begin(), m_vlist.end(), sortJavas);
+    } else {
+        qWarning() << "No Java versions found for your operating system." << SysInfo::currentSystem() << " " << SysInfo::useQTForArch();
+    }
+    endResetModel();
+}
+
+}  // namespace Java
diff --git a/launcher/ui/java/VersionList.h b/launcher/ui/java/VersionList.h
new file mode 100644
index 000000000..d334ed564
--- /dev/null
+++ b/launcher/ui/java/VersionList.h
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2024 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "BaseVersionList.h"
+#include "java/JavaMetadata.h"
+#include "meta/Version.h"
+
+namespace Java {
+
+class VersionList : public BaseVersionList {
+    Q_OBJECT
+
+   public:
+    explicit VersionList(Meta::Version::Ptr m_version, QObject* parent = 0);
+
+    Task::Ptr getLoadTask() override;
+    bool isLoaded() override;
+    const BaseVersion::Ptr at(int i) const override;
+    int count() const override;
+    void sortVersions() override;
+
+    QVariant data(const QModelIndex& index, int role) const override;
+    RoleList providesRoles() const override;
+
+   protected slots:
+    void updateListData(QList<BaseVersion::Ptr>) override {}
+
+   protected:
+    Meta::Version::Ptr m_version;
+    QList<Java::MetadataPtr> m_vlist;
+};
+
+}  // namespace Java
diff --git a/launcher/ui/pages/BasePageProvider.h b/launcher/ui/pages/BasePageProvider.h
index 422891e6b..ef3c1cd08 100644
--- a/launcher/ui/pages/BasePageProvider.h
+++ b/launcher/ui/pages/BasePageProvider.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #include <functional>
-#include <memory>
 #include "ui/pages/BasePage.h"
 
 class BasePageProvider {
diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp
index f60e627cd..5100fc18b 100644
--- a/launcher/ui/pages/global/APIPage.cpp
+++ b/launcher/ui/pages/global/APIPage.cpp
@@ -145,6 +145,7 @@ void APIPage::loadSettings()
     ui->modrinthToken->setText(modrinthToken);
     QString customUserAgent = s->get("UserAgentOverride").toString();
     ui->userAgentLineEdit->setText(customUserAgent);
+    ui->technicClientID->setText(s->get("TechnicClientID").toString());
 }
 
 void APIPage::applySettings()
@@ -174,6 +175,7 @@ void APIPage::applySettings()
     QString modrinthToken = ui->modrinthToken->text();
     s->set("ModrinthToken", modrinthToken);
     s->set("UserAgentOverride", ui->userAgentLineEdit->text());
+    s->set("TechnicClientID", ui->technicClientID->text());
 }
 
 void APIPage::fetchKeyButtonPressed()
diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index 51ad739b2..e9eb77581 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>841</width>
+    <height>620</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -207,7 +207,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you only need to set this to access private data. Read the &lt;a href=&quot;https://docs.modrinth.com/api-spec/#section/Authentication&quot;&gt;documentation&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you only need to set this to access private data. Read the &lt;a href=&quot;https://docs.modrinth.com/#section/Authentication&quot;&gt;documentation&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="openExternalLinks">
              <bool>true</bool>
@@ -304,6 +304,36 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Technic Client ID</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_9">
+          <item>
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you only need to set this to access private data.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="technicClientID">
+            <property name="placeholderText">
+             <string>(None)</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>Enter a custom GUID client ID for Technic here.</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index 6870ba505..384af07fe 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -35,11 +35,12 @@
  */
 
 #include "AccountListPage.h"
-#include "minecraft/auth/AccountData.h"
+#include "ui/dialogs/skins/SkinManageDialog.h"
 #include "ui_AccountListPage.h"
 
 #include <QItemSelectionModel>
 #include <QMenu>
+#include <QPushButton>
 
 #include <QDebug>
 
@@ -47,14 +48,8 @@
 
 #include "ui/dialogs/AuthlibInjectorLoginDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/LoginDialog.h"
 #include "ui/dialogs/MSALoginDialog.h"
 #include "ui/dialogs/OfflineLoginDialog.h"
-#include "ui/dialogs/ProgressDialog.h"
-#include "ui/dialogs/SkinUploadDialog.h"
-
-#include "minecraft/services/SkinDelete.h"
-#include "tasks/Task.h"
 
 #include "Application.h"
 
@@ -63,7 +58,7 @@ AccountListPage::AccountListPage(QWidget* parent) : QMainWindow(parent), ui(new
     ui->setupUi(this);
     ui->listView->setEmptyString(
         tr("Welcome!\n"
-           "If you're new here, you can select the \"Add Offline\" button to play without an account."));
+           "If you're new here, you can select the \"Add Microsoft\" button to link your Microsoft account."));
     ui->listView->setEmptyMode(VersionListView::String);
     ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
 
@@ -137,24 +132,11 @@ void AccountListPage::listChanged()
     updateButtonStates();
 }
 
-void AccountListPage::on_actionAddMojang_triggered()
-{
-    MinecraftAccountPtr account =
-        LoginDialog::newAccount(this, tr("Please enter your Mojang account email and password to add your account."));
-
-    if (account) {
-        m_accounts->addAccount(account);
-        if (m_accounts->count() == 1) {
-            m_accounts->setDefaultAccount(account);
-        }
-    }
-}
-
 void AccountListPage::on_actionAddAuthlibInjector_triggered()
 {
     if (!m_accounts->anyAccountIsValid()) {
         QMessageBox::warning(this, tr("Error"),
-                             tr("You must add a Microsoft or Mojang account that owns Minecraft before you can add an account on a custom "
+                             tr("You must add a Microsoft account that owns Minecraft before you can add an account on a custom "
                                 "authentication server."
                                 "<br><br>"
                                 "If you have lost your account you can contact Microsoft for support."));
@@ -179,9 +161,7 @@ void AccountListPage::on_actionAddAuthlibInjector_triggered()
 
 void AccountListPage::on_actionAddMicrosoft_triggered()
 {
-    MinecraftAccountPtr account =
-        MSALoginDialog::newAccount(this, tr("Please enter your Mojang account email and password to add your account."));
-
+    auto account = MSALoginDialog::newAccount(this);
     if (account) {
         m_accounts->addAccount(account);
         if (m_accounts->count() == 1) {
@@ -258,16 +238,17 @@ void AccountListPage::updateButtonStates()
     bool hasSelection = !selection.empty();
     bool accountIsReady = false;
     bool accountIsOnline = false;
+    bool accountSupportsSkinManagement = false;
     if (hasSelection) {
         QModelIndex selected = selection.first();
         MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
         accountIsReady = !account->isActive();
         accountIsOnline = account->accountType() != AccountType::Offline;
+        accountSupportsSkinManagement = account->supportsSkinManagement();
     }
     ui->actionRemove->setEnabled(accountIsReady);
     ui->actionSetDefault->setEnabled(accountIsReady);
-    ui->actionUploadSkin->setEnabled(accountIsReady && accountIsOnline);
-    ui->actionDeleteSkin->setEnabled(accountIsReady && accountIsOnline);
+    ui->actionManageSkins->setEnabled(accountIsReady && accountIsOnline && accountSupportsSkinManagement);
     ui->actionRefresh->setEnabled(accountIsReady && accountIsOnline);
 
     if (m_accounts->defaultAccount().get() == nullptr) {
@@ -280,29 +261,13 @@ void AccountListPage::updateButtonStates()
     ui->listView->resizeColumnToContents(3);
 }
 
-void AccountListPage::on_actionUploadSkin_triggered()
+void AccountListPage::on_actionManageSkins_triggered()
 {
     QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
     if (selection.size() > 0) {
         QModelIndex selected = selection.first();
         MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
-        SkinUploadDialog dialog(account, this);
+        SkinManageDialog dialog(this, account);
         dialog.exec();
     }
 }
-
-void AccountListPage::on_actionDeleteSkin_triggered()
-{
-    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-    if (selection.size() <= 0)
-        return;
-
-    QModelIndex selected = selection.first();
-    MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
-    ProgressDialog prog(this);
-    auto deleteSkinTask = std::make_shared<SkinDelete>(this, account);
-    if (prog.execWithTask((Task*)deleteSkinTask.get()) != QDialog::Accepted) {
-        CustomMessageBox::selectable(this, tr("Skin Delete"), tr("Failed to delete current skin!"), QMessageBox::Warning)->exec();
-        return;
-    }
-}
diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h
index 4166257c2..a02da25bd 100644
--- a/launcher/ui/pages/global/AccountListPage.h
+++ b/launcher/ui/pages/global/AccountListPage.h
@@ -66,11 +66,10 @@ class AccountListPage : public QMainWindow, public BasePage {
         return icon;
     }
     QString id() const override { return "accounts"; }
-    QString helpPage() const override { return "Getting-Started#adding-an-account"; }
+    QString helpPage() const override { return "/getting-started/adding-an-account"; }
     void retranslate() override;
 
    public slots:
-    void on_actionAddMojang_triggered();
     void on_actionAddAuthlibInjector_triggered();
     void on_actionAddMicrosoft_triggered();
     void on_actionAddOffline_triggered();
@@ -78,8 +77,7 @@ class AccountListPage : public QMainWindow, public BasePage {
     void on_actionRefresh_triggered();
     void on_actionSetDefault_triggered();
     void on_actionNoDefault_triggered();
-    void on_actionUploadSkin_triggered();
-    void on_actionDeleteSkin_triggered();
+    void on_actionManageSkins_triggered();
 
     void listChanged();
 
diff --git a/launcher/ui/pages/global/AccountListPage.ui b/launcher/ui/pages/global/AccountListPage.ui
index ccdabf9e1..a9284087e 100644
--- a/launcher/ui/pages/global/AccountListPage.ui
+++ b/launcher/ui/pages/global/AccountListPage.ui
@@ -53,7 +53,6 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionAddMicrosoft"/>
-   <addaction name="actionAddMojang"/>
    <addaction name="actionAddAuthlibInjector"/>
    <addaction name="actionAddOffline"/>
    <addaction name="actionRefresh"/>
@@ -61,24 +60,8 @@
    <addaction name="actionSetDefault"/>
    <addaction name="actionNoDefault"/>
    <addaction name="separator"/>
-   <addaction name="actionUploadSkin"/>
-   <addaction name="actionDeleteSkin"/>
+   <addaction name="actionManageSkins"/>
   </widget>
-  <action name="actionAddMojang">
-   <property name="text">
-    <string>Add &amp;Mojang</string>
-   </property>
-  </action>
-  <action name="actionAddAuthlibInjector">
-   <property name="text">
-    <string>Add &amp;authlib-injector</string>
-   </property>
-  </action>
-  <action name="actionRemove">
-   <property name="text">
-    <string>Remo&amp;ve</string>
-   </property>
-  </action>
   <action name="actionSetDefault">
    <property name="text">
     <string>&amp;Set Default</string>
@@ -92,17 +75,12 @@
     <string>&amp;No Default</string>
    </property>
   </action>
-  <action name="actionUploadSkin">
+  <action name="actionManageSkins">
    <property name="text">
-    <string>&amp;Upload Skin</string>
-   </property>
-  </action>
-  <action name="actionDeleteSkin">
-   <property name="text">
-    <string>&amp;Delete Skin</string>
+    <string>&amp;Manage Skins</string>
    </property>
    <property name="toolTip">
-    <string>Delete the currently active skin and go back to the default one</string>
+    <string>Manage Skins</string>
    </property>
   </action>
   <action name="actionAddMicrosoft">
@@ -110,6 +88,11 @@
     <string>&amp;Add Microsoft</string>
    </property>
   </action>
+  <action name="actionAddAuthlibInjector">
+   <property name="text">
+    <string>Add authlib-&amp;injector</string>
+   </property>
+  </action>
   <action name="actionAddOffline">
    <property name="text">
     <string>Add &amp;Offline</string>
@@ -123,6 +106,11 @@
     <string>Refresh the account tokens</string>
    </property>
   </action>
+  <action name="actionRemove">
+   <property name="text">
+    <string>Remo&amp;ve</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index ac50319ec..0ae296815 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -35,12 +35,18 @@
  */
 
 #include "JavaPage.h"
+#include "BuildConfig.h"
 #include "JavaCommon.h"
+#include "java/JavaInstall.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/java/InstallJavaDialog.h"
 #include "ui_JavaPage.h"
 
+#include <QCheckBox>
 #include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QStringListModel>
 #include <QTabBar>
 
 #include "ui/dialogs/VersionSelectDialog.h"
@@ -56,7 +62,22 @@
 JavaPage::JavaPage(QWidget* parent) : QWidget(parent), ui(new Ui::JavaPage)
 {
     ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();
+
+    if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
+        ui->managedJavaList->initialize(new JavaInstallList(this, true));
+        ui->managedJavaList->setResizeOn(2);
+        ui->managedJavaList->selectCurrent();
+        ui->managedJavaList->setEmptyString(tr("No managed Java versions are installed"));
+        ui->managedJavaList->setEmptyErrorString(tr("Couldn't load the managed Java list!"));
+        connect(ui->autodetectJavaCheckBox, &QCheckBox::stateChanged, this, [this] {
+            ui->autodownloadCheckBox->setEnabled(ui->autodetectJavaCheckBox->isChecked());
+            if (!ui->autodetectJavaCheckBox->isChecked())
+                ui->autodownloadCheckBox->setChecked(false);
+        });
+    } else {
+        ui->autodownloadCheckBox->setHidden(true);
+        ui->tabWidget->tabBar()->hide();
+    }
 
     loadSettings();
     updateThresholds();
@@ -94,6 +115,8 @@ void JavaPage::applySettings()
     s->set("JvmArgs", ui->jvmArgsTextBox->toPlainText().replace("\n", " "));
     s->set("IgnoreJavaCompatibility", ui->skipCompatibilityCheckbox->isChecked());
     s->set("IgnoreJavaWizard", ui->skipJavaWizardCheckbox->isChecked());
+    s->set("AutomaticJavaSwitch", ui->autodetectJavaCheckBox->isChecked());
+    s->set("AutomaticJavaDownload", ui->autodownloadCheckBox->isChecked());
     JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
 }
 void JavaPage::loadSettings()
@@ -116,6 +139,8 @@ void JavaPage::loadSettings()
     ui->jvmArgsTextBox->setPlainText(s->get("JvmArgs").toString());
     ui->skipCompatibilityCheckbox->setChecked(s->get("IgnoreJavaCompatibility").toBool());
     ui->skipJavaWizardCheckbox->setChecked(s->get("IgnoreJavaWizard").toBool());
+    ui->autodetectJavaCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool());
+    ui->autodownloadCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool() && s->get("AutomaticJavaDownload").toBool());
 }
 
 void JavaPage::on_javaDetectBtn_clicked()
@@ -134,6 +159,14 @@ void JavaPage::on_javaDetectBtn_clicked()
     if (vselect.result() == QDialog::Accepted && vselect.selectedVersion()) {
         java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion());
         ui->javaPathTextBox->setText(java->path);
+        if (!java->is_64bit && APPLICATION->settings()->get("MaxMemAlloc").toInt() > 2048) {
+            CustomMessageBox::selectable(this, tr("Confirm Selection"),
+                                         tr("You selected a 32-bit version of Java.\n"
+                                            "This installation does not support more than 2048MiB of RAM.\n"
+                                            "Please make sure that the maximum memory value is lower."),
+                                         QMessageBox::Warning, QMessageBox::Ok, QMessageBox::Ok)
+                ->exec();
+        }
     }
 }
 
@@ -166,6 +199,13 @@ void JavaPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void JavaPage::on_downloadJavaButton_clicked()
+{
+    auto jdialog = new Java::InstallDialog({}, nullptr, this);
+    jdialog->exec();
+    ui->managedJavaList->loadList();
+}
+
 void JavaPage::on_maxMemSpinBox_valueChanged([[maybe_unused]] int i)
 {
     updateThresholds();
@@ -210,3 +250,35 @@ void JavaPage::updateThresholds()
         ui->labelMaxMemIcon->setPixmap(pix);
     }
 }
+
+void JavaPage::on_removeJavaButton_clicked()
+{
+    auto version = ui->managedJavaList->selectedVersion();
+    auto dcast = std::dynamic_pointer_cast<JavaInstall>(version);
+    if (!dcast) {
+        return;
+    }
+    QDir dir(APPLICATION->javaPath());
+
+    auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+    for (auto& entry : entries) {
+        if (dcast->path.startsWith(entry.canonicalFilePath())) {
+            auto response = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
+                                                         tr("You are about to remove  the Java installation named \"%1\".\n"
+                                                            "Are you sure?")
+                                                             .arg(entry.fileName()),
+                                                         QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                                ->exec();
+
+            if (response == QMessageBox::Yes) {
+                FS::deletePath(entry.canonicalFilePath());
+                ui->managedJavaList->loadList();
+            }
+            break;
+        }
+    }
+}
+void JavaPage::on_refreshJavaButton_clicked()
+{
+    ui->managedJavaList->loadList();
+}
diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h
index 1a1bd96e1..0a1c4a6be 100644
--- a/launcher/ui/pages/global/JavaPage.h
+++ b/launcher/ui/pages/global/JavaPage.h
@@ -38,7 +38,7 @@
 #include <Application.h>
 #include <QObjectPtr.h>
 #include <QDialog>
-#include <memory>
+#include <QStringListModel>
 #include "JavaCommon.h"
 #include "ui/pages/BasePage.h"
 
@@ -72,6 +72,9 @@ class JavaPage : public QWidget, public BasePage {
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
+    void on_downloadJavaButton_clicked();
+    void on_removeJavaButton_clicked();
+    void on_refreshJavaButton_clicked();
     void on_maxMemSpinBox_valueChanged(int i);
     void checkerFinished();
 
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index fd16572d3..e6bbeb15a 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>545</width>
-    <height>580</height>
+    <width>559</width>
+    <height>659</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -34,9 +34,9 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="general">
       <attribute name="title">
-       <string notr="true">Tab 1</string>
+       <string notr="true">General</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
@@ -160,25 +160,6 @@
           <string>Java Runtime</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
-          <item row="7" column="0" colspan="3">
-           <widget class="QPlainTextEdit" name="jvmArgsTextBox">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>100</height>
-             </size>
-            </property>
-           </widget>
-          </item>
           <item row="4" column="0">
            <widget class="QCheckBox" name="skipCompatibilityCheckbox">
             <property name="sizePolicy">
@@ -225,7 +206,7 @@
             </item>
            </layout>
           </item>
-          <item row="6" column="0">
+          <item row="8" column="0">
            <widget class="QLabel" name="labelJVMArgs">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -241,6 +222,45 @@
             </property>
            </widget>
           </item>
+          <item row="5" column="0">
+           <widget class="QCheckBox" name="skipJavaWizardCheckbox">
+            <property name="toolTip">
+             <string>If enabled, the launcher will not prompt you to choose a Java version if one isn't found.</string>
+            </property>
+            <property name="text">
+             <string>Skip Java &amp;Wizard</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0" colspan="3">
+           <widget class="QPlainTextEdit" name="jvmArgsTextBox">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>100</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="autodetectJavaCheckBox">
+            <property name="toolTip">
+             <string>Automatically selects the Java version that is compatible with the current Minecraft instance, based on the major version required.</string>
+            </property>
+            <property name="text">
+             <string>Autodetect Java version</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="0" colspan="3">
            <layout class="QHBoxLayout" name="horizontalLayout">
             <item>
@@ -277,13 +297,16 @@
             </item>
            </layout>
           </item>
-          <item row="5" column="0">
-           <widget class="QCheckBox" name="skipJavaWizardCheckbox">
+          <item row="7" column="0">
+           <widget class="QCheckBox" name="autodownloadCheckBox">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="toolTip">
-             <string>If enabled, the launcher will not prompt you to choose a Java version if one isn't found.</string>
+             <string>Automatically downloads and selects the Java version recommended by Mojang.</string>
             </property>
             <property name="text">
-             <string>Skip Java &amp;Wizard</string>
+             <string>Auto-download Mojang Java</string>
             </property>
            </widget>
           </item>
@@ -305,16 +328,106 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="management">
+      <attribute name="title">
+       <string>Management</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Downloaded Java Versions</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <item>
+           <widget class="VersionSelectWidget" name="managedJavaList" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="managedJavaBtnLayout">
+            <item>
+             <widget class="QPushButton" name="downloadJavaButton">
+              <property name="text">
+               <string>Download</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="removeJavaButton">
+              <property name="text">
+               <string>Remove</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="refreshJavaButton">
+              <property name="text">
+               <string>Refresh</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="managementSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>VersionSelectWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/widgets/VersionSelectWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>minMemSpinBox</tabstop>
   <tabstop>maxMemSpinBox</tabstop>
   <tabstop>permGenSpinBox</tabstop>
-  <tabstop>javaBrowseBtn</tabstop>
   <tabstop>javaPathTextBox</tabstop>
+  <tabstop>javaBrowseBtn</tabstop>
+  <tabstop>javaDetectBtn</tabstop>
+  <tabstop>javaTestBtn</tabstop>
+  <tabstop>skipCompatibilityCheckbox</tabstop>
+  <tabstop>skipJavaWizardCheckbox</tabstop>
+  <tabstop>jvmArgsTextBox</tabstop>
   <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources/>
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 45a9e7cc8..8032bd937 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -4,6 +4,7 @@
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (c) 2022 dada513 <dada513@protonmail.com>
  *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -51,6 +52,7 @@
 #include "settings/MissingAuthlibInjectorBehavior.h"
 #include "settings/SettingsObject.h"
 #include "ui/themes/ITheme.h"
+#include "ui/themes/ThemeManager.h"
 #include "updater/ExternalUpdater.h"
 
 #include <QApplication>
@@ -67,9 +69,6 @@ enum InstSortMode {
 LauncherPage::LauncherPage(QWidget* parent) : QWidget(parent), ui(new Ui::LauncherPage)
 {
     ui->setupUi(this);
-    auto origForeground = ui->fontPreview->palette().color(ui->fontPreview->foregroundRole());
-    auto origBackground = ui->fontPreview->palette().color(ui->fontPreview->backgroundRole());
-    m_colors.reset(new LogColorCache(origForeground, origBackground));
 
     ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name);
     ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch);
@@ -86,8 +85,9 @@ LauncherPage::LauncherPage(QWidget* parent) : QWidget(parent), ui(new Ui::Launch
 
     ui->updateSettingsBox->setHidden(!APPLICATION->updater());
 
-    connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
-    connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
+    connect(ui->fontSizeBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &LauncherPage::refreshFontPreview);
+    connect(ui->consoleFont, &QFontComboBox::currentFontChanged, this, &LauncherPage::refreshFontPreview);
+    connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentWidgetThemeChanged, this, &LauncherPage::refreshFontPreview);
 
     connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentCatChanged, APPLICATION, &Application::currentCatChanged);
 }
@@ -179,6 +179,27 @@ void LauncherPage::on_downloadsDirBrowseBtn_clicked()
     }
 }
 
+void LauncherPage::on_javaDirBrowseBtn_clicked()
+{
+    QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Java Folder"), ui->javaDirTextBox->text());
+
+    if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
+        QString cooked_dir = FS::NormalizePath(raw_dir);
+        ui->javaDirTextBox->setText(cooked_dir);
+    }
+}
+
+void LauncherPage::on_skinsDirBrowseBtn_clicked()
+{
+    QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Skins Folder"), ui->skinsDirTextBox->text());
+
+    // do not allow current dir - it's dirty. Do not allow dirs that don't exist
+    if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
+        QString cooked_dir = FS::NormalizePath(raw_dir);
+        ui->skinsDirTextBox->setText(cooked_dir);
+    }
+}
+
 void LauncherPage::on_metadataDisableBtn_clicked()
 {
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
@@ -191,12 +212,15 @@ void LauncherPage::applySettings()
     // Updates
     if (APPLICATION->updater()) {
         APPLICATION->updater()->setAutomaticallyChecksForUpdates(ui->autoUpdateCheckBox->isChecked());
+        APPLICATION->updater()->setUpdateCheckInterval(ui->updateIntervalSpinBox->value() * 3600);
     }
 
     s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
 
     s->set("NumberOfConcurrentTasks", ui->numberOfConcurrentTasksSpinBox->value());
     s->set("NumberOfConcurrentDownloads", ui->numberOfConcurrentDownloadsSpinBox->value());
+    s->set("NumberOfManualRetries", ui->numberOfManualRetriesSpinBox->value());
+    s->set("RequestTimeout", ui->timeoutSecondsSpinBox->value());
 
     // Console settings
     s->set("ShowConsole", ui->showConsoleCheck->isChecked());
@@ -214,6 +238,8 @@ void LauncherPage::applySettings()
     s->set("CentralModsDir", ui->modsDirTextBox->text());
     s->set("IconsDir", ui->iconsDirTextBox->text());
     s->set("DownloadsDir", ui->downloadsDirTextBox->text());
+    s->set("SkinsDir", ui->skinsDirTextBox->text());
+    s->set("JavaDir", ui->javaDirTextBox->text());
     s->set("DownloadsDirWatchRecursive", ui->downloadsDirWatchRecursiveCheckBox->isChecked());
 
     auto sortMode = (InstSortMode)ui->sortingModeGroup->checkedId();
@@ -227,9 +253,13 @@ void LauncherPage::applySettings()
             break;
     }
 
+    // Cat
+    s->set("CatOpacity", ui->catOpacitySpinBox->value());
+
     // Mods
     s->set("ModMetadataDisabled", ui->metadataDisableBtn->isChecked());
     s->set("ModDependenciesDisabled", ui->dependenciesDisableBtn->isChecked());
+    s->set("SkipModpackUpdatePrompt", ui->skipModpackUpdatePromptBtn->isChecked());
 
     // authlib-injector
     s->set("MissingAuthlibInjectorBehavior", ui->missingAIComboBox->currentData().toInt());
@@ -240,6 +270,7 @@ void LauncherPage::loadSettings()
     // Updates
     if (APPLICATION->updater()) {
         ui->autoUpdateCheckBox->setChecked(APPLICATION->updater()->getAutomaticallyChecksForUpdates());
+        ui->updateIntervalSpinBox->setValue(APPLICATION->updater()->getUpdateCheckInterval() / 3600);
     }
 
     // Toolbar/menu bar settings (not applicable if native menu bar is present)
@@ -251,6 +282,8 @@ void LauncherPage::loadSettings()
 
     ui->numberOfConcurrentTasksSpinBox->setValue(s->get("NumberOfConcurrentTasks").toInt());
     ui->numberOfConcurrentDownloadsSpinBox->setValue(s->get("NumberOfConcurrentDownloads").toInt());
+    ui->numberOfManualRetriesSpinBox->setValue(s->get("NumberOfManualRetries").toInt());
+    ui->timeoutSecondsSpinBox->setValue(s->get("RequestTimeout").toInt());
 
     // Console settings
     ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
@@ -275,6 +308,8 @@ void LauncherPage::loadSettings()
     ui->modsDirTextBox->setText(s->get("CentralModsDir").toString());
     ui->iconsDirTextBox->setText(s->get("IconsDir").toString());
     ui->downloadsDirTextBox->setText(s->get("DownloadsDir").toString());
+    ui->skinsDirTextBox->setText(s->get("SkinsDir").toString());
+    ui->javaDirTextBox->setText(s->get("JavaDir").toString());
     ui->downloadsDirWatchRecursiveCheckBox->setChecked(s->get("DownloadsDirWatchRecursive").toBool());
 
     QString sortMode = s->get("InstSortMode").toString();
@@ -285,10 +320,14 @@ void LauncherPage::loadSettings()
         ui->sortByNameBtn->setChecked(true);
     }
 
+    // Cat
+    ui->catOpacitySpinBox->setValue(s->get("CatOpacity").toInt());
+
     // Mods
     ui->metadataDisableBtn->setChecked(s->get("ModMetadataDisabled").toBool());
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
     ui->dependenciesDisableBtn->setChecked(s->get("ModDependenciesDisabled").toBool());
+    ui->skipModpackUpdatePromptBtn->setChecked(s->get("SkipModpackUpdatePrompt").toBool());
 
     // Missing authlib-injector behavior
     int missingAI = s->get("MissingAuthlibInjectorBehavior").toInt();
@@ -301,37 +340,47 @@ void LauncherPage::loadSettings()
 
 void LauncherPage::refreshFontPreview()
 {
+    const LogColors& colors = APPLICATION->themeManager()->getLogColors();
+
     int fontSize = ui->fontSizeBox->value();
     QString fontFamily = ui->consoleFont->currentFont().family();
     ui->fontPreview->clear();
     defaultFormat->setFont(QFont(fontFamily, fontSize));
-    {
-        QTextCharFormat format(*defaultFormat);
-        format.setForeground(m_colors->getFront(MessageLevel::Error));
-        // append a paragraph/line
-        auto workCursor = ui->fontPreview->textCursor();
-        workCursor.movePosition(QTextCursor::End);
-        workCursor.insertText(tr("[Something/ERROR] A spooky error!"), format);
-        workCursor.insertBlock();
-    }
-    {
-        QTextCharFormat format(*defaultFormat);
-        format.setForeground(m_colors->getFront(MessageLevel::Message));
-        // append a paragraph/line
-        auto workCursor = ui->fontPreview->textCursor();
-        workCursor.movePosition(QTextCursor::End);
-        workCursor.insertText(tr("[Test/INFO] A harmless message..."), format);
-        workCursor.insertBlock();
-    }
-    {
+
+    auto print = [this, colors](const QString& message, MessageLevel::Enum level) {
         QTextCharFormat format(*defaultFormat);
-        format.setForeground(m_colors->getFront(MessageLevel::Warning));
+
+        QColor bg = colors.background.value(level);
+        QColor fg = colors.foreground.value(level);
+
+        if (bg.isValid())
+            format.setBackground(bg);
+
+        if (fg.isValid())
+            format.setForeground(fg);
+
         // append a paragraph/line
         auto workCursor = ui->fontPreview->textCursor();
         workCursor.movePosition(QTextCursor::End);
-        workCursor.insertText(tr("[Something/WARN] A not so spooky warning."), format);
+        workCursor.insertText(message, format);
         workCursor.insertBlock();
-    }
+    };
+
+    print(QString("%1 version: %2 (%3)\n")
+              .arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString(), BuildConfig.BUILD_PLATFORM),
+          MessageLevel::Launcher);
+
+    QDate today = QDate::currentDate();
+
+    if (today.month() == 10 && today.day() == 31)
+        print(tr("[Test/ERROR] OOoooOOOoooo! A spooky error!"), MessageLevel::Error);
+    else
+        print(tr("[Test/ERROR] A spooky error!"), MessageLevel::Error);
+
+    print(tr("[Test/INFO] A harmless message..."), MessageLevel::Info);
+    print(tr("[Test/WARN] A not so spooky warning."), MessageLevel::Warning);
+    print(tr("[Test/DEBUG] A secret debugging message..."), MessageLevel::Debug);
+    print(tr("[Test/FATAL] A terrifying fatal error!"), MessageLevel::Fatal);
 }
 
 void LauncherPage::retranslate()
diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h
index e733224d2..02f371b04 100644
--- a/launcher/ui/pages/global/LauncherPage.h
+++ b/launcher/ui/pages/global/LauncherPage.h
@@ -41,7 +41,6 @@
 #include <Application.h>
 #include <translations/TranslationsModel.h>
 #include "java/JavaChecker.h"
-#include "ui/ColorCache.h"
 #include "ui/pages/BasePage.h"
 
 class QTextCharFormat;
@@ -74,6 +73,8 @@ class LauncherPage : public QWidget, public BasePage {
     void on_modsDirBrowseBtn_clicked();
     void on_iconsDirBrowseBtn_clicked();
     void on_downloadsDirBrowseBtn_clicked();
+    void on_javaDirBrowseBtn_clicked();
+    void on_skinsDirBrowseBtn_clicked();
     void on_metadataDisableBtn_clicked();
 
     /*!
@@ -92,7 +93,5 @@ class LauncherPage : public QWidget, public BasePage {
     // default format for the font preview...
     QTextCharFormat* defaultFormat;
 
-    std::unique_ptr<LogColorCache> m_colors;
-
     std::shared_ptr<TranslationsModel> m_languageModel;
 };
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 4adccb4b3..c5244eb1a 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>511</width>
-    <height>629</height>
+    <height>726</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -58,6 +58,33 @@
             </property>
            </widget>
           </item>
+          <item>
+           <layout class="QFormLayout" name="updateSetingsLayout">
+            <item row="0" column="0">
+             <widget class="QLabel" name="updateIntervalLabel">
+              <property name="text">
+               <string>Update interval</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QSpinBox" name="updateIntervalSpinBox">
+              <property name="toolTip">
+               <string>Set it to 0 to only check on launch</string>
+              </property>
+              <property name="suffix">
+               <string>h</string>
+              </property>
+              <property name="minimum">
+               <number>0</number>
+              </property>
+              <property name="maximum">
+               <number>99999999</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>
@@ -67,7 +94,7 @@
           <string>Folders</string>
          </property>
          <layout class="QGridLayout" name="foldersBoxLayout">
-          <item row="3" column="0">
+          <item row="8" column="0">
            <widget class="QLabel" name="labelDownloadsDir">
             <property name="text">
              <string>&amp;Downloads:</string>
@@ -77,39 +104,59 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelInstDir">
+          <item row="8" column="2">
+           <widget class="QToolButton" name="downloadsDirBrowseBtn">
             <property name="text">
-             <string>I&amp;nstances:</string>
-            </property>
-            <property name="buddy">
-             <cstring>instDirTextBox</cstring>
+             <string>Browse</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="instDirTextBox"/>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="iconsDirTextBox"/>
           </item>
           <item row="3" column="1">
-           <widget class="QLineEdit" name="downloadsDirTextBox"/>
+           <widget class="QLineEdit" name="javaDirTextBox"/>
           </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="iconsDirTextBox"/>
+          <item row="4" column="0">
+           <widget class="QLabel" name="labelSkinsDir">
+            <property name="text">
+             <string>&amp;Skins:</string>
+            </property>
+            <property name="buddy">
+             <cstring>skinsDirTextBox</cstring>
+            </property>
+           </widget>
           </item>
-          <item row="3" column="2">
-           <widget class="QToolButton" name="downloadsDirBrowseBtn">
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelIconsDir">
             <property name="text">
-             <string>Browse</string>
+             <string>&amp;Icons:</string>
+            </property>
+            <property name="buddy">
+             <cstring>iconsDirTextBox</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="modsDirTextBox"/>
+          <item row="9" column="1" colspan="2">
+           <widget class="QCheckBox" name="downloadsDirWatchRecursiveCheckBox">
+            <property name="toolTip">
+             <string>When enabled, in addition to the downloads folder, its sub folders will also be searched when looking for resources (e.g. when looking for blocked mods on CurseForge).</string>
+            </property>
+            <property name="text">
+             <string>Check downloads folder recursively</string>
+            </property>
+           </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QToolButton" name="modsDirBrowseBtn">
+          <item row="8" column="1">
+           <widget class="QLineEdit" name="downloadsDirTextBox"/>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="labelJavaDir">
             <property name="text">
-             <string>Browse</string>
+             <string>&amp;Java:</string>
+            </property>
+            <property name="buddy">
+             <cstring>javaDirTextBox</cstring>
             </property>
            </widget>
           </item>
@@ -123,6 +170,22 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="skinsDirTextBox"/>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="modsDirTextBox"/>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="instDirTextBox"/>
+          </item>
+          <item row="1" column="2">
+           <widget class="QToolButton" name="modsDirBrowseBtn">
+            <property name="text">
+             <string>Browse</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="2">
            <widget class="QToolButton" name="instDirBrowseBtn">
             <property name="text">
@@ -137,23 +200,27 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelIconsDir">
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelInstDir">
             <property name="text">
-             <string>&amp;Icons:</string>
+             <string>I&amp;nstances:</string>
             </property>
             <property name="buddy">
-             <cstring>iconsDirTextBox</cstring>
+             <cstring>instDirTextBox</cstring>
             </property>
            </widget>
           </item>
-          <item row="4" column="1" colspan="2">
-           <widget class="QCheckBox" name="downloadsDirWatchRecursiveCheckBox">
-            <property name="toolTip">
-             <string>When enabled, in addition to the downloads folder, its sub folders will also be searched when looking for resources (e.g. when looking for blocked mods on CurseForge).</string>
+          <item row="3" column="2">
+           <widget class="QToolButton" name="javaDirBrowseBtn">
+            <property name="text">
+             <string>Browse</string>
             </property>
+           </widget>
+          </item>
+          <item row="4" column="2">
+           <widget class="QToolButton" name="skinsDirBrowseBtn">
             <property name="text">
-             <string>Check downloads folder recursively</string>
+             <string>Browse</string>
             </property>
            </widget>
           </item>
@@ -186,7 +253,7 @@
             </property>
            </widget>
           </item>
-           <item>
+          <item>
            <widget class="QCheckBox" name="dependenciesDisableBtn">
             <property name="toolTip">
              <string>Disable the automatic detection, installation, and updating of mod dependencies.</string>
@@ -196,6 +263,16 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="skipModpackUpdatePromptBtn">
+            <property name="toolTip">
+             <string>When creating a new modpack instance, do not suggest updating existing instances instead.</string>
+            </property>
+            <property name="text">
+             <string>Skip modpack update prompt</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -205,6 +282,13 @@
           <string>Miscellaneous</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="numberOfConcurrentDownloadsSpinBox">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="numberOfConcurrentTasksLabel">
             <property name="text">
@@ -226,10 +310,34 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="numberOfConcurrentDownloadsSpinBox">
+          <item row="2" column="0">
+           <widget class="QLabel" name="numberOfManualRetriesLabel">
+            <property name="text">
+             <string>Number of manual retries</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QSpinBox" name="numberOfManualRetriesSpinBox">
             <property name="minimum">
-             <number>1</number>
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="timeoutSecondsLabel">
+            <property name="toolTip">
+             <string>Seconds to wait until the requests are terminated</string>
+            </property>
+            <property name="text">
+             <string>Timeout for HTTP requests</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QSpinBox" name="timeoutSecondsSpinBox">
+            <property name="suffix">
+             <string>s</string>
             </property>
            </widget>
           </item>
@@ -253,7 +361,7 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_2">
+        <spacer name="verticalSpacer_FeaturesTab">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -267,7 +375,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="generalTab">
+     <widget class="QWidget" name="userInterfaceTab">
       <attribute name="title">
        <string>User Interface</string>
       </attribute>
@@ -316,6 +424,54 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="catBox">
+         <property name="title">
+          <string>Cat</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="0" column="0">
+           <widget class="QLabel" name="catOpacityLabel">
+            <property name="toolTip">
+             <string>Set the cat's opacity. 0% is fully transparent and 100% is fully opaque.</string>
+            </property>
+            <property name="text">
+             <string>Opacity</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QSpinBox" name="catOpacitySpinBox">
+            <property name="specialValueText">
+             <string/>
+            </property>
+            <property name="suffix">
+             <string>%</string>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="value">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <widget class="QGroupBox" name="toolsBox">
          <property name="sizePolicy">
@@ -342,7 +498,7 @@
         </widget>
        </item>
        <item>
-        <spacer name="generalTabSpacer">
+        <spacer name="verticalSpacer_UserInterfaceTab">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp
index f5887f23e..3243239ff 100644
--- a/launcher/ui/pages/global/MinecraftPage.cpp
+++ b/launcher/ui/pages/global/MinecraftPage.cpp
@@ -110,6 +110,7 @@ void MinecraftPage::applySettings()
     s->set("EnableFeralGamemode", ui->enableFeralGamemodeCheck->isChecked());
     s->set("EnableMangoHud", ui->enableMangoHud->isChecked());
     s->set("UseDiscreteGpu", ui->useDiscreteGpuCheck->isChecked());
+    s->set("UseZink", ui->useZink->isChecked());
 
     // Game time
     s->set("ShowGameTime", ui->showGameTime->isChecked());
@@ -152,6 +153,7 @@ void MinecraftPage::loadSettings()
     ui->enableFeralGamemodeCheck->setChecked(s->get("EnableFeralGamemode").toBool());
     ui->enableMangoHud->setChecked(s->get("EnableMangoHud").toBool());
     ui->useDiscreteGpuCheck->setChecked(s->get("UseDiscreteGpu").toBool());
+    ui->useZink->setChecked(s->get("UseZink").toBool());
 
 #if !defined(Q_OS_LINUX)
     ui->perfomanceGroupBox->setVisible(false);
diff --git a/launcher/ui/pages/global/MinecraftPage.ui b/launcher/ui/pages/global/MinecraftPage.ui
index 3008099e3..7d2741250 100644
--- a/launcher/ui/pages/global/MinecraftPage.ui
+++ b/launcher/ui/pages/global/MinecraftPage.ui
@@ -309,6 +309,16 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="useZink">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use Zink, a Mesa OpenGL driver that implements OpenGL on top of Vulkan. Performance may vary depending on the situation. Note: If no suitable Vulkan driver is found, software rendering will be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Use Zink</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index 2068fa6b1..8f8dab46d 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -88,6 +88,7 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
     };
     connect(selection_model, &QItemSelectionModel::selectionChanged, this, updateExtra);
     connect(model.get(), &ResourceFolderModel::updateFinished, this, updateExtra);
+    connect(model.get(), &ResourceFolderModel::parseFinished, this, updateExtra);
 
     connect(ui->filterEdit, &QLineEdit::textChanged, this, &ExternalResourcesPage::filterTextChanged);
 
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.ui b/launcher/ui/pages/instance/ExternalResourcesPage.ui
index ff08e12d2..9d6f61db0 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.ui
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.ui
@@ -70,15 +70,15 @@
    </layout>
   </widget>
   <widget class="WideBar" name="actionsToolbar">
-   <property name="useDefaultAction" stdset="0">
-    <bool>true</bool>
-   </property>
    <property name="windowTitle">
     <string>Actions</string>
    </property>
    <property name="toolButtonStyle">
     <enum>Qt::ToolButtonTextOnly</enum>
    </property>
+   <property name="useDefaultAction" stdset="0">
+    <bool>true</bool>
+   </property>
    <attribute name="toolBarArea">
     <enum>RightToolBarArea</enum>
    </attribute>
@@ -171,6 +171,17 @@
     <string>Try to check or update all selected resources (all resources if none are selected)</string>
    </property>
   </action>
+  <action name="actionExportMetadata">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Export modlist</string>
+   </property>
+   <property name="toolTip">
+    <string>Export mod's metadata to text</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index d4fd0ec5b..cf8d86cd4 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -36,6 +36,11 @@
  */
 
 #include "InstanceSettingsPage.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/WorldList.h"
+#include "settings/Setting.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/java/InstallJavaDialog.h"
 #include "ui_InstanceSettingsPage.h"
 
 #include <QDialog>
@@ -62,6 +67,8 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent)
     m_settings = inst->settings();
     ui->setupUi(this);
 
+    ui->javaDownloadBtn->setHidden(!BuildConfig.JAVA_DOWNLOADER_ENABLED);
+
     connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
     connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
     connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
@@ -71,6 +78,22 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent)
     connect(ui->useNativeGLFWCheck, &QAbstractButton::toggled, this, &InstanceSettingsPage::onUseNativeGLFWChanged);
     connect(ui->useNativeOpenALCheck, &QAbstractButton::toggled, this, &InstanceSettingsPage::onUseNativeOpenALChanged);
 
+    auto mInst = dynamic_cast<MinecraftInstance*>(inst);
+    m_world_quickplay_supported = mInst && mInst->traits().contains("feature:is_quick_play_singleplayer");
+    if (m_world_quickplay_supported) {
+        auto worlds = mInst->worldList();
+        worlds->update();
+        for (const auto& world : worlds->allWorlds()) {
+            ui->worldsCb->addItem(world.folderName());
+        }
+    } else {
+        ui->worldsCb->hide();
+        ui->worldJoinButton->hide();
+        ui->serverJoinAddressButton->setChecked(true);
+        ui->serverJoinAddress->setEnabled(true);
+        ui->serverJoinAddressButton->setStyleSheet("QRadioButton::indicator { width: 0px; height: 0px; }");
+    }
+
     loadSettings();
 
     updateThresholds();
@@ -186,9 +209,6 @@ void InstanceSettingsPage::applySettings()
         m_settings->reset("JvmArgs");
     }
 
-    // old generic 'override both' is removed.
-    m_settings->reset("OverrideJava");
-
     // Custom Commands
     bool custcmd = ui->customCommands->checked();
     m_settings->set("OverrideCommands", custcmd);
@@ -232,10 +252,13 @@ void InstanceSettingsPage::applySettings()
         m_settings->set("EnableFeralGamemode", ui->enableFeralGamemodeCheck->isChecked());
         m_settings->set("EnableMangoHud", ui->enableMangoHud->isChecked());
         m_settings->set("UseDiscreteGpu", ui->useDiscreteGpuCheck->isChecked());
+        m_settings->set("UseZink", ui->useZink->isChecked());
+
     } else {
         m_settings->reset("EnableFeralGamemode");
         m_settings->reset("EnableMangoHud");
         m_settings->reset("UseDiscreteGpu");
+        m_settings->reset("UseZink");
     }
 
     // Game time
@@ -253,9 +276,16 @@ void InstanceSettingsPage::applySettings()
     bool joinServerOnLaunch = ui->serverJoinGroupBox->isChecked();
     m_settings->set("JoinServerOnLaunch", joinServerOnLaunch);
     if (joinServerOnLaunch) {
-        m_settings->set("JoinServerOnLaunchAddress", ui->serverJoinAddress->text());
+        if (ui->serverJoinAddressButton->isChecked() || !m_world_quickplay_supported) {
+            m_settings->set("JoinServerOnLaunchAddress", ui->serverJoinAddress->text());
+            m_settings->reset("JoinWorldOnLaunch");
+        } else {
+            m_settings->set("JoinWorldOnLaunch", ui->worldsCb->currentText());
+            m_settings->reset("JoinServerOnLaunchAddress");
+        }
     } else {
         m_settings->reset("JoinServerOnLaunchAddress");
+        m_settings->reset("JoinWorldOnLaunch");
     }
 
     // Use an account for this instance
@@ -314,12 +344,16 @@ void InstanceSettingsPage::loadSettings()
     ui->labelPermgenNote->setVisible(permGenVisible);
 
     // Java Settings
-    bool overrideJava = m_settings->get("OverrideJava").toBool();
-    bool overrideLocation = m_settings->get("OverrideJavaLocation").toBool() || overrideJava;
-    bool overrideArgs = m_settings->get("OverrideJavaArgs").toBool() || overrideJava;
+    bool overrideLocation = m_settings->get("OverrideJavaLocation").toBool();
+    bool overrideArgs = m_settings->get("OverrideJavaArgs").toBool();
 
+    connect(m_settings->getSetting("OverrideJavaLocation").get(), &Setting::SettingChanged, ui->javaSettingsGroupBox,
+            [this] { ui->javaSettingsGroupBox->setChecked(m_settings->get("OverrideJavaLocation").toBool()); });
     ui->javaSettingsGroupBox->setChecked(overrideLocation);
     ui->javaPathTextBox->setText(m_settings->get("JavaPath").toString());
+    connect(m_settings->getSetting("JavaPath").get(), &Setting::SettingChanged, ui->javaSettingsGroupBox,
+            [this] { ui->javaPathTextBox->setText(m_settings->get("JavaPath").toString()); });
+
     ui->skipCompatibilityCheckbox->setChecked(m_settings->get("IgnoreJavaCompatibility").toBool());
 
     ui->javaArgumentsGroupBox->setChecked(overrideArgs);
@@ -354,6 +388,7 @@ void InstanceSettingsPage::loadSettings()
     ui->enableFeralGamemodeCheck->setChecked(m_settings->get("EnableFeralGamemode").toBool());
     ui->enableMangoHud->setChecked(m_settings->get("EnableMangoHud").toBool());
     ui->useDiscreteGpuCheck->setChecked(m_settings->get("UseDiscreteGpu").toBool());
+    ui->useZink->setChecked(m_settings->get("UseZink").toBool());
 
 #if !defined(Q_OS_LINUX)
     ui->settingsTabs->setTabVisible(ui->settingsTabs->indexOf(ui->performancePage), false);
@@ -375,7 +410,25 @@ void InstanceSettingsPage::loadSettings()
     ui->recordGameTime->setChecked(m_settings->get("RecordGameTime").toBool());
 
     ui->serverJoinGroupBox->setChecked(m_settings->get("JoinServerOnLaunch").toBool());
-    ui->serverJoinAddress->setText(m_settings->get("JoinServerOnLaunchAddress").toString());
+
+    if (auto server = m_settings->get("JoinServerOnLaunchAddress").toString(); !server.isEmpty()) {
+        ui->serverJoinAddress->setText(server);
+        ui->serverJoinAddressButton->setChecked(true);
+        ui->worldJoinButton->setChecked(false);
+        ui->serverJoinAddress->setEnabled(true);
+        ui->worldsCb->setEnabled(false);
+    } else if (auto world = m_settings->get("JoinWorldOnLaunch").toString(); !world.isEmpty() && m_world_quickplay_supported) {
+        ui->worldsCb->setCurrentText(world);
+        ui->serverJoinAddressButton->setChecked(false);
+        ui->worldJoinButton->setChecked(true);
+        ui->serverJoinAddress->setEnabled(false);
+        ui->worldsCb->setEnabled(true);
+    } else {
+        ui->serverJoinAddressButton->setChecked(true);
+        ui->worldJoinButton->setChecked(false);
+        ui->serverJoinAddress->setEnabled(true);
+        ui->worldsCb->setEnabled(false);
+    }
 
     ui->instanceAccountGroupBox->setChecked(m_settings->get("UseAccountForInstance").toBool());
     updateAccountsMenu();
@@ -384,6 +437,12 @@ void InstanceSettingsPage::loadSettings()
     ui->onlineFixes->setChecked(m_settings->get("OnlineFixes").toBool());
 }
 
+void InstanceSettingsPage::on_javaDownloadBtn_clicked()
+{
+    auto jdialog = new Java::InstallDialog({}, m_instance, this);
+    jdialog->exec();
+}
+
 void InstanceSettingsPage::on_javaDetectBtn_clicked()
 {
     if (JavaUtils::getJavaCheckPath().isEmpty()) {
@@ -405,6 +464,15 @@ void InstanceSettingsPage::on_javaDetectBtn_clicked()
         ui->labelPermGen->setVisible(visible);
         ui->labelPermgenNote->setVisible(visible);
         m_settings->set("PermGenVisible", visible);
+
+        if (!java->is_64bit && m_settings->get("MaxMemAlloc").toInt() > 2048) {
+            CustomMessageBox::selectable(this, tr("Confirm Selection"),
+                                         tr("You selected a 32-bit version of Java.\n"
+                                            "This installation does not support more than 2048MiB of RAM.\n"
+                                            "Please make sure that the maximum memory value is lower."),
+                                         QMessageBox::Warning, QMessageBox::Ok, QMessageBox::Ok)
+                ->exec();
+        }
     }
 }
 
@@ -530,3 +598,13 @@ void InstanceSettingsPage::updateThresholds()
         ui->labelMaxMemIcon->setPixmap(pix);
     }
 }
+
+void InstanceSettingsPage::on_serverJoinAddressButton_toggled(bool checked)
+{
+    ui->serverJoinAddress->setEnabled(checked);
+}
+
+void InstanceSettingsPage::on_worldJoinButton_toggled(bool checked)
+{
+    ui->worldsCb->setEnabled(checked);
+}
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index 8b78dcb7f..6499f9e8f 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -69,7 +69,10 @@ class InstanceSettingsPage : public QWidget, public BasePage {
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
+    void on_javaDownloadBtn_clicked();
     void on_maxMemSpinBox_valueChanged(int i);
+    void on_serverJoinAddressButton_toggled(bool checked);
+    void on_worldJoinButton_toggled(bool checked);
 
     void onUseNativeGLFWChanged(bool checked);
     void onUseNativeOpenALChanged(bool checked);
@@ -90,4 +93,5 @@ class InstanceSettingsPage : public QWidget, public BasePage {
     BaseInstance* m_instance;
     SettingsObjectPtr m_settings;
     unique_qobject_ptr<JavaCommon::TestCheck> checker;
+    bool m_world_quickplay_supported;
 };
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
index 632569e0c..4905eae87 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui
@@ -84,6 +84,13 @@
           </item>
           <item row="2" column="0">
            <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QPushButton" name="javaDownloadBtn">
+              <property name="text">
+               <string>Download Java</string>
+              </property>
+             </widget>
+            </item>
             <item>
              <widget class="QPushButton" name="javaDetectBtn">
               <property name="text">
@@ -567,6 +574,16 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="useZink">
+            <property name="toolTip">
+             <string>Use Zink, a Mesa OpenGL driver that implements OpenGL on top of Vulkan. Performance may vary depending on the situation. Note: If no suitable Vulkan driver is found, software rendering will be used.</string>
+            </property>
+            <property name="text">
+             <string>Use Zink</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -650,7 +667,7 @@
        <item>
         <widget class="QGroupBox" name="serverJoinGroupBox">
          <property name="title">
-          <string>Set a server to join on launch</string>
+          <string>Set a target to join on launch</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -658,26 +675,26 @@
          <property name="checked">
           <bool>false</bool>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_11">
-          <item>
-           <layout class="QGridLayout" name="serverJoinLayout">
-            <item row="0" column="0">
-             <widget class="QLabel" name="serverJoinAddressLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Server address:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="serverJoinAddress"/>
-            </item>
-           </layout>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="serverJoinAddressButton">
+            <property name="text">
+             <string>Server address:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QLineEdit" name="serverJoinAddress"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="worldJoinButton">
+            <property name="text">
+             <string>Singleplayer world</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QComboBox" name="worldsCb"/>
           </item>
          </layout>
         </widget>
@@ -754,6 +771,12 @@
   <tabstop>openGlobalJavaSettingsButton</tabstop>
   <tabstop>settingsTabs</tabstop>
   <tabstop>javaSettingsGroupBox</tabstop>
+  <tabstop>javaPathTextBox</tabstop>
+  <tabstop>javaBrowseBtn</tabstop>
+  <tabstop>javaDownloadBtn</tabstop>
+  <tabstop>javaDetectBtn</tabstop>
+  <tabstop>javaTestBtn</tabstop>
+  <tabstop>skipCompatibilityCheckbox</tabstop>
   <tabstop>memoryGroupBox</tabstop>
   <tabstop>minMemSpinBox</tabstop>
   <tabstop>maxMemSpinBox</tabstop>
@@ -773,6 +796,18 @@
   <tabstop>useNativeOpenALCheck</tabstop>
   <tabstop>showGameTime</tabstop>
   <tabstop>recordGameTime</tabstop>
+  <tabstop>miscellaneousSettingsBox</tabstop>
+  <tabstop>closeAfterLaunchCheck</tabstop>
+  <tabstop>quitAfterGameStopCheck</tabstop>
+  <tabstop>perfomanceGroupBox</tabstop>
+  <tabstop>enableFeralGamemodeCheck</tabstop>
+  <tabstop>enableMangoHud</tabstop>
+  <tabstop>useDiscreteGpuCheck</tabstop>
+  <tabstop>gameTimeGroupBox</tabstop>
+  <tabstop>serverJoinGroupBox</tabstop>
+  <tabstop>serverJoinAddress</tabstop>
+  <tabstop>instanceAccountGroupBox</tabstop>
+  <tabstop>instanceAccountSelector</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp
index 8e1e53762..6a4888f9c 100644
--- a/launcher/ui/pages/instance/LogPage.cpp
+++ b/launcher/ui/pages/instance/LogPage.cpp
@@ -3,7 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@
 #include "launch/LaunchTask.h"
 #include "settings/Setting.h"
 
-#include "ui/ColorCache.h"
 #include "ui/GuiUtil.h"
+#include "ui/themes/ThemeManager.h"
 
 #include <BuildConfig.h>
 
@@ -57,26 +57,36 @@ class LogFormatProxyModel : public QIdentityProxyModel {
     LogFormatProxyModel(QObject* parent = nullptr) : QIdentityProxyModel(parent) {}
     QVariant data(const QModelIndex& index, int role) const override
     {
+        const LogColors& colors = APPLICATION->themeManager()->getLogColors();
+
         switch (role) {
             case Qt::FontRole:
                 return m_font;
             case Qt::ForegroundRole: {
-                MessageLevel::Enum level = (MessageLevel::Enum)QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();
-                return m_colors->getFront(level);
+                auto level = static_cast<MessageLevel::Enum>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
+                QColor result = colors.foreground.value(level);
+
+                if (result.isValid())
+                    return result;
+
+                break;
             }
             case Qt::BackgroundRole: {
-                MessageLevel::Enum level = (MessageLevel::Enum)QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();
-                return m_colors->getBack(level);
+                auto level = static_cast<MessageLevel::Enum>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
+                QColor result = colors.background.value(level);
+
+                if (result.isValid())
+                    return result;
+
+                break;
             }
-            default:
-                return QIdentityProxyModel::data(index, role);
         }
+
+        return QIdentityProxyModel::data(index, role);
     }
 
     void setFont(QFont font) { m_font = font; }
 
-    void setColors(LogColorCache* colors) { m_colors.reset(colors); }
-
     QModelIndex find(const QModelIndex& start, const QString& value, bool reverse) const
     {
         QModelIndex parentIndex = parent(start);
@@ -125,7 +135,6 @@ class LogFormatProxyModel : public QIdentityProxyModel {
 
    private:
     QFont m_font;
-    std::unique_ptr<LogColorCache> m_colors;
 };
 
 LogPage::LogPage(InstancePtr instance, QWidget* parent) : QWidget(parent), ui(new Ui::LogPage), m_instance(instance)
@@ -134,12 +143,6 @@ LogPage::LogPage(InstancePtr instance, QWidget* parent) : QWidget(parent), ui(ne
     ui->tabWidget->tabBar()->hide();
 
     m_proxy = new LogFormatProxyModel(this);
-    // set up text colors in the log proxy and adapt them to the current theme foreground and background
-    {
-        auto origForeground = ui->text->palette().color(ui->text->foregroundRole());
-        auto origBackground = ui->text->palette().color(ui->text->backgroundRole());
-        m_proxy->setColors(new LogColorCache(origForeground, origBackground));
-    }
 
     // set up fonts in the log proxy
     {
@@ -231,7 +234,7 @@ bool LogPage::apply()
 
 bool LogPage::shouldDisplay() const
 {
-    return m_instance->isRunning() || m_proxy->rowCount() > 0;
+    return true;
 }
 
 void LogPage::on_btnPaste_clicked()
diff --git a/launcher/ui/pages/instance/ManagedPackPage.cpp b/launcher/ui/pages/instance/ManagedPackPage.cpp
index a47403926..a909d10d1 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.cpp
+++ b/launcher/ui/pages/instance/ManagedPackPage.cpp
@@ -371,7 +371,7 @@ void ModrinthManagedPackPage::update()
 
 void ModrinthManagedPackPage::updateFromFile()
 {
-    auto output = QFileDialog::getOpenFileUrl(this, tr("Choose update file"), QDir::homePath(), "Modrinth pack (*.mrpack *.zip)");
+    auto output = QFileDialog::getOpenFileUrl(this, tr("Choose update file"), QDir::homePath(), tr("Modrinth pack") + " (*.mrpack *.zip)");
     if (output.isEmpty())
         return;
     QMap<QString, QString> extra_info;
@@ -538,7 +538,7 @@ void FlameManagedPackPage::update()
 
 void FlameManagedPackPage::updateFromFile()
 {
-    auto output = QFileDialog::getOpenFileUrl(this, tr("Choose update file"), QDir::homePath(), "CurseForge pack (*.zip)");
+    auto output = QFileDialog::getOpenFileUrl(this, tr("Choose update file"), QDir::homePath(), tr("CurseForge pack") + " (*.zip)");
     if (output.isEmpty())
         return;
 
diff --git a/launcher/ui/pages/instance/ManagedPackPage.h b/launcher/ui/pages/instance/ManagedPackPage.h
index fe5a200de..c44f77070 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.h
+++ b/launcher/ui/pages/instance/ManagedPackPage.h
@@ -119,6 +119,7 @@ class ModrinthManagedPackPage final : public ManagedPackPage {
 
     void parseManagedPack() override;
     [[nodiscard]] QString url() const override;
+    [[nodiscard]] QString helpPage() const override { return "modrinth-managed-pack"; }
 
    public slots:
     void suggestVersion() override;
@@ -142,6 +143,7 @@ class FlameManagedPackPage final : public ManagedPackPage {
 
     void parseManagedPack() override;
     [[nodiscard]] QString url() const override;
+    [[nodiscard]] QString helpPage() const override { return "curseforge-managed-pack"; }
 
    public slots:
     void suggestVersion() override;
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 313fef2b6..f2feb8c7f 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -37,9 +37,11 @@
  */
 
 #include "ModFolderPage.h"
+#include "ui/dialogs/ExportToModListDialog.h"
 #include "ui_ExternalResourcesPage.h"
 
 #include <QAbstractItemModel>
+#include <QAction>
 #include <QEvent>
 #include <QKeyEvent>
 #include <QMenu>
@@ -66,6 +68,7 @@
 
 #include "Version.h"
 #include "tasks/ConcurrentTask.h"
+#include "tasks/Task.h"
 #include "ui/dialogs/ProgressDialog.h"
 
 ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel> mods, QWidget* parent)
@@ -121,10 +124,19 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
         ui->actionsToolbar->addAction(ui->actionVisitItemPage);
         connect(ui->actionVisitItemPage, &QAction::triggered, this, &ModFolderPage::visitModPages);
 
+        auto changeVersion = new QAction(tr("Change Version"));
+        changeVersion->setToolTip(tr("Change mod version"));
+        changeVersion->setEnabled(false);
+        ui->actionsToolbar->insertActionAfter(ui->actionUpdateItem, changeVersion);
+        connect(changeVersion, &QAction::triggered, this, &ModFolderPage::changeModVersion);
+
+        ui->actionsToolbar->insertActionAfter(ui->actionVisitItemPage, ui->actionExportMetadata);
+        connect(ui->actionExportMetadata, &QAction::triggered, this, &ModFolderPage::exportModMetadata);
+
         auto check_allow_update = [this] { return ui->treeView->selectionModel()->hasSelection() || !m_model->empty(); };
 
         connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
-                [this, check_allow_update, actionRemoveItemMetadata] {
+                [this, check_allow_update, actionRemoveItemMetadata, changeVersion] {
                     ui->actionUpdateItem->setEnabled(check_allow_update());
 
                     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
@@ -134,11 +146,12 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
                     if (selected <= 1) {
                         ui->actionVisitItemPage->setText(tr("Visit mod's page"));
                         ui->actionVisitItemPage->setToolTip(tr("Go to mod's home page"));
-
                     } else {
                         ui->actionVisitItemPage->setText(tr("Visit mods' pages"));
                         ui->actionVisitItemPage->setToolTip(tr("Go to the pages of the selected mods"));
                     }
+
+                    changeVersion->setEnabled(mods_list.length() == 1 && mods_list[0]->metadata() != nullptr);
                     ui->actionVisitItemPage->setEnabled(selected != 0);
                     actionRemoveItemMetadata->setEnabled(selected != 0);
                 });
@@ -310,7 +323,27 @@ void ModFolderPage::updateMods(bool includeDeps)
 
 CoreModFolderPage::CoreModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel> mods, QWidget* parent)
     : ModFolderPage(inst, mods, parent)
-{}
+{
+    auto mcInst = dynamic_cast<MinecraftInstance*>(m_instance);
+    if (mcInst) {
+        auto version = mcInst->getPackProfile();
+        if (version && version->getComponent("net.minecraftforge") && version->getComponent("net.minecraft")) {
+            auto minecraftCmp = version->getComponent("net.minecraft");
+            if (!minecraftCmp->m_loaded) {
+                version->reload(Net::Mode::Offline);
+                auto update = version->getCurrentTask();
+                if (update) {
+                    connect(update.get(), &Task::finished, this, [this] {
+                        if (m_container) {
+                            m_container->refreshContainer();
+                        }
+                    });
+                    update->start();
+                }
+            }
+        }
+    }
+}
 
 bool CoreModFolderPage::shouldDisplay() const
 {
@@ -320,15 +353,10 @@ bool CoreModFolderPage::shouldDisplay() const
             return true;
 
         auto version = inst->getPackProfile();
-
-        if (!version)
-            return true;
-        if (!version->getComponent("net.minecraftforge"))
-            return false;
-        if (!version->getComponent("net.minecraft"))
+        if (!version || !version->getComponent("net.minecraftforge") || !version->getComponent("net.minecraft"))
             return false;
-        if (version->getComponent("net.minecraft")->getReleaseDateTime() < g_VersionFilterData.legacyCutoffDate)
-            return true;
+        auto minecraftCmp = version->getComponent("net.minecraft");
+        return minecraftCmp->m_loaded && minecraftCmp->getReleaseDateTime() < g_VersionFilterData.legacyCutoffDate;
     }
     return false;
 }
@@ -372,3 +400,66 @@ void ModFolderPage::deleteModMetadata()
 
     m_model->deleteModsMetadata(selection);
 }
+
+void ModFolderPage::changeModVersion()
+{
+    if (m_instance->typeName() != "Minecraft")
+        return;  // this is a null instance or a legacy instance
+
+    auto profile = static_cast<MinecraftInstance*>(m_instance)->getPackProfile();
+    if (!profile->getModLoaders().has_value()) {
+        QMessageBox::critical(this, tr("Error"), tr("Please install a mod loader first!"));
+        return;
+    }
+    if (APPLICATION->settings()->get("ModMetadataDisabled").toBool()) {
+        QMessageBox::critical(this, tr("Error"), tr("Mod updates are unavailable when metadata is disabled!"));
+        return;
+    }
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
+    auto mods_list = m_model->selectedMods(selection);
+    if (mods_list.length() != 1 || mods_list[0]->metadata() == nullptr)
+        return;
+
+    ResourceDownload::ModDownloadDialog mdownload(this, m_model, m_instance);
+    mdownload.setModMetadata((*mods_list.begin())->metadata());
+    if (mdownload.exec()) {
+        auto tasks = new ConcurrentTask(this, "Download Mods", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
+        connect(tasks, &Task::failed, [this, tasks](QString reason) {
+            CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
+            tasks->deleteLater();
+        });
+        connect(tasks, &Task::aborted, [this, tasks]() {
+            CustomMessageBox::selectable(this, tr("Aborted"), tr("Download stopped by user."), QMessageBox::Information)->show();
+            tasks->deleteLater();
+        });
+        connect(tasks, &Task::succeeded, [this, tasks]() {
+            QStringList warnings = tasks->warnings();
+            if (warnings.count())
+                CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
+
+            tasks->deleteLater();
+        });
+
+        for (auto& task : mdownload.getTasks()) {
+            tasks->addTask(task);
+        }
+
+        ProgressDialog loadDialog(this);
+        loadDialog.setSkipButton(true, tr("Abort"));
+        loadDialog.execWithTask(tasks);
+
+        m_model->update();
+    }
+}
+
+void ModFolderPage::exportModMetadata()
+{
+    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
+    auto selectedMods = m_model->selectedMods(selection);
+    if (selectedMods.length() == 0)
+        selectedMods = m_model->allMods();
+
+    std::sort(selectedMods.begin(), selectedMods.end(), [](const Mod* a, const Mod* b) { return a->name() < b->name(); });
+    ExportToModListDialog dlg(m_instance->name(), selectedMods, this);
+    dlg.exec();
+}
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index 4672350c6..41b605991 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -62,16 +62,19 @@ class ModFolderPage : public ExternalResourcesPage {
    private slots:
     void removeItems(const QItemSelection& selection) override;
     void deleteModMetadata();
+    void exportModMetadata();
 
     void installMods();
     void updateMods(bool includeDeps = false);
     void visitModPages();
+    void changeModVersion();
 
    protected:
     std::shared_ptr<ModFolderModel> m_model;
 };
 
 class CoreModFolderPage : public ModFolderPage {
+    Q_OBJECT
    public:
     explicit CoreModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel> mods, QWidget* parent = 0);
     virtual ~CoreModFolderPage() = default;
@@ -85,6 +88,7 @@ class CoreModFolderPage : public ModFolderPage {
 };
 
 class NilModFolderPage : public ModFolderPage {
+    Q_OBJECT
    public:
     explicit NilModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel> mods, QWidget* parent = 0);
     virtual ~NilModFolderPage() = default;
diff --git a/launcher/ui/pages/instance/OtherLogsPage.h b/launcher/ui/pages/instance/OtherLogsPage.h
index de42f5a23..85a3a2dbc 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.h
+++ b/launcher/ui/pages/instance/OtherLogsPage.h
@@ -57,7 +57,7 @@ class OtherLogsPage : public QWidget, public BasePage {
     QString id() const override { return "logs"; }
     QString displayName() const override { return tr("Other logs"); }
     QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
-    QString helpPage() const override { return "Minecraft-Logs"; }
+    QString helpPage() const override { return "other-Logs"; }
     void retranslate() override;
 
     void openedImpl() override;
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index c3f955733..b619a07b8 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -242,6 +242,11 @@ ScreenshotsPage::ScreenshotsPage(QString path, QWidget* parent) : QMainWindow(pa
     m_model->setReadOnly(false);
     m_model->setNameFilters({ "*.png" });
     m_model->setNameFilterDisables(false);
+    // Sorts by modified date instead of creation date because that column is not available and would require subclassing, this should work
+    // considering screenshots aren't modified after creation.
+    constexpr int file_modified_column_index = 3;
+    m_model->sort(file_modified_column_index, Qt::DescendingOrder);
+
     m_folder = path;
     m_valid = FS::ensureFolderPathExists(m_folder);
 
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index f842b4b93..d8035e73e 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -168,7 +168,7 @@ class ServersModel : public QAbstractListModel {
         m_saveTimer.setInterval(5000);
         connect(&m_saveTimer, &QTimer::timeout, this, &ServersModel::save_internal);
     }
-    virtual ~ServersModel() {};
+    virtual ~ServersModel() = default;
 
     void observe()
     {
@@ -731,7 +731,7 @@ void ServersPage::on_actionMove_Down_triggered()
 void ServersPage::on_actionJoin_triggered()
 {
     const auto& address = m_model->at(currentServer)->m_address;
-    APPLICATION->launch(m_inst, true, false, std::make_shared<MinecraftServerTarget>(MinecraftServerTarget::parse(address)));
+    APPLICATION->launch(m_inst, true, false, std::make_shared<MinecraftTarget>(MinecraftTarget::parse(address, false)));
 }
 
 #include "ServersPage.moc"
diff --git a/launcher/ui/pages/instance/ShaderPackPage.h b/launcher/ui/pages/instance/ShaderPackPage.h
index 7c43a3756..d134e67ad 100644
--- a/launcher/ui/pages/instance/ShaderPackPage.h
+++ b/launcher/ui/pages/instance/ShaderPackPage.h
@@ -48,7 +48,7 @@ class ShaderPackPage : public ExternalResourcesPage {
     QString displayName() const override { return tr("Shader packs"); }
     QIcon icon() const override { return APPLICATION->getThemedIcon("shaderpacks"); }
     QString id() const override { return "shaderpacks"; }
-    QString helpPage() const override { return "Resource-packs"; }
+    QString helpPage() const override { return "shader-packs"; }
 
     bool shouldDisplay() const override { return true; }
 
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index f89d8176e..29a503593 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -49,8 +49,12 @@
 #include <QMessageBox>
 #include <QString>
 #include <QUrl>
+#include <algorithm>
 
+#include "QObjectPtr.h"
 #include "VersionPage.h"
+#include "meta/JsonFormat.h"
+#include "tasks/SequentialTask.h"
 #include "ui/dialogs/InstallLoaderDialog.h"
 #include "ui_VersionPage.h"
 
@@ -63,11 +67,9 @@
 
 #include "DesktopServices.h"
 #include "Exception.h"
-#include "Version.h"
 #include "icons/IconList.h"
 #include "minecraft/PackProfile.h"
 #include "minecraft/auth/AccountList.h"
-#include "minecraft/mod/Mod.h"
 
 #include "meta/Index.h"
 #include "meta/VersionList.h"
@@ -297,7 +299,7 @@ void VersionPage::on_actionRemove_triggered()
 
 void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
 {
-    auto list = GuiUtil::BrowseForFiles("jarmod", tr("Select jar mods"), tr("Minecraft.jar mods (*.zip *.jar)"),
+    auto list = GuiUtil::BrowseForFiles("jarmod", tr("Select jar mods"), tr("Minecraft.jar mods") + " (*.zip *.jar)",
                                         APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
     if (!list.empty()) {
         m_profile->installJarMods(list);
@@ -307,7 +309,7 @@ void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
 
 void VersionPage::on_actionReplace_Minecraft_jar_triggered()
 {
-    auto jarPath = GuiUtil::BrowseForFile("jar", tr("Select jar"), tr("Minecraft.jar replacement (*.jar)"),
+    auto jarPath = GuiUtil::BrowseForFile("jar", tr("Select jar"), tr("Minecraft.jar replacement") + " (*.jar)",
                                           APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
     if (!jarPath.isEmpty()) {
         m_profile->installCustomJar(jarPath);
@@ -317,7 +319,7 @@ void VersionPage::on_actionReplace_Minecraft_jar_triggered()
 
 void VersionPage::on_actionImport_Components_triggered()
 {
-    QStringList list = GuiUtil::BrowseForFiles("component", tr("Select components"), tr("Components (*.json)"),
+    QStringList list = GuiUtil::BrowseForFiles("component", tr("Select components"), tr("Components") + " (*.json)",
                                                APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
 
     if (!list.isEmpty()) {
@@ -332,7 +334,7 @@ void VersionPage::on_actionImport_Components_triggered()
 
 void VersionPage::on_actionAdd_Agents_triggered()
 {
-    QStringList list = GuiUtil::BrowseForFiles("agent", tr("Select agents"), tr("Java agents (*.jar)"),
+    QStringList list = GuiUtil::BrowseForFiles("agent", tr("Select agents"), tr("Java agents") + " (*.jar)",
                                                APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
 
     if (!list.isEmpty())
@@ -370,11 +372,25 @@ void VersionPage::on_actionChange_version_triggered()
     auto patch = m_profile->getComponent(versionRow);
     auto name = patch->getName();
     auto list = patch->getVersionList();
+    list->clearExternalRecommends();
     if (!list) {
         return;
     }
     auto uid = list->uid();
 
+    // recommend the correct lwjgl version for the current minecraft version
+    if (uid == "org.lwjgl" || uid == "org.lwjgl3") {
+        auto minecraft = m_profile->getComponent("net.minecraft");
+        auto lwjglReq = std::find_if(minecraft->m_cachedRequires.cbegin(), minecraft->m_cachedRequires.cend(),
+                                     [uid](const Meta::Require& req) -> bool { return req.uid == uid; });
+        if (lwjglReq != minecraft->m_cachedRequires.cend()) {
+            auto lwjglVersion = !lwjglReq->equalsVersion.isEmpty() ? lwjglReq->equalsVersion : lwjglReq->suggests;
+            if (!lwjglVersion.isEmpty()) {
+                list->addExternalRecommends({ lwjglVersion });
+            }
+        }
+    }
+
     VersionSelectDialog vselect(list.get(), tr("Change %1 version").arg(name), this);
     if (uid == "net.fabricmc.intermediary" || uid == "org.quiltmc.hashed") {
         vselect.setEmptyString(tr("No intermediary mappings versions are currently available."));
@@ -393,6 +409,11 @@ void VersionPage::on_actionChange_version_triggered()
     bool important = false;
     if (uid == "net.minecraft") {
         important = true;
+        if (APPLICATION->settings()->get("AutomaticJavaSwitch").toBool() && m_inst->settings()->get("AutomaticJava").toBool() &&
+            m_inst->settings()->get("OverrideJavaLocation").toBool()) {
+            m_inst->settings()->set("OverrideJavaLocation", false);
+            m_inst->settings()->set("JavaPath", "");
+        }
     }
     m_profile->setComponentVersion(uid, vselect.selectedVersion()->descriptor(), important);
     m_profile->resolve(Net::Mode::Online);
@@ -401,14 +422,27 @@ void VersionPage::on_actionChange_version_triggered()
 
 void VersionPage::on_actionDownload_All_triggered()
 {
-    auto updateTask = m_inst->createUpdateTask(Net::Mode::Online);
-    if (!updateTask) {
+    if (!APPLICATION->accounts()->anyAccountIsValid()) {
+        CustomMessageBox::selectable(this, tr("Error"),
+                                     tr("Cannot download Minecraft or update instances unless you have at least "
+                                        "one account added.\nPlease add a Microsoft account."),
+                                     QMessageBox::Warning)
+            ->show();
         return;
     }
+
+    auto updateTasks = m_inst->createUpdateTask();
+    if (updateTasks.isEmpty()) {
+        return;
+    }
+    auto task = makeShared<SequentialTask>(this);
+    for (auto t : updateTasks) {
+        task->addTask(t);
+    }
     ProgressDialog tDialog(this);
-    connect(updateTask.get(), &Task::failed, this, &VersionPage::onGameUpdateError);
+    connect(task.get(), &Task::failed, this, &VersionPage::onGameUpdateError);
     // FIXME: unused return value
-    tDialog.execWithTask(updateTask.get());
+    tDialog.execWithTask(task.get());
     updateButtons();
     m_container->refreshContainer();
 }
diff --git a/launcher/ui/pages/instance/VersionPage.h b/launcher/ui/pages/instance/VersionPage.h
index c3d6dedd5..6ca5a10e2 100644
--- a/launcher/ui/pages/instance/VersionPage.h
+++ b/launcher/ui/pages/instance/VersionPage.h
@@ -41,6 +41,7 @@
 #pragma once
 
 #include <QMainWindow>
+#include <QSortFilterProxyModel>
 
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index 692db7ad7..4ed5f1f73 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -82,7 +82,7 @@ class WorldListProxyModel : public QSortFilterProxyModel {
     }
 };
 
-WorldListPage::WorldListPage(BaseInstance* inst, std::shared_ptr<WorldList> worlds, QWidget* parent)
+WorldListPage::WorldListPage(InstancePtr inst, std::shared_ptr<WorldList> worlds, QWidget* parent)
     : QMainWindow(parent), m_inst(inst), ui(new Ui::WorldListPage), m_worlds(worlds)
 {
     ui->setupUi(this);
@@ -113,6 +113,11 @@ void WorldListPage::openedImpl()
 {
     m_worlds->startWatching();
 
+    auto mInst = std::dynamic_pointer_cast<MinecraftInstance>(m_inst);
+    if (!mInst || !mInst->traits().contains("feature:is_quick_play_singleplayer")) {
+        ui->toolBar->removeAction(ui->actionJoin);
+    }
+
     auto const setting_name = QString("WideBarVisibility_%1").arg(id());
     if (!APPLICATION->settings()->contains(setting_name))
         m_wide_bar_setting = APPLICATION->settings()->registerSetting(setting_name);
@@ -339,11 +344,19 @@ void WorldListPage::worldChanged([[maybe_unused]] const QModelIndex& current, [[
     ui->actionDatapacks->setEnabled(enable);
     bool hasIcon = !index.data(WorldList::IconFileRole).isNull();
     ui->actionReset_Icon->setEnabled(enable && hasIcon);
+
+    auto mInst = std::dynamic_pointer_cast<MinecraftInstance>(m_inst);
+    auto supportsJoin = mInst && mInst->traits().contains("feature:is_quick_play_singleplayer");
+    ui->actionJoin->setEnabled(enable && supportsJoin);
+
+    if (!supportsJoin) {
+        ui->toolBar->removeAction(ui->actionJoin);
+    }
 }
 
 void WorldListPage::on_actionAdd_triggered()
 {
-    auto list = GuiUtil::BrowseForFiles(displayName(), tr("Select a Minecraft world zip"), tr("Minecraft World Zip File (*.zip)"),
+    auto list = GuiUtil::BrowseForFiles(displayName(), tr("Select a Minecraft world zip"), tr("Minecraft World Zip File") + " (*.zip)",
                                         QString(), this->parentWidget());
     if (!list.empty()) {
         m_worlds->stopWatching();
@@ -418,4 +431,15 @@ void WorldListPage::on_actionRefresh_triggered()
     m_worlds->update();
 }
 
+void WorldListPage::on_actionJoin_triggered()
+{
+    QModelIndex index = getSelectedWorld();
+    if (!index.isValid()) {
+        return;
+    }
+    auto worldVariant = m_worlds->data(index, WorldList::ObjectRole);
+    auto world = (World*)worldVariant.value<void*>();
+    APPLICATION->launch(m_inst, true, false, std::make_shared<MinecraftTarget>(MinecraftTarget::parse(world->folderName(), true)));
+}
+
 #include "WorldListPage.moc"
diff --git a/launcher/ui/pages/instance/WorldListPage.h b/launcher/ui/pages/instance/WorldListPage.h
index 4f83002f4..84d9cd075 100644
--- a/launcher/ui/pages/instance/WorldListPage.h
+++ b/launcher/ui/pages/instance/WorldListPage.h
@@ -53,7 +53,7 @@ class WorldListPage : public QMainWindow, public BasePage {
     Q_OBJECT
 
    public:
-    explicit WorldListPage(BaseInstance* inst, std::shared_ptr<WorldList> worlds, QWidget* parent = 0);
+    explicit WorldListPage(InstancePtr inst, std::shared_ptr<WorldList> worlds, QWidget* parent = 0);
     virtual ~WorldListPage();
 
     virtual QString displayName() const override { return tr("Worlds"); }
@@ -72,7 +72,7 @@ class WorldListPage : public QMainWindow, public BasePage {
     QMenu* createPopupMenu() override;
 
    protected:
-    BaseInstance* m_inst;
+    InstancePtr m_inst;
 
    private:
     QModelIndex getSelectedWorld();
@@ -101,6 +101,7 @@ class WorldListPage : public QMainWindow, public BasePage {
     void on_actionReset_Icon_triggered();
     void worldChanged(const QModelIndex& current, const QModelIndex& previous);
     void mceditState(LoggedProcess::State state);
+    void on_actionJoin_triggered();
 
     void ShowContextMenu(const QPoint& pos);
 };
diff --git a/launcher/ui/pages/instance/WorldListPage.ui b/launcher/ui/pages/instance/WorldListPage.ui
index d74dd0796..04344b453 100644
--- a/launcher/ui/pages/instance/WorldListPage.ui
+++ b/launcher/ui/pages/instance/WorldListPage.ui
@@ -81,6 +81,7 @@
    </attribute>
    <addaction name="actionAdd"/>
    <addaction name="separator"/>
+   <addaction name="actionJoin"/>
    <addaction name="actionRename"/>
    <addaction name="actionCopy"/>
    <addaction name="actionRemove"/>
@@ -97,6 +98,11 @@
     <string>Add</string>
    </property>
   </action>
+  <action name="actionJoin">
+   <property name="text">
+    <string>Join</string>
+   </property>
+  </action>
   <action name="actionRename">
    <property name="text">
     <string>Rename</string>
diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp
index ed7ebfad9..1efc6199e 100644
--- a/launcher/ui/pages/modplatform/ImportPage.cpp
+++ b/launcher/ui/pages/modplatform/ImportPage.cpp
@@ -40,6 +40,7 @@
 #include "ui_ImportPage.h"
 
 #include <QFileDialog>
+#include <QMimeDatabase>
 #include <QValidator>
 #include <utility>
 
@@ -51,6 +52,7 @@
 #include "Json.h"
 
 #include "InstanceImportTask.h"
+#include "net/NetJob.h"
 
 class UrlValidator : public QValidator {
    public:
@@ -102,7 +104,7 @@ void ImportPage::updateState()
         return;
     }
     if (ui->modpackEdit->hasAcceptableInput()) {
-        QString input = ui->modpackEdit->text();
+        QString input = ui->modpackEdit->text().trimmed();
         auto url = QUrl::fromUserInput(input);
         if (url.isLocalFile()) {
             // FIXME: actually do some validation of what's inside here... this is fake AF
diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index c628f74ac..1f0329321 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -25,15 +25,21 @@ ResourceAPI::SearchArgs ModModel::createSearchArguments()
     Q_ASSERT(m_filter);
 
     std::optional<std::list<Version>> versions{};
+    std::optional<QStringList> categories{};
+    auto loaders = profile->getSupportedModLoaders();
 
-    {  // Version filter
-        if (!m_filter->versions.empty())
-            versions = m_filter->versions;
-    }
+    // Version filter
+    if (!m_filter->versions.empty())
+        versions = m_filter->versions;
+    if (m_filter->loaders)
+        loaders = m_filter->loaders;
+    if (!m_filter->categoryIds.empty())
+        categories = m_filter->categoryIds;
+    auto side = m_filter->side;
 
     auto sort = getCurrentSortingMethodByIndex();
 
-    return { ModPlatform::ResourceType::MOD, m_next_search_offset, m_search_term, sort, profile->getSupportedModLoaders(), versions };
+    return { ModPlatform::ResourceType::MOD, m_next_search_offset, m_search_term, sort, loaders, versions, side, categories };
 }
 
 ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(QModelIndex& entry)
@@ -45,10 +51,13 @@ ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(QModelIndex& en
     Q_ASSERT(m_filter);
 
     std::optional<std::list<Version>> versions{};
+    auto loaders = profile->getSupportedModLoaders();
     if (!m_filter->versions.empty())
         versions = m_filter->versions;
+    if (m_filter->loaders)
+        loaders = m_filter->loaders;
 
-    return { pack, versions, profile->getSupportedModLoaders() };
+    return { pack, versions, loaders };
 }
 
 ResourceAPI::ProjectInfoArgs ModModel::createInfoArguments(QModelIndex& entry)
@@ -79,4 +88,42 @@ bool ModModel::isPackInstalled(ModPlatform::IndexedPack::Ptr pack) const
     });
 }
 
+QVariant ModModel::getInstalledPackVersion(ModPlatform::IndexedPack::Ptr pack) const
+{
+    auto allMods = static_cast<MinecraftInstance&>(m_base_instance).loaderModList()->allMods();
+    for (auto mod : allMods) {
+        if (auto meta = mod->metadata(); meta && meta->provider == pack->provider && meta->project_id == pack->addonId) {
+            return meta->version();
+        }
+    }
+    return {};
+}
+
+bool checkSide(QString filter, QString value)
+{
+    return filter.isEmpty() || value.isEmpty() || filter == "both" || value == "both" || filter == value;
+}
+
+bool ModModel::checkFilters(ModPlatform::IndexedPack::Ptr pack)
+{
+    if (!m_filter)
+        return true;
+    return !(m_filter->hideInstalled && isPackInstalled(pack)) && checkSide(m_filter->side, pack->side);
+}
+
+bool ModModel::checkVersionFilters(const ModPlatform::IndexedVersion& v)
+{
+    if (!m_filter)
+        return true;
+    auto loaders = static_cast<MinecraftInstance&>(m_base_instance).getPackProfile()->getSupportedModLoaders();
+    if (m_filter->loaders)
+        loaders = m_filter->loaders;
+    return (!optedOut(v) &&                                                         // is opted out(aka curseforge download link)
+            (!loaders.has_value() || !v.loaders || loaders.value() & v.loaders) &&  // loaders
+            checkSide(m_filter->side, v.side) &&                                    // side
+            (m_filter->releases.empty() ||                                          // releases
+             std::find(m_filter->releases.cbegin(), m_filter->releases.cend(), v.version_type) != m_filter->releases.cend()) &&
+            m_filter->checkMcVersions(v.mcVersion));  // mcVersions
+}
+
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ModModel.h b/launcher/ui/pages/modplatform/ModModel.h
index dd187aa8d..5c994f373 100644
--- a/launcher/ui/pages/modplatform/ModModel.h
+++ b/launcher/ui/pages/modplatform/ModModel.h
@@ -35,6 +35,7 @@ class ModModel : public ResourceModel {
     virtual ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) = 0;
 
     void setFilter(std::shared_ptr<ModFilterWidget::Filter> filter) { m_filter = filter; }
+    virtual QVariant getInstalledPackVersion(ModPlatform::IndexedPack::Ptr) const override;
 
    public slots:
     ResourceAPI::SearchArgs createSearchArguments() override;
@@ -45,6 +46,9 @@ class ModModel : public ResourceModel {
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override = 0;
     virtual bool isPackInstalled(ModPlatform::IndexedPack::Ptr) const override;
 
+    virtual bool checkFilters(ModPlatform::IndexedPack::Ptr) override;
+    virtual bool checkVersionFilters(const ModPlatform::IndexedVersion&) override;
+
    protected:
     BaseInstance& m_base_instance;
 
diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index d6cc1fdcc..c9817cdf7 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -57,7 +58,6 @@ namespace ResourceDownload {
 
 ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
-    connect(m_ui->searchButton, &QPushButton::clicked, this, &ModPage::triggerSearch);
     connect(m_ui->resourceFilterButton, &QPushButton::clicked, this, &ModPage::filterMods);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ModPage::onResourceSelected);
 }
@@ -67,17 +67,18 @@ void ModPage::setFilterWidget(unique_qobject_ptr<ModFilterWidget>& widget)
     if (m_filter_widget)
         disconnect(m_filter_widget.get(), nullptr, nullptr, nullptr);
 
-    m_filter_widget.swap(widget);
+    auto old = m_ui->splitter->replaceWidget(0, widget.get());
+    // because we replaced the widget we also need to delete it
+    if (old) {
+        delete old;
+    }
 
-    m_ui->gridLayout_3->addWidget(m_filter_widget.get(), 0, 0, 1, m_ui->gridLayout_3->columnCount());
+    m_filter_widget.swap(widget);
 
-    m_filter_widget->setInstance(&static_cast<MinecraftInstance&>(m_base_instance));
     m_filter = m_filter_widget->getFilter();
 
-    connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this,
-            [&] { m_ui->searchButton->setStyleSheet("text-decoration: underline"); });
-    connect(m_filter_widget.get(), &ModFilterWidget::filterUnchanged, this,
-            [&] { m_ui->searchButton->setStyleSheet("text-decoration: none"); });
+    connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this, &ModPage::triggerSearch);
+    prepareProviderCategories();
 }
 
 /******** Callbacks to events in the UI (set up in the derived classes) ********/
@@ -89,13 +90,15 @@ void ModPage::filterMods()
 
 void ModPage::triggerSearch()
 {
+    auto changed = m_filter_widget->changed();
     m_filter = m_filter_widget->getFilter();
+    m_ui->packView->selectionModel()->setCurrentIndex({}, QItemSelectionModel::SelectionFlag::ClearAndSelect);
     m_ui->packView->clearSelection();
     m_ui->packDescription->clear();
     m_ui->versionSelectionBox->clear();
     updateSelectionButton();
 
-    static_cast<ModModel*>(m_model)->searchWithTerm(getSearchTerm(), m_ui->sortByBox->currentData().toUInt(), m_filter_widget->changed());
+    static_cast<ModModel*>(m_model)->searchWithTerm(getSearchTerm(), m_ui->sortByBox->currentData().toUInt(), changed);
     m_fetch_progress.watch(m_model->activeSearchJob().get());
 }
 
@@ -110,40 +113,6 @@ QMap<QString, QString> ModPage::urlHandlers() const
 
 /******** Make changes to the UI ********/
 
-void ModPage::updateVersionList()
-{
-    m_ui->versionSelectionBox->clear();
-    auto packProfile = (dynamic_cast<MinecraftInstance&>(m_base_instance)).getPackProfile();
-
-    QString mcVersion = packProfile->getComponentVersion("net.minecraft");
-
-    auto current_pack = getCurrentPack();
-    if (!current_pack)
-        return;
-    for (int i = 0; i < current_pack->versions.size(); i++) {
-        auto version = current_pack->versions[i];
-        bool valid = false;
-        for (auto& mcVer : m_filter->versions) {
-            if (validateVersion(version, mcVer.toString(), packProfile->getSupportedModLoaders())) {
-                valid = true;
-                break;
-            }
-        }
-
-        // Only add the version if it's valid or using the 'Any' filter, but never if the version is opted out
-        if ((valid || m_filter->versions.empty()) && !optedOut(version)) {
-            auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
-            m_ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(i));
-        }
-    }
-    if (m_ui->versionSelectionBox->count() == 0) {
-        m_ui->versionSelectionBox->addItem(tr("No valid version found!"), QVariant(-1));
-        m_ui->resourceSelectionButton->setText(tr("Cannot select invalid version :("));
-    }
-
-    updateSelectionButton();
-}
-
 void ModPage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack,
                                 ModPlatform::IndexedVersion& version,
                                 const std::shared_ptr<ResourceFolderModel> base_model)
diff --git a/launcher/ui/pages/modplatform/ModPage.h b/launcher/ui/pages/modplatform/ModPage.h
index f3660dd48..5c9a82303 100644
--- a/launcher/ui/pages/modplatform/ModPage.h
+++ b/launcher/ui/pages/modplatform/ModPage.h
@@ -31,8 +31,7 @@ class ModPage : public ResourcePage {
         auto page = new T(dialog, instance);
         auto model = static_cast<ModModel*>(page->getModel());
 
-        auto filter_widget =
-            ModFilterWidget::create(static_cast<MinecraftInstance&>(instance).getPackProfile()->getComponentVersion("net.minecraft"), page);
+        auto filter_widget = page->createFilterWidget();
         page->setFilterWidget(filter_widget);
         model->setFilter(page->getFilter());
 
@@ -51,20 +50,17 @@ class ModPage : public ResourcePage {
 
     void addResourceToPage(ModPlatform::IndexedPack::Ptr, ModPlatform::IndexedVersion&, std::shared_ptr<ResourceFolderModel>) override;
 
-    virtual auto validateVersion(ModPlatform::IndexedVersion& ver,
-                                 QString mineVer,
-                                 std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const -> bool = 0;
+    virtual unique_qobject_ptr<ModFilterWidget> createFilterWidget() = 0;
 
     [[nodiscard]] bool supportsFiltering() const override { return true; };
     auto getFilter() const -> const std::shared_ptr<ModFilterWidget::Filter> { return m_filter; }
     void setFilterWidget(unique_qobject_ptr<ModFilterWidget>&);
 
-   public slots:
-    void updateVersionList() override;
-
    protected:
     ModPage(ModDownloadDialog* dialog, BaseInstance& instance);
 
+    virtual void prepareProviderCategories() {};
+
    protected slots:
     virtual void filterMods();
     void triggerSearch() override;
diff --git a/launcher/ui/pages/modplatform/ModpackProviderBasePage.h b/launcher/ui/pages/modplatform/ModpackProviderBasePage.h
new file mode 100644
index 000000000..a3daa9a81
--- /dev/null
+++ b/launcher/ui/pages/modplatform/ModpackProviderBasePage.h
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "ui/pages/BasePage.h"
+
+class ModpackProviderBasePage : public BasePage {
+   public:
+    /** Programatically set the term in the search bar. */
+    virtual void setSearchTerm(QString) = 0;
+    /** Get the current term in the search bar. */
+    [[nodiscard]] virtual QString getSerachTerm() const = 0;
+};
\ No newline at end of file
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index f3c7ff60b..50a170fff 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -31,9 +31,9 @@ QHash<ResourceModel*, bool> ResourceModel::s_running_models;
 ResourceModel::ResourceModel(ResourceAPI* api) : QAbstractListModel(), m_api(api)
 {
     s_running_models.insert(this, true);
-#ifndef LAUNCHER_TEST
-    m_current_info_job.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
-#endif
+    if (APPLICATION_DYN) {
+        m_current_info_job.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
+    }
 }
 
 ResourceModel::~ResourceModel()
@@ -60,11 +60,15 @@ auto ResourceModel::data(const QModelIndex& index, int role) const -> QVariant
             return pack->description;
         }
         case Qt::DecorationRole: {
-            if (auto icon_or_none = const_cast<ResourceModel*>(this)->getIcon(const_cast<QModelIndex&>(index), pack->logoUrl);
-                icon_or_none.has_value())
-                return icon_or_none.value();
-
-            return APPLICATION->getThemedIcon("screenshot-placeholder");
+            if (APPLICATION_DYN) {
+                if (auto icon_or_none = const_cast<ResourceModel*>(this)->getIcon(const_cast<QModelIndex&>(index), pack->logoUrl);
+                    icon_or_none.has_value())
+                    return icon_or_none.value();
+
+                return APPLICATION->getThemedIcon("screenshot-placeholder");
+            } else {
+                return {};
+            }
         }
         case Qt::SizeHintRole:
             return QSize(0, 58);
@@ -317,8 +321,10 @@ std::optional<QIcon> ResourceModel::getIcon(QModelIndex& index, const QUrl& url)
     if (QPixmapCache::find(url.toString(), &pixmap))
         return { pixmap };
 
-    if (!m_current_icon_job)
+    if (!m_current_icon_job) {
         m_current_icon_job.reset(new NetJob("IconJob", APPLICATION->network()));
+        m_current_icon_job->setAskRetry(false);
+    }
 
     if (m_currently_running_icon_actions.contains(url))
         return {};
@@ -331,7 +337,7 @@ std::optional<QIcon> ResourceModel::getIcon(QModelIndex& index, const QUrl& url)
     auto icon_fetch_action = Net::ApiDownload::makeCached(url, cache_entry);
 
     auto full_file_path = cache_entry->getFullPath();
-    connect(icon_fetch_action.get(), &NetAction::succeeded, this, [=] {
+    connect(icon_fetch_action.get(), &Task::succeeded, this, [=] {
         auto icon = QIcon(full_file_path);
         QPixmapCache::insert(url.toString(), icon.pixmap(icon.actualSize({ 64, 64 })));
 
@@ -339,7 +345,7 @@ std::optional<QIcon> ResourceModel::getIcon(QModelIndex& index, const QUrl& url)
 
         emit dataChanged(index, index, { Qt::DecorationRole });
     });
-    connect(icon_fetch_action.get(), &NetAction::failed, this, [=] {
+    connect(icon_fetch_action.get(), &Task::failed, this, [=] {
         m_currently_running_icon_actions.remove(url);
         m_failed_icon_actions.insert(url);
     });
@@ -410,12 +416,17 @@ void ResourceModel::searchRequestSucceeded(QJsonDocument& doc)
         m_search_state = SearchState::CanFetchMore;
     }
 
+    QList<ModPlatform::IndexedPack::Ptr> filteredNewList;
+    for (auto p : newList)
+        if (checkFilters(p))
+            filteredNewList << p;
+
     // When you have a Qt build with assertions turned on, proceeding here will abort the application
-    if (newList.size() == 0)
+    if (filteredNewList.size() == 0)
         return;
 
-    beginInsertRows(QModelIndex(), m_packs.size(), m_packs.size() + newList.size() - 1);
-    m_packs.append(newList);
+    beginInsertRows(QModelIndex(), m_packs.size(), m_packs.size() + filteredNewList.size() - 1);
+    m_packs.append(filteredNewList);
     endInsertRows();
 }
 
@@ -558,4 +569,8 @@ void ResourceModel::removePack(const QString& rem)
         ver.is_currently_selected = false;
 }
 
+bool ResourceModel::checkVersionFilters(const ModPlatform::IndexedVersion& v)
+{
+    return (!optedOut(v));
+}
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourceModel.h b/launcher/ui/pages/modplatform/ResourceModel.h
index 12db49080..4c7ea33a0 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.h
+++ b/launcher/ui/pages/modplatform/ResourceModel.h
@@ -11,6 +11,7 @@
 #include "QObjectPtr.h"
 
 #include "ResourceDownloadTask.h"
+#include "modplatform/ModIndex.h"
 #include "modplatform/ResourceAPI.h"
 
 #include "tasks/ConcurrentTask.h"
@@ -55,6 +56,17 @@ class ResourceModel : public QAbstractListModel {
 
     [[nodiscard]] auto getSortingMethods() const { return m_api->getSortingMethods(); }
 
+    virtual QVariant getInstalledPackVersion(ModPlatform::IndexedPack::Ptr) const { return {}; }
+    /** Whether the version is opted out or not. Currently only makes sense in CF. */
+    virtual bool optedOut(const ModPlatform::IndexedVersion& ver) const
+    {
+        Q_UNUSED(ver);
+        return false;
+    };
+
+    virtual bool checkFilters(ModPlatform::IndexedPack::Ptr) { return true; }
+    virtual bool checkVersionFilters(const ModPlatform::IndexedVersion&);
+
    public slots:
     void fetchMore(const QModelIndex& parent) override;
     // NOTE: Can't use [[nodiscard]] here because of https://bugreports.qt.io/browse/QTBUG-58628 on Qt 5.12
diff --git a/launcher/ui/pages/modplatform/ResourcePackPage.cpp b/launcher/ui/pages/modplatform/ResourcePackPage.cpp
index 2a4d02815..849ea1111 100644
--- a/launcher/ui/pages/modplatform/ResourcePackPage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePackPage.cpp
@@ -15,7 +15,6 @@ namespace ResourceDownload {
 
 ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
-    connect(m_ui->searchButton, &QPushButton::clicked, this, &ResourcePackResourcePage::triggerSearch);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ResourcePackResourcePage::onResourceSelected);
 }
 
@@ -23,6 +22,7 @@ ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialo
 
 void ResourcePackResourcePage::triggerSearch()
 {
+    m_ui->packView->selectionModel()->setCurrentIndex({}, QItemSelectionModel::SelectionFlag::ClearAndSelect);
     m_ui->packView->clearSelection();
     m_ui->packDescription->clear();
     m_ui->versionSelectionBox->clear();
diff --git a/launcher/ui/pages/modplatform/ResourcePackPage.h b/launcher/ui/pages/modplatform/ResourcePackPage.h
index 6015aec0b..440d91ab0 100644
--- a/launcher/ui/pages/modplatform/ResourcePackPage.h
+++ b/launcher/ui/pages/modplatform/ResourcePackPage.h
@@ -40,6 +40,8 @@ class ResourcePackResourcePage : public ResourcePage {
 
     [[nodiscard]] QMap<QString, QString> urlHandlers() const override;
 
+    [[nodiscard]] inline auto helpPage() const -> QString override { return "resourcepack-platform"; }
+
    protected:
     ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance);
 
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index b9c706c6c..dea28d6d5 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -67,11 +68,13 @@ ResourcePage::ResourcePage(ResourceDownloadDialog* parent, BaseInstance& base_in
 
     connect(&m_search_timer, &QTimer::timeout, this, &ResourcePage::triggerSearch);
 
+    // hide progress bar to prevent weird artifact
+    m_fetch_progress.hide();
     m_fetch_progress.hideIfInactive(true);
     m_fetch_progress.setFixedHeight(24);
     m_fetch_progress.progressFormat("");
 
-    m_ui->gridLayout_3->addWidget(&m_fetch_progress, 0, 0, 1, m_ui->gridLayout_3->columnCount());
+    m_ui->verticalLayout->insertWidget(1, &m_fetch_progress);
 
     m_ui->packView->setItemDelegate(new ProjectItemDelegate(this));
     m_ui->packView->installEventFilter(this);
@@ -93,8 +96,10 @@ void ResourcePage::retranslate()
 
 void ResourcePage::openedImpl()
 {
-    if (!supportsFiltering())
+    if (!supportsFiltering()) {
         m_ui->resourceFilterButton->setVisible(false);
+        m_ui->filterWidget->hide();
+    }
 
     //: String in the search bar of the mod downloading dialog
     m_ui->searchEdit->setPlaceholderText(tr("Search for %1...").arg(resourcesString()));
@@ -249,7 +254,10 @@ void ResourcePage::updateSelectionButton()
 
     m_ui->resourceSelectionButton->setEnabled(true);
     if (auto current_pack = getCurrentPack(); current_pack) {
-        if (!current_pack->isVersionSelected(m_selected_version_index))
+        if (current_pack->versionsLoaded && current_pack->versions.empty()) {
+            m_ui->resourceSelectionButton->setEnabled(false);
+            qWarning() << tr("No version available for the selected pack");
+        } else if (!current_pack->isVersionSelected(m_selected_version_index))
             m_ui->resourceSelectionButton->setText(tr("Select %1 for download").arg(resourceString()));
         else
             m_ui->resourceSelectionButton->setText(tr("Deselect %1 for download").arg(resourceString()));
@@ -266,18 +274,21 @@ void ResourcePage::updateVersionList()
     m_ui->versionSelectionBox->clear();
     m_ui->versionSelectionBox->blockSignals(false);
 
-    if (current_pack)
+    if (current_pack) {
+        auto installedVersion = m_model->getInstalledPackVersion(current_pack);
+
         for (int i = 0; i < current_pack->versions.size(); i++) {
             auto& version = current_pack->versions[i];
-            if (optedOut(version))
+            if (!m_model->checkVersionFilters(version))
                 continue;
 
             auto release_type = current_pack->versions[i].version_type.isValid()
                                     ? QString(" [%1]").arg(current_pack->versions[i].version_type.toString())
                                     : "";
-            m_ui->versionSelectionBox->addItem(current_pack->versions[i].version, QVariant(i));
-        }
 
+            m_ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(i));
+        }
+    }
     if (m_ui->versionSelectionBox->count() == 0) {
         m_ui->versionSelectionBox->addItem(tr("No valid version found."), QVariant(-1));
         m_ui->resourceSelectionButton->setText(tr("Cannot select invalid version :("));
@@ -313,14 +324,9 @@ void ResourcePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelI
     updateUi();
 }
 
-void ResourcePage::onVersionSelectionChanged(QString versionData)
+void ResourcePage::onVersionSelectionChanged(int index)
 {
-    if (versionData.isNull() || versionData.isEmpty()) {
-        m_selected_version_index = -1;
-        return;
-    }
-
-    m_selected_version_index = m_ui->versionSelectionBox->currentData().toInt();
+    m_selected_version_index = index;
     updateSelectionButton();
 }
 
@@ -394,7 +400,7 @@ void ResourcePage::openUrl(const QUrl& url)
         }
     }
 
-    if (!page.isNull()) {
+    if (!page.isNull() && !m_do_not_jump_to_mod) {
         const QString slug = match.captured(1);
 
         // ensure the user isn't opening the same mod
@@ -438,4 +444,52 @@ void ResourcePage::openUrl(const QUrl& url)
     QDesktopServices::openUrl(url);
 }
 
+void ResourcePage::openProject(QVariant projectID)
+{
+    m_ui->sortByBox->hide();
+    m_ui->searchEdit->hide();
+    m_ui->resourceFilterButton->hide();
+    m_ui->packView->hide();
+    m_ui->resourceSelectionButton->hide();
+    m_do_not_jump_to_mod = true;
+
+    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+
+    auto okBtn = buttonBox->button(QDialogButtonBox::Ok);
+    okBtn->setDefault(true);
+    okBtn->setAutoDefault(true);
+    okBtn->setText(tr("Reinstall"));
+    okBtn->setShortcut(tr("Ctrl+Return"));
+    okBtn->setEnabled(false);
+
+    auto cancelBtn = buttonBox->button(QDialogButtonBox::Cancel);
+    cancelBtn->setDefault(false);
+    cancelBtn->setAutoDefault(false);
+
+    connect(okBtn, &QPushButton::clicked, this, [this] {
+        onResourceSelected();
+        m_parent_dialog->accept();
+    });
+
+    connect(cancelBtn, &QPushButton::clicked, m_parent_dialog, &ResourceDownloadDialog::reject);
+    m_ui->gridLayout_4->addWidget(buttonBox, 1, 2);
+
+    auto jump = [this, okBtn] {
+        for (int row = 0; row < m_model->rowCount({}); row++) {
+            const QModelIndex index = m_model->index(row);
+            m_ui->packView->setCurrentIndex(index);
+            okBtn->setEnabled(true);
+            return;
+        }
+        m_ui->packDescription->setText(tr("The resource was not found"));
+    };
+
+    m_ui->searchEdit->setText("#" + projectID.toString());
+    triggerSearch();
+
+    if (m_model->hasActiveSearchJob())
+        connect(m_model->activeSearchJob().get(), &Task::finished, jump);
+    else
+        jump();
+}
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourcePage.h b/launcher/ui/pages/modplatform/ResourcePage.h
index 235b44412..b625240eb 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.h
+++ b/launcher/ui/pages/modplatform/ResourcePage.h
@@ -83,11 +83,13 @@ class ResourcePage : public QWidget, public BasePage {
     QList<DownloadTaskPtr> selectedPacks() { return m_model->selectedPacks(); }
     bool hasSelectedPacks() { return !(m_model->selectedPacks().isEmpty()); }
 
+    virtual void openProject(QVariant projectID);
+
    protected slots:
-    virtual void triggerSearch() {}
+    virtual void triggerSearch() = 0;
 
     void onSelectionChanged(QModelIndex first, QModelIndex second);
-    void onVersionSelectionChanged(QString data);
+    void onVersionSelectionChanged(int index);
     void onResourceSelected();
 
     // NOTE: Can't use [[nodiscard]] here because of https://bugreports.qt.io/browse/QTBUG-58628 on Qt 5.12
@@ -96,13 +98,6 @@ class ResourcePage : public QWidget, public BasePage {
     virtual QMap<QString, QString> urlHandlers() const = 0;
     virtual void openUrl(const QUrl&);
 
-    /** Whether the version is opted out or not. Currently only makes sense in CF. */
-    virtual bool optedOut(ModPlatform::IndexedVersion& ver) const
-    {
-        Q_UNUSED(ver);
-        return false;
-    };
-
    public:
     BaseInstance& m_base_instance;
 
@@ -118,6 +113,8 @@ class ResourcePage : public QWidget, public BasePage {
 
     // Used to do instant searching with a delay to cache quick changes
     QTimer m_search_timer;
+
+    bool m_do_not_jump_to_mod = false;
 };
 
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourcePage.ui b/launcher/ui/pages/modplatform/ResourcePage.ui
index 73a9d3b1a..491e7d9f0 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.ui
+++ b/launcher/ui/pages/modplatform/ResourcePage.ui
@@ -10,48 +10,55 @@
     <height>685</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0" colspan="4">
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="1" column="2">
-      <widget class="ProjectDescriptionPage" name="packDescription">
-       <property name="openExternalLinks">
-        <bool>false</bool>
-       </property>
-       <property name="openLinks">
-        <bool>false</bool>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="resourceFilterButton">
+       <property name="text">
+        <string>Filter options</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QListView" name="packView">
-       <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="alternatingRowColors">
-        <bool>true</bool>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>48</width>
-         <height>48</height>
-        </size>
-       </property>
-      </widget>
+     <item>
+      <widget class="QLineEdit" name="searchEdit"/>
      </item>
     </layout>
    </item>
-   <item row="0" column="3">
-    <widget class="QPushButton" name="searchButton">
-     <property name="text">
-      <string>Search</string>
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="childrenCollapsible">
+      <bool>false</bool>
      </property>
+     <widget class="QWidget" name="filterWidget" native="true"/>
+     <widget class="QListView" name="packView">
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>48</width>
+        <height>48</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="ProjectDescriptionPage" name="packDescription">
+      <property name="openExternalLinks">
+       <bool>false</bool>
+      </property>
+      <property name="openLinks">
+       <bool>false</bool>
+      </property>
+     </widget>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLineEdit" name="searchEdit"/>
-   </item>
-   <item row="2" column="0" colspan="4">
+   <item>
     <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0">
      <item row="0" column="2">
       <widget class="QComboBox" name="versionSelectionBox"/>
@@ -74,20 +81,6 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1">
-    <widget class="QPushButton" name="resourceFilterButton">
-     <property name="text">
-      <string>Filter options</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -98,8 +91,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>searchEdit</tabstop>
-  <tabstop>searchButton</tabstop>
   <tabstop>packView</tabstop>
   <tabstop>packDescription</tabstop>
   <tabstop>sortByBox</tabstop>
diff --git a/launcher/ui/pages/modplatform/ShaderPackPage.cpp b/launcher/ui/pages/modplatform/ShaderPackPage.cpp
index 586dffc55..ebd8d4ea2 100644
--- a/launcher/ui/pages/modplatform/ShaderPackPage.cpp
+++ b/launcher/ui/pages/modplatform/ShaderPackPage.cpp
@@ -16,7 +16,6 @@ namespace ResourceDownload {
 
 ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
 {
-    connect(m_ui->searchButton, &QPushButton::clicked, this, &ShaderPackResourcePage::triggerSearch);
     connect(m_ui->packView, &QListView::doubleClicked, this, &ShaderPackResourcePage::onResourceSelected);
 }
 
@@ -24,6 +23,7 @@ ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog,
 
 void ShaderPackResourcePage::triggerSearch()
 {
+    m_ui->packView->selectionModel()->setCurrentIndex({}, QItemSelectionModel::SelectionFlag::ClearAndSelect);
     m_ui->packView->clearSelection();
     m_ui->packDescription->clear();
     m_ui->versionSelectionBox->clear();
diff --git a/launcher/ui/pages/modplatform/ShaderPackPage.h b/launcher/ui/pages/modplatform/ShaderPackPage.h
index c29317e15..4b92c33dc 100644
--- a/launcher/ui/pages/modplatform/ShaderPackPage.h
+++ b/launcher/ui/pages/modplatform/ShaderPackPage.h
@@ -42,6 +42,8 @@ class ShaderPackResourcePage : public ResourcePage {
 
     [[nodiscard]] QMap<QString, QString> urlHandlers() const override;
 
+    [[nodiscard]] inline auto helpPage() const -> QString override { return "shaderpack-platform"; }
+
    protected:
     ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance);
 
diff --git a/launcher/ui/pages/modplatform/TexturePackModel.cpp b/launcher/ui/pages/modplatform/TexturePackModel.cpp
index fa6369514..cb4cafd41 100644
--- a/launcher/ui/pages/modplatform/TexturePackModel.cpp
+++ b/launcher/ui/pages/modplatform/TexturePackModel.cpp
@@ -17,9 +17,9 @@ TexturePackResourceModel::TexturePackResourceModel(BaseInstance const& inst, Res
 {
     if (!m_version_list->isLoaded()) {
         qDebug() << "Loading version list...";
-        auto task = m_version_list->getLoadTask();
-        if (!task->isRunning())
-            task->start();
+        m_task = m_version_list->getLoadTask();
+        if (!m_task->isRunning())
+            m_task->start();
     }
 }
 
@@ -35,7 +35,8 @@ void waitOnVersionListLoad(Meta::VersionList::Ptr version_list)
 
     auto task = version_list->getLoadTask();
     QObject::connect(task.get(), &Task::finished, &load_version_list_loop, &QEventLoop::quit);
-
+    if (!task->isRunning())
+        task->start();
     load_version_list_loop.exec();
     if (time_limit_for_list_load.isActive())
         time_limit_for_list_load.stop();
diff --git a/launcher/ui/pages/modplatform/TexturePackModel.h b/launcher/ui/pages/modplatform/TexturePackModel.h
index bb2db5cfc..607a03be3 100644
--- a/launcher/ui/pages/modplatform/TexturePackModel.h
+++ b/launcher/ui/pages/modplatform/TexturePackModel.h
@@ -22,6 +22,7 @@ class TexturePackResourceModel : public ResourcePackResourceModel {
 
    protected:
     Meta::VersionList::Ptr m_version_list;
+    Task::Ptr m_task;
 };
 
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/TexturePackPage.h b/launcher/ui/pages/modplatform/TexturePackPage.h
index 948e5286b..42aa921c5 100644
--- a/launcher/ui/pages/modplatform/TexturePackPage.h
+++ b/launcher/ui/pages/modplatform/TexturePackPage.h
@@ -41,7 +41,6 @@ class TexturePackResourcePage : public ResourcePackResourcePage {
    protected:
     TexturePackResourcePage(TexturePackDownloadDialog* dialog, BaseInstance& instance) : ResourcePackResourcePage(dialog, instance)
     {
-        connect(m_ui->searchButton, &QPushButton::clicked, this, &TexturePackResourcePage::triggerSearch);
         connect(m_ui->packView, &QListView::doubleClicked, this, &TexturePackResourcePage::onResourceSelected);
     }
 };
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
index d46b97af1..f116ca915 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
@@ -195,6 +195,7 @@ void ListModel::requestLogo(QString file, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(file));
     auto job = new NetJob(QString("ATLauncher Icon Download %1").arg(file), APPLICATION->network());
+    job->setAskRetry(false);
     job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
index d79b7621a..7c69b315e 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
@@ -164,3 +164,13 @@ void AtlPage::onVersionSelectionChanged(QString version)
     selectedVersion = version;
     suggestCurrent();
 }
+
+void AtlPage::setSearchTerm(QString term)
+{
+    ui->searchEdit->setText(term);
+}
+
+QString AtlPage::getSerachTerm() const
+{
+    return ui->searchEdit->text();
+}
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
index 6bc449649..73460232b 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
@@ -42,8 +42,7 @@
 #include <QWidget>
 
 #include "Application.h"
-#include "tasks/Task.h"
-#include "ui/pages/BasePage.h"
+#include "ui/pages/modplatform/ModpackProviderBasePage.h"
 
 namespace Ui {
 class AtlPage;
@@ -51,7 +50,7 @@ class AtlPage;
 
 class NewInstanceDialog;
 
-class AtlPage : public QWidget, public BasePage {
+class AtlPage : public QWidget, public ModpackProviderBasePage {
     Q_OBJECT
 
    public:
@@ -66,6 +65,11 @@ class AtlPage : public QWidget, public BasePage {
 
     void openedImpl() override;
 
+    /** Programatically set the term in the search bar. */
+    virtual void setSearchTerm(QString) override;
+    /** Get the current term in the search bar. */
+    [[nodiscard]] virtual QString getSerachTerm() const override;
+
    private:
     void suggestCurrent();
 
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui b/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui
index 8b6747331..0b1411b96 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui
@@ -10,30 +10,51 @@
     <height>685</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="0" colspan="2">
-    <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0" rowminimumheight="0" columnminimumwidth="0,0,0">
-     <item row="0" column="2">
-      <widget class="QComboBox" name="versionSelectionBox"/>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Version selected:</string>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <italic>true</italic>
+      </font>
+     </property>
+     <property name="text">
+      <string>Warning: This is still a work in progress. If you run into issues with the imported modpack, it may be a bug.</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="searchEdit">
+     <property name="placeholderText">
+      <string>Search and filter...</string>
+     </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QTreeView" name="packView">
+       <property name="alternatingRowColors">
+        <bool>true</bool>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       <property name="iconSize">
+        <size>
+         <width>96</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="0" column="0">
-      <widget class="QComboBox" name="sortByBox"/>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="1" column="1">
+     <item>
       <widget class="QTextBrowser" name="packDescription">
        <property name="openExternalLinks">
         <bool>true</bool>
@@ -43,56 +64,28 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QTreeView" name="packView">
-       <property name="alternatingRowColors">
-        <bool>true</bool>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QComboBox" name="sortByBox"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Version selected:</string>
        </property>
-       <property name="iconSize">
-        <size>
-         <width>96</width>
-         <height>48</height>
-        </size>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QComboBox" name="versionSelectionBox"/>
+     </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="QLineEdit" name="searchEdit">
-     <property name="placeholderText">
-      <string>Search and filter...</string>
-     </property>
-     <property name="clearButtonEnabled">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Search</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label_2">
-     <property name="font">
-      <font>
-       <italic>true</italic>
-      </font>
-     </property>
-     <property name="text">
-      <string>Warning: This is still a work in progress. If you run into issues with the imported modpack, it may be a bug.</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <tabstops>
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
index 3b266bcef..cfdb185ff 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
@@ -1,6 +1,7 @@
 #include "FlameModel.h"
 #include <Json.h>
 #include "Application.h"
+#include "modplatform/ModIndex.h"
 #include "modplatform/ResourceAPI.h"
 #include "modplatform/flame/FlameAPI.h"
 #include "ui/widgets/ProjectItem.h"
@@ -110,6 +111,7 @@ void ListModel::requestLogo(QString logo, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo));
     auto job = new NetJob(QString("Flame Icon Download %1").arg(logo), APPLICATION->network());
+    job->setAskRetry(false);
     job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
@@ -172,7 +174,7 @@ void ListModel::performPaginatedSearch()
             callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
             callbacks.on_abort = [this] {
                 qCritical() << "Search task aborted by an unknown reason!";
-                searchRequestFailed("Abborted");
+                searchRequestFailed("Aborted");
             };
             static const FlameAPI api;
             if (auto job = api.getProjectInfo({ projectId }, std::move(callbacks)); job) {
@@ -182,34 +184,28 @@ void ListModel::performPaginatedSearch()
             return;
         }
     }
+    ResourceAPI::SortingMethod sort{};
+    sort.index = currentSort + 1;
+
     auto netJob = makeShared<NetJob>("Flame::Search", APPLICATION->network());
-    auto searchUrl = QString(
-                         "https://api.curseforge.com/v1/mods/search?"
-                         "gameId=432&"
-                         "classId=4471&"
-                         "index=%1&"
-                         "pageSize=25&"
-                         "searchFilter=%2&"
-                         "sortField=%3&"
-                         "sortOrder=desc")
-                         .arg(nextSearchOffset)
-                         .arg(currentSearchTerm)
-                         .arg(currentSort + 1);
-
-    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), response));
+    auto searchUrl = FlameAPI().getSearchURL({ ModPlatform::ResourceType::MODPACK, nextSearchOffset, currentSearchTerm, sort,
+                                               m_filter->loaders, m_filter->versions, "", m_filter->categoryIds });
+
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl.value()), response));
     jobPtr = netJob;
     jobPtr->start();
     QObject::connect(netJob.get(), &NetJob::succeeded, this, &ListModel::searchRequestFinished);
     QObject::connect(netJob.get(), &NetJob::failed, this, &ListModel::searchRequestFailed);
 }
 
-void ListModel::searchWithTerm(const QString& term, int sort)
+void ListModel::searchWithTerm(const QString& term, int sort, std::shared_ptr<ModFilterWidget::Filter> filter, bool filterChanged)
 {
-    if (currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort) {
+    if (currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort && !filterChanged) {
         return;
     }
     currentSearchTerm = term;
     currentSort = sort;
+    m_filter = filter;
     if (hasActiveSearchJob()) {
         jobPtr->abort();
         searchState = ResetRequested;
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.h b/launcher/ui/pages/modplatform/flame/FlameModel.h
index 9b6d70fec..026f6d1ee 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.h
@@ -14,6 +14,7 @@
 
 #include <net/NetJob.h>
 #include <functional>
+#include "ui/widgets/ModFilterWidget.h"
 
 #include <modplatform/flame/FlamePackIndex.h>
 
@@ -38,7 +39,7 @@ class ListModel : public QAbstractListModel {
     void fetchMore(const QModelIndex& parent) override;
 
     void getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback);
-    void searchWithTerm(const QString& term, int sort);
+    void searchWithTerm(const QString& term, int sort, std::shared_ptr<ModFilterWidget::Filter> filter, bool filterChanged);
 
     [[nodiscard]] bool hasActiveSearchJob() const { return jobPtr && jobPtr->isRunning(); }
     [[nodiscard]] Task::Ptr activeSearchJob() { return hasActiveSearchJob() ? jobPtr : nullptr; }
@@ -65,6 +66,7 @@ class ListModel : public QAbstractListModel {
 
     QString currentSearchTerm;
     int currentSort = 0;
+    std::shared_ptr<ModFilterWidget::Filter> m_filter;
     int nextSearchOffset = 0;
     enum SearchState { None, CanPossiblyFetchMore, ResetRequested, Finished } searchState = None;
     Task::Ptr jobPtr;
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
index d3473412a..9abf4a9c6 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
@@ -34,10 +34,14 @@
  */
 
 #include "FlamePage.h"
+#include "Version.h"
+#include "modplatform/flame/FlamePackIndex.h"
 #include "ui/dialogs/CustomMessageBox.h"
+#include "ui/widgets/ModFilterWidget.h"
 #include "ui_FlamePage.h"
 
 #include <QKeyEvent>
+#include <memory>
 
 #include "Application.h"
 #include "FlameModel.h"
@@ -56,7 +60,6 @@ FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent)
     : QWidget(parent), ui(new Ui::FlamePage), dialog(dialog), m_fetch_progress(this, false)
 {
     ui->setupUi(this);
-    connect(ui->searchButton, &QPushButton::clicked, this, &FlamePage::triggerSearch);
     ui->searchEdit->installEventFilter(this);
     listModel = new Flame::ListModel(this);
     ui->packView->setModel(listModel);
@@ -73,7 +76,7 @@ FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent)
     m_fetch_progress.setFixedHeight(24);
     m_fetch_progress.progressFormat("");
 
-    ui->gridLayout->addWidget(&m_fetch_progress, 2, 0, 1, ui->gridLayout->columnCount());
+    ui->verticalLayout->insertWidget(2, &m_fetch_progress);
 
     // index is used to set the sorting with the curseforge api
     ui->sortByBox->addItem(tr("Sort by Featured"));
@@ -85,10 +88,11 @@ FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent)
 
     connect(ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlamePage::onSelectionChanged);
-    connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlamePage::onVersionSelectionChanged);
+    connect(ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FlamePage::onVersionSelectionChanged);
 
     ui->packView->setItemDelegate(new ProjectItemDelegate(this));
     ui->packDescription->setMetaEntry("FlamePacks");
+    createFilterWidget();
 }
 
 FlamePage::~FlamePage()
@@ -132,10 +136,25 @@ void FlamePage::openedImpl()
 
 void FlamePage::triggerSearch()
 {
-    listModel->searchWithTerm(ui->searchEdit->text(), ui->sortByBox->currentIndex());
+    ui->packView->selectionModel()->setCurrentIndex({}, QItemSelectionModel::SelectionFlag::ClearAndSelect);
+    ui->packView->clearSelection();
+    ui->packDescription->clear();
+    ui->versionSelectionBox->clear();
+    listModel->searchWithTerm(ui->searchEdit->text(), ui->sortByBox->currentIndex(), m_filterWidget->getFilter(),
+                              m_filterWidget->changed());
     m_fetch_progress.watch(listModel->activeSearchJob().get());
 }
 
+bool checkVersionFilters(const Flame::IndexedVersion& v, std::shared_ptr<ModFilterWidget::Filter> filter)
+{
+    if (!filter)
+        return true;
+    return ((!filter->loaders || !v.loaders || filter->loaders & v.loaders) &&  // loaders
+            (filter->releases.empty() ||                                        // releases
+             std::find(filter->releases.cbegin(), filter->releases.cend(), v.version_type) != filter->releases.cend()) &&
+            filter->checkMcVersions({ v.mcVersion }));  // mcVersions}
+}
+
 void FlamePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelIndex prev)
 {
     ui->versionSelectionBox->clear();
@@ -149,7 +168,7 @@ void FlamePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelInde
 
     current = listModel->data(curr, Qt::UserRole).value<Flame::IndexedPack>();
 
-    if (current.versionsLoaded == false) {
+    if (!current.versionsLoaded || m_filterWidget->changed()) {
         qDebug() << "Loading flame modpack versions";
         auto netJob = new NetJob(QString("Flame::PackVersions(%1)").arg(current.name), APPLICATION->network());
         auto response = std::make_shared<QByteArray>();
@@ -177,9 +196,23 @@ void FlamePage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelInde
                 qWarning() << "Error while reading flame modpack version: " << e.cause();
             }
 
+            auto pred = [this](const Flame::IndexedVersion& v) { return !checkVersionFilters(v, m_filterWidget->getFilter()); };
+#if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
+            current.versions.removeIf(pred);
+#else
+    for (auto it = current.versions.begin(); it != current.versions.end();)
+        if (pred(*it))
+            it = current.versions.erase(it);
+        else
+            ++it;
+#endif
             for (auto version : current.versions) {
                 auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
-                ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(version.downloadUrl));
+                auto mcVersion = !version.mcVersion.isEmpty() && !version.version.contains(version.mcVersion)
+                                     ? QString(" for %1").arg(version.mcVersion)
+                                     : "";
+                ui->versionSelectionBox->addItem(QString("%1%2%3").arg(version.version, mcVersion, release_type),
+                                                 QVariant(version.downloadUrl));
             }
 
             QVariant current_updated;
@@ -237,17 +270,17 @@ void FlamePage::suggestCurrent()
                        [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
 }
 
-void FlamePage::onVersionSelectionChanged(QString version)
+void FlamePage::onVersionSelectionChanged(int index)
 {
     bool is_blocked = false;
     ui->versionSelectionBox->currentData().toInt(&is_blocked);
 
-    if (version.isNull() || version.isEmpty() || is_blocked) {
+    if (index == -1 || is_blocked) {
         m_selected_version_index = -1;
         return;
     }
 
-    m_selected_version_index = ui->versionSelectionBox->currentIndex();
+    m_selected_version_index = index;
 
     Q_ASSERT(current.versions.at(m_selected_version_index).downloadUrl == ui->versionSelectionBox->currentData().toString());
 
@@ -296,3 +329,34 @@ void FlamePage::updateUi()
     ui->packDescription->setHtml(StringUtils::htmlListPatch(text + current.description));
     ui->packDescription->flush();
 }
+QString FlamePage::getSerachTerm() const
+{
+    return ui->searchEdit->text();
+}
+
+void FlamePage::setSearchTerm(QString term)
+{
+    ui->searchEdit->setText(term);
+}
+
+void FlamePage::createFilterWidget()
+{
+    auto widget = ModFilterWidget::create(nullptr, false, this);
+    m_filterWidget.swap(widget);
+    auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
+    // because we replaced the widget we also need to delete it
+    if (old) {
+        delete old;
+    }
+
+    connect(ui->filterButton, &QPushButton::clicked, this, [this] { m_filterWidget->setHidden(!m_filterWidget->isHidden()); });
+
+    connect(m_filterWidget.get(), &ModFilterWidget::filterChanged, this, &FlamePage::triggerSearch);
+    auto response = std::make_shared<QByteArray>();
+    m_categoriesTask = FlameAPI::getCategories(response, ModPlatform::ResourceType::MODPACK);
+    QObject::connect(m_categoriesTask.get(), &Task::succeeded, [this, response]() {
+        auto categories = FlameAPI::loadModCategories(response);
+        m_filterWidget->setCategories(categories);
+    });
+    m_categoriesTask->start();
+}
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.h b/launcher/ui/pages/modplatform/flame/FlamePage.h
index d35858fbc..27c96d2f1 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.h
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.h
@@ -40,7 +40,8 @@
 #include <Application.h>
 #include <modplatform/flame/FlamePackIndex.h>
 #include <QTimer>
-#include "ui/pages/BasePage.h"
+#include "ui/pages/modplatform/ModpackProviderBasePage.h"
+#include "ui/widgets/ModFilterWidget.h"
 #include "ui/widgets/ProgressWidget.h"
 
 namespace Ui {
@@ -53,7 +54,7 @@ namespace Flame {
 class ListModel;
 }
 
-class FlamePage : public QWidget, public BasePage {
+class FlamePage : public QWidget, public ModpackProviderBasePage {
     Q_OBJECT
 
    public:
@@ -72,13 +73,19 @@ class FlamePage : public QWidget, public BasePage {
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
+    /** Programatically set the term in the search bar. */
+    virtual void setSearchTerm(QString) override;
+    /** Get the current term in the search bar. */
+    [[nodiscard]] virtual QString getSerachTerm() const override;
+
    private:
     void suggestCurrent();
 
    private slots:
     void triggerSearch();
     void onSelectionChanged(QModelIndex first, QModelIndex second);
-    void onVersionSelectionChanged(QString data);
+    void onVersionSelectionChanged(int index);
+    void createFilterWidget();
 
    private:
     Ui::FlamePage* ui = nullptr;
@@ -92,4 +99,7 @@ class FlamePage : public QWidget, public BasePage {
 
     // Used to do instant searching with a delay to cache quick changes
     QTimer m_search_timer;
+
+    unique_qobject_ptr<ModFilterWidget> m_filterWidget;
+    Task::Ptr m_categoriesTask;
 };
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.ui b/launcher/ui/pages/modplatform/flame/FlamePage.ui
index f9e1fe67f..b028e7569 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.ui
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.ui
@@ -10,8 +10,8 @@
     <height>600</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <widget class="QLabel" name="label_2">
      <property name="font">
       <font>
@@ -29,8 +29,8 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLineEdit" name="searchEdit">
        <property name="placeholderText">
@@ -39,45 +39,51 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="searchButton">
+      <widget class="QPushButton" name="filterButton">
        <property name="text">
-        <string>Search</string>
+        <string>Filter</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QListView" name="packView">
-       <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="alternatingRowColors">
-        <bool>true</bool>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>48</width>
-         <height>48</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="ProjectDescriptionPage" name="packDescription">
-       <property name="openExternalLinks">
-        <bool>true</bool>
-       </property>
-       <property name="openLinks">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QWidget" name="widget" native="true"/>
+     <widget class="QListView" name="packView">
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>48</width>
+        <height>48</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="ProjectDescriptionPage" name="packDescription">
+      <property name="openExternalLinks">
+       <bool>true</bool>
+      </property>
+      <property name="openLinks">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </widget>
    </item>
-   <item row="4" column="0">
+   <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="QComboBox" name="sortByBox"/>
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
index 7d18e72a6..ae4562be4 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
@@ -6,11 +6,17 @@
 
 #include "Json.h"
 
+#include "minecraft/PackProfile.h"
 #include "modplatform/flame/FlameAPI.h"
 #include "modplatform/flame/FlameModIndex.h"
 
 namespace ResourceDownload {
 
+static bool isOptedOut(const ModPlatform::IndexedVersion& ver)
+{
+    return ver.downloadUrl.isEmpty();
+}
+
 FlameModModel::FlameModModel(BaseInstance& base) : ModModel(base, new FlameAPI) {}
 
 void FlameModModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
@@ -34,6 +40,11 @@ auto FlameModModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJs
     return FlameMod::loadDependencyVersions(m, arr, &m_base_instance);
 }
 
+bool FlameModModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameModModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -57,6 +68,11 @@ void FlameResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m
     FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
+bool FlameResourcePackModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameResourcePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -116,6 +132,11 @@ ResourceAPI::VersionSearchArgs FlameTexturePackModel::createVersionsArguments(QM
     return args;
 }
 
+bool FlameTexturePackModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameTexturePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -139,6 +160,11 @@ void FlameShaderPackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m,
     FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
+bool FlameShaderPackModel::optedOut(const ModPlatform::IndexedVersion& ver) const
+{
+    return isOptedOut(ver);
+}
+
 auto FlameShaderPackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.h b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
index 76dbd7b3d..458fd85d0 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
+++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
@@ -17,6 +17,8 @@ class FlameModModel : public ModModel {
     FlameModModel(BaseInstance&);
     ~FlameModModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
@@ -36,6 +38,8 @@ class FlameResourcePackModel : public ResourcePackResourceModel {
     FlameResourcePackModel(const BaseInstance&);
     ~FlameResourcePackModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
@@ -54,6 +58,8 @@ class FlameTexturePackModel : public TexturePackResourceModel {
     FlameTexturePackModel(const BaseInstance&);
     ~FlameTexturePackModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
@@ -75,6 +81,8 @@ class FlameShaderPackModel : public ShaderPackResourceModel {
     FlameShaderPackModel(const BaseInstance&);
     ~FlameShaderPackModel() override = default;
 
+    bool optedOut(const ModPlatform::IndexedVersion& ver) const override;
+
    private:
     [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
     [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp b/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
index 23373ec9d..ce8c03fa1 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,6 +38,10 @@
  */
 
 #include "FlameResourcePages.h"
+#include <QList>
+#include <memory>
+#include "modplatform/ModIndex.h"
+#include "modplatform/flame/FlameAPI.h"
 #include "ui_ResourcePage.h"
 
 #include "FlameResourceModels.h"
@@ -44,11 +49,6 @@
 
 namespace ResourceDownload {
 
-static bool isOptedOut(ModPlatform::IndexedVersion const& ver)
-{
-    return ver.downloadUrl.isEmpty();
-}
-
 FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ModPage(dialog, instance)
 {
     m_model = new FlameModModel(instance);
@@ -60,25 +60,12 @@ FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance) :
     // so it's best not to connect them in the parent's contructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlameModPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlameModPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FlameModPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &FlameModPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver,
-                                   QString mineVer,
-                                   std::optional<ModPlatform::ModLoaderTypes> loaders) const -> bool
-{
-    return ver.mcVersion.contains(mineVer) && !ver.downloadUrl.isEmpty() &&
-           (!loaders.has_value() || !ver.loaders || loaders.value() & ver.loaders);
-}
-
-bool FlameModPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameModPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -107,17 +94,13 @@ FlameResourcePackPage::FlameResourcePackPage(ResourcePackDownloadDialog* dialog,
     // so it's best not to connect them in the parent's contructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlameResourcePackPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlameResourcePackPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &FlameResourcePackPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &FlameResourcePackPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-bool FlameResourcePackPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameResourcePackPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -146,17 +129,13 @@ FlameTexturePackPage::FlameTexturePackPage(TexturePackDownloadDialog* dialog, Ba
     // so it's best not to connect them in the parent's contructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlameTexturePackPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlameTexturePackPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &FlameTexturePackPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &FlameTexturePackPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-bool FlameTexturePackPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameTexturePackPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -185,17 +164,13 @@ FlameShaderPackPage::FlameShaderPackPage(ShaderPackDownloadDialog* dialog, BaseI
     // so it's best not to connect them in the parent's constructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlameShaderPackPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlameShaderPackPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &FlameShaderPackPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &FlameShaderPackPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-bool FlameShaderPackPage::optedOut(ModPlatform::IndexedVersion& ver) const
-{
-    return isOptedOut(ver);
-}
-
 void FlameShaderPackPage::openUrl(const QUrl& url)
 {
     if (url.scheme().isEmpty()) {
@@ -232,4 +207,19 @@ auto FlameShaderPackPage::shouldDisplay() const -> bool
     return true;
 }
 
+unique_qobject_ptr<ModFilterWidget> FlameModPage::createFilterWidget()
+{
+    return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_base_instance), false, this);
+}
+
+void FlameModPage::prepareProviderCategories()
+{
+    auto response = std::make_shared<QByteArray>();
+    m_categoriesTask = FlameAPI::getModCategories(response);
+    QObject::connect(m_categoriesTask.get(), &Task::succeeded, [this, response]() {
+        auto categories = FlameAPI::loadModCategories(response);
+        m_filter_widget->setCategories(categories);
+    });
+    m_categoriesTask->start();
+};
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourcePages.h b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
index f2f5cecad..052706549 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
@@ -5,6 +5,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -94,12 +95,14 @@ class FlameModPage : public ModPage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    bool validateVersion(ModPlatform::IndexedVersion& ver,
-                         QString mineVer,
-                         std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const override;
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
+    unique_qobject_ptr<ModFilterWidget> createFilterWidget() override;
+
+   protected:
+    virtual void prepareProviderCategories() override;
+
+   private:
+    Task::Ptr m_categoriesTask;
 };
 
 class FlameResourcePackPage : public ResourcePackResourcePage {
@@ -124,8 +127,6 @@ class FlameResourcePackPage : public ResourcePackResourcePage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return ""; }
 
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
 };
 
@@ -151,8 +152,6 @@ class FlameTexturePackPage : public TexturePackResourcePage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return ""; }
 
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
 };
 
@@ -178,8 +177,6 @@ class FlameShaderPackPage : public ShaderPackResourcePage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return ""; }
 
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
-
     void openUrl(const QUrl& url) override;
 };
 
diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
index db59fe10a..15303bb22 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
@@ -135,4 +135,13 @@ void ImportFTBPage::triggerSearch()
     currentModel->setSearchTerm(ui->searchEdit->text());
 }
 
+void ImportFTBPage::setSearchTerm(QString term)
+{
+    ui->searchEdit->setText(term);
+}
+
+QString ImportFTBPage::getSerachTerm() const
+{
+    return ui->searchEdit->text();
+}
 }  // namespace FTBImportAPP
diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
index 8e9661272..7afff5a9d 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
@@ -25,7 +25,7 @@
 
 #include <Application.h>
 #include "modplatform/import_ftb/PackHelpers.h"
-#include "ui/pages/BasePage.h"
+#include "ui/pages/modplatform/ModpackProviderBasePage.h"
 #include "ui/pages/modplatform/import_ftb/ListModel.h"
 
 class NewInstanceDialog;
@@ -35,7 +35,7 @@ namespace Ui {
 class ImportFTBPage;
 }
 
-class ImportFTBPage : public QWidget, public BasePage {
+class ImportFTBPage : public QWidget, public ModpackProviderBasePage {
     Q_OBJECT
 
    public:
@@ -44,11 +44,16 @@ class ImportFTBPage : public QWidget, public BasePage {
     QString displayName() const override { return tr("FTB App Import"); }
     QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
     QString id() const override { return "import_ftb"; }
-    QString helpPage() const override { return "FTB-platform"; }
+    QString helpPage() const override { return "FTB-import"; }
     bool shouldDisplay() const override { return true; }
     void openedImpl() override;
     void retranslate() override;
 
+    /** Programatically set the term in the search bar. */
+    virtual void setSearchTerm(QString) override;
+    /** Get the current term in the search bar. */
+    [[nodiscard]] virtual QString getSerachTerm() const override;
+
    private:
     void suggestCurrent();
     void onPackSelectionChanged(Modpack* pack = nullptr);
diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui
index 6613a5939..18c604ca4 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui
@@ -10,45 +10,18 @@
     <height>1011</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="1">
-    <widget class="QTreeView" name="modpackList">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Note: If your FTB instances are not in the default location, select it using the button next to search.</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QComboBox" name="sortByBox">
-       <property name="minimumSize">
-        <size>
-         <width>265</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="1">
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLineEdit" name="searchEdit">
@@ -60,13 +33,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="pushButton">
-       <property name="text">
-        <string>Search</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="browseButton">
        <property name="toolTip">
@@ -86,16 +52,43 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Note: If your FTB instances are not in the default location, select it using the button next to search.</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+   <item>
+    <widget class="QTreeView" name="modpackList">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
      </property>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QComboBox" name="sortByBox">
+       <property name="minimumSize">
+        <size>
+         <width>265</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index 49666cf6e..98922123c 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -264,6 +264,7 @@ void ListModel::requestLogo(QString file)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file));
     NetJob* job = new NetJob(QString("FTB Icon Download for %1").arg(file), APPLICATION->network());
+    job->setAskRetry(false);
     job->addNetAction(Net::ApiDownload::makeCached(QUrl(QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
 
     auto fullPath = entry->getFullPath();
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
index a587b5baf..226a30ee3 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
@@ -369,4 +369,13 @@ void Page::triggerSearch()
     currentModel->setSearchTerm(ui->searchEdit->text());
 }
 
+void Page::setSearchTerm(QString term)
+{
+    ui->searchEdit->setText(term);
+}
+
+QString Page::getSerachTerm() const
+{
+    return ui->searchEdit->text();
+}
 }  // namespace LegacyFTB
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.h b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
index 4d317b7c0..a2dee24e9 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
@@ -43,7 +43,7 @@
 #include "QObjectPtr.h"
 #include "modplatform/legacy_ftb/PackFetchTask.h"
 #include "modplatform/legacy_ftb/PackHelpers.h"
-#include "ui/pages/BasePage.h"
+#include "ui/pages/modplatform/ModpackProviderBasePage.h"
 
 class NewInstanceDialog;
 
@@ -57,7 +57,7 @@ class ListModel;
 class FilterModel;
 class PrivatePackManager;
 
-class Page : public QWidget, public BasePage {
+class Page : public QWidget, public ModpackProviderBasePage {
     Q_OBJECT
 
    public:
@@ -66,11 +66,16 @@ class Page : public QWidget, public BasePage {
     QString displayName() const override { return "FTB Legacy"; }
     QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
     QString id() const override { return "legacy_ftb"; }
-    QString helpPage() const override { return "FTB-platform"; }
+    QString helpPage() const override { return "FTB-legacy"; }
     bool shouldDisplay() const override;
     void openedImpl() override;
     void retranslate() override;
 
+    /** Programatically set the term in the search bar. */
+    virtual void setSearchTerm(QString) override;
+    /** Get the current term in the search bar. */
+    [[nodiscard]] virtual QString getSerachTerm() const override;
+
    private:
     void suggestCurrent();
     void onPackSelectionChanged(Modpack* pack = nullptr);
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.ui b/launcher/ui/pages/modplatform/legacy_ftb/Page.ui
index 56cba7485..544ad77d3 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.ui
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.ui
@@ -10,8 +10,8 @@
     <height>602</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_5">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLineEdit" name="searchEdit">
@@ -23,16 +23,9 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="pushButton">
-       <property name="text">
-        <string>Search</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -134,9 +127,19 @@
      </widget>
     </widget>
    </item>
-   <item row="5" column="0">
-    <layout class="QGridLayout" name="gridLayout_4">
-     <item row="0" column="1">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QComboBox" name="sortByBox">
+       <property name="minimumSize">
+        <size>
+         <width>265</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Version selected:</string>
@@ -146,19 +149,9 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
+     <item>
       <widget class="QComboBox" name="versionSelectionBox"/>
      </item>
-     <item row="0" column="0">
-      <widget class="QComboBox" name="sortByBox">
-       <property name="minimumSize">
-        <size>
-         <width>265</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index bac294b60..417ff4080 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -152,33 +152,26 @@ void ModpackListModel::performPaginatedSearch()
             return;
         }
     }  // TODO: Move to standalone API
+    ResourceAPI::SortingMethod sort{};
+    sort.name = currentSort;
+    auto searchUrl = ModrinthAPI().getSearchURL({ ModPlatform::ResourceType::MODPACK, nextSearchOffset, currentSearchTerm, sort,
+                                                  m_filter->loaders, m_filter->versions, "", m_filter->categoryIds });
+
     auto netJob = makeShared<NetJob>("Modrinth::SearchModpack", APPLICATION->network());
-    auto searchAllUrl = QString(BuildConfig.MODRINTH_PROD_URL +
-                                "/search?"
-                                "offset=%1&"
-                                "limit=%2&"
-                                "query=%3&"
-                                "index=%4&"
-                                "facets=[[\"project_type:modpack\"]]")
-                            .arg(nextSearchOffset)
-                            .arg(m_modpacks_per_page)
-                            .arg(currentSearchTerm)
-                            .arg(currentSort);
-
-    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchAllUrl), m_all_response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl.value()), m_allResponse));
 
     QObject::connect(netJob.get(), &NetJob::succeeded, this, [this] {
-        QJsonParseError parse_error_all{};
+        QJsonParseError parseError{};
 
-        QJsonDocument doc_all = QJsonDocument::fromJson(*m_all_response, &parse_error_all);
-        if (parse_error_all.error != QJsonParseError::NoError) {
-            qWarning() << "Error while parsing JSON response from " << debugName() << " at " << parse_error_all.offset
-                       << " reason: " << parse_error_all.errorString();
-            qWarning() << *m_all_response;
+        QJsonDocument doc = QJsonDocument::fromJson(*m_allResponse, &parseError);
+        if (parseError.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from " << debugName() << " at " << parseError.offset
+                       << " reason: " << parseError.errorString();
+            qWarning() << *m_allResponse;
             return;
         }
 
-        searchRequestFinished(doc_all);
+        searchRequestFinished(doc);
     });
     QObject::connect(netJob.get(), &NetJob::failed, this, &ModpackListModel::searchRequestFailed);
 
@@ -220,19 +213,23 @@ static auto sortFromIndex(int index) -> QString
     }
 }
 
-void ModpackListModel::searchWithTerm(const QString& term, const int sort)
+void ModpackListModel::searchWithTerm(const QString& term,
+                                      const int sort,
+                                      std::shared_ptr<ModFilterWidget::Filter> filter,
+                                      bool filterChanged)
 {
     if (sort > 5 || sort < 0)
         return;
 
     auto sort_str = sortFromIndex(sort);
 
-    if (currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort_str) {
+    if (currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort_str && !filterChanged) {
         return;
     }
 
     currentSearchTerm = term;
     currentSort = sort_str;
+    m_filter = filter;
 
     refresh();
 }
@@ -254,6 +251,7 @@ void ModpackListModel::requestLogo(QString logo, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo));
     auto job = new NetJob(QString("%1 Icon Download %2").arg(m_parent->debugName()).arg(logo), APPLICATION->network());
+    job->setAskRetry(false);
     job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
@@ -352,10 +350,10 @@ void ModpackListModel::searchRequestForOneSucceeded(QJsonDocument& doc)
 void ModpackListModel::searchRequestFailed(QString reason)
 {
     auto failed_action = dynamic_cast<NetJob*>(jobPtr.get())->getFailedActions().at(0);
-    if (!failed_action->m_reply) {
+    if (failed_action->replyStatusCode() == -1) {
         // Network error
         QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load modpacks."));
-    } else if (failed_action->m_reply && failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 409) {
+    } else if (failed_action->replyStatusCode() == 409) {
         // 409 Gone, notify user to update
         QMessageBox::critical(nullptr, tr("Error"),
                               //: %1 refers to the launcher itself
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
index 514ee4484..640ddf688 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
@@ -71,7 +71,7 @@ class ModpackListModel : public QAbstractListModel {
     /* Ask the API for more information */
     void fetchMore(const QModelIndex& parent) override;
     void refresh();
-    void searchWithTerm(const QString& term, int sort);
+    void searchWithTerm(const QString& term, int sort, std::shared_ptr<ModFilterWidget::Filter> filter, bool filterChanged);
 
     [[nodiscard]] bool hasActiveSearchJob() const { return jobPtr && jobPtr->isRunning(); }
     [[nodiscard]] Task::Ptr activeSearchJob() { return hasActiveSearchJob() ? jobPtr : nullptr; }
@@ -112,12 +112,13 @@ class ModpackListModel : public QAbstractListModel {
 
     QString currentSearchTerm;
     QString currentSort;
+    std::shared_ptr<ModFilterWidget::Filter> m_filter;
     int nextSearchOffset = 0;
     enum SearchState { None, CanPossiblyFetchMore, ResetRequested, Finished } searchState = None;
 
     Task::Ptr jobPtr;
 
-    std::shared_ptr<QByteArray> m_all_response = std::make_shared<QByteArray>();
+    std::shared_ptr<QByteArray> m_allResponse = std::make_shared<QByteArray>();
     QByteArray m_specific_response;
 
     int m_modpacks_per_page = 20;
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index df446da0d..129f180a2 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -35,6 +35,8 @@
  */
 
 #include "ModrinthPage.h"
+#include "Version.h"
+#include "modplatform/modrinth/ModrinthAPI.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui_ModrinthPage.h"
 
@@ -58,8 +60,8 @@ ModrinthPage::ModrinthPage(NewInstanceDialog* dialog, QWidget* parent)
     : QWidget(parent), ui(new Ui::ModrinthPage), dialog(dialog), m_fetch_progress(this, false)
 {
     ui->setupUi(this);
+    createFilterWidget();
 
-    connect(ui->searchButton, &QPushButton::clicked, this, &ModrinthPage::triggerSearch);
     ui->searchEdit->installEventFilter(this);
     m_model = new Modrinth::ModpackListModel(this);
     ui->packView->setModel(m_model);
@@ -76,7 +78,7 @@ ModrinthPage::ModrinthPage(NewInstanceDialog* dialog, QWidget* parent)
     m_fetch_progress.setFixedHeight(24);
     m_fetch_progress.progressFormat("");
 
-    ui->gridLayout->addWidget(&m_fetch_progress, 2, 0, 1, ui->gridLayout->columnCount());
+    ui->verticalLayout->insertWidget(1, &m_fetch_progress);
 
     ui->sortByBox->addItem(tr("Sort by Relevance"));
     ui->sortByBox->addItem(tr("Sort by Total Downloads"));
@@ -86,7 +88,7 @@ ModrinthPage::ModrinthPage(NewInstanceDialog* dialog, QWidget* parent)
 
     connect(ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthPage::onSelectionChanged);
-    connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthPage::onVersionSelectionChanged);
+    connect(ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ModrinthPage::onVersionSelectionChanged);
 
     ui->packView->setItemDelegate(new ProjectItemDelegate(this));
     ui->packDescription->setMetaEntry(metaEntryBase());
@@ -105,6 +107,7 @@ void ModrinthPage::retranslate()
 void ModrinthPage::openedImpl()
 {
     BasePage::openedImpl();
+    suggestCurrent();
     triggerSearch();
 }
 
@@ -126,6 +129,16 @@ bool ModrinthPage::eventFilter(QObject* watched, QEvent* event)
     return QObject::eventFilter(watched, event);
 }
 
+bool checkVersionFilters(const Modrinth::ModpackVersion& v, std::shared_ptr<ModFilterWidget::Filter> filter)
+{
+    if (!filter)
+        return true;
+    return ((!filter->loaders || !v.loaders || filter->loaders & v.loaders) &&  // loaders
+            (filter->releases.empty() ||                                        // releases
+             std::find(filter->releases.cbegin(), filter->releases.cend(), v.version_type) != filter->releases.cend()) &&
+            filter->checkMcVersions({ v.gameVersion }));  // gameVersion}
+}
+
 void ModrinthPage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelIndex prev)
 {
     ui->versionSelectionBox->clear();
@@ -190,7 +203,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelI
     } else
         updateUI();
 
-    if (!current.versionsLoaded) {
+    if (!current.versionsLoaded || m_filterWidget->changed()) {
         qDebug() << "Loading modrinth modpack versions";
 
         auto netJob = new NetJob(QString("Modrinth::PackVersions(%1)").arg(current.name), APPLICATION->network());
@@ -221,13 +234,24 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, [[maybe_unused]] QModelI
                 qDebug() << *response;
                 qWarning() << "Error while reading modrinth modpack version: " << e.cause();
             }
+            auto pred = [this](const Modrinth::ModpackVersion& v) { return !checkVersionFilters(v, m_filterWidget->getFilter()); };
+#if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
+            current.versions.removeIf(pred);
+#else
+    for (auto it = current.versions.begin(); it != current.versions.end();)
+        if (pred(*it))
+            it = current.versions.erase(it);
+        else
+            ++it;
+#endif
             for (auto version : current.versions) {
                 auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
-                if (!version.name.contains(version.version))
-                    ui->versionSelectionBox->addItem(QString("%1 — %2%3").arg(version.name, version.version, release_type),
-                                                     QVariant(version.id));
-                else
-                    ui->versionSelectionBox->addItem(QString("%1%2").arg(version.name, release_type), QVariant(version.id));
+                auto mcVersion = !version.gameVersion.isEmpty() && !version.name.contains(version.gameVersion)
+                                     ? QString(" for %1").arg(version.gameVersion)
+                                     : "";
+                auto versionStr = !version.name.contains(version.version) ? version.version : "";
+                ui->versionSelectionBox->addItem(QString("%1%2 — %3%4").arg(version.name, mcVersion, versionStr, release_type),
+                                                 QVariant(version.id));
             }
 
             QVariant current_updated;
@@ -337,16 +361,52 @@ void ModrinthPage::suggestCurrent()
 
 void ModrinthPage::triggerSearch()
 {
-    m_model->searchWithTerm(ui->searchEdit->text(), ui->sortByBox->currentIndex());
+    ui->packView->selectionModel()->setCurrentIndex({}, QItemSelectionModel::SelectionFlag::ClearAndSelect);
+    ui->packView->clearSelection();
+    ui->packDescription->clear();
+    ui->versionSelectionBox->clear();
+    m_model->searchWithTerm(ui->searchEdit->text(), ui->sortByBox->currentIndex(), m_filterWidget->getFilter(), m_filterWidget->changed());
     m_fetch_progress.watch(m_model->activeSearchJob().get());
 }
 
-void ModrinthPage::onVersionSelectionChanged(QString version)
+void ModrinthPage::onVersionSelectionChanged(int index)
 {
-    if (version.isNull() || version.isEmpty()) {
+    if (index == -1) {
         selectedVersion = "";
         return;
     }
     selectedVersion = ui->versionSelectionBox->currentData().toString();
     suggestCurrent();
 }
+
+void ModrinthPage::setSearchTerm(QString term)
+{
+    ui->searchEdit->setText(term);
+}
+
+QString ModrinthPage::getSerachTerm() const
+{
+    return ui->searchEdit->text();
+}
+
+void ModrinthPage::createFilterWidget()
+{
+    auto widget = ModFilterWidget::create(nullptr, true, this);
+    m_filterWidget.swap(widget);
+    auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
+    // because we replaced the widget we also need to delete it
+    if (old) {
+        delete old;
+    }
+
+    connect(ui->filterButton, &QPushButton::clicked, this, [this] { m_filterWidget->setHidden(!m_filterWidget->isHidden()); });
+
+    connect(m_filterWidget.get(), &ModFilterWidget::filterChanged, this, &ModrinthPage::triggerSearch);
+    auto response = std::make_shared<QByteArray>();
+    m_categoriesTask = ModrinthAPI::getModCategories(response);
+    QObject::connect(m_categoriesTask.get(), &Task::succeeded, [this, response]() {
+        auto categories = ModrinthAPI::loadCategories(response, "modpack");
+        m_filterWidget->setCategories(categories);
+    });
+    m_categoriesTask->start();
+}
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index 4240dcafb..7f504cdbd 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -38,9 +38,10 @@
 
 #include "Application.h"
 #include "ui/dialogs/NewInstanceDialog.h"
-#include "ui/pages/BasePage.h"
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
+#include "ui/pages/modplatform/ModpackProviderBasePage.h"
+#include "ui/widgets/ModFilterWidget.h"
 #include "ui/widgets/ProgressWidget.h"
 
 #include <QTimer>
@@ -54,7 +55,7 @@ namespace Modrinth {
 class ModpackListModel;
 }
 
-class ModrinthPage : public QWidget, public BasePage {
+class ModrinthPage : public QWidget, public ModpackProviderBasePage {
     Q_OBJECT
 
    public:
@@ -78,10 +79,16 @@ class ModrinthPage : public QWidget, public BasePage {
     void openedImpl() override;
     bool eventFilter(QObject* watched, QEvent* event) override;
 
+    /** Programatically set the term in the search bar. */
+    virtual void setSearchTerm(QString) override;
+    /** Get the current term in the search bar. */
+    [[nodiscard]] virtual QString getSerachTerm() const override;
+
    private slots:
     void onSelectionChanged(QModelIndex first, QModelIndex second);
-    void onVersionSelectionChanged(QString data);
+    void onVersionSelectionChanged(int index);
     void triggerSearch();
+    void createFilterWidget();
 
    private:
     Ui::ModrinthPage* ui;
@@ -95,4 +102,7 @@ class ModrinthPage : public QWidget, public BasePage {
 
     // Used to do instant searching with a delay to cache quick changes
     QTimer m_search_timer;
+
+    unique_qobject_ptr<ModFilterWidget> m_filterWidget;
+    Task::Ptr m_categoriesTask;
 };
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
index 68b1d4e24..ef44abb52 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
@@ -10,38 +10,62 @@
     <height>600</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
-    <layout class="QHBoxLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QListView" name="packView">
-       <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="alternatingRowColors">
-        <bool>true</bool>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>48</width>
-         <height>48</height>
-        </size>
+      <widget class="QLineEdit" name="searchEdit">
+       <property name="placeholderText">
+        <string>Search and filter...</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="ProjectDescriptionPage" name="packDescription">
-       <property name="openExternalLinks">
-        <bool>true</bool>
-       </property>
-       <property name="openLinks">
-        <bool>true</bool>
+      <widget class="QPushButton" name="filterButton">
+       <property name="text">
+        <string>Filter</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QWidget" name="widget" native="true"/>
+     <widget class="QListView" name="packView">
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>48</width>
+        <height>48</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="ProjectDescriptionPage" name="packDescription">
+      <property name="openExternalLinks">
+       <bool>true</bool>
+      </property>
+      <property name="openLinks">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="QComboBox" name="sortByBox"/>
@@ -61,24 +85,6 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="0">
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QLineEdit" name="searchEdit">
-       <property name="placeholderText">
-        <string>Search and filter ...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="searchButton">
-       <property name="text">
-        <string>Search</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -89,8 +95,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>searchEdit</tabstop>
-  <tabstop>searchButton</tabstop>
   <tabstop>packView</tabstop>
   <tabstop>packDescription</tabstop>
   <tabstop>sortByBox</tabstop>
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
index a4197b225..85dcde471 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
@@ -4,6 +4,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -57,19 +58,13 @@ ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance& instan
     // so it's best not to connect them in the parent's constructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthModPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthModPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ModrinthModPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &ModrinthModPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver,
-                                      QString mineVer,
-                                      std::optional<ModPlatform::ModLoaderTypes> loaders) const -> bool
-{
-    return ver.mcVersion.contains(mineVer) && (!loaders.has_value() || !ver.loaders || loaders.value() & ver.loaders);
-}
-
 ModrinthResourcePackPage::ModrinthResourcePackPage(ResourcePackDownloadDialog* dialog, BaseInstance& instance)
     : ResourcePackResourcePage(dialog, instance)
 {
@@ -82,7 +77,8 @@ ModrinthResourcePackPage::ModrinthResourcePackPage(ResourcePackDownloadDialog* d
     // so it's best not to connect them in the parent's constructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthResourcePackPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthResourcePackPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ModrinthResourcePackPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &ModrinthResourcePackPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
@@ -100,7 +96,8 @@ ModrinthTexturePackPage::ModrinthTexturePackPage(TexturePackDownloadDialog* dial
     // so it's best not to connect them in the parent's constructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthTexturePackPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthTexturePackPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ModrinthTexturePackPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &ModrinthTexturePackPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
@@ -118,7 +115,8 @@ ModrinthShaderPackPage::ModrinthShaderPackPage(ShaderPackDownloadDialog* dialog,
     // so it's best not to connect them in the parent's constructor...
     connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthShaderPackPage::onSelectionChanged);
-    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthShaderPackPage::onVersionSelectionChanged);
+    connect(m_ui->versionSelectionBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ModrinthShaderPackPage::onVersionSelectionChanged);
     connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &ModrinthShaderPackPage::onResourceSelected);
 
     m_ui->packDescription->setMetaEntry(metaEntryBase());
@@ -144,4 +142,19 @@ auto ModrinthShaderPackPage::shouldDisplay() const -> bool
     return true;
 }
 
+unique_qobject_ptr<ModFilterWidget> ModrinthModPage::createFilterWidget()
+{
+    return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_base_instance), true, this);
+}
+
+void ModrinthModPage::prepareProviderCategories()
+{
+    auto response = std::make_shared<QByteArray>();
+    auto task = ModrinthAPI::getModCategories(response);
+    QObject::connect(task.get(), &Task::succeeded, [this, response]() {
+        auto categories = ModrinthAPI::loadModCategories(response);
+        m_filter_widget->setCategories(categories);
+    });
+    task->start();
+};
 }  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
index 384ca281e..eaf6129a5 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
@@ -4,6 +4,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -93,9 +94,10 @@ class ModrinthModPage : public ModPage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    auto validateVersion(ModPlatform::IndexedVersion& ver,
-                         QString mineVer,
-                         std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const -> bool override;
+    unique_qobject_ptr<ModFilterWidget> createFilterWidget() override;
+
+   protected:
+    virtual void prepareProviderCategories() override;
 };
 
 class ModrinthResourcePackPage : public ResourcePackResourcePage {
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index 6f1810d71..f7e7f4433 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -154,6 +154,10 @@ void Technic::ListModel::performSearch()
             QString("%1search?build=%2&q=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, BuildConfig.TECHNIC_API_BUILD, currentSearchTerm);
         searchMode = List;
     }
+    auto clientId = APPLICATION->settings()->get("TechnicClientID").toString();
+    if (!clientId.isEmpty()) {
+        searchUrl += "?cid=" + clientId;
+    }
     netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), response));
     jobPtr = netJob;
     jobPtr->start();
@@ -292,6 +296,7 @@ void Technic::ListModel::requestLogo(QString logo, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("TechnicPacks", QString("logos/%1").arg(logo));
     auto job = new NetJob(QString("Technic Icon Download %1").arg(logo), APPLICATION->network());
+    job->setAskRetry(false);
     job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
index 391c10122..50d267b1f 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
@@ -58,7 +58,6 @@ TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget* parent)
     : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog), m_fetch_progress(this, false)
 {
     ui->setupUi(this);
-    connect(ui->searchButton, &QPushButton::clicked, this, &TechnicPage::triggerSearch);
     ui->searchEdit->installEventFilter(this);
     model = new Technic::ListModel(this);
     ui->packView->setModel(model);
@@ -72,7 +71,7 @@ TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget* parent)
     m_fetch_progress.setFixedHeight(24);
     m_fetch_progress.progressFormat("");
 
-    ui->gridLayout->addWidget(&m_fetch_progress, 2, 0, 1, ui->gridLayout->columnCount());
+    ui->verticalLayout->insertWidget(1, &m_fetch_progress);
 
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &TechnicPage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &TechnicPage::onVersionSelectionChanged);
@@ -343,3 +342,13 @@ void TechnicPage::onVersionSelectionChanged(QString version)
     selectedVersion = version;
     selectVersion();
 }
+
+void TechnicPage::setSearchTerm(QString term)
+{
+    ui->searchEdit->setText(term);
+}
+
+QString TechnicPage::getSerachTerm() const
+{
+    return ui->searchEdit->text();
+}
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.h b/launcher/ui/pages/modplatform/technic/TechnicPage.h
index 01439337d..d1f691b22 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.h
@@ -41,7 +41,7 @@
 #include <Application.h>
 #include "TechnicData.h"
 #include "net/NetJob.h"
-#include "ui/pages/BasePage.h"
+#include "ui/pages/modplatform/ModpackProviderBasePage.h"
 #include "ui/widgets/ProgressWidget.h"
 
 namespace Ui {
@@ -54,7 +54,7 @@ namespace Technic {
 class ListModel;
 }
 
-class TechnicPage : public QWidget, public BasePage {
+class TechnicPage : public QWidget, public ModpackProviderBasePage {
     Q_OBJECT
 
    public:
@@ -71,6 +71,11 @@ class TechnicPage : public QWidget, public BasePage {
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
+    /** Programatically set the term in the search bar. */
+    virtual void setSearchTerm(QString) override;
+    /** Get the current term in the search bar. */
+    [[nodiscard]] virtual QString getSerachTerm() const override;
+
    private:
     void suggestCurrent();
     void metadataLoaded();
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.ui b/launcher/ui/pages/modplatform/technic/TechnicPage.ui
index b988eda2b..f4e75ae12 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.ui
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.ui
@@ -10,23 +10,41 @@
     <height>405</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="4" column="0" colspan="2">
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="0" column="2">
-      <widget class="QComboBox" name="versionSelectionBox"/>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Version selected:</string>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLineEdit" name="searchEdit">
+     <property name="placeholderText">
+      <string>Search and filter...</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QListView" name="packView">
+       <property name="alternatingRowColors">
+        <bool>true</bool>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="0" column="0">
+     <item>
+      <widget class="QTextBrowser" name="packDescription">
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -42,46 +60,21 @@
        </property>
       </spacer>
      </item>
-    </layout>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <layout class="QGridLayout" name="gridLayout_2">
-     <item row="0" column="0">
-      <widget class="QListView" name="packView">
-       <property name="alternatingRowColors">
-        <bool>true</bool>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Version selected:</string>
        </property>
-       <property name="iconSize">
-        <size>
-         <width>48</width>
-         <height>48</height>
-        </size>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QTextBrowser" name="packDescription">
-       <property name="openExternalLinks">
-        <bool>true</bool>
-       </property>
-      </widget>
+     <item>
+      <widget class="QComboBox" name="versionSelectionBox"/>
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="QLineEdit" name="searchEdit">
-     <property name="placeholderText">
-      <string>Search and filter...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="searchButton">
-     <property name="text">
-      <string>Search</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/launcher/ui/setupwizard/AutoJavaWizardPage.cpp b/launcher/ui/setupwizard/AutoJavaWizardPage.cpp
new file mode 100644
index 000000000..fd173e71d
--- /dev/null
+++ b/launcher/ui/setupwizard/AutoJavaWizardPage.cpp
@@ -0,0 +1,33 @@
+#include "AutoJavaWizardPage.h"
+#include "ui_AutoJavaWizardPage.h"
+
+#include "Application.h"
+
+AutoJavaWizardPage::AutoJavaWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(new Ui::AutoJavaWizardPage)
+{
+    ui->setupUi(this);
+}
+
+AutoJavaWizardPage::~AutoJavaWizardPage()
+{
+    delete ui;
+}
+
+void AutoJavaWizardPage::initializePage() {}
+
+bool AutoJavaWizardPage::validatePage()
+{
+    auto s = APPLICATION->settings();
+
+    if (!ui->previousSettingsRadioButton->isChecked()) {
+        s->set("AutomaticJavaSwitch", true);
+        s->set("AutomaticJavaDownload", true);
+    }
+    s->set("UserAskedAboutAutomaticJavaDownload", true);
+    return true;
+}
+
+void AutoJavaWizardPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/setupwizard/AutoJavaWizardPage.h b/launcher/ui/setupwizard/AutoJavaWizardPage.h
new file mode 100644
index 000000000..fcdf5bdf1
--- /dev/null
+++ b/launcher/ui/setupwizard/AutoJavaWizardPage.h
@@ -0,0 +1,22 @@
+#pragma once
+#include <QWidget>
+#include "BaseWizardPage.h"
+
+namespace Ui {
+class AutoJavaWizardPage;
+}
+
+class AutoJavaWizardPage : public BaseWizardPage {
+    Q_OBJECT
+
+   public:
+    explicit AutoJavaWizardPage(QWidget* parent = nullptr);
+    ~AutoJavaWizardPage();
+
+    void initializePage() override;
+    bool validatePage() override;
+    void retranslate() override;
+
+   private:
+    Ui::AutoJavaWizardPage* ui;
+};
diff --git a/launcher/ui/setupwizard/AutoJavaWizardPage.ui b/launcher/ui/setupwizard/AutoJavaWizardPage.ui
new file mode 100644
index 000000000..a862524b0
--- /dev/null
+++ b/launcher/ui/setupwizard/AutoJavaWizardPage.ui
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AutoJavaWizardPage</class>
+ <widget class="QWidget" name="AutoJavaWizardPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;New Feature Alert!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>We've added a feature to automatically download the correct Java version for each version of Minecraft (this can be changed in the Java Settings). Would you like to enable or disable this feature?</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="defaultSettingsRadioButton">
+     <property name="text">
+      <string>Enable Auto-Download</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <attribute name="buttonGroup">
+      <string notr="true">buttonGroup</string>
+     </attribute>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="previousSettingsRadioButton">
+     <property name="text">
+      <string>Disable Auto-Download</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+     <attribute name="buttonGroup">
+      <string notr="true">buttonGroup</string>
+     </attribute>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>156</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+ <buttongroups>
+  <buttongroup name="buttonGroup"/>
+ </buttongroups>
+</ui>
diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp
index abe4860da..3861a294b 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.cpp
+++ b/launcher/ui/setupwizard/JavaWizardPage.cpp
@@ -12,12 +12,8 @@
 
 #include <sys.h>
 
-#include "FileSystem.h"
 #include "JavaCommon.h"
-#include "java/JavaInstall.h"
-#include "java/JavaUtils.h"
 
-#include "ui/dialogs/CustomMessageBox.h"
 #include "ui/widgets/JavaSettingsWidget.h"
 #include "ui/widgets/VersionSelectWidget.h"
 
@@ -57,6 +53,9 @@ bool JavaWizardPage::validatePage()
 {
     auto settings = APPLICATION->settings();
     auto result = m_java_widget->validate();
+    settings->set("AutomaticJavaSwitch", m_java_widget->autoDetectJava());
+    settings->set("AutomaticJavaDownload", m_java_widget->autoDownloadJava());
+    settings->set("UserAskedAboutAutomaticJavaDownload", true);
     switch (result) {
         default:
         case JavaSettingsWidget::ValidationStatus::Bad: {
@@ -84,7 +83,6 @@ void JavaWizardPage::retranslate()
 {
     setTitle(tr("Java"));
     setSubTitle(
-        tr("You do not have a working Java set up yet or it went missing.\n"
-           "Please select one of the following or browse for a Java executable."));
+        tr("Please select how much memory to allocate to instances and if Fjord Launcher should manage Java automatically or manually."));
     m_java_widget->retranslate();
 }
diff --git a/launcher/ui/setupwizard/JavaWizardPage.h b/launcher/ui/setupwizard/JavaWizardPage.h
index dde765f27..9bf9cfa2b 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.h
+++ b/launcher/ui/setupwizard/JavaWizardPage.h
@@ -9,7 +9,7 @@ class JavaWizardPage : public BaseWizardPage {
    public:
     explicit JavaWizardPage(QWidget* parent = Q_NULLPTR);
 
-    virtual ~JavaWizardPage() {};
+    virtual ~JavaWizardPage() = default;
 
     bool wantsRefreshButton() override;
     void refresh() override;
diff --git a/launcher/ui/setupwizard/LoginWizardPage.cpp b/launcher/ui/setupwizard/LoginWizardPage.cpp
new file mode 100644
index 000000000..f53e31908
--- /dev/null
+++ b/launcher/ui/setupwizard/LoginWizardPage.cpp
@@ -0,0 +1,44 @@
+#include "LoginWizardPage.h"
+#include "minecraft/auth/AccountList.h"
+#include "ui/dialogs/MSALoginDialog.h"
+#include "ui_LoginWizardPage.h"
+
+#include "Application.h"
+
+LoginWizardPage::LoginWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(new Ui::LoginWizardPage)
+{
+    ui->setupUi(this);
+}
+
+LoginWizardPage::~LoginWizardPage()
+{
+    delete ui;
+}
+
+void LoginWizardPage::initializePage() {}
+
+bool LoginWizardPage::validatePage()
+{
+    return true;
+}
+
+void LoginWizardPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
+
+void LoginWizardPage::on_pushButton_clicked()
+{
+    wizard()->hide();
+    auto account = MSALoginDialog::newAccount(nullptr);
+    wizard()->show();
+    if (account) {
+        APPLICATION->accounts()->addAccount(account);
+        APPLICATION->accounts()->setDefaultAccount(account);
+        if (wizard()->currentId() == wizard()->pageIds().last()) {
+            wizard()->accept();
+        } else {
+            wizard()->next();
+        }
+    }
+}
diff --git a/launcher/ui/setupwizard/LoginWizardPage.h b/launcher/ui/setupwizard/LoginWizardPage.h
new file mode 100644
index 000000000..af71fc183
--- /dev/null
+++ b/launcher/ui/setupwizard/LoginWizardPage.h
@@ -0,0 +1,24 @@
+#pragma once
+#include <QWidget>
+#include "BaseWizardPage.h"
+
+namespace Ui {
+class LoginWizardPage;
+}
+
+class LoginWizardPage : public BaseWizardPage {
+    Q_OBJECT
+
+   public:
+    explicit LoginWizardPage(QWidget* parent = nullptr);
+    ~LoginWizardPage();
+
+    void initializePage() override;
+    bool validatePage() override;
+    void retranslate() override;
+   private slots:
+    void on_pushButton_clicked();
+
+   private:
+    Ui::LoginWizardPage* ui;
+};
diff --git a/launcher/ui/setupwizard/LoginWizardPage.ui b/launcher/ui/setupwizard/LoginWizardPage.ui
new file mode 100644
index 000000000..191316c4e
--- /dev/null
+++ b/launcher/ui/setupwizard/LoginWizardPage.ui
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LoginWizardPage</class>
+ <widget class="QWidget" name="LoginWizardPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Add Microsoft account&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>In order to play Minecraft, you must have at least one Microsoft account logged in. Do you want to log in now?</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="pushButton">
+     <property name="text">
+      <string>Add Microsoft account</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>156</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+ <buttongroups>
+  <buttongroup name="buttonGroup"/>
+ </buttongroups>
+</ui>
diff --git a/launcher/ui/themes/BrightTheme.cpp b/launcher/ui/themes/BrightTheme.cpp
index ffccdaab1..81bdd773e 100644
--- a/launcher/ui/themes/BrightTheme.cpp
+++ b/launcher/ui/themes/BrightTheme.cpp
@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #include "BrightTheme.h"
 
 #include <QObject>
@@ -12,11 +46,6 @@ QString BrightTheme::name()
     return QObject::tr("Bright");
 }
 
-bool BrightTheme::hasColorScheme()
-{
-    return true;
-}
-
 QPalette BrightTheme::colorScheme()
 {
     QPalette brightPalette;
@@ -55,3 +84,7 @@ QString BrightTheme::appStyleSheet()
 {
     return QString();
 }
+QString BrightTheme::tooltip()
+{
+    return QString();
+}
diff --git a/launcher/ui/themes/BrightTheme.h b/launcher/ui/themes/BrightTheme.h
index 44a767492..070eef124 100644
--- a/launcher/ui/themes/BrightTheme.h
+++ b/launcher/ui/themes/BrightTheme.h
@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #pragma once
 
 #include "FusionTheme.h"
@@ -8,9 +42,9 @@ class BrightTheme : public FusionTheme {
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
-    bool hasColorScheme() override;
     QPalette colorScheme() override;
     double fadeAmount() override;
     QColor fadeColor() override;
diff --git a/launcher/ui/themes/CatPack.cpp b/launcher/ui/themes/CatPack.cpp
index 50c10189e..85eb85a18 100644
--- a/launcher/ui/themes/CatPack.cpp
+++ b/launcher/ui/themes/CatPack.cpp
@@ -36,7 +36,10 @@
 #include "ui/themes/CatPack.h"
 #include <QDate>
 #include <QDir>
+#include <QDirIterator>
 #include <QFileInfo>
+#include <QImageReader>
+#include <QRandomGenerator>
 #include "FileSystem.h"
 #include "Json.h"
 
@@ -79,7 +82,7 @@ JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.di
     auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "CatPack JSON file");
     const auto root = doc.object();
     m_name = Json::requireString(root, "name", "Catpack name");
-    m_defaultPath = FS::PathCombine(path, Json::requireString(root, "default", "Default Cat"));
+    m_default_path = FS::PathCombine(path, Json::requireString(root, "default", "Default Cat"));
     auto variants = Json::ensureArray(root, "variants", QJsonArray(), "Catpack Variants");
     for (auto v : variants) {
         auto variant = Json::ensureObject(v, QJsonObject(), "Cat variant");
@@ -117,5 +120,21 @@ QString JsonCatPack::path(QDate now)
         if (startDate <= now && now <= endDate)
             return var.path;
     }
-    return m_defaultPath;
+    auto dInfo = QFileInfo(m_default_path);
+    if (!dInfo.isDir())
+        return m_default_path;
+
+    QStringList supportedImageFormats;
+    for (auto format : QImageReader::supportedImageFormats()) {
+        supportedImageFormats.append("*." + format);
+    }
+
+    auto files = QDir(m_default_path).entryInfoList(supportedImageFormats, QDir::Files, QDir::Name);
+    if (files.length() == 0)
+        return "";
+    auto idx = (now.dayOfYear() - 1) % files.length();
+    auto isRandom = dInfo.fileName().compare("random", Qt::CaseInsensitive) == 0;
+    if (isRandom)
+        idx = QRandomGenerator::global()->bounded(0, files.length());
+    return files[idx].absoluteFilePath();
 }
diff --git a/launcher/ui/themes/CatPack.h b/launcher/ui/themes/CatPack.h
index 1d310e796..5a13d0cef 100644
--- a/launcher/ui/themes/CatPack.h
+++ b/launcher/ui/themes/CatPack.h
@@ -87,6 +87,6 @@ class JsonCatPack : public BasicCatPack {
     QString path(QDate now);
 
    private:
-    QString m_defaultPath;
+    QString m_default_path;
     QList<Variant> m_variants;
 };
diff --git a/launcher/ui/themes/CustomTheme.cpp b/launcher/ui/themes/CustomTheme.cpp
index 4859983c6..081ba1900 100644
--- a/launcher/ui/themes/CustomTheme.cpp
+++ b/launcher/ui/themes/CustomTheme.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,121 +40,6 @@
 
 const char* themeFile = "theme.json";
 
-static bool readThemeJson(const QString& path,
-                          QPalette& palette,
-                          double& fadeAmount,
-                          QColor& fadeColor,
-                          QString& name,
-                          QString& widgets,
-                          QString& qssFilePath,
-                          bool& dataIncomplete)
-{
-    QFileInfo pathInfo(path);
-    if (pathInfo.exists() && pathInfo.isFile()) {
-        try {
-            auto doc = Json::requireDocument(path, "Theme JSON file");
-            const QJsonObject root = doc.object();
-            dataIncomplete = !root.contains("qssFilePath");
-            name = Json::requireString(root, "name", "Theme name");
-            widgets = Json::requireString(root, "widgets", "Qt widget theme");
-            qssFilePath = Json::ensureString(root, "qssFilePath", "themeStyle.css");
-            auto colorsRoot = Json::requireObject(root, "colors", "colors object");
-            auto readColor = [&](QString colorName) -> QColor {
-                auto colorValue = Json::ensureString(colorsRoot, colorName, QString());
-                if (!colorValue.isEmpty()) {
-                    QColor color(colorValue);
-                    if (!color.isValid()) {
-                        themeWarningLog() << "Color value" << colorValue << "for" << colorName << "was not recognized.";
-                        return QColor();
-                    }
-                    return color;
-                }
-                return QColor();
-            };
-            auto readAndSetColor = [&](QPalette::ColorRole role, QString colorName) {
-                auto color = readColor(colorName);
-                if (color.isValid()) {
-                    palette.setColor(role, color);
-                } else {
-                    themeDebugLog() << "Color value for" << colorName << "was not present.";
-                }
-            };
-
-            // palette
-            readAndSetColor(QPalette::Window, "Window");
-            readAndSetColor(QPalette::WindowText, "WindowText");
-            readAndSetColor(QPalette::Base, "Base");
-            readAndSetColor(QPalette::AlternateBase, "AlternateBase");
-            readAndSetColor(QPalette::ToolTipBase, "ToolTipBase");
-            readAndSetColor(QPalette::ToolTipText, "ToolTipText");
-            readAndSetColor(QPalette::Text, "Text");
-            readAndSetColor(QPalette::Button, "Button");
-            readAndSetColor(QPalette::ButtonText, "ButtonText");
-            readAndSetColor(QPalette::BrightText, "BrightText");
-            readAndSetColor(QPalette::Link, "Link");
-            readAndSetColor(QPalette::Highlight, "Highlight");
-            readAndSetColor(QPalette::HighlightedText, "HighlightedText");
-
-            // fade
-            fadeColor = readColor("fadeColor");
-            fadeAmount = Json::ensureDouble(colorsRoot, "fadeAmount", 0.5, "fade amount");
-
-        } catch (const Exception& e) {
-            themeWarningLog() << "Couldn't load theme json: " << e.cause();
-            return false;
-        }
-    } else {
-        themeDebugLog() << "No theme json present.";
-        return false;
-    }
-    return true;
-}
-
-static bool writeThemeJson(const QString& path,
-                           const QPalette& palette,
-                           double fadeAmount,
-                           QColor fadeColor,
-                           QString name,
-                           QString widgets,
-                           QString qssFilePath)
-{
-    QJsonObject rootObj;
-    rootObj.insert("name", name);
-    rootObj.insert("widgets", widgets);
-    rootObj.insert("qssFilePath", qssFilePath);
-
-    QJsonObject colorsObj;
-    auto insertColor = [&](QPalette::ColorRole role, QString colorName) { colorsObj.insert(colorName, palette.color(role).name()); };
-
-    // palette
-    insertColor(QPalette::Window, "Window");
-    insertColor(QPalette::WindowText, "WindowText");
-    insertColor(QPalette::Base, "Base");
-    insertColor(QPalette::AlternateBase, "AlternateBase");
-    insertColor(QPalette::ToolTipBase, "ToolTipBase");
-    insertColor(QPalette::ToolTipText, "ToolTipText");
-    insertColor(QPalette::Text, "Text");
-    insertColor(QPalette::Button, "Button");
-    insertColor(QPalette::ButtonText, "ButtonText");
-    insertColor(QPalette::BrightText, "BrightText");
-    insertColor(QPalette::Link, "Link");
-    insertColor(QPalette::Highlight, "Highlight");
-    insertColor(QPalette::HighlightedText, "HighlightedText");
-
-    // fade
-    colorsObj.insert("fadeColor", fadeColor.name());
-    colorsObj.insert("fadeAmount", fadeAmount);
-
-    rootObj.insert("colors", colorsObj);
-    try {
-        Json::write(rootObj, path);
-        return true;
-    } catch ([[maybe_unused]] const Exception& e) {
-        themeWarningLog() << "Failed to write theme json to" << path;
-        return false;
-    }
-}
-
 /// @param baseTheme Base Theme
 /// @param fileInfo FileInfo object for file to load
 /// @param isManifest whether to load a theme manifest or a qss file
@@ -176,23 +62,22 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
 
         auto themeFilePath = FS::PathCombine(path, themeFile);
 
-        bool jsonDataIncomplete = false;
-
         m_palette = baseTheme->colorScheme();
-        if (readThemeJson(themeFilePath, m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath, jsonDataIncomplete)) {
+
+        bool hasCustomLogColors = false;
+
+        if (read(themeFilePath, hasCustomLogColors)) {
             // If theme data was found, fade "Disabled" color of each role according to FadeAmount
             m_palette = fadeInactive(m_palette, m_fadeAmount, m_fadeColor);
+
+            if (!hasCustomLogColors)
+                m_logColors = defaultLogColors(m_palette);
         } else {
             themeDebugLog() << "Did not read theme json file correctly, not changing theme, keeping previous.";
+            m_logColors = defaultLogColors(m_palette);
             return;
         }
 
-        // FIXME: This is kinda jank, it only actually checks if the qss file path is not present. It should actually check for any relevant
-        // missing data (e.g. name, colors)
-        if (jsonDataIncomplete) {
-            writeThemeJson(fileInfo.absoluteFilePath(), m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath);
-        }
-
         auto qssFilePath = FS::PathCombine(path, m_qssFilePath);
         QFileInfo info(qssFilePath);
         if (info.isFile()) {
@@ -251,11 +136,6 @@ QString CustomTheme::name()
     return m_name;
 }
 
-bool CustomTheme::hasColorScheme()
-{
-    return true;
-}
-
 QPalette CustomTheme::colorScheme()
 {
     return m_palette;
@@ -285,3 +165,103 @@ QString CustomTheme::qtTheme()
 {
     return m_widgets;
 }
+QString CustomTheme::tooltip()
+{
+    return m_tooltip;
+}
+
+bool CustomTheme::read(const QString& path, bool& hasCustomLogColors)
+{
+    QFileInfo pathInfo(path);
+    if (pathInfo.exists() && pathInfo.isFile()) {
+        try {
+            auto doc = Json::requireDocument(path, "Theme JSON file");
+            const QJsonObject root = doc.object();
+            m_name = Json::requireString(root, "name", "Theme name");
+            m_widgets = Json::requireString(root, "widgets", "Qt widget theme");
+            m_qssFilePath = Json::ensureString(root, "qssFilePath", "themeStyle.css");
+
+            auto readColor = [&](const QJsonObject& colors, const QString& colorName) -> QColor {
+                auto colorValue = Json::ensureString(colors, colorName, QString());
+                if (!colorValue.isEmpty()) {
+                    QColor color(colorValue);
+                    if (!color.isValid()) {
+                        themeWarningLog() << "Color value" << colorValue << "for" << colorName << "was not recognized.";
+                        return {};
+                    }
+                    return color;
+                }
+                return {};
+            };
+
+            if (root.contains("colors")) {
+                auto colorsRoot = Json::requireObject(root, "colors");
+                auto readAndSetPaletteColor = [&](QPalette::ColorRole role, const QString& colorName) {
+                    auto color = readColor(colorsRoot, colorName);
+                    if (color.isValid()) {
+                        m_palette.setColor(role, color);
+                    } else {
+                        themeDebugLog() << "Color value for" << colorName << "was not present.";
+                    }
+                };
+
+                // palette
+                readAndSetPaletteColor(QPalette::Window, "Window");
+                readAndSetPaletteColor(QPalette::WindowText, "WindowText");
+                readAndSetPaletteColor(QPalette::Base, "Base");
+                readAndSetPaletteColor(QPalette::AlternateBase, "AlternateBase");
+                readAndSetPaletteColor(QPalette::ToolTipBase, "ToolTipBase");
+                readAndSetPaletteColor(QPalette::ToolTipText, "ToolTipText");
+                readAndSetPaletteColor(QPalette::Text, "Text");
+                readAndSetPaletteColor(QPalette::Button, "Button");
+                readAndSetPaletteColor(QPalette::ButtonText, "ButtonText");
+                readAndSetPaletteColor(QPalette::BrightText, "BrightText");
+                readAndSetPaletteColor(QPalette::Link, "Link");
+                readAndSetPaletteColor(QPalette::Highlight, "Highlight");
+                readAndSetPaletteColor(QPalette::HighlightedText, "HighlightedText");
+
+                // fade
+                m_fadeColor = readColor(colorsRoot, "fadeColor");
+                m_fadeAmount = Json::ensureDouble(colorsRoot, "fadeAmount", 0.5, "fade amount");
+            }
+
+            if (root.contains("logColors")) {
+                hasCustomLogColors = true;
+
+                auto logColorsRoot = Json::requireObject(root, "logColors");
+                auto readAndSetLogColor = [&](MessageLevel::Enum level, bool fg, const QString& colorName) {
+                    auto color = readColor(logColorsRoot, colorName);
+                    if (color.isValid()) {
+                        if (fg)
+                            m_logColors.foreground[level] = color;
+                        else
+                            m_logColors.background[level] = color;
+                    } else {
+                        themeDebugLog() << "Color value for" << colorName << "was not present.";
+                    }
+                };
+
+                readAndSetLogColor(MessageLevel::Message, false, "MessageHighlight");
+                readAndSetLogColor(MessageLevel::Launcher, false, "LauncherHighlight");
+                readAndSetLogColor(MessageLevel::Debug, false, "DebugHighlight");
+                readAndSetLogColor(MessageLevel::Warning, false, "WarningHighlight");
+                readAndSetLogColor(MessageLevel::Error, false, "ErrorHighlight");
+                readAndSetLogColor(MessageLevel::Fatal, false, "FatalHighlight");
+
+                readAndSetLogColor(MessageLevel::Message, true, "Message");
+                readAndSetLogColor(MessageLevel::Launcher, true, "Launcher");
+                readAndSetLogColor(MessageLevel::Debug, true, "Debug");
+                readAndSetLogColor(MessageLevel::Warning, true, "Warning");
+                readAndSetLogColor(MessageLevel::Error, true, "Error");
+                readAndSetLogColor(MessageLevel::Fatal, true, "Fatal");
+            }
+        } catch (const Exception& e) {
+            themeWarningLog() << "Couldn't load theme json: " << e.cause();
+            return false;
+        }
+    } else {
+        themeDebugLog() << "No theme json present.";
+        return false;
+    }
+    return true;
+}
diff --git a/launcher/ui/themes/CustomTheme.h b/launcher/ui/themes/CustomTheme.h
index 3ec4cafa2..b8d073921 100644
--- a/launcher/ui/themes/CustomTheme.h
+++ b/launcher/ui/themes/CustomTheme.h
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,16 +45,19 @@ class CustomTheme : public ITheme {
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
-    bool hasColorScheme() override;
     QPalette colorScheme() override;
     double fadeAmount() override;
     QColor fadeColor() override;
     QString qtTheme() override;
+    LogColors logColorScheme() override { return m_logColors; }
     QStringList searchPaths() override;
 
-   private: /* data */
+   private:
+    bool read(const QString& path, bool& hasCustomLogColors);
+
     QPalette m_palette;
     QColor m_fadeColor;
     double m_fadeAmount;
@@ -62,4 +66,11 @@ class CustomTheme : public ITheme {
     QString m_id;
     QString m_widgets;
     QString m_qssFilePath;
+    LogColors m_logColors;
+    /**
+     * The tooltip could be defined in the theme json,
+     * or composed of other fields that could be in there.
+     * like author, license, etc.
+     */
+    QString m_tooltip = "";
 };
diff --git a/launcher/ui/themes/DarkTheme.cpp b/launcher/ui/themes/DarkTheme.cpp
index c3a68a2d4..804126547 100644
--- a/launcher/ui/themes/DarkTheme.cpp
+++ b/launcher/ui/themes/DarkTheme.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #include "DarkTheme.h"
 
 #include <QObject>
@@ -12,11 +47,6 @@ QString DarkTheme::name()
     return QObject::tr("Dark");
 }
 
-bool DarkTheme::hasColorScheme()
-{
-    return true;
-}
-
 QPalette DarkTheme::colorScheme()
 {
     QPalette darkPalette;
@@ -56,3 +86,8 @@ QString DarkTheme::appStyleSheet()
 {
     return "QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }";
 }
+
+QString DarkTheme::tooltip()
+{
+    return "";
+}
diff --git a/launcher/ui/themes/DarkTheme.h b/launcher/ui/themes/DarkTheme.h
index 431e9a735..c97edbcbe 100644
--- a/launcher/ui/themes/DarkTheme.h
+++ b/launcher/ui/themes/DarkTheme.h
@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #pragma once
 
 #include "FusionTheme.h"
@@ -8,9 +42,9 @@ class DarkTheme : public FusionTheme {
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
-    bool hasColorScheme() override;
     QPalette colorScheme() override;
     double fadeAmount() override;
     QColor fadeColor() override;
diff --git a/launcher/ui/themes/ITheme.cpp b/launcher/ui/themes/ITheme.cpp
index 046ae16b4..cae6e90db 100644
--- a/launcher/ui/themes/ITheme.cpp
+++ b/launcher/ui/themes/ITheme.cpp
@@ -44,9 +44,7 @@ void ITheme::apply(bool)
 {
     APPLICATION->setStyleSheet(QString());
     QApplication::setStyle(new HintOverrideProxyStyle(QStyleFactory::create(qtTheme())));
-    if (hasColorScheme()) {
-        QApplication::setPalette(colorScheme());
-    }
+    QApplication::setPalette(colorScheme());
     APPLICATION->setStyleSheet(appStyleSheet());
     QDir::setSearchPaths("theme", searchPaths());
 }
@@ -73,3 +71,30 @@ QPalette ITheme::fadeInactive(QPalette in, qreal bias, QColor color)
     blend(QPalette::HighlightedText);
     return in;
 }
+
+LogColors ITheme::defaultLogColors(const QPalette& palette)
+{
+    LogColors result;
+
+    const QColor& bg = palette.color(QPalette::Base);
+    const QColor& fg = palette.color(QPalette::Text);
+
+    auto blend = [bg, fg](QColor color) {
+        if (Rainbow::luma(fg) > Rainbow::luma(bg)) {
+            // for dark color schemes, produce a fitting color first
+            color = Rainbow::tint(fg, color, 0.5);
+        }
+        // adapt contrast
+        return Rainbow::mix(fg, color, 1);
+    };
+
+    result.background[MessageLevel::Fatal] = Qt::black;
+
+    result.foreground[MessageLevel::Launcher] = blend(QColor("purple"));
+    result.foreground[MessageLevel::Debug] = blend(QColor("green"));
+    result.foreground[MessageLevel::Warning] = blend(QColor("orange"));
+    result.foreground[MessageLevel::Error] = blend(QColor("red"));
+    result.foreground[MessageLevel::Fatal] = blend(QColor("red"));
+
+    return result;
+}
diff --git a/launcher/ui/themes/ITheme.h b/launcher/ui/themes/ITheme.h
index d85e7f983..7dc5fc64a 100644
--- a/launcher/ui/themes/ITheme.h
+++ b/launcher/ui/themes/ITheme.h
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,25 +34,35 @@
  *      limitations under the License.
  */
 #pragma once
+#include <MessageLevel.h>
+#include <QMap>
 #include <QPalette>
 #include <QString>
 
 class QStyle;
 
+struct LogColors {
+    QMap<MessageLevel::Enum, QColor> background;
+    QMap<MessageLevel::Enum, QColor> foreground;
+};
+
+// TODO: rename to Theme; this is not an interface as it contains method implementations
 class ITheme {
    public:
     virtual ~ITheme() {}
     virtual void apply(bool initial);
     virtual QString id() = 0;
     virtual QString name() = 0;
+    virtual QString tooltip() = 0;
     virtual bool hasStyleSheet() = 0;
     virtual QString appStyleSheet() = 0;
     virtual QString qtTheme() = 0;
-    virtual bool hasColorScheme() = 0;
     virtual QPalette colorScheme() = 0;
     virtual QColor fadeColor() = 0;
     virtual double fadeAmount() = 0;
+    virtual LogColors logColorScheme() { return defaultLogColors(colorScheme()); }
     virtual QStringList searchPaths() { return {}; }
 
     static QPalette fadeInactive(QPalette in, qreal bias, QColor color);
+    static LogColors defaultLogColors(const QPalette& palette);
 };
diff --git a/launcher/ui/themes/SystemTheme.cpp b/launcher/ui/themes/SystemTheme.cpp
index cefe664db..a1674455a 100644
--- a/launcher/ui/themes/SystemTheme.cpp
+++ b/launcher/ui/themes/SystemTheme.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,31 +35,16 @@
  */
 #include "SystemTheme.h"
 #include <QApplication>
-#include <QDebug>
 #include <QStyle>
 #include <QStyleFactory>
 #include "HintOverrideProxyStyle.h"
 #include "ThemeManager.h"
 
-SystemTheme::SystemTheme()
+SystemTheme::SystemTheme(const QString& styleName, const QPalette& palette, bool isDefaultTheme)
 {
-    themeDebugLog() << "Determining System Theme...";
-    const auto& style = QApplication::style();
-    systemPalette = QApplication::palette();
-    QString lowerThemeName = style->objectName();
-    themeDebugLog() << "System theme seems to be:" << lowerThemeName;
-    QStringList styles = QStyleFactory::keys();
-    for (auto& st : styles) {
-        themeDebugLog() << "Considering theme from theme factory:" << st.toLower();
-        if (st.toLower() == lowerThemeName) {
-            systemTheme = st;
-            themeDebugLog() << "System theme has been determined to be:" << systemTheme;
-            return;
-        }
-    }
-    // fall back to fusion if we can't find the current theme.
-    systemTheme = "Fusion";
-    themeDebugLog() << "System theme not found, defaulted to Fusion";
+    themeName = isDefaultTheme ? "system" : styleName;
+    widgetTheme = styleName;
+    colorPalette = palette;
 }
 
 void SystemTheme::apply(bool initial)
@@ -76,22 +61,49 @@ void SystemTheme::apply(bool initial)
 
 QString SystemTheme::id()
 {
-    return "system";
+    return themeName;
 }
 
 QString SystemTheme::name()
 {
-    return QObject::tr("System");
+    if (themeName.toLower() == "windowsvista") {
+        return QObject::tr("Windows Vista");
+    } else if (themeName.toLower() == "windows") {
+        return QObject::tr("Windows 9x");
+    } else if (themeName.toLower() == "windows11") {
+        return QObject::tr("Windows 11");
+    } else if (themeName.toLower() == "system") {
+        return QObject::tr("System");
+    } else {
+        return themeName;
+    }
+}
+
+QString SystemTheme::tooltip()
+{
+    if (themeName.toLower() == "windowsvista") {
+        return QObject::tr("Widget style trying to look like your win32 theme");
+    } else if (themeName.toLower() == "windows") {
+        return QObject::tr("Windows 9x inspired widget style");
+    } else if (themeName.toLower() == "windows11") {
+        return QObject::tr("WinUI 3 inspired Qt widget style");
+    } else if (themeName.toLower() == "fusion") {
+        return QObject::tr("The default Qt widget style");
+    } else if (themeName.toLower() == "system") {
+        return QObject::tr("Your current system theme");
+    } else {
+        return "";
+    }
 }
 
 QString SystemTheme::qtTheme()
 {
-    return systemTheme;
+    return widgetTheme;
 }
 
 QPalette SystemTheme::colorScheme()
 {
-    return systemPalette;
+    return colorPalette;
 }
 
 QString SystemTheme::appStyleSheet()
@@ -113,8 +125,3 @@ bool SystemTheme::hasStyleSheet()
 {
     return false;
 }
-
-bool SystemTheme::hasColorScheme()
-{
-    return true;
-}
diff --git a/launcher/ui/themes/SystemTheme.h b/launcher/ui/themes/SystemTheme.h
index 4f7d83e57..7c260fdc4 100644
--- a/launcher/ui/themes/SystemTheme.h
+++ b/launcher/ui/themes/SystemTheme.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,21 +38,22 @@
 
 class SystemTheme : public ITheme {
    public:
-    SystemTheme();
+    SystemTheme(const QString& styleName, const QPalette& palette, bool isDefaultTheme);
     virtual ~SystemTheme() {}
     void apply(bool initial) override;
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     QString qtTheme() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
-    bool hasColorScheme() override;
     QPalette colorScheme() override;
     double fadeAmount() override;
     QColor fadeColor() override;
 
    private:
-    QPalette systemPalette;
-    QString systemTheme;
+    QPalette colorPalette;
+    QString widgetTheme;
+    QString themeName;
 };
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 5f96ec8e4..d1442e8b9 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -23,6 +23,8 @@
 #include <QDirIterator>
 #include <QIcon>
 #include <QImageReader>
+#include <QStyle>
+#include <QStyleFactory>
 #include "Exception.h"
 #include "ui/themes/BrightTheme.h"
 #include "ui/themes/CatPack.h"
@@ -34,6 +36,13 @@
 
 ThemeManager::ThemeManager()
 {
+    themeDebugLog() << "Determining System Widget Theme...";
+    const auto& style = QApplication::style();
+    m_defaultStyle = style->objectName();
+    themeDebugLog() << "System theme seems to be:" << m_defaultStyle;
+
+    m_defaultPalette = QApplication::palette();
+
     initializeThemes();
     initializeCatPacks();
 }
@@ -120,13 +129,24 @@ void ThemeManager::initializeIcons()
 void ThemeManager::initializeWidgets()
 {
     themeDebugLog() << "<> Initializing Widget Themes";
-    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>());
+    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>(m_defaultStyle, m_defaultPalette, true));
     auto darkThemeId = addTheme(std::make_unique<DarkTheme>());
     themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;
     themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<BrightTheme>());
 
-    // TODO: need some way to differentiate same name themes in different subdirectories (maybe smaller grey text next to theme name in
-    // dropdown?)
+    themeDebugLog() << "<> Initializing System Widget Themes";
+    QStringList styles = QStyleFactory::keys();
+    for (auto& st : styles) {
+#ifdef Q_OS_WINDOWS
+        if (QSysInfo::productVersion() != "11" && st == "windows11") {
+            continue;
+        }
+#endif
+        themeDebugLog() << "Loading System Theme:" << addTheme(std::make_unique<SystemTheme>(st, m_defaultPalette, false));
+    }
+
+    // TODO: need some way to differentiate same name themes in different subdirectories
+    //  (maybe smaller grey text next to theme name in dropdown?)
 
     if (!m_applicationThemeFolder.mkpath("."))
         themeWarningLog() << "Couldn't create theme folder";
@@ -228,6 +248,8 @@ void ThemeManager::setApplicationTheme(const QString& name, bool initial)
         auto& theme = themeIter->second;
         themeDebugLog() << "applying theme" << theme->name();
         theme->apply(initial);
+
+        m_logColors = theme->logColorScheme();
     } else {
         themeWarningLog() << "Tried to set invalid theme:" << name;
     }
@@ -238,7 +260,11 @@ void ThemeManager::applyCurrentlySelectedTheme(bool initial)
     auto settings = APPLICATION->settings();
     setIconTheme(settings->get("IconTheme").toString());
     themeDebugLog() << "<> Icon theme set.";
-    setApplicationTheme(settings->get("ApplicationTheme").toString(), initial);
+    auto applicationTheme = settings->get("ApplicationTheme").toString();
+    if (applicationTheme == "") {
+        applicationTheme = m_defaultStyle;
+    }
+    setApplicationTheme(applicationTheme, initial);
     themeDebugLog() << "<> Application theme set.";
 }
 
@@ -314,3 +340,13 @@ void ThemeManager::initializeCatPacks()
         }
     }
 }
+
+void ThemeManager::refresh()
+{
+    m_themes.clear();
+    m_icons.clear();
+    m_catPacks.clear();
+
+    initializeThemes();
+    initializeCatPacks();
+}
\ No newline at end of file
diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index b5c66677b..a9036107c 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
- *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,10 +18,12 @@
  */
 #pragma once
 
+#include <QDir>
+#include <QLoggingCategory>
 #include <QString>
+#include <memory>
 
 #include "IconTheme.h"
-#include "ui/MainWindow.h"
 #include "ui/themes/CatPack.h"
 #include "ui/themes/ITheme.h"
 
@@ -55,6 +57,10 @@ class ThemeManager {
     QString getCatPack(QString catName = "");
     QList<CatPack*> getValidCatPacks();
 
+    const LogColors& getLogColors() { return m_logColors; }
+
+    void refresh();
+
    private:
     std::map<QString, std::unique_ptr<ITheme>> m_themes;
     std::map<QString, IconTheme> m_icons;
@@ -62,6 +68,9 @@ class ThemeManager {
     QDir m_applicationThemeFolder{ "themes" };
     QDir m_catPacksFolder{ "catpacks" };
     std::map<QString, std::unique_ptr<CatPack>> m_catPacks;
+    QString m_defaultStyle;
+    QPalette m_defaultPalette;
+    LogColors m_logColors;
 
     void initializeThemes();
     void initializeCatPacks();
diff --git a/launcher/ui/widgets/CheckComboBox.cpp b/launcher/ui/widgets/CheckComboBox.cpp
new file mode 100644
index 000000000..41def3ba1
--- /dev/null
+++ b/launcher/ui/widgets/CheckComboBox.cpp
@@ -0,0 +1,206 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "CheckComboBox.h"
+
+#include <QAbstractItemView>
+#include <QBoxLayout>
+#include <QEvent>
+#include <QIdentityProxyModel>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QListView>
+#include <QMouseEvent>
+#include <QStringList>
+#include <QStylePainter>
+
+class CheckComboModel : public QIdentityProxyModel {
+    Q_OBJECT
+
+   public:
+    explicit CheckComboModel(QObject* parent = nullptr) : QIdentityProxyModel(parent) {}
+
+    virtual Qt::ItemFlags flags(const QModelIndex& index) const { return QIdentityProxyModel::flags(index) | Qt::ItemIsUserCheckable; }
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
+    {
+        if (role == Qt::CheckStateRole) {
+            auto txt = QIdentityProxyModel::data(index, Qt::DisplayRole).toString();
+            return checked.contains(txt) ? Qt::Checked : Qt::Unchecked;
+        }
+        if (role == Qt::DisplayRole)
+            return QIdentityProxyModel::data(index, Qt::DisplayRole);
+        return {};
+    }
+    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole)
+    {
+        if (role == Qt::CheckStateRole) {
+            auto txt = QIdentityProxyModel::data(index, Qt::DisplayRole).toString();
+            if (checked.contains(txt)) {
+                checked.removeOne(txt);
+            } else {
+                checked.push_back(txt);
+            }
+            emit dataChanged(index, index);
+            emit checkStateChanged();
+            return true;
+        }
+        return QIdentityProxyModel::setData(index, value, role);
+    }
+    QStringList getChecked() { return checked; }
+
+   signals:
+    void checkStateChanged();
+
+   private:
+    QStringList checked;
+};
+
+CheckComboBox::CheckComboBox(QWidget* parent) : QComboBox(parent), m_separator(", ")
+{
+    view()->installEventFilter(this);
+    view()->window()->installEventFilter(this);
+    view()->viewport()->installEventFilter(this);
+    this->installEventFilter(this);
+}
+
+void CheckComboBox::setSourceModel(QAbstractItemModel* new_model)
+{
+    auto proxy = new CheckComboModel(this);
+    proxy->setSourceModel(new_model);
+    model()->disconnect(this);
+    QComboBox::setModel(proxy);
+    connect(this, QOverload<int>::of(&QComboBox::activated), this, &CheckComboBox::toggleCheckState);
+    connect(proxy, &CheckComboModel::checkStateChanged, this, &CheckComboBox::emitCheckedItemsChanged);
+    connect(model(), &CheckComboModel::rowsInserted, this, &CheckComboBox::emitCheckedItemsChanged);
+    connect(model(), &CheckComboModel::rowsRemoved, this, &CheckComboBox::emitCheckedItemsChanged);
+}
+
+void CheckComboBox::hidePopup()
+{
+    if (!containerMousePress)
+        QComboBox::hidePopup();
+}
+
+void CheckComboBox::emitCheckedItemsChanged()
+{
+    emit checkedItemsChanged(checkedItems());
+}
+
+QString CheckComboBox::defaultText() const
+{
+    return m_default_text;
+}
+
+void CheckComboBox::setDefaultText(const QString& text)
+{
+    m_default_text = text;
+}
+
+QString CheckComboBox::separator() const
+{
+    return m_separator;
+}
+
+void CheckComboBox::setSeparator(const QString& separator)
+{
+    m_separator = separator;
+}
+
+bool CheckComboBox::eventFilter(QObject* receiver, QEvent* event)
+{
+    switch (event->type()) {
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease: {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (receiver == this && (keyEvent->key() == Qt::Key_Up || keyEvent->key() == Qt::Key_Down)) {
+                showPopup();
+                return true;
+            } else if (keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Escape) {
+                QComboBox::hidePopup();
+                return (keyEvent->key() != Qt::Key_Escape);
+            }
+            break;
+        }
+        case QEvent::MouseButtonPress: {
+            auto ev = static_cast<QMouseEvent*>(event);
+            containerMousePress = ev && view()->indexAt(ev->pos()).isValid();
+            break;
+        }
+        case QEvent::Wheel:
+            return receiver == this;
+        default:
+            break;
+    }
+    return false;
+}
+
+void CheckComboBox::toggleCheckState(int index)
+{
+    QVariant value = itemData(index, Qt::CheckStateRole);
+    if (value.isValid()) {
+        Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
+        setItemData(index, (state == Qt::Unchecked ? Qt::Checked : Qt::Unchecked), Qt::CheckStateRole);
+    }
+    emitCheckedItemsChanged();
+}
+
+Qt::CheckState CheckComboBox::itemCheckState(int index) const
+{
+    return static_cast<Qt::CheckState>(itemData(index, Qt::CheckStateRole).toInt());
+}
+
+void CheckComboBox::setItemCheckState(int index, Qt::CheckState state)
+{
+    setItemData(index, state, Qt::CheckStateRole);
+}
+
+QStringList CheckComboBox::checkedItems() const
+{
+    if (model())
+        return dynamic_cast<CheckComboModel*>(model())->getChecked();
+    return {};
+}
+
+void CheckComboBox::setCheckedItems(const QStringList& items)
+{
+    foreach (auto text, items) {
+        auto index = findText(text);
+        setItemCheckState(index, index != -1 ? Qt::Checked : Qt::Unchecked);
+    }
+}
+
+void CheckComboBox::paintEvent(QPaintEvent*)
+{
+    QStylePainter painter(this);
+    painter.setPen(palette().color(QPalette::Text));
+
+    // draw the combobox frame, focusrect and selected etc.
+    QStyleOptionComboBox opt;
+    initStyleOption(&opt);
+    QStringList items = checkedItems();
+    if (items.isEmpty())
+        opt.currentText = defaultText();
+    else
+        opt.currentText = items.join(separator());
+    painter.drawComplexControl(QStyle::CC_ComboBox, opt);
+
+    // draw the icon and text
+    painter.drawControl(QStyle::CE_ComboBoxLabel, opt);
+}
+
+#include "CheckComboBox.moc"
\ No newline at end of file
diff --git a/launcher/ui/widgets/CheckComboBox.h b/launcher/ui/widgets/CheckComboBox.h
new file mode 100644
index 000000000..876c6e3e1
--- /dev/null
+++ b/launcher/ui/widgets/CheckComboBox.h
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QComboBox>
+#include <QLineEdit>
+
+class CheckComboBox : public QComboBox {
+    Q_OBJECT
+
+   public:
+    explicit CheckComboBox(QWidget* parent = nullptr);
+    virtual ~CheckComboBox() = default;
+
+    void hidePopup() override;
+
+    QString defaultText() const;
+    void setDefaultText(const QString& text);
+
+    Qt::CheckState itemCheckState(int index) const;
+    void setItemCheckState(int index, Qt::CheckState state);
+
+    QString separator() const;
+    void setSeparator(const QString& separator);
+
+    QStringList checkedItems() const;
+
+    void setSourceModel(QAbstractItemModel* model);
+
+   public slots:
+    void setCheckedItems(const QStringList& items);
+
+   signals:
+    void checkedItemsChanged(const QStringList& items);
+
+   protected:
+    void paintEvent(QPaintEvent*) override;
+
+   private:
+    void emitCheckedItemsChanged();
+    bool eventFilter(QObject* receiver, QEvent* event) override;
+    void toggleCheckState(int index);
+
+   private:
+    QString m_default_text;
+    QString m_separator;
+    bool containerMousePress;
+};
\ No newline at end of file
diff --git a/launcher/ui/widgets/CustomCommands.ui b/launcher/ui/widgets/CustomCommands.ui
index 4a39ff7f7..b485c293e 100644
--- a/launcher/ui/widgets/CustomCommands.ui
+++ b/launcher/ui/widgets/CustomCommands.ui
@@ -38,19 +38,6 @@
       <bool>false</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelPostExitCmd">
-        <property name="text">
-         <string>P&amp;ost-exit command:</string>
-        </property>
-        <property name="buddy">
-         <cstring>postExitCmdTextBox</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
-      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="labelPreLaunchCmd">
         <property name="text">
@@ -61,8 +48,8 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="postExitCmdTextBox"/>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="labelWrapperCmd">
@@ -77,6 +64,19 @@
       <item row="1" column="1">
        <widget class="QLineEdit" name="wrapperCmdTextBox"/>
       </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelPostExitCmd">
+        <property name="text">
+         <string>P&amp;ost-exit command:</string>
+        </property>
+        <property name="buddy">
+         <cstring>postExitCmdTextBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="postExitCmdTextBox"/>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/launcher/ui/widgets/InfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp
index 69f72fea2..44f702659 100644
--- a/launcher/ui/widgets/InfoFrame.cpp
+++ b/launcher/ui/widgets/InfoFrame.cpp
@@ -36,6 +36,8 @@
 
 #include <QLabel>
 #include <QMessageBox>
+#include <QTextCursor>
+#include <QTextDocument>
 #include <QToolTip>
 
 #include "InfoFrame.h"
@@ -274,12 +276,27 @@ void InfoFrame::setDescription(QString text)
     }
     QString labeltext;
     labeltext.reserve(300);
-    if (finaltext.length() > 290) {
+
+    // elide rich text by getting characters without formatting
+    const int maxCharacterElide = 290;
+    QTextDocument doc;
+    doc.setHtml(text);
+
+    if (doc.characterCount() > maxCharacterElide) {
         ui->descriptionLabel->setOpenExternalLinks(false);
-        ui->descriptionLabel->setTextFormat(Qt::TextFormat::RichText);
+        ui->descriptionLabel->setTextFormat(Qt::TextFormat::RichText);  // This allows injecting HTML here.
         m_description = text;
-        // This allows injecting HTML here.
-        labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
+
+        // move the cursor to the character elide, doesn't see html
+        QTextCursor cursor(&doc);
+        cursor.movePosition(QTextCursor::End);
+        cursor.setPosition(maxCharacterElide, QTextCursor::KeepAnchor);
+        cursor.removeSelectedText();
+
+        // insert the post fix at the cursor
+        cursor.insertHtml("<a href=\"#mod_desc\">...</a>");
+
+        labeltext.append(doc.toHtml());
         QObject::connect(ui->descriptionLabel, &QLabel::linkActivated, this, &InfoFrame::descriptionEllipsisHandler);
     } else {
         ui->descriptionLabel->setTextFormat(Qt::TextFormat::AutoText);
@@ -316,7 +333,7 @@ void InfoFrame::setLicense(QString text)
     if (finaltext.length() > 290) {
         ui->licenseLabel->setOpenExternalLinks(false);
         ui->licenseLabel->setTextFormat(Qt::TextFormat::RichText);
-        m_description = text;
+        m_license = text;
         // This allows injecting HTML here.
         labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
         QObject::connect(ui->licenseLabel, &QLabel::linkActivated, this, &InfoFrame::licenseEllipsisHandler);
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index bd6b6b118..2b270c482 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -3,20 +3,27 @@
 #include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLayoutItem>
 #include <QLineEdit>
+#include <QMessageBox>
 #include <QPushButton>
+#include <QSizePolicy>
 #include <QSpinBox>
 #include <QToolButton>
 #include <QVBoxLayout>
 
 #include <sys.h>
 
+#include "DesktopServices.h"
 #include "FileSystem.h"
 #include "JavaCommon.h"
+#include "java/JavaChecker.h"
 #include "java/JavaInstall.h"
+#include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
+#include "ui/java/InstallJavaDialog.h"
 #include "ui/widgets/VersionSelectWidget.h"
 
 #include "Application.h"
@@ -29,15 +36,20 @@ JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent)
     goodIcon = APPLICATION->getThemedIcon("status-good");
     yellowIcon = APPLICATION->getThemedIcon("status-yellow");
     badIcon = APPLICATION->getThemedIcon("status-bad");
+    m_memoryTimer = new QTimer(this);
     setupUi();
 
-    connect(m_minMemSpinBox, SIGNAL(valueChanged(int)), this, SLOT(memoryValueChanged(int)));
-    connect(m_maxMemSpinBox, SIGNAL(valueChanged(int)), this, SLOT(memoryValueChanged(int)));
-    connect(m_permGenSpinBox, SIGNAL(valueChanged(int)), this, SLOT(memoryValueChanged(int)));
+    connect(m_minMemSpinBox, SIGNAL(valueChanged(int)), this, SLOT(onSpinBoxValueChanged(int)));
+    connect(m_maxMemSpinBox, SIGNAL(valueChanged(int)), this, SLOT(onSpinBoxValueChanged(int)));
+    connect(m_permGenSpinBox, SIGNAL(valueChanged(int)), this, SLOT(onSpinBoxValueChanged(int)));
+    connect(m_memoryTimer, &QTimer::timeout, this, &JavaSettingsWidget::memoryValueChanged);
     connect(m_versionWidget, &VersionSelectWidget::selectedVersionChanged, this, &JavaSettingsWidget::javaVersionSelected);
     connect(m_javaBrowseBtn, &QPushButton::clicked, this, &JavaSettingsWidget::on_javaBrowseBtn_clicked);
     connect(m_javaPathTextBox, &QLineEdit::textEdited, this, &JavaSettingsWidget::javaPathEdited);
     connect(m_javaStatusBtn, &QToolButton::clicked, this, &JavaSettingsWidget::on_javaStatusBtn_clicked);
+    if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
+        connect(m_javaDownloadBtn, &QPushButton::clicked, this, &JavaSettingsWidget::javaDownloadBtn_clicked);
+    }
 }
 
 void JavaSettingsWidget::setupUi()
@@ -47,7 +59,6 @@ void JavaSettingsWidget::setupUi()
     m_verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
 
     m_versionWidget = new VersionSelectWidget(this);
-    m_verticalLayout->addWidget(m_versionWidget);
 
     m_horizontalLayout = new QHBoxLayout();
     m_horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
@@ -65,8 +76,6 @@ void JavaSettingsWidget::setupUi()
     m_javaStatusBtn->setIcon(yellowIcon);
     m_horizontalLayout->addWidget(m_javaStatusBtn);
 
-    m_verticalLayout->addLayout(m_horizontalLayout);
-
     m_memoryGroupBox = new QGroupBox(this);
     m_memoryGroupBox->setObjectName(QStringLiteral("memoryGroupBox"));
     m_gridLayout_2 = new QGridLayout(m_memoryGroupBox);
@@ -120,6 +129,57 @@ void JavaSettingsWidget::setupUi()
 
     m_verticalLayout->addWidget(m_memoryGroupBox);
 
+    m_horizontalBtnLayout = new QHBoxLayout();
+    m_horizontalBtnLayout->setObjectName(QStringLiteral("horizontalBtnLayout"));
+
+    if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
+        m_javaDownloadBtn = new QPushButton(tr("Download Java"), this);
+        m_horizontalBtnLayout->addWidget(m_javaDownloadBtn);
+    }
+
+    m_autoJavaGroupBox = new QGroupBox(this);
+    m_autoJavaGroupBox->setObjectName(QStringLiteral("autoJavaGroupBox"));
+    m_veriticalJavaLayout = new QVBoxLayout(m_autoJavaGroupBox);
+    m_veriticalJavaLayout->setObjectName(QStringLiteral("veriticalJavaLayout"));
+
+    m_autodetectJavaCheckBox = new QCheckBox(m_autoJavaGroupBox);
+    m_autodetectJavaCheckBox->setObjectName("autodetectJavaCheckBox");
+    m_autodetectJavaCheckBox->setChecked(true);
+    m_veriticalJavaLayout->addWidget(m_autodetectJavaCheckBox);
+
+    if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
+        m_autodownloadCheckBox = new QCheckBox(m_autoJavaGroupBox);
+        m_autodownloadCheckBox->setObjectName("autodownloadCheckBox");
+        m_autodownloadCheckBox->setEnabled(m_autodetectJavaCheckBox->isChecked());
+        m_veriticalJavaLayout->addWidget(m_autodownloadCheckBox);
+        connect(m_autodetectJavaCheckBox, &QCheckBox::stateChanged, this, [this] {
+            m_autodownloadCheckBox->setEnabled(m_autodetectJavaCheckBox->isChecked());
+            if (!m_autodetectJavaCheckBox->isChecked())
+                m_autodownloadCheckBox->setChecked(false);
+        });
+
+        connect(m_autodownloadCheckBox, &QCheckBox::stateChanged, this, [this] {
+            auto isChecked = m_autodownloadCheckBox->isChecked();
+            m_versionWidget->setVisible(!isChecked);
+            m_javaStatusBtn->setVisible(!isChecked);
+            m_javaBrowseBtn->setVisible(!isChecked);
+            m_javaPathTextBox->setVisible(!isChecked);
+            m_javaDownloadBtn->setVisible(!isChecked);
+            if (!isChecked) {
+                m_verticalLayout->removeItem(m_verticalSpacer);
+            } else {
+                m_verticalLayout->addSpacerItem(m_verticalSpacer);
+            }
+        });
+    }
+    m_verticalLayout->addWidget(m_autoJavaGroupBox);
+
+    m_verticalLayout->addLayout(m_horizontalBtnLayout);
+
+    m_verticalLayout->addWidget(m_versionWidget);
+    m_verticalLayout->addLayout(m_horizontalLayout);
+    m_verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
     retranslate();
 }
 
@@ -137,10 +197,16 @@ void JavaSettingsWidget::initialize()
     m_maxMemSpinBox->setValue(observedMaxMemory);
     m_permGenSpinBox->setValue(observedPermGenMemory);
     updateThresholds();
+    if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
+        m_autodownloadCheckBox->setChecked(true);
+    }
 }
 
 void JavaSettingsWidget::refresh()
 {
+    if (BuildConfig.JAVA_DOWNLOADER_ENABLED && m_autodownloadCheckBox->isChecked()) {
+        return;
+    }
     if (JavaUtils::getJavaCheckPath().isEmpty()) {
         JavaCommon::javaCheckNotFound(this);
         return;
@@ -153,20 +219,52 @@ JavaSettingsWidget::ValidationStatus JavaSettingsWidget::validate()
     switch (javaStatus) {
         default:
         case JavaStatus::NotSet:
+            /* fallthrough */
         case JavaStatus::DoesNotExist:
+            /* fallthrough */
         case JavaStatus::DoesNotStart:
+            /* fallthrough */
         case JavaStatus::ReturnedInvalidData: {
-            int button = CustomMessageBox::selectable(this, tr("No Java version selected"),
-                                                      tr("You didn't select a Java version or selected something that doesn't work.\n"
-                                                         "%1 will not be able to start Minecraft.\n"
-                                                         "Do you wish to proceed without any Java?"
-                                                         "\n\n"
-                                                         "You can change the Java version in the settings later.\n")
-                                                          .arg(BuildConfig.LAUNCHER_DISPLAYNAME),
-                                                      QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::NoButton)
-                             ->exec();
-            if (button == QMessageBox::No) {
-                return ValidationStatus::Bad;
+            if (!(BuildConfig.JAVA_DOWNLOADER_ENABLED && m_autodownloadCheckBox->isChecked())) {  // the java will not be autodownloaded
+                int button = QMessageBox::No;
+                if (m_result.mojangPlatform == "32" && maxHeapSize() > 2048) {
+                    button = CustomMessageBox::selectable(
+                                 this, tr("32-bit Java detected"),
+                                 tr("You selected a 32-bit installation of Java, but allocated more than 2048MiB as maximum memory.\n"
+                                    "%1 will not be able to start Minecraft.\n"
+                                    "Do you wish to proceed?"
+                                    "\n\n"
+                                    "You can change the Java version in the settings later.\n")
+                                     .arg(BuildConfig.LAUNCHER_DISPLAYNAME),
+                                 QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No | QMessageBox::Help, QMessageBox::NoButton)
+                                 ->exec();
+
+                } else {
+                    button = CustomMessageBox::selectable(this, tr("No Java version selected"),
+                                                          tr("You either didn't select a Java version or selected one that does not work.\n"
+                                                             "%1 will not be able to start Minecraft.\n"
+                                                             "Do you wish to proceed without a functional version of Java?"
+                                                             "\n\n"
+                                                             "You can change the Java version in the settings later.\n")
+                                                              .arg(BuildConfig.LAUNCHER_DISPLAYNAME),
+                                                          QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No | QMessageBox::Help,
+                                                          QMessageBox::NoButton)
+                                 ->exec();
+                }
+                switch (button) {
+                    case QMessageBox::Yes:
+                        return ValidationStatus::JavaBad;
+                    case QMessageBox::Help:
+                        DesktopServices::openUrl(QUrl(BuildConfig.HELP_URL.arg("java-wizard")));
+                    /* fallthrough */
+                    case QMessageBox::No:
+                    /* fallthrough */
+                    default:
+                        return ValidationStatus::Bad;
+                }
+                if (button == QMessageBox::No) {
+                    return ValidationStatus::Bad;
+                }
             }
             return ValidationStatus::JavaBad;
         } break;
@@ -212,20 +310,21 @@ int JavaSettingsWidget::permGenSize() const
     return m_permGenSpinBox->value();
 }
 
-void JavaSettingsWidget::memoryValueChanged(int)
+void JavaSettingsWidget::memoryValueChanged()
 {
     bool actuallyChanged = false;
     unsigned int min = m_minMemSpinBox->value();
     unsigned int max = m_maxMemSpinBox->value();
     unsigned int permgen = m_permGenSpinBox->value();
-    QObject* obj = sender();
-    if (obj == m_minMemSpinBox && min != observedMinMemory) {
+    if (min != observedMinMemory) {
         observedMinMemory = min;
         actuallyChanged = true;
-    } else if (obj == m_maxMemSpinBox && max != observedMaxMemory) {
+    }
+    if (max != observedMaxMemory) {
         observedMaxMemory = max;
         actuallyChanged = true;
-    } else if (obj == m_permGenSpinBox && permgen != observedPermGenMemory) {
+    }
+    if (permgen != observedPermGenMemory) {
         observedPermGenMemory = permgen;
         actuallyChanged = true;
     }
@@ -250,21 +349,22 @@ void JavaSettingsWidget::javaVersionSelected(BaseVersion::Ptr version)
 
 void JavaSettingsWidget::on_javaBrowseBtn_clicked()
 {
-    QString filter;
-#if defined Q_OS_WIN32
-    filter = "Java (javaw.exe)";
-#else
-    filter = "Java (java)";
-#endif
-    QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"), QString(), filter);
+    auto filter = QString("Java (%1)").arg(JavaUtils::javaExecutable);
+    auto raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"), QString(), filter);
     if (raw_path.isEmpty()) {
         return;
     }
-    QString cooked_path = FS::NormalizePath(raw_path);
+    auto cooked_path = FS::NormalizePath(raw_path);
     m_javaPathTextBox->setText(cooked_path);
     checkJavaPath(cooked_path);
 }
 
+void JavaSettingsWidget::javaDownloadBtn_clicked()
+{
+    auto jdialog = new Java::InstallDialog({}, nullptr, this);
+    jdialog->exec();
+}
+
 void JavaSettingsWidget::on_javaStatusBtn_clicked()
 {
     QString text;
@@ -359,34 +459,30 @@ void JavaSettingsWidget::checkJavaPath(const QString& path)
         return;
     }
     setJavaStatus(JavaStatus::Pending);
-    m_checker.reset(new JavaChecker());
-    m_checker->m_path = path;
-    m_checker->m_minMem = minHeapSize();
-    m_checker->m_maxMem = maxHeapSize();
-    if (m_permGenSpinBox->isVisible()) {
-        m_checker->m_permGen = m_permGenSpinBox->value();
-    }
+    m_checker.reset(
+        new JavaChecker(path, "", minHeapSize(), maxHeapSize(), m_permGenSpinBox->isVisible() ? m_permGenSpinBox->value() : 0, 0, this));
     connect(m_checker.get(), &JavaChecker::checkFinished, this, &JavaSettingsWidget::checkFinished);
-    m_checker->performCheck();
+    m_checker->start();
 }
 
-void JavaSettingsWidget::checkFinished(JavaCheckResult result)
+void JavaSettingsWidget::checkFinished(const JavaChecker::Result& result)
 {
     m_result = result;
     switch (result.validity) {
-        case JavaCheckResult::Validity::Valid: {
+        case JavaChecker::Result::Validity::Valid: {
             setJavaStatus(JavaStatus::Good);
             break;
         }
-        case JavaCheckResult::Validity::ReturnedInvalidData: {
+        case JavaChecker::Result::Validity::ReturnedInvalidData: {
             setJavaStatus(JavaStatus::ReturnedInvalidData);
             break;
         }
-        case JavaCheckResult::Validity::Errored: {
+        case JavaChecker::Result::Validity::Errored: {
             setJavaStatus(JavaStatus::DoesNotStart);
             break;
         }
     }
+    updateThresholds();
     m_checker.reset();
     if (!queuedCheck.isNull()) {
         checkJavaPath(queuedCheck);
@@ -403,6 +499,11 @@ void JavaSettingsWidget::retranslate()
     m_minMemSpinBox->setToolTip(tr("The amount of memory Minecraft is started with."));
     m_permGenSpinBox->setToolTip(tr("The amount of memory available to store loaded Java classes."));
     m_javaBrowseBtn->setText(tr("Browse"));
+    if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
+        m_autodownloadCheckBox->setText(tr("Auto-download Mojang Java"));
+    }
+    m_autodetectJavaCheckBox->setText(tr("Autodetect Java version"));
+    m_autoJavaGroupBox->setTitle(tr("Autodetect Java"));
 }
 
 void JavaSettingsWidget::updateThresholds()
@@ -418,6 +519,12 @@ void JavaSettingsWidget::updateThresholds()
     } else if (observedMaxMemory < observedMinMemory) {
         iconName = "status-yellow";
         m_labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation is smaller than the minimum value"));
+    } else if (BuildConfig.JAVA_DOWNLOADER_ENABLED && m_autodownloadCheckBox->isChecked()) {
+        iconName = "status-good";
+        m_labelMaxMemIcon->setToolTip("");
+    } else if (observedMaxMemory > 2048 && !m_result.is_64bit) {
+        iconName = "status-bad";
+        m_labelMaxMemIcon->setToolTip(tr("You are exceeding the maximum allocation supported by 32-bit installations of Java."));
     } else {
         iconName = "status-good";
         m_labelMaxMemIcon->setToolTip("");
@@ -430,3 +537,23 @@ void JavaSettingsWidget::updateThresholds()
         m_labelMaxMemIcon->setPixmap(pix);
     }
 }
+
+bool JavaSettingsWidget::autoDownloadJava() const
+{
+    return m_autodownloadCheckBox && m_autodownloadCheckBox->isChecked();
+}
+
+bool JavaSettingsWidget::autoDetectJava() const
+{
+    return m_autodetectJavaCheckBox->isChecked();
+}
+
+void JavaSettingsWidget::onSpinBoxValueChanged(int)
+{
+    m_memoryTimer->start(500);
+}
+
+JavaSettingsWidget::~JavaSettingsWidget()
+{
+    delete m_verticalSpacer;
+};
\ No newline at end of file
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h
index 18a480532..35be48478 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.h
+++ b/launcher/ui/widgets/JavaSettingsWidget.h
@@ -4,6 +4,7 @@
 #include <BaseVersion.h>
 #include <QObjectPtr.h>
 #include <java/JavaChecker.h>
+#include <qcheckbox.h>
 #include <QIcon>
 
 class QLineEdit;
@@ -16,6 +17,7 @@ class QGroupBox;
 class QGridLayout;
 class QLabel;
 class QToolButton;
+class QSpacerItem;
 
 /**
  * This is a widget for all the Java settings dialogs and pages.
@@ -25,7 +27,7 @@ class JavaSettingsWidget : public QWidget {
 
    public:
     explicit JavaSettingsWidget(QWidget* parent);
-    virtual ~JavaSettingsWidget() {};
+    virtual ~JavaSettingsWidget();
 
     enum class JavaStatus { NotSet, Pending, Good, DoesNotExist, DoesNotStart, ReturnedInvalidData } javaStatus = JavaStatus::NotSet;
 
@@ -41,16 +43,20 @@ class JavaSettingsWidget : public QWidget {
     int minHeapSize() const;
     int maxHeapSize() const;
     QString javaPath() const;
+    bool autoDetectJava() const;
+    bool autoDownloadJava() const;
 
     void updateThresholds();
 
    protected slots:
-    void memoryValueChanged(int);
+    void onSpinBoxValueChanged(int);
+    void memoryValueChanged();
     void javaPathEdited(const QString& path);
     void javaVersionSelected(BaseVersion::Ptr version);
     void on_javaBrowseBtn_clicked();
     void on_javaStatusBtn_clicked();
-    void checkFinished(JavaCheckResult result);
+    void javaDownloadBtn_clicked();
+    void checkFinished(const JavaChecker::Result& result);
 
    protected: /* methods */
     void checkJavaPathOnEdit(const QString& path);
@@ -61,6 +67,7 @@ class JavaSettingsWidget : public QWidget {
    private: /* data */
     VersionSelectWidget* m_versionWidget = nullptr;
     QVBoxLayout* m_verticalLayout = nullptr;
+    QSpacerItem* m_verticalSpacer = nullptr;
 
     QLineEdit* m_javaPathTextBox = nullptr;
     QPushButton* m_javaBrowseBtn = nullptr;
@@ -76,15 +83,24 @@ class JavaSettingsWidget : public QWidget {
     QSpinBox* m_minMemSpinBox = nullptr;
     QLabel* m_labelPermGen = nullptr;
     QSpinBox* m_permGenSpinBox = nullptr;
+
+    QHBoxLayout* m_horizontalBtnLayout = nullptr;
+    QPushButton* m_javaDownloadBtn = nullptr;
     QIcon goodIcon;
     QIcon yellowIcon;
     QIcon badIcon;
 
+    QGroupBox* m_autoJavaGroupBox = nullptr;
+    QVBoxLayout* m_veriticalJavaLayout = nullptr;
+    QCheckBox* m_autodetectJavaCheckBox = nullptr;
+    QCheckBox* m_autodownloadCheckBox = nullptr;
+
     unsigned int observedMinMemory = 0;
     unsigned int observedMaxMemory = 0;
     unsigned int observedPermGenMemory = 0;
     QString queuedCheck;
     uint64_t m_availableMemory = 0ull;
     shared_qobject_ptr<JavaChecker> m_checker;
-    JavaCheckResult m_result;
+    JavaChecker::Result m_result;
+    QTimer* m_memoryTimer;
 };
diff --git a/launcher/ui/widgets/ModFilterWidget.cpp b/launcher/ui/widgets/ModFilterWidget.cpp
index c2c099eeb..68adcdb71 100644
--- a/launcher/ui/widgets/ModFilterWidget.cpp
+++ b/launcher/ui/widgets/ModFilterWidget.cpp
@@ -1,13 +1,185 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #include "ModFilterWidget.h"
+#include <QCheckBox>
+#include <QComboBox>
+#include <QListWidget>
+#include <algorithm>
+#include <list>
+#include "BaseVersionList.h"
+#include "Version.h"
+#include "meta/Index.h"
+#include "modplatform/ModIndex.h"
+#include "ui/widgets/CheckComboBox.h"
 #include "ui_ModFilterWidget.h"
 
 #include "Application.h"
+#include "minecraft/PackProfile.h"
+
+unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, bool extended, QWidget* parent)
+{
+    return unique_qobject_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended, parent));
+}
+
+class VersionBasicModel : public QIdentityProxyModel {
+    Q_OBJECT
+
+   public:
+    explicit VersionBasicModel(QObject* parent = nullptr) : QIdentityProxyModel(parent) {}
+
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (role == Qt::DisplayRole)
+            return QIdentityProxyModel::data(index, BaseVersionList::VersionIdRole);
+        if (role == Qt::UserRole)
+            return QIdentityProxyModel::data(index, BaseVersionList::VersionIdRole);
+        return {};
+    }
+};
+
+class AllVersionProxyModel : public QSortFilterProxyModel {
+    Q_OBJECT
+
+   public:
+    AllVersionProxyModel(QObject* parent = nullptr) : QSortFilterProxyModel(parent) {}
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override { return QSortFilterProxyModel::rowCount(parent) + 1; }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (!index.isValid()) {
+            return {};
+        }
+
+        if (index.row() == 0) {
+            if (role == Qt::DisplayRole) {
+                return tr("All Versions");
+            }
+            if (role == Qt::UserRole) {
+                return "all";
+            }
+            return {};
+        }
+
+        QModelIndex newIndex = QSortFilterProxyModel::index(index.row() - 1, index.column());
+        return QSortFilterProxyModel::data(newIndex, role);
+    }
+
+    Qt::ItemFlags flags(const QModelIndex& index) const override
+    {
+        if (index.row() == 0) {
+            return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+        }
+        return QSortFilterProxyModel::flags(index);
+    }
+};
 
-unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_version, QWidget* parent)
+ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, QWidget* parent)
+    : QTabWidget(parent), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter())
 {
-    auto filter_widget = new ModFilterWidget(default_version, parent);
+    ui->setupUi(this);
+
+    m_versions_proxy = new VersionProxyModel(this);
+    m_versions_proxy->setFilter(BaseVersionList::TypeRole, new ExactFilter("release"));
+
+    QAbstractProxyModel* proxy = new VersionBasicModel(this);
+    proxy->setSourceModel(m_versions_proxy);
+
+    if (extended) {
+        if (!m_instance) {
+            ui->environmentGroup->hide();
+        }
+        ui->versions->setSourceModel(proxy);
+        ui->versions->setSeparator(", ");
+        ui->versions->setDefaultText(tr("All Versions"));
+        ui->version->hide();
+    } else {
+        auto allVersions = new AllVersionProxyModel(this);
+        allVersions->setSourceModel(proxy);
+        proxy = allVersions;
+        ui->version->setModel(proxy);
+        ui->versions->hide();
+        ui->showAllVersions->hide();
+        ui->environmentGroup->hide();
+    }
+
+    ui->versions->setStyleSheet("combobox-popup: 0;");
+    ui->version->setStyleSheet("combobox-popup: 0;");
+    connect(ui->showAllVersions, &QCheckBox::stateChanged, this, &ModFilterWidget::onShowAllVersionsChanged);
+    connect(ui->versions, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ModFilterWidget::onVersionFilterChanged);
+    connect(ui->versions, &CheckComboBox::checkedItemsChanged, this, [this] { onVersionFilterChanged(0); });
+    connect(ui->version, &QComboBox::currentTextChanged, this, &ModFilterWidget::onVersionFilterTextChanged);
+
+    connect(ui->neoForge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->forge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->fabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->quilt, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+
+    connect(ui->neoForge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->forge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->fabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->quilt, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+
+    if (extended) {
+        connect(ui->clientSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged);
+        connect(ui->serverSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged);
+    }
+
+    connect(ui->hideInstalled, &QCheckBox::stateChanged, this, &ModFilterWidget::onHideInstalledFilterChanged);
+
+    setHidden(true);
+    loadVersionList();
+    prepareBasicFilter();
+}
 
-    if (!filter_widget->versionList()->isLoaded()) {
+auto ModFilterWidget::getFilter() -> std::shared_ptr<Filter>
+{
+    m_filter_changed = false;
+    return m_filter;
+}
+
+ModFilterWidget::~ModFilterWidget()
+{
+    delete ui;
+}
+
+void ModFilterWidget::loadVersionList()
+{
+    m_version_list = APPLICATION->metadataIndex()->get("net.minecraft");
+    if (!m_version_list->isLoaded()) {
         QEventLoop load_version_list_loop;
 
         QTimer time_limit_for_list_load;
@@ -16,10 +188,12 @@ unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_vers
         time_limit_for_list_load.callOnTimeout(&load_version_list_loop, &QEventLoop::quit);
         time_limit_for_list_load.start(4000);
 
-        auto task = filter_widget->versionList()->getLoadTask();
+        auto task = m_version_list->getLoadTask();
 
-        connect(task.get(), &Task::failed,
-                [filter_widget] { filter_widget->disableVersionButton(VersionButtonID::Major, tr("failed to get version index")); });
+        connect(task.get(), &Task::failed, [this] {
+            ui->versions->setEnabled(false);
+            ui->showAllVersions->setEnabled(false);
+        });
         connect(task.get(), &Task::finished, &load_version_list_loop, &QEventLoop::quit);
 
         if (!task->isRunning())
@@ -29,128 +203,138 @@ unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(Version default_vers
         if (time_limit_for_list_load.isActive())
             time_limit_for_list_load.stop();
     }
-
-    return unique_qobject_ptr<ModFilterWidget>(filter_widget);
+    m_versions_proxy->setSourceModel(m_version_list.get());
 }
 
-ModFilterWidget::ModFilterWidget(Version def, QWidget* parent) : QTabWidget(parent), m_filter(new Filter()), ui(new Ui::ModFilterWidget)
+void ModFilterWidget::prepareBasicFilter()
 {
-    ui->setupUi(this);
+    if (m_instance) {
+        m_filter->hideInstalled = false;
+        m_filter->side = "";  // or "both"
+        auto loaders = m_instance->getPackProfile()->getSupportedModLoaders().value();
+        ui->neoForge->setChecked(loaders & ModPlatform::NeoForge);
+        ui->forge->setChecked(loaders & ModPlatform::Forge);
+        ui->fabric->setChecked(loaders & ModPlatform::Fabric);
+        ui->quilt->setChecked(loaders & ModPlatform::Quilt);
+        m_filter->loaders = loaders;
+        auto def = m_instance->getPackProfile()->getComponentVersion("net.minecraft");
+        m_filter->versions.emplace_front(def);
+        ui->versions->setCheckedItems({ def });
+        ui->version->setCurrentIndex(ui->version->findText(def));
+    } else {
+        ui->hideInstalled->hide();
+    }
+}
 
-    m_mcVersion_buttons.addButton(ui->strictVersionButton, VersionButtonID::Strict);
-    ui->strictVersionButton->click();
-    m_mcVersion_buttons.addButton(ui->majorVersionButton, VersionButtonID::Major);
-    m_mcVersion_buttons.addButton(ui->allVersionsButton, VersionButtonID::All);
-    // m_mcVersion_buttons.addButton(ui->betweenVersionsButton, VersionButtonID::Between);
+void ModFilterWidget::onShowAllVersionsChanged()
+{
+    if (ui->showAllVersions->isChecked())
+        m_versions_proxy->clearFilters();
+    else
+        m_versions_proxy->setFilter(BaseVersionList::TypeRole, new ExactFilter("release"));
+}
 
-    connect(&m_mcVersion_buttons, SIGNAL(idClicked(int)), this, SLOT(onVersionFilterChanged(int)));
+void ModFilterWidget::onVersionFilterChanged(int)
+{
+    auto versions = ui->versions->checkedItems();
+    versions.sort();
+    std::list<Version> current_list;
 
-    m_filter->versions.push_front(def);
+    for (const QString& version : versions)
+        current_list.emplace_back(version);
 
-    m_version_list = APPLICATION->metadataIndex()->get("net.minecraft");
-    setHidden(true);
+    m_filter_changed = m_filter->versions.size() != current_list.size() ||
+                       !std::equal(m_filter->versions.begin(), m_filter->versions.end(), current_list.begin(), current_list.end());
+    m_filter->versions = current_list;
+    if (m_filter_changed)
+        emit filterChanged();
 }
 
-void ModFilterWidget::setInstance(MinecraftInstance* instance)
+void ModFilterWidget::onLoadersFilterChanged()
 {
-    m_instance = instance;
+    ModPlatform::ModLoaderTypes loaders;
+    if (ui->neoForge->isChecked())
+        loaders |= ModPlatform::NeoForge;
+    if (ui->forge->isChecked())
+        loaders |= ModPlatform::Forge;
+    if (ui->fabric->isChecked())
+        loaders |= ModPlatform::Fabric;
+    if (ui->quilt->isChecked())
+        loaders |= ModPlatform::Quilt;
+    m_filter_changed = loaders != m_filter->loaders;
+    m_filter->loaders = loaders;
+    if (m_filter_changed)
+        emit filterChanged();
+}
 
-    ui->strictVersionButton->setText(tr("Strict match (= %1)").arg(mcVersionStr()));
+void ModFilterWidget::onSideFilterChanged()
+{
+    QString side;
 
-    // we can't do this for snapshots sadly
-    if (mcVersionStr().contains('.')) {
-        auto mcVersionSplit = mcVersionStr().split(".");
-        ui->majorVersionButton->setText(tr("Major version match (= %1.%2.x)").arg(mcVersionSplit[0], mcVersionSplit[1]));
+    if (ui->clientSide->isChecked() != ui->serverSide->isChecked()) {
+        if (ui->clientSide->isChecked())
+            side = "client";
+        else
+            side = "server";
     } else {
-        ui->majorVersionButton->setText(tr("Major version match (unsupported)"));
-        disableVersionButton(Major);
+        // both are checked or none are checked; in either case no filtering will happen
+        side = "";
     }
-    ui->allVersionsButton->setText(tr("Any version"));
-    // ui->betweenVersionsButton->setText(
-    //     tr("Between two versions"));
+
+    m_filter_changed = side != m_filter->side;
+    m_filter->side = side;
+    if (m_filter_changed)
+        emit filterChanged();
 }
 
-auto ModFilterWidget::getFilter() -> std::shared_ptr<Filter>
+void ModFilterWidget::onHideInstalledFilterChanged()
 {
-    m_last_version_id = m_version_id;
-    emit filterUnchanged();
-    return m_filter;
+    auto hide = ui->hideInstalled->isChecked();
+    m_filter_changed = hide != m_filter->hideInstalled;
+    m_filter->hideInstalled = hide;
+    if (m_filter_changed)
+        emit filterChanged();
 }
 
-void ModFilterWidget::disableVersionButton(VersionButtonID id, QString reason)
+void ModFilterWidget::onVersionFilterTextChanged(const QString& version)
 {
-    QAbstractButton* btn = nullptr;
-
-    switch (id) {
-        case (VersionButtonID::Strict):
-            btn = ui->strictVersionButton;
-            break;
-        case (VersionButtonID::Major):
-            btn = ui->majorVersionButton;
-            break;
-        case (VersionButtonID::All):
-            btn = ui->allVersionsButton;
-            break;
-        case (VersionButtonID::Between):
-        default:
-            break;
-    }
-
-    if (btn) {
-        btn->setEnabled(false);
-        if (!reason.isEmpty())
-            btn->setText(btn->text() + QString(" (%1)").arg(reason));
+    m_filter->versions.clear();
+    if (ui->version->currentData(Qt::UserRole) != "all") {
+        m_filter->versions.emplace_back(version);
     }
+    m_filter_changed = true;
+    emit filterChanged();
 }
 
-void ModFilterWidget::onVersionFilterChanged(int id)
+void ModFilterWidget::setCategories(const QList<ModPlatform::Category>& categories)
 {
-    // ui->lowerVersionComboBox->setEnabled(id == VersionButtonID::Between);
-    // ui->upperVersionComboBox->setEnabled(id == VersionButtonID::Between);
+    m_categories = categories;
 
-    int index = 1;
+    delete ui->categoryGroup->layout();
+    auto layout = new QVBoxLayout(ui->categoryGroup);
 
-    auto cast_id = (VersionButtonID)id;
-    if (cast_id != m_version_id) {
-        m_version_id = cast_id;
-    } else {
-        return;
-    }
-
-    m_filter->versions.clear();
+    for (const auto& category : categories) {
+        auto name = category.name;
+        name.replace("-", " ");
+        name.replace("&", "&&");
+        auto checkbox = new QCheckBox(name);
+        auto font = checkbox->font();
+        font.setCapitalization(QFont::Capitalize);
+        checkbox->setFont(font);
 
-    switch (cast_id) {
-        case (VersionButtonID::Strict):
-            m_filter->versions.push_front(mcVersion());
-            break;
-        case (VersionButtonID::Major): {
-            auto versionSplit = mcVersionStr().split(".");
+        layout->addWidget(checkbox);
 
-            auto major_version = QString("%1.%2").arg(versionSplit[0], versionSplit[1]);
-            QString version_str = major_version;
+        const QString id = category.id;
+        connect(checkbox, &QCheckBox::toggled, this, [this, id](bool checked) {
+            if (checked)
+                m_filter->categoryIds.append(id);
+            else
+                m_filter->categoryIds.removeOne(id);
 
-            while (m_version_list->hasVersion(version_str)) {
-                m_filter->versions.emplace_back(version_str);
-                version_str = QString("%1.%2").arg(major_version, QString::number(index++));
-            }
-
-            break;
-        }
-        case (VersionButtonID::All):
-            // Empty list to avoid enumerating all versions :P
-            break;
-        case (VersionButtonID::Between):
-            // TODO
-            break;
+            m_filter_changed = true;
+            emit filterChanged();
+        });
     }
-
-    if (changed())
-        emit filterChanged();
-    else
-        emit filterUnchanged();
 }
 
-ModFilterWidget::~ModFilterWidget()
-{
-    delete ui;
-}
+#include "ModFilterWidget.moc"
\ No newline at end of file
diff --git a/launcher/ui/widgets/ModFilterWidget.h b/launcher/ui/widgets/ModFilterWidget.h
index ed6cd0ea7..50f0e06c9 100644
--- a/launcher/ui/widgets/ModFilterWidget.h
+++ b/launcher/ui/widgets/ModFilterWidget.h
@@ -1,15 +1,52 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #pragma once
 
 #include <QButtonGroup>
+#include <QList>
+#include <QListWidgetItem>
 #include <QTabWidget>
 
 #include "Version.h"
 
-#include "meta/Index.h"
+#include "VersionProxyModel.h"
 #include "meta/VersionList.h"
 
 #include "minecraft/MinecraftInstance.h"
-#include "minecraft/PackProfile.h"
+#include "modplatform/ModIndex.h"
 
 class MinecraftInstance;
 
@@ -20,59 +57,66 @@ class ModFilterWidget;
 class ModFilterWidget : public QTabWidget {
     Q_OBJECT
    public:
-    enum VersionButtonID { Strict = 0, Major = 1, All = 2, Between = 3 };
-
     struct Filter {
         std::list<Version> versions;
-
-        bool operator==(const Filter& other) const { return versions == other.versions; }
+        std::list<ModPlatform::IndexedVersionType> releases;
+        ModPlatform::ModLoaderTypes loaders;
+        QString side;
+        bool hideInstalled;
+        QStringList categoryIds;
+
+        bool operator==(const Filter& other) const
+        {
+            return hideInstalled == other.hideInstalled && side == other.side && loaders == other.loaders && versions == other.versions &&
+                   releases == other.releases && categoryIds == other.categoryIds;
+        }
         bool operator!=(const Filter& other) const { return !(*this == other); }
-    };
 
-    std::shared_ptr<Filter> m_filter;
+        bool checkMcVersions(QStringList value)
+        {
+            for (auto mcVersion : versions)
+                if (value.contains(mcVersion.toString()))
+                    return true;
 
-   public:
-    static unique_qobject_ptr<ModFilterWidget> create(Version default_version, QWidget* parent = nullptr);
-    ~ModFilterWidget();
-
-    void setInstance(MinecraftInstance* instance);
+            return versions.empty();
+        }
+    };
 
-    /// By default all buttons are enabled
-    void disableVersionButton(VersionButtonID, QString reason = {});
+    static unique_qobject_ptr<ModFilterWidget> create(MinecraftInstance* instance, bool extended, QWidget* parent = nullptr);
+    virtual ~ModFilterWidget();
 
     auto getFilter() -> std::shared_ptr<Filter>;
-    auto changed() const -> bool { return m_last_version_id != m_version_id; }
+    auto changed() const -> bool { return m_filter_changed; }
 
-    Meta::VersionList::Ptr versionList() { return m_version_list; }
+   signals:
+    void filterChanged();
+
+   public slots:
+    void setCategories(const QList<ModPlatform::Category>&);
 
    private:
-    ModFilterWidget(Version def, QWidget* parent = nullptr);
+    ModFilterWidget(MinecraftInstance* instance, bool extendedSupport, QWidget* parent = nullptr);
 
-    inline auto mcVersionStr() const -> QString
-    {
-        return m_instance ? m_instance->getPackProfile()->getComponentVersion("net.minecraft") : "";
-    }
-    inline auto mcVersion() const -> Version { return { mcVersionStr() }; }
+    void loadVersionList();
+    void prepareBasicFilter();
 
    private slots:
-    void onVersionFilterChanged(int id);
-
-   public:
-   signals:
-    void filterChanged();
-    void filterUnchanged();
+    void onVersionFilterChanged(int);
+    void onVersionFilterTextChanged(const QString& version);
+    void onLoadersFilterChanged();
+    void onSideFilterChanged();
+    void onHideInstalledFilterChanged();
+    void onShowAllVersionsChanged();
 
    private:
     Ui::ModFilterWidget* ui;
 
     MinecraftInstance* m_instance = nullptr;
-
-    /* Version stuff */
-    QButtonGroup m_mcVersion_buttons;
+    std::shared_ptr<Filter> m_filter;
+    bool m_filter_changed = false;
 
     Meta::VersionList::Ptr m_version_list;
+    VersionProxyModel* m_versions_proxy = nullptr;
 
-    /* Used to tell if the filter was changed since the last getFilter() call */
-    VersionButtonID m_last_version_id = VersionButtonID::Strict;
-    VersionButtonID m_version_id = VersionButtonID::Strict;
+    QList<ModPlatform::Category> m_categories;
 };
diff --git a/launcher/ui/widgets/ModFilterWidget.ui b/launcher/ui/widgets/ModFilterWidget.ui
index ebe5d2be1..236847094 100644
--- a/launcher/ui/widgets/ModFilterWidget.ui
+++ b/launcher/ui/widgets/ModFilterWidget.ui
@@ -1,54 +1,219 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ModFilterWidget</class>
- <widget class="QTabWidget" name="ModFilterWidget">
+ <widget class="QWidget" name="ModFilterWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>310</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <widget class="QWidget" name="VersionPage">
-   <attribute name="title">
-    <string>Minecraft versions</string>
-   </attribute>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <layout class="QFormLayout" name="formLayout">
-      <item row="2" column="0">
-       <widget class="QRadioButton" name="allVersionsButton">
-        <property name="text">
-         <string notr="true">allVersions</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="strictVersionButton">
-        <property name="text">
-         <string notr="true">strictVersion</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QRadioButton" name="majorVersionButton">
-        <property name="text">
-         <string notr="true">majorVersion</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
+  <property name="minimumSize">
+   <size>
+    <width>275</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>310</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="minimumSize">
+      <size>
+       <width>275</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>308</width>
+        <height>598</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QGroupBox" name="categoryGroup">
+         <property name="title">
+          <string>Categories</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="loaderGroup">
+         <property name="title">
+          <string>Loaders</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QCheckBox" name="neoForge">
+            <property name="text">
+             <string>NeoForge</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="forge">
+            <property name="text">
+             <string>Forge</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="fabric">
+            <property name="text">
+             <string>Fabric</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="quilt">
+            <property name="text">
+             <string>Quilt</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="minecraftVersionGroup">
+         <property name="title">
+          <string>Versions</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QCheckBox" name="showAllVersions">
+            <property name="text">
+             <string>Show all versions</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="CheckComboBox" name="versions"/>
+          </item>
+          <item>
+           <widget class="QComboBox" name="version"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="environmentGroup">
+         <property name="title">
+          <string>Environments</string>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <widget class="QCheckBox" name="clientSide">
+            <property name="text">
+             <string>Client</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="serverSide">
+            <property name="text">
+             <string>Server</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="hideInstalled">
+         <property name="text">
+          <string>Hide installed items</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CheckComboBox</class>
+   <extends>QComboBox</extends>
+   <header>ui/widgets/CheckComboBox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/launcher/ui/widgets/PageContainer.h b/launcher/ui/widgets/PageContainer.h
index 05be1c3a5..ab4444c99 100644
--- a/launcher/ui/widgets/PageContainer.h
+++ b/launcher/ui/widgets/PageContainer.h
@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <QListView>
 #include <QModelIndex>
 #include <QWidget>
 
@@ -86,6 +87,8 @@ class PageContainer : public QWidget, public BasePageContainer {
 
     void changeEvent(QEvent*) override;
 
+    void hidePageList() { m_pageList->hide(); }
+
    private:
     void createUI();
     void retranslate();
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 25b91857c..2108bf56e 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@ ThemeCustomizationWidget::ThemeCustomizationWidget(QWidget* parent) : QWidget(pa
 {
     ui->setupUi(this);
     loadSettings();
+    ThemeCustomizationWidget::refresh();
 
     connect(ui->iconsComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyIconTheme);
     connect(ui->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
@@ -39,6 +40,8 @@ ThemeCustomizationWidget::ThemeCustomizationWidget(QWidget* parent) : QWidget(pa
             [] { DesktopServices::openPath(APPLICATION->themeManager()->getApplicationThemesFolder().path()); });
     connect(ui->catPackFolder, &QPushButton::clicked, this,
             [] { DesktopServices::openPath(APPLICATION->themeManager()->getCatPacksFolder().path()); });
+
+    connect(ui->refreshButton, &QPushButton::clicked, this, &ThemeCustomizationWidget::refresh);
 }
 
 ThemeCustomizationWidget::~ThemeCustomizationWidget()
@@ -148,6 +151,10 @@ void ThemeCustomizationWidget::loadSettings()
         int idx = 0;
         for (auto& theme : themes) {
             ui->widgetStyleComboBox->addItem(theme->name(), theme->id());
+            if (theme->tooltip() != "") {
+                int index = ui->widgetStyleComboBox->count() - 1;
+                ui->widgetStyleComboBox->setItemData(index, theme->tooltip(), Qt::ToolTipRole);
+            }
             if (currentTheme == theme->id()) {
                 ui->widgetStyleComboBox->setCurrentIndex(idx);
             }
@@ -169,3 +176,22 @@ void ThemeCustomizationWidget::retranslate()
 {
     ui->retranslateUi(this);
 }
+
+void ThemeCustomizationWidget::refresh()
+{
+    applySettings();
+    disconnect(ui->iconsComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyIconTheme);
+    disconnect(ui->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+               &ThemeCustomizationWidget::applyWidgetTheme);
+    disconnect(ui->backgroundCatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+               &ThemeCustomizationWidget::applyCatTheme);
+    APPLICATION->themeManager()->refresh();
+    ui->iconsComboBox->clear();
+    ui->widgetStyleComboBox->clear();
+    ui->backgroundCatComboBox->clear();
+    loadSettings();
+    connect(ui->iconsComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyIconTheme);
+    connect(ui->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ThemeCustomizationWidget::applyWidgetTheme);
+    connect(ui->backgroundCatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyCatTheme);
+};
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.h b/launcher/ui/widgets/ThemeCustomizationWidget.h
index cef5fb6c6..6977b8495 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.h
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.h
@@ -44,6 +44,7 @@ class ThemeCustomizationWidget : public QWidget {
     void applyIconTheme(int index);
     void applyWidgetTheme(int index);
     void applyCatTheme(int index);
+    void refresh();
 
    signals:
     int currentIconThemeChanged(int index);
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui
index 4503181c2..1faa45c4f 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.ui
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="sizeConstraint">
     <enum>QLayout::SetMinimumSize</enum>
    </property>
@@ -29,141 +29,179 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="iconsLabel">
-     <property name="text">
-      <string>&amp;Icons</string>
-     </property>
-     <property name="buddy">
-      <cstring>iconsComboBox</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <layout class="QHBoxLayout" name="iconsLayout">
-     <item>
-      <widget class="QComboBox" name="iconsComboBox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="iconsLabel">
+       <property name="text">
+        <string>&amp;Icons</string>
        </property>
-       <property name="focusPolicy">
-        <enum>Qt::StrongFocus</enum>
+       <property name="buddy">
+        <cstring>iconsComboBox</cstring>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="iconsFolder">
-       <property name="toolTip">
-        <string>View icon themes folder.</string>
-       </property>
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="iconsLayout">
+       <item>
+        <widget class="QComboBox" name="iconsComboBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="iconsFolder">
+         <property name="toolTip">
+          <string>View icon themes folder.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset theme="viewfolder"/>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="widgetStyleLabel">
        <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset theme="viewfolder">
-         <normaloff>.</normaloff>.</iconset>
+        <string>&amp;Widgets</string>
        </property>
-       <property name="flat">
-        <bool>true</bool>
+       <property name="buddy">
+        <cstring>widgetStyleComboBox</cstring>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="widgetStyleLabel">
-     <property name="text">
-      <string>&amp;Widgets</string>
-     </property>
-     <property name="buddy">
-      <cstring>widgetStyleComboBox</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <layout class="QHBoxLayout" name="widgetStyleLayout">
-     <item>
-      <widget class="QComboBox" name="widgetStyleComboBox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::StrongFocus</enum>
-       </property>
-      </widget>
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="widgetStyleLayout">
+       <item>
+        <widget class="QComboBox" name="widgetStyleComboBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="widgetStyleFolder">
+         <property name="toolTip">
+          <string>View widget themes folder.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset theme="viewfolder"/>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
-     <item>
-      <widget class="QPushButton" name="widgetStyleFolder">
+     <item row="2" column="0">
+      <widget class="QLabel" name="backgroundCatLabel">
        <property name="toolTip">
-        <string>View widget themes folder.</string>
+        <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
        </property>
        <property name="text">
-        <string/>
+        <string>C&amp;at</string>
        </property>
-       <property name="icon">
-        <iconset theme="viewfolder">
-         <normaloff>.</normaloff>.</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
+       <property name="buddy">
+        <cstring>backgroundCatComboBox</cstring>
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <layout class="QHBoxLayout" name="catLayout">
+       <item>
+        <widget class="QComboBox" name="backgroundCatComboBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="catPackFolder">
+         <property name="toolTip">
+          <string>View cat packs folder.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset theme="viewfolder"/>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="backgroundCatLabel">
-     <property name="toolTip">
-      <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
-     </property>
-     <property name="text">
-      <string>C&amp;at</string>
-     </property>
-     <property name="buddy">
-      <cstring>backgroundCatComboBox</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <layout class="QHBoxLayout" name="catLayout">
+   <item>
+    <layout class="QHBoxLayout" name="refreshLayout">
      <item>
-      <widget class="QComboBox" name="backgroundCatComboBox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::StrongFocus</enum>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="toolTip">
-        <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
        </property>
-      </widget>
+      </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="catPackFolder">
-       <property name="toolTip">
-        <string>View cat packs folder.</string>
-       </property>
+      <widget class="QPushButton" name="refreshButton">
        <property name="text">
-        <string/>
+        <string>Refresh all</string>
        </property>
-       <property name="icon">
-        <iconset theme="viewfolder">
-         <normaloff>.</normaloff>.</iconset>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="flat">
-        <bool>true</bool>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
        </property>
-      </widget>
+      </spacer>
      </item>
     </layout>
    </item>
diff --git a/launcher/ui/widgets/VariableSizedImageObject.cpp b/launcher/ui/widgets/VariableSizedImageObject.cpp
index 3dd9d5634..9723a2c56 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.cpp
+++ b/launcher/ui/widgets/VariableSizedImageObject.cpp
@@ -80,7 +80,7 @@ void VariableSizedImageObject::drawObject(QPainter* painter,
 {
     if (!format.hasProperty(ImageData)) {
         QUrl image_url{ qvariant_cast<QString>(format.property(QTextFormat::ImageName)) };
-        if (m_fetching_images.contains(image_url))
+        if (m_fetching_images.contains(image_url) || image_url.isEmpty())
             return;
 
         auto meta = std::make_shared<ImageMetadata>();
@@ -140,6 +140,7 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, std::shared_ptr<Ima
         QString("images/%1").arg(QString(QCryptographicHash::hash(meta->url.toEncoded(), QCryptographicHash::Algorithm::Sha1).toHex())));
 
     auto job = new NetJob(QString("Load Image: %1").arg(meta->url.fileName()), APPLICATION->network());
+    job->setAskRetry(false);
     job->addNetAction(Net::ApiDownload::makeCached(meta->url, entry));
 
     auto full_entry_path = entry->getFullPath();
diff --git a/launcher/ui/widgets/VersionSelectWidget.cpp b/launcher/ui/widgets/VersionSelectWidget.cpp
index a24630b31..2d735d18f 100644
--- a/launcher/ui/widgets/VersionSelectWidget.cpp
+++ b/launcher/ui/widgets/VersionSelectWidget.cpp
@@ -105,14 +105,14 @@ bool VersionSelectWidget::eventFilter(QObject* watched, QEvent* event)
     return QObject::eventFilter(watched, event);
 }
 
-void VersionSelectWidget::initialize(BaseVersionList* vlist)
+void VersionSelectWidget::initialize(BaseVersionList* vlist, bool forceLoad)
 {
     m_vlist = vlist;
     m_proxyModel->setSourceModel(vlist);
     listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     listView->header()->setSectionResizeMode(resizeOnColumn, QHeaderView::Stretch);
 
-    if (!m_vlist->isLoaded()) {
+    if (!m_vlist->isLoaded() || forceLoad) {
         loadList();
     } else {
         if (m_proxyModel->rowCount() == 0) {
@@ -129,16 +129,12 @@ void VersionSelectWidget::closeEvent(QCloseEvent* event)
 
 void VersionSelectWidget::loadList()
 {
-    auto newTask = m_vlist->getLoadTask();
-    if (!newTask) {
-        return;
-    }
-    loadTask = newTask.get();
-    connect(loadTask, &Task::succeeded, this, &VersionSelectWidget::onTaskSucceeded);
-    connect(loadTask, &Task::failed, this, &VersionSelectWidget::onTaskFailed);
-    connect(loadTask, &Task::progress, this, &VersionSelectWidget::changeProgress);
-    if (!loadTask->isRunning()) {
-        loadTask->start();
+    m_load_task = m_vlist->getLoadTask();
+    connect(m_load_task.get(), &Task::succeeded, this, &VersionSelectWidget::onTaskSucceeded);
+    connect(m_load_task.get(), &Task::failed, this, &VersionSelectWidget::onTaskFailed);
+    connect(m_load_task.get(), &Task::progress, this, &VersionSelectWidget::changeProgress);
+    if (!m_load_task->isRunning()) {
+        m_load_task->start();
     }
     sneakyProgressBar->setHidden(false);
 }
@@ -150,7 +146,7 @@ void VersionSelectWidget::onTaskSucceeded()
     }
     sneakyProgressBar->setHidden(true);
     preselect();
-    loadTask = nullptr;
+    m_load_task.reset();
 }
 
 void VersionSelectWidget::onTaskFailed(const QString& reason)
diff --git a/launcher/ui/widgets/VersionSelectWidget.h b/launcher/ui/widgets/VersionSelectWidget.h
index d5ef1cc9f..c16d4c0dd 100644
--- a/launcher/ui/widgets/VersionSelectWidget.h
+++ b/launcher/ui/widgets/VersionSelectWidget.h
@@ -54,7 +54,7 @@ class VersionSelectWidget : public QWidget {
     ~VersionSelectWidget();
 
     //! loads the list if needed.
-    void initialize(BaseVersionList* vlist);
+    void initialize(BaseVersionList* vlist, bool forceLoad = false);
 
     //! Starts a task that loads the list.
     void loadList();
@@ -98,7 +98,7 @@ class VersionSelectWidget : public QWidget {
     BaseVersionList* m_vlist = nullptr;
     VersionProxyModel* m_proxyModel = nullptr;
     int resizeOnColumn = 0;
-    Task* loadTask;
+    Task::Ptr m_load_task;
     bool preselectedAlready = false;
 
     QVBoxLayout* verticalLayout = nullptr;
diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp
index 46caaaef2..2940d7ce7 100644
--- a/launcher/ui/widgets/WideBar.cpp
+++ b/launcher/ui/widgets/WideBar.cpp
@@ -309,4 +309,15 @@ bool WideBar::checkHash(QByteArray const& old_hash) const
     return old_hash == getHash();
 }
 
+void WideBar::removeAction(QAction* action)
+{
+    auto iter = getMatching(action);
+    if (iter == m_entries.end())
+        return;
+
+    iter->bar_action->setVisible(false);
+    removeAction(iter->bar_action);
+    m_entries.erase(iter);
+}
+
 #include "WideBar.moc"
diff --git a/launcher/ui/widgets/WideBar.h b/launcher/ui/widgets/WideBar.h
index c47f3a596..f4877a89a 100644
--- a/launcher/ui/widgets/WideBar.h
+++ b/launcher/ui/widgets/WideBar.h
@@ -38,6 +38,8 @@ class WideBar : public QToolBar {
     [[nodiscard]] QByteArray getVisibilityState() const;
     void setVisibilityState(QByteArray&&);
 
+    void removeAction(QAction* action);
+
    private:
     struct BarEntry {
         enum class Type { None, Action, Separator, Spacer } type = Type::None;
diff --git a/launcher/updater/PrismExternalUpdater.cpp b/launcher/updater/PrismExternalUpdater.cpp
index d334a8c35..da1861103 100644
--- a/launcher/updater/PrismExternalUpdater.cpp
+++ b/launcher/updater/PrismExternalUpdater.cpp
@@ -85,6 +85,11 @@ PrismExternalUpdater::~PrismExternalUpdater()
 }
 
 void PrismExternalUpdater::checkForUpdates()
+{
+    checkForUpdates(true);
+}
+
+void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
 {
     QProgressDialog progress(tr("Checking for updates..."), "", 0, 0, priv->parent);
     progress.setCancelButton(nullptr);
@@ -160,7 +165,7 @@ void PrismExternalUpdater::checkForUpdates()
     switch (exit_code) {
         case 0:
             // no update available
-            {
+            if (triggeredByUser) {
                 qDebug() << "No update available";
                 auto msgBox = QMessageBox(QMessageBox::Information, tr("No Update Available"), tr("You are running the latest version."),
                                           QMessageBox::Ok, priv->parent);
@@ -257,7 +262,7 @@ void PrismExternalUpdater::setBetaAllowed(bool allowed)
 
 void PrismExternalUpdater::resetAutoCheckTimer()
 {
-    if (priv->autoCheck) {
+    if (priv->autoCheck && priv->updateInterval > 0) {
         int timeoutDuration = 0;
         auto now = QDateTime::currentDateTime();
         if (priv->lastCheck.isValid()) {
@@ -288,7 +293,7 @@ void PrismExternalUpdater::disconnectTimer()
 void PrismExternalUpdater::autoCheckTimerFired()
 {
     qDebug() << "Auto update Timer fired";
-    checkForUpdates();
+    checkForUpdates(false);
 }
 
 void PrismExternalUpdater::offerUpdate(const QString& version_name, const QString& version_tag, const QString& release_notes)
diff --git a/launcher/updater/PrismExternalUpdater.h b/launcher/updater/PrismExternalUpdater.h
index bfe94c149..b88676028 100644
--- a/launcher/updater/PrismExternalUpdater.h
+++ b/launcher/updater/PrismExternalUpdater.h
@@ -41,6 +41,7 @@ class PrismExternalUpdater : public ExternalUpdater {
      * Check for updates manually, showing the user a progress bar and an alert if no updates are found.
      */
     void checkForUpdates() override;
+    void checkForUpdates(bool triggeredByUser);
 
     /*!
      * Indicates whether or not to check for updates automatically.
diff --git a/launcher/updater/prismupdater/PrismUpdater.cpp b/launcher/updater/prismupdater/PrismUpdater.cpp
index fc7d5cea0..8f43c8415 100644
--- a/launcher/updater/prismupdater/PrismUpdater.cpp
+++ b/launcher/updater/prismupdater/PrismUpdater.cpp
@@ -244,8 +244,9 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
 
     auto updater_executable = QCoreApplication::applicationFilePath();
 
-    if (BuildConfig.BUILD_ARTIFACT.toLower() == "macos")
-        showFatalErrorMessage(tr("MacOS Not Supported"), tr("The updater does not support installations on MacOS"));
+#ifdef Q_OS_MACOS
+    showFatalErrorMessage(tr("MacOS Not Supported"), tr("The updater does not support installations on MacOS"));
+#endif
 
     if (updater_executable.startsWith("/tmp/.mount_")) {
         m_isAppimage = true;
@@ -327,6 +328,19 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
         // on command line
         adjustedBy = "Command line";
         m_dataPath = dirParam;
+#ifndef Q_OS_MACOS
+        if (QDir(FS::PathCombine(m_rootPath, "UserData")).exists()) {
+            m_isPortable = true;
+        }
+        if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) {
+            m_isPortable = true;
+        }
+#endif
+    } else if (auto dataDirEnv =
+                   QProcessEnvironment::systemEnvironment().value(QString("%1_DATA_DIR").arg(BuildConfig.LAUNCHER_NAME.toUpper()));
+               !dataDirEnv.isEmpty()) {
+        adjustedBy = "System environment";
+        m_dataPath = dataDirEnv;
 #ifndef Q_OS_MACOS
         if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) {
             m_isPortable = true;
@@ -338,7 +352,11 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
         adjustedBy = "Persistent data path";
 
 #ifndef Q_OS_MACOS
-        if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) {
+        if (auto portableUserData = FS::PathCombine(m_rootPath, "UserData"); QDir(portableUserData).exists()) {
+            m_dataPath = portableUserData;
+            adjustedBy = "Portable user data path";
+            m_isPortable = true;
+        } else if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) {
             m_dataPath = m_rootPath;
             adjustedBy = "Portable data path";
             m_isPortable = true;
@@ -352,15 +370,10 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
         FS::ensureFolderPathExists(FS::PathCombine(m_dataPath, "logs"));
         static const QString baseLogFile = BuildConfig.LAUNCHER_NAME + "Updater" + (m_checkOnly ? "-CheckOnly" : "") + "-%0.log";
         static const QString logBase = FS::PathCombine(m_dataPath, "logs", baseLogFile);
-        auto moveFile = [](const QString& oldName, const QString& newName) {
-            QFile::remove(newName);
-            QFile::copy(oldName, newName);
-            QFile::remove(oldName);
-        };
 
         if (FS::ensureFolderPathExists("logs")) {  // enough history to track both launches of the updater during a portable install
-            moveFile(logBase.arg(1), logBase.arg(2));
-            moveFile(logBase.arg(0), logBase.arg(1));
+            FS::move(logBase.arg(1), logBase.arg(2));
+            FS::move(logBase.arg(0), logBase.arg(1));
         }
 
         logFile = std::unique_ptr<QFile>(new QFile(logBase.arg(0)));
@@ -585,12 +598,6 @@ void PrismUpdaterApp::run()
         return exit(result ? 0 : 1);
     }
 
-    if (BuildConfig.BUILD_ARTIFACT.toLower() == "linux" && !m_isPortable) {
-        showFatalErrorMessage(tr("Updating Not Supported"),
-                              tr("Updating non-portable linux installations is not supported. Please use your system package manager"));
-        return;
-    }
-
     if (need_update || m_forceUpdate || !m_userSelectedVersion.isEmpty()) {
         GitHubRelease update_release = latest;
         if (!m_userSelectedVersion.isEmpty()) {
@@ -792,6 +799,10 @@ QList<GitHubReleaseAsset> PrismUpdaterApp::validReleaseArtifacts(const GitHubRel
     if (BuildConfig.BUILD_ARTIFACT.isEmpty())
         qWarning() << "Build platform is not set!";
     for (auto asset : release.assets) {
+        if (asset.name.endsWith(".zsync")) {
+            qDebug() << "Rejecting zsync file" << asset.name;
+            continue;
+        }
         if (!m_isAppimage && asset.name.toLower().endsWith("appimage")) {
             qDebug() << "Rejecting" << asset.name << "because it is an AppImage";
             continue;
@@ -923,7 +934,7 @@ bool PrismUpdaterApp::callAppImageUpdate()
 
 void PrismUpdaterApp::clearUpdateLog()
 {
-    QFile::remove(m_updateLogPath);
+    FS::deletePath(m_updateLogPath);
 }
 
 void PrismUpdaterApp::logUpdate(const QString& msg)
@@ -1025,7 +1036,7 @@ void PrismUpdaterApp::performInstall(QFileInfo file)
     FS::write(changelog_path, m_install_release.body.toUtf8());
 
     logUpdate(tr("Updating from %1 to %2").arg(m_prismVersion).arg(m_install_release.tag_name));
-    if (m_isPortable || file.suffix().toLower() == "zip") {
+    if (m_isPortable || file.fileName().endsWith(".zip") || file.fileName().endsWith(".tar.gz")) {
         write_lock_file(update_lock_path, QDateTime::currentDateTime(), m_prismVersion, m_install_release.tag_name, m_rootPath, m_dataPath);
         logUpdate(tr("Updating portable install at %1").arg(m_rootPath));
         unpackAndInstall(file);
@@ -1099,7 +1110,7 @@ void PrismUpdaterApp::backupAppDir()
 
     if (file_list.isEmpty()) {
         // best guess
-        if (BuildConfig.BUILD_ARTIFACT.toLower() == "linux") {
+        if (BuildConfig.BUILD_ARTIFACT.toLower().contains("linux")) {
             file_list.append({ "FjordLauncher", "bin", "share", "lib" });
         } else {  // windows by process of elimination
             file_list.append({
@@ -1199,7 +1210,7 @@ std::optional<QDir> PrismUpdaterApp::unpackArchive(QFileInfo archive)
         QProcess proc = QProcess();
         proc.start(cmd, args);
         if (!proc.waitForStarted(5000)) {  // wait 5 seconds to start
-            auto msg = tr("Failed to launcher child process \"%1 %2\".").arg(cmd).arg(args.join(" "));
+            auto msg = tr("Failed to launch child process \"%1 %2\".").arg(cmd).arg(args.join(" "));
             logUpdate(msg);
             showFatalErrorMessage(tr("Failed extract archive"), msg);
             return std::nullopt;
@@ -1230,7 +1241,7 @@ bool PrismUpdaterApp::loadPrismVersionFromExe(const QString& exe_path)
     proc.setReadChannel(QProcess::StandardOutput);
     proc.start(exe_path, { "--version" });
     if (!proc.waitForStarted(5000)) {
-        showFatalErrorMessage(tr("Failed to Check Version"), tr("Failed to launcher child launcher process to read version."));
+        showFatalErrorMessage(tr("Failed to Check Version"), tr("Failed to launch child process to read version."));
         return false;
     }  // wait 5 seconds to start
     if (!proc.waitForFinished(5000)) {
diff --git a/libraries/README.md b/libraries/README.md
index e75a381ee..67d78dade 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -32,14 +32,6 @@ Simple Java tool that prints the JVM details - version and platform bitness.
 
 Do what you want with it. It is so trivial that noone cares.
 
-## Katabasis
-
-Oauth2 library customized for Microsoft authentication.
-
-This is a fork of the [O2 library](https://github.com/pipacs/o2).
-
-MIT licensed.
-
 ## launcher
 
 Java launcher part for Minecraft.
diff --git a/libraries/katabasis/.gitignore b/libraries/katabasis/.gitignore
deleted file mode 100644
index 35e189c5e..000000000
--- a/libraries/katabasis/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build/
-*.kdev4
diff --git a/libraries/katabasis/CMakeLists.txt b/libraries/katabasis/CMakeLists.txt
deleted file mode 100644
index 643244ede..000000000
--- a/libraries/katabasis/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-cmake_minimum_required(VERSION 3.9.4)
-
-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BUILD_DIR}" IS_IN_SOURCE_BUILD)
-if(IS_IN_SOURCE_BUILD)
-    message(FATAL_ERROR "You are building Katabasis in-source. Please separate the build tree from the source tree.")
-endif()
-
-project(Katabasis)
-enable_testing()
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_CXX_STANDARD_REQUIRED true)
-set(CMAKE_C_STANDARD_REQUIRED true)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_C_STANDARD 11)
-
-if(QT_VERSION_MAJOR EQUAL 5)
-    find_package(Qt5 COMPONENTS Core Network REQUIRED)
-elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
-    find_package(Qt6 COMPONENTS Core Network REQUIRED)
-endif()
-
-set( katabasis_PRIVATE
-    src/DeviceFlow.cpp
-    src/JsonResponse.cpp
-    src/JsonResponse.h
-    src/PollServer.cpp
-    src/Reply.cpp
-)
-
-set( katabasis_PUBLIC
-    include/katabasis/DeviceFlow.h
-    include/katabasis/Globals.h
-    include/katabasis/PollServer.h
-    include/katabasis/Reply.h
-    include/katabasis/RequestParameter.h
-)
-
-ecm_qt_declare_logging_category(katabasis_PRIVATE
-    HEADER KatabasisLogging.h  # NOTE: this won't be in src/, but CMAKE_BINARY_DIR/src isn't included by default so this should be fine
-    IDENTIFIER katabasisCredentials
-    CATEGORY_NAME "katabasis.credentials"
-    DEFAULT_SEVERITY Warning
-    DESCRIPTION "Secrets and credentials from Katabasis"
-    EXPORT "Katabasis"
-)
-
-add_library( Katabasis STATIC ${katabasis_PRIVATE} ${katabasis_PUBLIC} )
-target_link_libraries(Katabasis Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network)
-
-# needed for statically linked Katabasis in shared libs on x86_64
-set_target_properties(Katabasis
-    PROPERTIES POSITION_INDEPENDENT_CODE TRUE
-)
-
-target_include_directories(Katabasis PUBLIC include PRIVATE src include/katabasis)
diff --git a/libraries/katabasis/LICENSE b/libraries/katabasis/LICENSE
deleted file mode 100644
index 9ac8d42fb..000000000
--- a/libraries/katabasis/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2012, Akos Polster
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice, 
-this list of conditions and the following disclaimer in the documentation 
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libraries/katabasis/README.md b/libraries/katabasis/README.md
deleted file mode 100644
index fe6dd4aca..000000000
--- a/libraries/katabasis/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Katabasis - MS-flavored OAuth for Qt, derived from the O2 library
-
-This library's sole purpose is to make interacting with MSA and various MSA and XBox authenticated services less painful.
-
-It may be possible to backport some of the changes to O2 in the future, but for the sake of going fast, all compatibility concerns have been ignored.
-
-[You can find the original library's git repository here.](https://github.com/pipacs/o2)
-
-Notes to contributors:
-
-* Please follow the coding style of the existing source, where reasonable
-* Code contributions are released under Simplified BSD License, as specified in LICENSE. Do not contribute if this license does not suit your code
-* If you are interested in working on this, come to the Prism Launcher Discord server and talk first
-
-## Installation
-
-Clone the Github repository, integrate the it into your CMake build system.
-
-The library is static only, dynamic linking and system-wide installation are out of scope and undesirable.
-
-## Usage
-
-At this stage, don't, unless you want to help with the library itself.
-
-This is an experimental fork of the O2 library and is undergoing a big design/architecture shift in order to support different features:
-
-* Multiple accounts
-* Multi-stage authentication/authorization schemes
-* Tighter control over token chains and their storage
-* Talking to complex APIs and individually authorized microservices
-* Token lifetime management, 'offline mode' and resilience in face of network failures
-* Token and claims/entitlements validation
-* Caching of some API results
-* XBox magic
-* Mojang magic
-* Generally, magic that you would spend weeks on researching while getting confused by contradictory/incomplete documentation (if any is available)
diff --git a/libraries/katabasis/acknowledgements.md b/libraries/katabasis/acknowledgements.md
deleted file mode 100644
index a6989d15a..000000000
--- a/libraries/katabasis/acknowledgements.md
+++ /dev/null
@@ -1,108 +0,0 @@
-## O2 library by Akos Polster and contributors
-
-[The origin of this fork.](https://github.com/pipacs/o2)
-
-> Copyright (c) 2012, Akos Polster
-> All rights reserved.
->
-> Redistribution and use in source and binary forms, with or without
-> modification, are permitted provided that the following conditions are met:
->
-> * Redistributions of source code must retain the above copyright notice, this
-> list of conditions and the following disclaimer.
->
-> * Redistributions in binary form must reproduce the above copyright notice,
-> this list of conditions and the following disclaimer in the documentation
-> and/or other materials provided with the distribution.
->
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-> DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-> FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-> DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-> SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-> OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-> OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-## SimpleCrypt by Andre Somers
-
-Cryptographic methods for Qt.
-
-> Copyright (c) 2011, Andre Somers
-> All rights reserved.
->
-> Redistribution and use in source and binary forms, with or without
-> modification, are permitted provided that the following conditions are met:
->
-> * Redistributions of source code must retain the above copyright
->      notice, this list of conditions and the following disclaimer.
-> * Redistributions in binary form must reproduce the above copyright
->      notice, this list of conditions and the following disclaimer in the
->      documentation and/or other materials provided with the distribution.
-> * Neither the name of the Rathenau Instituut, Andre Somers nor the
->      names of its contributors may be used to endorse or promote products
->      derived from this software without specific prior written permission.
->
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-> ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-> WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-> DISCLAIMED. IN NO EVENT SHALL ANDRE SOMERS BE LIABLE FOR ANY
-> DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-> (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-> ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-## Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
-
-Configurable settings storage, Twitter XAuth specialization, new demos, cleanups.
-
-> "Hi Akos,
->
-> I'm writing this mail to confirm that my contributions to the O2 library, available here <https://github.com/pipacs/o2>, can be freely distributed according to the project's license (as shown in the LICENSE file).
->
-> Regards,
-> -mandeep"
-
-## Sergey Gavrushkin <https://github.com/ncux>
-
-FreshBooks specialization
-
-## Theofilos Intzoglou <https://github.com/parapente>
-
-Hubic specialization
-
-## Dimitar
-
-SurveyMonkey specialization
-
-## David Brooks <https://github.com/dbrnz>
-
-CMake related fixes and improvements.
-
-## Lukas Vogel <https://github.com/lukedirtwalker>
-
-Spotify support
-
-## Alan Garny <https://github.com/agarny>
-
-Windows DLL build support
-
-## MartinMikita <https://github.com/MartinMikita>
-
-Bug fixes
-
-## Larry Shaffer <https://github.com/dakcarto>
-
-Versioning, shared lib, install target and header support
-
-## Gilmanov Ildar <https://github.com/gilmanov-ildar>
-
-Bug fixes, support for ```qml``` module
-
-## Fabian Vogt <https://github.com/Vogtinator>
-
-Bug fixes, support for building without Qt keywords enabled
diff --git a/libraries/katabasis/include/katabasis/Bits.h b/libraries/katabasis/include/katabasis/Bits.h
deleted file mode 100644
index 15da2a5a8..000000000
--- a/libraries/katabasis/include/katabasis/Bits.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <QDateTime>
-#include <QMap>
-#include <QString>
-#include <QVariantMap>
-
-namespace Katabasis {
-enum class Activity {
-    Idle,
-    LoggingIn,
-    LoggingOut,
-    Refreshing,
-    FailedSoft,  //!< soft failure. this generally means the user auth details haven't been invalidated
-    FailedHard,  //!< hard failure. auth is invalid
-    FailedGone,  //!< hard failure. auth is invalid, and the account no longer exists
-    Succeeded
-};
-
-enum class Validity { None, Assumed, Certain };
-
-struct Token {
-    QDateTime issueInstant;
-    QDateTime notAfter;
-    QString token;
-    QString refresh_token;
-    QVariantMap extra;
-
-    Validity validity = Validity::None;
-    bool persistent = true;
-};
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/include/katabasis/DeviceFlow.h b/libraries/katabasis/include/katabasis/DeviceFlow.h
deleted file mode 100644
index 98724d81b..000000000
--- a/libraries/katabasis/include/katabasis/DeviceFlow.h
+++ /dev/null
@@ -1,149 +0,0 @@
-#pragma once
-
-#include <QLoggingCategory>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QPair>
-
-#include "Bits.h"
-#include "Reply.h"
-#include "RequestParameter.h"
-
-namespace Katabasis {
-
-class ReplyServer;
-class PollServer;
-
-/// Simple OAuth2 Device Flow authenticator.
-class DeviceFlow : public QObject {
-    Q_OBJECT
-   public:
-    Q_ENUMS(GrantFlow)
-
-   public:
-    struct Options {
-        QString userAgent = QStringLiteral("Katabasis/1.0");
-        QString responseType = QStringLiteral("code");
-        QString scope;
-        QString clientIdentifier;
-        QString clientSecret;
-        QUrl authorizationUrl;
-        QUrl accessTokenUrl;
-    };
-
-   public:
-    /// Are we authenticated?
-    bool linked();
-
-    /// Authentication token.
-    QString token();
-
-    /// Provider-specific extra tokens, available after a successful authentication
-    QVariantMap extraTokens();
-
-   public:
-    // TODO: put in `Options`
-    /// User-defined extra parameters to append to request URL
-    QVariantMap extraRequestParams();
-    void setExtraRequestParams(const QVariantMap& value);
-
-    // TODO: split up the class into multiple, each implementing one OAuth2 flow
-    /// Grant type (if non-standard)
-    QString grantType();
-    void setGrantType(const QString& value);
-
-   public:
-    /// Constructor.
-    /// @param  parent  Parent object.
-    explicit DeviceFlow(Options& opts, Token& token, QObject* parent = 0, QNetworkAccessManager* manager = 0);
-
-    /// Get refresh token.
-    QString refreshToken();
-
-    /// Get token expiration time
-    QDateTime expires();
-
-   public slots:
-    /// Authenticate.
-    void login();
-
-    /// De-authenticate.
-    void logout();
-
-    /// Refresh token.
-    bool refresh();
-
-    /// Handle situation where reply server has opted to close its connection
-    void serverHasClosed(bool paramsfound = false);
-
-   signals:
-    /// Emitted when client needs to open a web browser window, with the given URL.
-    void openBrowser(const QUrl& url);
-
-    /// Emitted when client can close the browser window.
-    void closeBrowser();
-
-    /// Emitted when client needs to show a verification uri and user code
-    void showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn);
-
-    /// Emitted when the internal state changes
-    void activityChanged(Activity activity);
-
-   public slots:
-    /// Handle verification response.
-    void onVerificationReceived(QMap<QString, QString>);
-
-   protected slots:
-    /// Handle completion of a Device Authorization Request
-    void onDeviceAuthReplyFinished();
-
-    /// Handle completion of a refresh request.
-    void onRefreshFinished();
-
-    /// Handle failure of a refresh request.
-    void onRefreshError(QNetworkReply::NetworkError error, QNetworkReply* reply);
-
-   protected:
-    /// Set refresh token.
-    void setRefreshToken(const QString& v);
-
-    /// Set token expiration time.
-    void setExpires(QDateTime v);
-
-    /// Start polling authorization server
-    void startPollServer(const QVariantMap& params, int expiresIn);
-
-    /// Set authentication token.
-    void setToken(const QString& v);
-
-    /// Set the linked state
-    void setLinked(bool v);
-
-    /// Set extra tokens found in OAuth response
-    void setExtraTokens(QVariantMap extraTokens);
-
-    /// Set local poll server
-    void setPollServer(PollServer* server);
-
-    PollServer* pollServer() const;
-
-    void updateActivity(Activity activity);
-
-   protected:
-    Options options_;
-
-    QVariantMap extraReqParams_;
-    QNetworkAccessManager* manager_ = nullptr;
-    ReplyList timedReplies_;
-    QString grantType_;
-
-   protected:
-    Token& token_;
-
-   private:
-    PollServer* pollServer_ = nullptr;
-    Activity activity_ = Activity::Idle;
-};
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/include/katabasis/Globals.h b/libraries/katabasis/include/katabasis/Globals.h
deleted file mode 100644
index 02fe1cf45..000000000
--- a/libraries/katabasis/include/katabasis/Globals.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-namespace Katabasis {
-
-// Common constants
-const char ENCRYPTION_KEY[] = "12345678";
-const char MIME_TYPE_XFORM[] = "application/x-www-form-urlencoded";
-const char MIME_TYPE_JSON[] = "application/json";
-
-// OAuth 1/1.1 Request Parameters
-const char OAUTH_CALLBACK[] = "oauth_callback";
-const char OAUTH_CONSUMER_KEY[] = "oauth_consumer_key";
-const char OAUTH_NONCE[] = "oauth_nonce";
-const char OAUTH_SIGNATURE[] = "oauth_signature";
-const char OAUTH_SIGNATURE_METHOD[] = "oauth_signature_method";
-const char OAUTH_TIMESTAMP[] = "oauth_timestamp";
-const char OAUTH_VERSION[] = "oauth_version";
-// OAuth 1/1.1 Response Parameters
-const char OAUTH_TOKEN[] = "oauth_token";
-const char OAUTH_TOKEN_SECRET[] = "oauth_token_secret";
-const char OAUTH_CALLBACK_CONFIRMED[] = "oauth_callback_confirmed";
-const char OAUTH_VERFIER[] = "oauth_verifier";
-
-// OAuth 2 Request Parameters
-const char OAUTH2_RESPONSE_TYPE[] = "response_type";
-const char OAUTH2_CLIENT_ID[] = "client_id";
-const char OAUTH2_CLIENT_SECRET[] = "client_secret";
-const char OAUTH2_USERNAME[] = "username";
-const char OAUTH2_PASSWORD[] = "password";
-const char OAUTH2_REDIRECT_URI[] = "redirect_uri";
-const char OAUTH2_SCOPE[] = "scope";
-const char OAUTH2_GRANT_TYPE_CODE[] = "code";
-const char OAUTH2_GRANT_TYPE_TOKEN[] = "token";
-const char OAUTH2_GRANT_TYPE_PASSWORD[] = "password";
-const char OAUTH2_GRANT_TYPE_DEVICE[] = "urn:ietf:params:oauth:grant-type:device_code";
-const char OAUTH2_GRANT_TYPE[] = "grant_type";
-const char OAUTH2_API_KEY[] = "api_key";
-const char OAUTH2_STATE[] = "state";
-const char OAUTH2_CODE[] = "code";
-
-// OAuth 2 Response Parameters
-const char OAUTH2_ACCESS_TOKEN[] = "access_token";
-const char OAUTH2_REFRESH_TOKEN[] = "refresh_token";
-const char OAUTH2_EXPIRES_IN[] = "expires_in";
-const char OAUTH2_DEVICE_CODE[] = "device_code";
-const char OAUTH2_USER_CODE[] = "user_code";
-const char OAUTH2_VERIFICATION_URI[] = "verification_uri";
-const char OAUTH2_VERIFICATION_URL[] = "verification_url";  // Google sign-in
-const char OAUTH2_VERIFICATION_URI_COMPLETE[] = "verification_uri_complete";
-const char OAUTH2_INTERVAL[] = "interval";
-
-// Parameter values
-const char AUTHORIZATION_CODE[] = "authorization_code";
-
-// Standard HTTP headers
-const char HTTP_HTTP_HEADER[] = "HTTP";
-const char HTTP_AUTHORIZATION_HEADER[] = "Authorization";
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/include/katabasis/PollServer.h b/libraries/katabasis/include/katabasis/PollServer.h
deleted file mode 100644
index fd6a5351c..000000000
--- a/libraries/katabasis/include/katabasis/PollServer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <QByteArray>
-#include <QMap>
-#include <QNetworkRequest>
-#include <QObject>
-#include <QString>
-#include <QTimer>
-
-class QNetworkAccessManager;
-
-namespace Katabasis {
-
-/// Poll an authorization server for token
-class PollServer : public QObject {
-    Q_OBJECT
-
-   public:
-    explicit PollServer(QNetworkAccessManager* manager,
-                        const QNetworkRequest& request,
-                        const QByteArray& payload,
-                        int expiresIn,
-                        QObject* parent = 0);
-
-    /// Seconds to wait between polling requests
-    Q_PROPERTY(int interval READ interval WRITE setInterval)
-    int interval() const;
-    void setInterval(int interval);
-
-   signals:
-    void verificationReceived(QMap<QString, QString>);
-    void serverClosed(bool);  // whether it has found parameters
-
-   public slots:
-    void startPolling();
-
-   protected slots:
-    void onPollTimeout();
-    void onExpiration();
-    void onReplyFinished();
-
-   protected:
-    QNetworkAccessManager* manager_;
-    const QNetworkRequest request_;
-    const QByteArray payload_;
-    const int expiresIn_;
-    QTimer expirationTimer;
-    QTimer pollTimer;
-};
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/include/katabasis/Reply.h b/libraries/katabasis/include/katabasis/Reply.h
deleted file mode 100644
index 89ee90e98..000000000
--- a/libraries/katabasis/include/katabasis/Reply.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <QByteArray>
-#include <QList>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QTimer>
-
-namespace Katabasis {
-
-constexpr int defaultTimeout = 30 * 1000;
-
-/// A network request/reply pair that can time out.
-class Reply : public QTimer {
-    Q_OBJECT
-
-   public:
-    Reply(QNetworkReply* reply, int timeOut = defaultTimeout, QObject* parent = 0);
-
-   signals:
-    void error(QNetworkReply::NetworkError);
-
-   public slots:
-    /// When time out occurs, the QNetworkReply's error() signal is triggered.
-    void onTimeOut();
-
-   public:
-    QNetworkReply* reply;
-    bool timedOut = false;
-};
-
-/// List of O2Replies.
-class ReplyList {
-   public:
-    ReplyList() { ignoreSslErrors_ = false; }
-
-    /// Destructor.
-    /// Deletes all O2Reply instances in the list.
-    virtual ~ReplyList();
-
-    /// Create a new O2Reply from a QNetworkReply, and add it to this list.
-    void add(QNetworkReply* reply, int timeOut = defaultTimeout);
-
-    /// Add an O2Reply to the list, while taking ownership of it.
-    void add(Reply* reply);
-
-    /// Remove item from the list that corresponds to a QNetworkReply.
-    void remove(QNetworkReply* reply);
-
-    /// Find an O2Reply in the list, corresponding to a QNetworkReply.
-    /// @return Matching O2Reply or NULL.
-    Reply* find(QNetworkReply* reply);
-
-    bool ignoreSslErrors();
-    void setIgnoreSslErrors(bool ignoreSslErrors);
-
-   protected:
-    QList<Reply*> replies_;
-    bool ignoreSslErrors_;
-};
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/include/katabasis/RequestParameter.h b/libraries/katabasis/include/katabasis/RequestParameter.h
deleted file mode 100644
index 1d23cf0e1..000000000
--- a/libraries/katabasis/include/katabasis/RequestParameter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-namespace Katabasis {
-
-/// Request parameter (name-value pair) participating in authentication.
-struct RequestParameter {
-    RequestParameter(const QByteArray& n, const QByteArray& v) : name(n), value(v) {}
-    bool operator<(const RequestParameter& other) const { return (name == other.name) ? (value < other.value) : (name < other.name); }
-    QByteArray name;
-    QByteArray value;
-};
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/src/DeviceFlow.cpp b/libraries/katabasis/src/DeviceFlow.cpp
deleted file mode 100644
index c6928b60d..000000000
--- a/libraries/katabasis/src/DeviceFlow.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-#include <QCryptographicHash>
-#include <QDataStream>
-#include <QDateTime>
-#include <QDebug>
-#include <QList>
-#include <QMap>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QPair>
-#include <QTcpServer>
-#include <QTimer>
-#include <QUuid>
-#include <QVariantMap>
-
-#include <QUrlQuery>
-
-#include "katabasis/DeviceFlow.h"
-#include "katabasis/Globals.h"
-#include "katabasis/PollServer.h"
-
-#include "JsonResponse.h"
-#include "KatabasisLogging.h"
-
-namespace {
-
-// ref: https://tools.ietf.org/html/rfc8628#section-3.2
-// Exception: Google sign-in uses "verification_url" instead of "*_uri" - we'll accept both.
-bool hasMandatoryDeviceAuthParams(const QVariantMap& params)
-{
-    if (!params.contains(Katabasis::OAUTH2_DEVICE_CODE))
-        return false;
-
-    if (!params.contains(Katabasis::OAUTH2_USER_CODE))
-        return false;
-
-    if (!(params.contains(Katabasis::OAUTH2_VERIFICATION_URI) || params.contains(Katabasis::OAUTH2_VERIFICATION_URL)))
-        return false;
-
-    if (!params.contains(Katabasis::OAUTH2_EXPIRES_IN))
-        return false;
-
-    return true;
-}
-
-QByteArray createQueryParameters(const QList<Katabasis::RequestParameter>& parameters)
-{
-    QByteArray ret;
-    bool first = true;
-    for (auto& h : parameters) {
-        if (first) {
-            first = false;
-        } else {
-            ret.append("&");
-        }
-        ret.append(QUrl::toPercentEncoding(h.name) + "=" + QUrl::toPercentEncoding(h.value));
-    }
-    return ret;
-}
-}  // namespace
-
-namespace Katabasis {
-
-DeviceFlow::DeviceFlow(Options& opts, Token& token, QObject* parent, QNetworkAccessManager* manager) : QObject(parent), token_(token)
-{
-    manager_ = manager ? manager : new QNetworkAccessManager(this);
-    qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
-    options_ = opts;
-}
-
-bool DeviceFlow::linked()
-{
-    return token_.validity != Validity::None;
-}
-void DeviceFlow::setLinked(bool v)
-{
-    qDebug() << "DeviceFlow::setLinked:" << (v ? "true" : "false");
-    token_.validity = v ? Validity::Certain : Validity::None;
-}
-
-void DeviceFlow::updateActivity(Activity activity)
-{
-    if (activity_ == activity) {
-        return;
-    }
-
-    activity_ = activity;
-    switch (activity) {
-        case Katabasis::Activity::Idle:
-        case Katabasis::Activity::LoggingIn:
-        case Katabasis::Activity::LoggingOut:
-        case Katabasis::Activity::Refreshing:
-            // non-terminal states...
-            break;
-        case Katabasis::Activity::FailedSoft:
-            // terminal state, tokens did not change
-            break;
-        case Katabasis::Activity::FailedHard:
-        case Katabasis::Activity::FailedGone:
-            // terminal state, tokens are invalid
-            token_ = Token();
-            break;
-        case Katabasis::Activity::Succeeded:
-            setLinked(true);
-            break;
-    }
-    emit activityChanged(activity_);
-}
-
-QString DeviceFlow::token()
-{
-    return token_.token;
-}
-void DeviceFlow::setToken(const QString& v)
-{
-    token_.token = v;
-}
-
-QVariantMap DeviceFlow::extraTokens()
-{
-    return token_.extra;
-}
-
-void DeviceFlow::setExtraTokens(QVariantMap extraTokens)
-{
-    token_.extra = extraTokens;
-}
-
-void DeviceFlow::setPollServer(PollServer* server)
-{
-    if (pollServer_)
-        pollServer_->deleteLater();
-
-    pollServer_ = server;
-}
-
-PollServer* DeviceFlow::pollServer() const
-{
-    return pollServer_;
-}
-
-QVariantMap DeviceFlow::extraRequestParams()
-{
-    return extraReqParams_;
-}
-
-void DeviceFlow::setExtraRequestParams(const QVariantMap& value)
-{
-    extraReqParams_ = value;
-}
-
-QString DeviceFlow::grantType()
-{
-    if (!grantType_.isEmpty())
-        return grantType_;
-
-    return OAUTH2_GRANT_TYPE_DEVICE;
-}
-
-void DeviceFlow::setGrantType(const QString& value)
-{
-    grantType_ = value;
-}
-
-// First get the URL and token to display to the user
-void DeviceFlow::login()
-{
-    qDebug() << "DeviceFlow::link";
-
-    updateActivity(Activity::LoggingIn);
-    setLinked(false);
-    setToken("");
-    setExtraTokens(QVariantMap());
-    setRefreshToken(QString());
-    setExpires(QDateTime());
-
-    QList<RequestParameter> parameters;
-    parameters.append(RequestParameter(OAUTH2_CLIENT_ID, options_.clientIdentifier.toUtf8()));
-    parameters.append(RequestParameter(OAUTH2_SCOPE, options_.scope.toUtf8()));
-    parameters.append(RequestParameter(OAUTH2_RESPONSE_TYPE, options_.responseType.toUtf8()));
-    QByteArray payload = createQueryParameters(parameters);
-
-    QUrl url(options_.authorizationUrl);
-    QNetworkRequest deviceRequest(url);
-    deviceRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    QNetworkReply* tokenReply = manager_->post(deviceRequest, payload);
-
-    connect(tokenReply, &QNetworkReply::finished, this, &DeviceFlow::onDeviceAuthReplyFinished, Qt::QueuedConnection);
-}
-
-// Then, once we get them, present them to the user
-void DeviceFlow::onDeviceAuthReplyFinished()
-{
-    qDebug() << "DeviceFlow::onDeviceAuthReplyFinished";
-    QNetworkReply* tokenReply = qobject_cast<QNetworkReply*>(sender());
-    if (!tokenReply) {
-        qDebug() << "DeviceFlow::onDeviceAuthReplyFinished: reply is null";
-        return;
-    }
-    if (tokenReply->error() == QNetworkReply::NoError) {
-        QByteArray replyData = tokenReply->readAll();
-
-        // Dump replyData
-        // SENSITIVE DATA in RelWithDebInfo or Debug builds
-        // qDebug() << "DeviceFlow::onDeviceAuthReplyFinished: replyData\n";
-        // qDebug() << QString( replyData );
-
-        QVariantMap params = parseJsonResponse(replyData);
-
-        // Dump tokens
-        qDebug() << "DeviceFlow::onDeviceAuthReplyFinished: Tokens returned:\n";
-        foreach (QString key, params.keys()) {
-            // SENSITIVE DATA in RelWithDebInfo or Debug builds, so it is truncated first
-            qDebug() << key << ": " << params.value(key).toString();
-        }
-
-        // Check for mandatory parameters
-        if (hasMandatoryDeviceAuthParams(params)) {
-            qDebug() << "DeviceFlow::onDeviceAuthReplyFinished: Device auth request response";
-
-            const QString userCode = params.take(OAUTH2_USER_CODE).toString();
-            QUrl uri = params.take(OAUTH2_VERIFICATION_URI).toUrl();
-            if (uri.isEmpty())
-                uri = params.take(OAUTH2_VERIFICATION_URL).toUrl();
-
-            if (params.contains(OAUTH2_VERIFICATION_URI_COMPLETE))
-                emit openBrowser(params.take(OAUTH2_VERIFICATION_URI_COMPLETE).toUrl());
-
-            bool ok = false;
-            int expiresIn = params[OAUTH2_EXPIRES_IN].toInt(&ok);
-            if (!ok) {
-                qWarning() << "DeviceFlow::startPollServer: No expired_in parameter";
-                updateActivity(Activity::FailedHard);
-                return;
-            }
-
-            emit showVerificationUriAndCode(uri, userCode, expiresIn);
-
-            startPollServer(params, expiresIn);
-        } else {
-            qWarning() << "DeviceFlow::onDeviceAuthReplyFinished: Mandatory parameters missing from response";
-            updateActivity(Activity::FailedHard);
-        }
-    }
-    tokenReply->deleteLater();
-}
-
-// Spin up polling for the user completing the login flow out of band
-void DeviceFlow::startPollServer(const QVariantMap& params, int expiresIn)
-{
-    qDebug() << "DeviceFlow::startPollServer: device_ and user_code expires in" << expiresIn << "seconds";
-
-    QUrl url(options_.accessTokenUrl);
-    QNetworkRequest authRequest(url);
-    authRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-
-    const QString deviceCode = params[OAUTH2_DEVICE_CODE].toString();
-    const QString grantType = grantType_.isEmpty() ? OAUTH2_GRANT_TYPE_DEVICE : grantType_;
-
-    QList<RequestParameter> parameters;
-    parameters.append(RequestParameter(OAUTH2_CLIENT_ID, options_.clientIdentifier.toUtf8()));
-    if (!options_.clientSecret.isEmpty()) {
-        parameters.append(RequestParameter(OAUTH2_CLIENT_SECRET, options_.clientSecret.toUtf8()));
-    }
-    parameters.append(RequestParameter(OAUTH2_DEVICE_CODE, deviceCode.toUtf8()));
-    parameters.append(RequestParameter(OAUTH2_GRANT_TYPE, grantType.toUtf8()));
-    parameters.append(RequestParameter(OAUTH2_RESPONSE_TYPE, options_.responseType.toUtf8()));
-
-    QByteArray payload = createQueryParameters(parameters);
-
-    PollServer* pollServer = new PollServer(manager_, authRequest, payload, expiresIn, this);
-    if (params.contains(OAUTH2_INTERVAL)) {
-        bool ok = false;
-        int interval = params[OAUTH2_INTERVAL].toInt(&ok);
-        if (ok) {
-            pollServer->setInterval(interval);
-        }
-    }
-    connect(pollServer, &PollServer::verificationReceived, this, &DeviceFlow::onVerificationReceived);
-    connect(pollServer, &PollServer::serverClosed, this, &DeviceFlow::serverHasClosed);
-    setPollServer(pollServer);
-    pollServer->startPolling();
-}
-
-// Once the user completes the flow, update the internal state and report it to observers
-void DeviceFlow::onVerificationReceived(const QMap<QString, QString> response)
-{
-    qDebug() << "DeviceFlow::onVerificationReceived: Emitting closeBrowser()";
-    emit closeBrowser();
-
-    if (response.contains("error")) {
-        qWarning() << "DeviceFlow::onVerificationReceived: Verification failed:" << response;
-        updateActivity(Activity::FailedHard);
-        return;
-    }
-
-    // Check for mandatory tokens
-    if (response.contains(OAUTH2_ACCESS_TOKEN)) {
-        qDebug() << "DeviceFlow::onVerificationReceived: Access token returned for implicit or device flow";
-        setToken(response.value(OAUTH2_ACCESS_TOKEN));
-        if (response.contains(OAUTH2_EXPIRES_IN)) {
-            bool ok = false;
-            int expiresIn = response.value(OAUTH2_EXPIRES_IN).toInt(&ok);
-            if (ok) {
-                qDebug() << "DeviceFlow::onVerificationReceived: Token expires in" << expiresIn << "seconds";
-                setExpires(QDateTime::currentDateTimeUtc().addSecs(expiresIn));
-            }
-        }
-        if (response.contains(OAUTH2_REFRESH_TOKEN)) {
-            setRefreshToken(response.value(OAUTH2_REFRESH_TOKEN));
-        }
-        updateActivity(Activity::Succeeded);
-    } else {
-        qWarning() << "DeviceFlow::onVerificationReceived: Access token missing from response for implicit or device flow";
-        updateActivity(Activity::FailedHard);
-    }
-}
-
-// Or if the flow fails or the polling times out, update the internal state with error and report it to observers
-void DeviceFlow::serverHasClosed(bool paramsfound)
-{
-    if (!paramsfound) {
-        // server has probably timed out after receiving first response
-        updateActivity(Activity::FailedHard);
-    }
-    // poll server is not re-used for later auth requests
-    setPollServer(NULL);
-}
-
-void DeviceFlow::logout()
-{
-    qDebug() << "DeviceFlow::unlink";
-    updateActivity(Activity::LoggingOut);
-    // FIXME: implement logout flows... if they exist
-    token_ = Token();
-    updateActivity(Activity::FailedHard);
-}
-
-QDateTime DeviceFlow::expires()
-{
-    return token_.notAfter;
-}
-void DeviceFlow::setExpires(QDateTime v)
-{
-    token_.notAfter = v;
-}
-
-QString DeviceFlow::refreshToken()
-{
-    return token_.refresh_token;
-}
-
-void DeviceFlow::setRefreshToken(const QString& v)
-{
-    qCDebug(katabasisCredentials) << "new refresh token:" << v;
-    token_.refresh_token = v;
-}
-
-namespace {
-QByteArray buildRequestBody(const QMap<QString, QString>& parameters)
-{
-    QByteArray body;
-    bool first = true;
-    foreach (QString key, parameters.keys()) {
-        if (first) {
-            first = false;
-        } else {
-            body.append("&");
-        }
-        QString value = parameters.value(key);
-        body.append(QUrl::toPercentEncoding(key) + QString("=").toUtf8() + QUrl::toPercentEncoding(value));
-    }
-    return body;
-}
-}  // namespace
-
-bool DeviceFlow::refresh()
-{
-    qDebug() << "DeviceFlow::refresh: Token: ..." << refreshToken().right(7);
-
-    updateActivity(Activity::Refreshing);
-
-    if (refreshToken().isEmpty()) {
-        qWarning() << "DeviceFlow::refresh: No refresh token";
-        onRefreshError(QNetworkReply::AuthenticationRequiredError, nullptr);
-        return false;
-    }
-    if (options_.accessTokenUrl.isEmpty()) {
-        qWarning() << "DeviceFlow::refresh: Refresh token URL not set";
-        onRefreshError(QNetworkReply::AuthenticationRequiredError, nullptr);
-        return false;
-    }
-
-    QNetworkRequest refreshRequest(options_.accessTokenUrl);
-    refreshRequest.setHeader(QNetworkRequest::ContentTypeHeader, MIME_TYPE_XFORM);
-    QMap<QString, QString> parameters;
-    parameters.insert(OAUTH2_CLIENT_ID, options_.clientIdentifier);
-    if (!options_.clientSecret.isEmpty()) {
-        parameters.insert(OAUTH2_CLIENT_SECRET, options_.clientSecret);
-    }
-    parameters.insert(OAUTH2_SCOPE, options_.scope.toUtf8());
-    parameters.insert(OAUTH2_REFRESH_TOKEN, refreshToken());
-    parameters.insert(OAUTH2_GRANT_TYPE, OAUTH2_REFRESH_TOKEN);
-
-    QByteArray data = buildRequestBody(parameters);
-    QNetworkReply* refreshReply = manager_->post(refreshRequest, data);
-    timedReplies_.add(refreshReply);
-    connect(refreshReply, &QNetworkReply::finished, this, &DeviceFlow::onRefreshFinished, Qt::QueuedConnection);
-    return true;
-}
-
-void DeviceFlow::onRefreshFinished()
-{
-    QNetworkReply* refreshReply = qobject_cast<QNetworkReply*>(sender());
-
-    auto networkError = refreshReply->error();
-    if (networkError == QNetworkReply::NoError) {
-        QByteArray reply = refreshReply->readAll();
-        QVariantMap tokens = parseJsonResponse(reply);
-        setToken(tokens.value(OAUTH2_ACCESS_TOKEN).toString());
-        setExpires(QDateTime::currentDateTimeUtc().addSecs(tokens.value(OAUTH2_EXPIRES_IN).toInt()));
-        QString refreshToken = tokens.value(OAUTH2_REFRESH_TOKEN).toString();
-        if (!refreshToken.isEmpty()) {
-            setRefreshToken(refreshToken);
-        } else {
-            qDebug() << "No new refresh token. Keep the old one.";
-        }
-        timedReplies_.remove(refreshReply);
-        refreshReply->deleteLater();
-        updateActivity(Activity::Succeeded);
-        qDebug() << "New token expires in" << expires() << "seconds";
-    } else {
-        // FIXME: differentiate the error more here
-        onRefreshError(networkError, refreshReply);
-    }
-}
-
-void DeviceFlow::onRefreshError(QNetworkReply::NetworkError error, QNetworkReply* refreshReply)
-{
-    QString errorString = "No Reply";
-    if (refreshReply) {
-        timedReplies_.remove(refreshReply);
-        errorString = refreshReply->errorString();
-    }
-
-    switch (error) {
-        // used for invalid credentials and similar errors. Fall through.
-        case QNetworkReply::AuthenticationRequiredError:
-        case QNetworkReply::ContentAccessDenied:
-        case QNetworkReply::ContentOperationNotPermittedError:
-        case QNetworkReply::ProtocolInvalidOperationError:
-            updateActivity(Activity::FailedHard);
-            break;
-        case QNetworkReply::ContentGoneError: {
-            updateActivity(Activity::FailedGone);
-            break;
-        }
-        case QNetworkReply::TimeoutError:
-        case QNetworkReply::OperationCanceledError:
-        case QNetworkReply::SslHandshakeFailedError:
-        default:
-            updateActivity(Activity::FailedSoft);
-            return;
-    }
-    if (refreshReply) {
-        refreshReply->deleteLater();
-    }
-    qDebug() << "DeviceFlow::onRefreshFinished: Error" << static_cast<int>(error) << " - " << errorString;
-}
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/src/JsonResponse.cpp b/libraries/katabasis/src/JsonResponse.cpp
deleted file mode 100644
index 6840627ac..000000000
--- a/libraries/katabasis/src/JsonResponse.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "JsonResponse.h"
-
-#include <QByteArray>
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-
-namespace Katabasis {
-
-QVariantMap parseJsonResponse(const QByteArray& data)
-{
-    QJsonParseError err;
-    QJsonDocument doc = QJsonDocument::fromJson(data, &err);
-    if (err.error != QJsonParseError::NoError) {
-        qWarning() << "parseTokenResponse: Failed to parse token response due to err:" << err.errorString();
-        return QVariantMap();
-    }
-
-    if (!doc.isObject()) {
-        qWarning() << "parseTokenResponse: Token response is not an object";
-        return QVariantMap();
-    }
-
-    return doc.object().toVariantMap();
-}
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/src/JsonResponse.h b/libraries/katabasis/src/JsonResponse.h
deleted file mode 100644
index ff3471752..000000000
--- a/libraries/katabasis/src/JsonResponse.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <QVariantMap>
-
-class QByteArray;
-
-namespace Katabasis {
-
-/// Parse JSON data into a QVariantMap
-QVariantMap parseJsonResponse(const QByteArray& data);
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/src/PollServer.cpp b/libraries/katabasis/src/PollServer.cpp
deleted file mode 100644
index c1c316df9..000000000
--- a/libraries/katabasis/src/PollServer.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-
-#include "JsonResponse.h"
-#include "katabasis/PollServer.h"
-
-namespace {
-QMap<QString, QString> toVerificationParams(const QVariantMap& map)
-{
-    QMap<QString, QString> params;
-    for (QVariantMap::const_iterator i = map.constBegin(); i != map.constEnd(); ++i) {
-        params[i.key()] = i.value().toString();
-    }
-    return params;
-}
-}  // namespace
-
-namespace Katabasis {
-
-PollServer::PollServer(QNetworkAccessManager* manager,
-                       const QNetworkRequest& request,
-                       const QByteArray& payload,
-                       int expiresIn,
-                       QObject* parent)
-    : QObject(parent), manager_(manager), request_(request), payload_(payload), expiresIn_(expiresIn)
-{
-    expirationTimer.setTimerType(Qt::VeryCoarseTimer);
-    expirationTimer.setInterval(expiresIn * 1000);
-    expirationTimer.setSingleShot(true);
-    connect(&expirationTimer, SIGNAL(timeout()), this, SLOT(onExpiration()));
-    expirationTimer.start();
-
-    pollTimer.setTimerType(Qt::VeryCoarseTimer);
-    pollTimer.setInterval(5 * 1000);
-    pollTimer.setSingleShot(true);
-    connect(&pollTimer, SIGNAL(timeout()), this, SLOT(onPollTimeout()));
-}
-
-int PollServer::interval() const
-{
-    return pollTimer.interval() / 1000;
-}
-
-void PollServer::setInterval(int interval)
-{
-    pollTimer.setInterval(interval * 1000);
-}
-
-void PollServer::startPolling()
-{
-    if (expirationTimer.isActive()) {
-        pollTimer.start();
-    }
-}
-
-void PollServer::onPollTimeout()
-{
-    qDebug() << "PollServer::onPollTimeout: retrying";
-    QNetworkReply* reply = manager_->post(request_, payload_);
-    connect(reply, SIGNAL(finished()), this, SLOT(onReplyFinished()));
-}
-
-void PollServer::onExpiration()
-{
-    pollTimer.stop();
-    emit serverClosed(false);
-}
-
-void PollServer::onReplyFinished()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-
-    if (!reply) {
-        qDebug() << "PollServer::onReplyFinished: reply is null";
-        return;
-    }
-
-    QByteArray replyData = reply->readAll();
-    QMap<QString, QString> params = toVerificationParams(parseJsonResponse(replyData));
-
-    // Dump replyData
-    // SENSITIVE DATA in RelWithDebInfo or Debug builds
-    // qDebug() << "PollServer::onReplyFinished: replyData\n";
-    // qDebug() << QString( replyData );
-
-    if (reply->error() == QNetworkReply::TimeoutError) {
-        // rfc8628#section-3.2
-        // "On encountering a connection timeout, clients MUST unilaterally
-        // reduce their polling frequency before retrying.  The use of an
-        // exponential backoff algorithm to achieve this, such as doubling the
-        // polling interval on each such connection timeout, is RECOMMENDED."
-        setInterval(interval() * 2);
-        pollTimer.start();
-    } else {
-        QString error = params.value("error");
-        if (error == "slow_down") {
-            // rfc8628#section-3.2
-            // "A variant of 'authorization_pending', the authorization request is
-            // still pending and polling should continue, but the interval MUST
-            // be increased by 5 seconds for this and all subsequent requests."
-            setInterval(interval() + 5);
-            pollTimer.start();
-        } else if (error == "authorization_pending") {
-            // keep trying - rfc8628#section-3.2
-            // "The authorization request is still pending as the end user hasn't
-            // yet completed the user-interaction steps (Section 3.3)."
-            pollTimer.start();
-        } else {
-            expirationTimer.stop();
-            emit serverClosed(true);
-            // let O2 handle the other cases
-            emit verificationReceived(params);
-        }
-    }
-    reply->deleteLater();
-}
-
-}  // namespace Katabasis
diff --git a/libraries/katabasis/src/Reply.cpp b/libraries/katabasis/src/Reply.cpp
deleted file mode 100644
index 4a5017e22..000000000
--- a/libraries/katabasis/src/Reply.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <QNetworkReply>
-#include <QTimer>
-
-#include "katabasis/Reply.h"
-
-namespace Katabasis {
-
-Reply::Reply(QNetworkReply* r, int timeOut, QObject* parent) : QTimer(parent), reply(r)
-{
-    setSingleShot(true);
-    connect(this, &Reply::timeout, this, &Reply::onTimeOut, Qt::QueuedConnection);
-    start(timeOut);
-}
-
-void Reply::onTimeOut()
-{
-    timedOut = true;
-    reply->abort();
-}
-
-// ----------------------------
-
-ReplyList::~ReplyList()
-{
-    foreach (Reply* timedReply, replies_) {
-        delete timedReply;
-    }
-}
-
-void ReplyList::add(QNetworkReply* reply, int timeOut)
-{
-    if (reply && ignoreSslErrors()) {
-        reply->ignoreSslErrors();
-    }
-    add(new Reply(reply, timeOut));
-}
-
-void ReplyList::add(Reply* reply)
-{
-    replies_.append(reply);
-}
-
-void ReplyList::remove(QNetworkReply* reply)
-{
-    Reply* o2Reply = find(reply);
-    if (o2Reply) {
-        o2Reply->stop();
-        (void)replies_.removeOne(o2Reply);
-        // we took ownership, we must free
-        delete o2Reply;
-    }
-}
-
-Reply* ReplyList::find(QNetworkReply* reply)
-{
-    foreach (Reply* timedReply, replies_) {
-        if (timedReply->reply == reply) {
-            return timedReply;
-        }
-    }
-    return 0;
-}
-
-bool ReplyList::ignoreSslErrors()
-{
-    return ignoreSslErrors_;
-}
-
-void ReplyList::setIgnoreSslErrors(bool ignoreSslErrors)
-{
-    ignoreSslErrors_ = ignoreSslErrors;
-}
-
-}  // namespace Katabasis
diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
index de28a0401..a5f027ba6 100644
--- a/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
+++ b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
@@ -70,7 +70,7 @@ public abstract class AbstractLauncher implements Launcher {
     // secondary parameters
     protected final int width, height;
     protected final boolean maximize;
-    protected final String serverAddress, serverPort;
+    protected final String serverAddress, serverPort, worldName;
 
     protected final String mainClassName;
 
@@ -80,6 +80,7 @@ protected AbstractLauncher(Parameters params) {
 
         serverAddress = params.getString("serverAddress", null);
         serverPort = params.getString("serverPort", null);
+        worldName = params.getString("worldName", null);
 
         String windowParams = params.getString("windowParams", null);
 
diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java
index 49e5d518f..dc518be64 100644
--- a/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java
+++ b/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java
@@ -62,13 +62,15 @@
 import java.util.List;
 
 public final class StandardLauncher extends AbstractLauncher {
-    private final boolean quickPlaySupported;
+    private final boolean quickPlayMultiplayerSupported;
+    private final boolean quickPlaySingleplayerSupported;
 
     public StandardLauncher(Parameters params) {
         super(params);
 
         List<String> traits = params.getList("traits", Collections.<String>emptyList());
-        quickPlaySupported = traits.contains("feature:is_quick_play_multiplayer");
+        quickPlayMultiplayerSupported = traits.contains("feature:is_quick_play_multiplayer");
+        quickPlaySingleplayerSupported = traits.contains("feature:is_quick_play_singleplayer");
     }
 
     @Override
@@ -83,7 +85,7 @@ public void launch() throws Throwable {
         }
 
         if (serverAddress != null) {
-            if (quickPlaySupported) {
+            if (quickPlayMultiplayerSupported) {
                 // as of 23w14a
                 gameArgs.add("--quickPlayMultiplayer");
                 gameArgs.add(serverAddress + ':' + serverPort);
@@ -93,6 +95,9 @@ public void launch() throws Throwable {
                 gameArgs.add("--port");
                 gameArgs.add(serverPort);
             }
+        } else if (worldName != null && quickPlaySingleplayerSupported) {
+            gameArgs.add("--quickPlaySingleplayer");
+            gameArgs.add(worldName);
         }
 
         // find and invoke the main method
diff --git a/libraries/murmur2/src/MurmurHash2.cpp b/libraries/murmur2/src/MurmurHash2.cpp
index e73127953..99befd107 100644
--- a/libraries/murmur2/src/MurmurHash2.cpp
+++ b/libraries/murmur2/src/MurmurHash2.cpp
@@ -8,14 +8,14 @@
 
 #include "MurmurHash2.h"
 
-//-----------------------------------------------------------------------------
+namespace Murmur2 {
 
 // 'm' and 'r' are mixing constants generated offline.
 // They're not really 'magic', they just happen to work well.
 const uint32_t m = 0x5bd1e995;
 const int r = 24;
 
-uint32_t MurmurHash2(std::ifstream&& file_stream, std::size_t buffer_size, std::function<bool(char)> filter_out)
+uint32_t hash(Reader* file_stream, std::size_t buffer_size, std::function<bool(char)> filter_out)
 {
     auto* buffer = new char[buffer_size];
     char data[4];
@@ -26,24 +26,21 @@ uint32_t MurmurHash2(std::ifstream&& file_stream, std::size_t buffer_size, std::
     // We need the size without the filtered out characters before actually calculating the hash,
     // to setup the initial value for the hash.
     do {
-        file_stream.read(buffer, buffer_size);
-        read = file_stream.gcount();
+        read = file_stream->read(buffer, buffer_size);
         for (int i = 0; i < read; i++) {
             if (!filter_out(buffer[i]))
                 size += 1;
         }
-    } while (!file_stream.eof());
+    } while (!file_stream->eof());
 
-    file_stream.clear();
-    file_stream.seekg(0, file_stream.beg);
+    file_stream->goToBeginning();
 
     int index = 0;
 
     // This forces a seed of 1.
     IncrementalHashInfo info{ (uint32_t)1 ^ size, (uint32_t)size };
     do {
-        file_stream.read(buffer, buffer_size);
-        read = file_stream.gcount();
+        read = file_stream->read(buffer, buffer_size);
         for (int i = 0; i < read; i++) {
             char c = buffer[i];
 
@@ -57,14 +54,13 @@ uint32_t MurmurHash2(std::ifstream&& file_stream, std::size_t buffer_size, std::
             if (index == 0)
                 FourBytes_MurmurHash2(reinterpret_cast<unsigned char*>(&data), info);
         }
-    } while (!file_stream.eof());
+    } while (!file_stream->eof());
 
     // Do one last bit shuffle in the hash
     FourBytes_MurmurHash2(reinterpret_cast<unsigned char*>(&data), info);
 
     delete[] buffer;
 
-    file_stream.close();
     return info.h;
 }
 
@@ -109,4 +105,4 @@ void FourBytes_MurmurHash2(const unsigned char* data, IncrementalHashInfo& prev)
     }
 }
 
-//-----------------------------------------------------------------------------
+}  // namespace Murmur2
\ No newline at end of file
diff --git a/libraries/murmur2/src/MurmurHash2.h b/libraries/murmur2/src/MurmurHash2.h
index 5d4f48713..e6c196fd1 100644
--- a/libraries/murmur2/src/MurmurHash2.h
+++ b/libraries/murmur2/src/MurmurHash2.h
@@ -9,19 +9,22 @@
 #pragma once
 
 #include <cstdint>
-#include <fstream>
-
 #include <functional>
 
-//-----------------------------------------------------------------------------
+namespace Murmur2 {
 
 #define KiB 1024
 #define MiB 1024 * KiB
 
-uint32_t MurmurHash2(
-    std::ifstream&& file_stream,
-    std::size_t buffer_size = 4 * MiB,
-    std::function<bool(char)> filter_out = [](char) { return false; });
+class Reader {
+   public:
+    virtual ~Reader() = default;
+    virtual int read(char* s, int n) = 0;
+    virtual bool eof() = 0;
+    virtual void goToBeginning() = 0;
+};
+
+uint32_t hash(Reader* file_stream, std::size_t buffer_size = 4 * MiB, std::function<bool(char)> filter_out = [](char) { return false; });
 
 struct IncrementalHashInfo {
     uint32_t h;
@@ -29,5 +32,4 @@ struct IncrementalHashInfo {
 };
 
 void FourBytes_MurmurHash2(const unsigned char* data, IncrementalHashInfo& prev);
-
-//-----------------------------------------------------------------------------
+}  // namespace Murmur2
diff --git a/nix/README.md b/nix/README.md
index 8584e93a2..f081d771a 100644
--- a/nix/README.md
+++ b/nix/README.md
@@ -1,31 +1,34 @@
 # Fjord Launcher Nix Packaging
 
+## Installing a stable release (nixpkgs)
+
+Fjord Launcher is packaged in [nixpkgs](https://github.com/NixOS/nixpkgs/) since 22.11.
+
+See [Package variants](#package-variants) for a list of available packages.
+
 ## Installing a development release (flake)
 
-We use [garnix](https://garnix.io/) to build and cache our development builds.
-If you want to avoid rebuilds you may add the garnix cache to your substitutors, or use `--accept-flake-config`
+We use [cachix](https://cachix.org/) to cache our development and release builds.
+If you want to avoid rebuilds you may add the Cachix bucket to your substitutors, or use `--accept-flake-config`
 to temporarily enable it when using `nix` commands.
 
 Example (NixOS):
 
 ```nix
-{...}:
 {
   nix.settings = {
-    trusted-substituters = [
-      "https://cache.garnix.io"
-    ];
+    trusted-substituters = [ "https://unmojang.cachix.org" ];
 
     trusted-public-keys = [
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      "unmojang.cachix.org-1:OfHnbBNduZ6Smx9oNbLFbYyvOWSoxb2uPcnXPj4EDQY="
     ];
   };
 }
 ```
 
-### Using the overlay
+### Installing the package directly
 
-After adding `github:unmojang/FjordLauncher` to your flake inputs, you can add the `default` overlay to your nixpkgs instance.
+After adding `github:unmojang/FjordLauncher` to your flake inputs, you can access the flake's `packages` output.
 
 Example:
 
@@ -33,34 +36,47 @@ Example:
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     fjordlauncher = {
       url = "github:unmojang/FjordLauncher";
+
       # Optional: Override the nixpkgs input of fjordlauncher to use the same revision as the rest of your flake
-      # Note that overriding any input of fjordlauncher may break reproducibility
+      # Note that this may break the reproducibility mentioned above, and you might not be able to access the binary cache
+      #
       # inputs.nixpkgs.follows = "nixpkgs";
+
+      # This is not required for Flakes
+      inputs.flake-compat.follows = "";
     };
   };
 
-  outputs = {nixpkgs, fjordlauncher}: {
-    nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-
-      modules = [
-        ({pkgs, ...}: {
-          nixpkgs.overlays = [fjordlauncher.overlays.default];
-
-          environment.systemPackages = [pkgs.fjordlauncher];
-        })
-      ];
+  outputs =
+    { nixpkgs, fjordlauncher, ... }:
+    {
+      nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
+        modules = [
+          ./configuration.nix
+
+          (
+            { pkgs, ... }:
+            {
+              environment.systemPackages = [ fjordlauncher.packages.${pkgs.system}.fjordlauncher ];
+            }
+          )
+        ];
+      };
     };
-  }
 }
 ```
 
-### Installing the package directly
+### Using the overlay
+
+Alternatively, if you don't want to use our `packages` output, you can add our overlay to your nixpkgs instance.
+This will ensure Fjord is built with your system's packages.
 
-Alternatively, if you don't want to use an overlay, you can install Fjord Launcher directly by installing the `fjordlauncher` package.
-This way the installed package is fully reproducible.
+> [!WARNING]
+> Depending on what revision of nixpkgs your system uses, this may result in binaries that differ from the above `packages` output
+> If this is the case, you will not be able to use the binary cache
 
 Example:
 
@@ -68,25 +84,38 @@ Example:
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     fjordlauncher = {
       url = "github:unmojang/FjordLauncher";
+
       # Optional: Override the nixpkgs input of fjordlauncher to use the same revision as the rest of your flake
-      # Note that overriding any input of fjordlauncher may break reproducibility
+      # Note that this may break the reproducibility mentioned above, and you might not be able to access the binary cache
+      #
       # inputs.nixpkgs.follows = "nixpkgs";
+
+      # This is not required for Flakes
+      inputs.flake-compat.follows = "";
     };
   };
 
-  outputs = {nixpkgs, fjordlauncher}: {
-    nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-
-      modules = [
-        ({pkgs, ...}: {
-          environment.systemPackages = [fjordlauncher.packages.${pkgs.system}.fjordlauncher];
-        })
-      ];
+  outputs =
+    { nixpkgs, fjordlauncher, ... }:
+    {
+      nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
+        modules = [
+          ./configuration.nix
+
+          (
+            { pkgs, ... }:
+            {
+              nixpkgs.overlays = [ fjordlauncher.overlays.default ];
+
+              environment.systemPackages = [ pkgs.fjordlauncher ];
+            }
+          )
+        ];
+      };
     };
-  }
 }
 ```
 
@@ -106,50 +135,57 @@ nix profile install github:unmojang/FjordLauncher
 
 ## Installing a development release (without flakes)
 
-We use [garnix](https://garnix.io/) to build and cache our development builds.
-If you want to avoid rebuilds you may add the garnix cache to your substitutors.
+We use [Cachix](https://cachix.org/) to cache our development and release builds.
+If you want to avoid rebuilds you may add the Cachix bucket to your substitutors.
 
 Example (NixOS):
 
 ```nix
-{...}:
 {
   nix.settings = {
-    trusted-substituters = [
-      "https://cache.garnix.io"
-    ];
+    trusted-substituters = [ "https://unmojang.cachix.org" ];
 
     trusted-public-keys = [
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      "unmojang.cachix.org-1:OfHnbBNduZ6Smx9oNbLFbYyvOWSoxb2uPcnXPj4EDQY="
     ];
   };
 }
 ```
 
-### Using the overlay (`fetchTarball`)
+### Installing the package directly (`fetchTarball`)
 
 We use flake-compat to allow using this Flake on a system that doesn't use flakes.
 
 Example:
 
 ```nix
-{pkgs, ...}: {
-  nixpkgs.overlays = [(import (builtins.fetchTarball "https://github.com/unmojang/FjordLauncher/archive/develop.tar.gz")).overlays.default];
-
-  environment.systemPackages = [pkgs.fjordlauncher];
+{ pkgs, ... }:
+{
+  environment.systemPackages = [
+    (import (
+      builtins.fetchTarball "https://github.com/FjordLauncher/FjordLauncher/archive/develop.tar.gz"
+    )).packages.${pkgs.system}.fjordlauncher
+  ];
 }
 ```
 
-### Installing the package directly (`fetchTarball`)
+### Using the overlay (`fetchTarball`)
 
-Alternatively, if you don't want to use an overlay, you can install Fjord Launcher directly by installing the `fjordlauncher` package.
-This way the installed package is fully reproducible.
+Alternatively, if you don't want to use our `packages` output, you can add our overlay to your instance of nixpkgs.
+This results in Fjord using your system's libraries
 
 Example:
 
 ```nix
-{pkgs, ...}: {
-  environment.systemPackages = [(import (builtins.fetchTarball "https://github.com/unmojang/FjordLauncher/archive/develop.tar.gz")).packages.${pkgs.system}.fjordlauncher];
+{ pkgs, ... }:
+{
+  nixpkgs.overlays = [
+    (import (
+      builtins.fetchTarball "https://github.com/FjordLauncher/FjordLauncher/archive/develop.tar.gz"
+    )).overlays.default
+  ];
+
+  environment.systemPackages = [ pkgs.fjordlauncher ];
 }
 ```
 
@@ -171,18 +207,20 @@ nix-env -iA fjordlauncher.fjordlauncher
 
 Both Nixpkgs and this repository offer the following packages:
 
-- `fjordlauncher` - Preferred build using Qt 6
-- `fjordlauncher-qt5` - Legacy build using Qt 5 (i.e. for Qt 5 theming support)
-
-Both of these packages also have `-unwrapped` counterparts, that are not wrapped and can therefore be customized even further than what the wrapper packages offer.
+- `fjordlauncher` - The preferred build, wrapped with everything necessary to run the launcher and Minecraft
+- `fjordlauncher-unwrapped` - A minimal build that allows for advanced customization of the launcher's runtime environment
 
 ### Customizing wrapped packages
 
-The wrapped packages (`fjordlauncher` and `fjordlauncher-qt5`) offer some build parameters to further customize the launcher's environment.
+The wrapped package (`fjordlauncher`) offers some build parameters to further customize the launcher's environment.
 
 The following parameters can be overridden:
 
-- `msaClientID` (default: `null`, requires full rebuild!) Client ID used for Microsoft Authentication
-- `gamemodeSupport` (default: `true`) Turn on/off support for [Feral GameMode](https://github.com/FeralInteractive/gamemode)
-- `jdks` (default: `[ jdk17 jdk8 ]`) Java runtimes added to `FJORDLAUNCHER_JAVA_PATHS` variable
 - `additionalLibs` (default: `[ ]`) Additional libraries that will be added to `LD_LIBRARY_PATH`
+- `additionalPrograms` (default: `[ ]`) Additional libraries that will be added to `PATH`
+- `controllerSupport` (default: `isLinux`) Turn on/off support for controllers on Linux (macOS will always have this)
+- `gamemodeSupport` (default: `isLinux`) Turn on/off support for [Feral GameMode](https://github.com/FeralInteractive/gamemode) on Linux
+- `jdks` (default: `[ jdk21 jdk17 jdk8 ]`) Java runtimes added to `FJORDLAUNCHER_JAVA_PATHS` variable
+- `msaClientID` (default: `null`, requires full rebuild!) Client ID used for Microsoft Authentication
+- `textToSpeechSupport` (default: `isLinux`) Turn on/off support for text-to-speech on Linux (macOS will always have this)
+- `withWaylandGLFW` (default: `isLinux`) Build with support for native Wayland via a custom GLFW
diff --git a/nix/checks.nix b/nix/checks.nix
new file mode 100644
index 000000000..ec219d6f8
--- /dev/null
+++ b/nix/checks.nix
@@ -0,0 +1,42 @@
+{
+  runCommand,
+  deadnix,
+  llvmPackages_18,
+  markdownlint-cli,
+  nixfmt-rfc-style,
+  statix,
+  self,
+}:
+{
+  formatting =
+    runCommand "check-formatting"
+      {
+        nativeBuildInputs = [
+          deadnix
+          llvmPackages_18.clang-tools
+          markdownlint-cli
+          nixfmt-rfc-style
+          statix
+        ];
+      }
+      ''
+        cd ${self}
+
+        echo "Running clang-format...."
+        clang-format --dry-run --style='file' --Werror */**.{c,cc,cpp,h,hh,hpp}
+
+        echo "Running deadnix..."
+        deadnix --fail
+
+        echo "Running markdownlint..."
+        markdownlint --dot .
+
+        echo "Running nixfmt..."
+        nixfmt --check .
+
+        echo "Running statix"
+        statix check .
+
+        touch $out
+      '';
+}
diff --git a/nix/dev.nix b/nix/dev.nix
deleted file mode 100644
index 08bbeea3f..000000000
--- a/nix/dev.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  perSystem = {
-    config,
-    lib,
-    pkgs,
-    ...
-  }: {
-    pre-commit.settings = {
-      hooks = {
-        markdownlint.enable = true;
-
-        alejandra.enable = true;
-        deadnix.enable = true;
-        nil.enable = true;
-
-        clang-format = {
-          enable = true;
-          types_or = ["c" "c++" "java" "json" "objective-c"];
-        };
-      };
-
-      tools.clang-tools = lib.mkForce pkgs.clang-tools_18;
-    };
-
-    devShells.default = pkgs.mkShell {
-      shellHook = ''
-        ${config.pre-commit.installationScript}
-      '';
-
-      inputsFrom = [config.packages.fjordlauncher-unwrapped];
-      buildInputs = with pkgs; [ccache ninja];
-    };
-
-    formatter = pkgs.alejandra;
-  };
-}
diff --git a/nix/distribution.nix b/nix/distribution.nix
deleted file mode 100644
index 8981fa6af..000000000
--- a/nix/distribution.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  inputs,
-  self,
-  ...
-}: {
-  perSystem = {
-    lib,
-    pkgs,
-    ...
-  }: {
-    packages = let
-      ourPackages = lib.fix (final: self.overlays.default final pkgs);
-    in {
-      inherit
-        (ourPackages)
-        fjordlauncher-unwrapped
-        fjordlauncher
-        ;
-      default = ourPackages.fjordlauncher;
-    };
-  };
-
-  flake = {
-    overlays.default = final: prev: let
-      version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
-    in {
-      fjordlauncher-unwrapped = prev.callPackage ./pkg {
-        inherit (inputs) libnbtplusplus;
-        inherit version;
-      };
-
-      fjordlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {
-        inherit (final) fjordlauncher-unwrapped;
-      };
-    };
-  };
-}
diff --git a/nix/pkg/default.nix b/nix/pkg/default.nix
deleted file mode 100644
index 7f6aacdfa..000000000
--- a/nix/pkg/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  cmark,
-  darwin,
-  extra-cmake-modules,
-  gamemode,
-  ghc_filesystem,
-  jdk17,
-  kdePackages,
-  ninja,
-  stripJavaArchivesHook,
-  tomlplusplus,
-  zlib,
-  msaClientID ? null,
-  gamemodeSupport ? stdenv.isLinux,
-  version,
-  libnbtplusplus,
-}:
-assert lib.assertMsg (
-  gamemodeSupport -> stdenv.isLinux
-) "gamemodeSupport is only available on Linux.";
-  stdenv.mkDerivation {
-    pname = "fjordlauncher-unwrapped";
-    inherit version;
-
-    src = lib.fileset.toSource {
-      root = ../../.;
-      fileset = lib.fileset.unions (map (fileName: ../../${fileName}) [
-        "buildconfig"
-        "cmake"
-        "launcher"
-        "libraries"
-        "program_info"
-        "tests"
-        "COPYING.md"
-        "CMakeLists.txt"
-      ]);
-    };
-
-    postUnpack = ''
-      rm -rf source/libraries/libnbtplusplus
-      ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
-    '';
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-      extra-cmake-modules
-      jdk17
-      stripJavaArchivesHook
-    ];
-
-    buildInputs =
-      [
-        cmark
-        ghc_filesystem
-        kdePackages.qtbase
-        kdePackages.qtnetworkauth
-        kdePackages.quazip
-        tomlplusplus
-        zlib
-      ]
-      ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.Cocoa]
-      ++ lib.optional gamemodeSupport gamemode;
-
-    hardeningEnable = lib.optionals stdenv.isLinux ["pie"];
-
-    cmakeFlags =
-      [
-        (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
-      ]
-      ++ lib.optionals (msaClientID != null) [
-        (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
-      ]
-      ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
-        (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
-      ]
-      ++ lib.optionals stdenv.isDarwin [
-        # we wrap our binary manually
-        (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
-        # disable built-in updater
-        (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
-        (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
-      ];
-
-    dontWrapQtApps = true;
-
-    meta = {
-      description = "Prism Launcher fork with support for alternative auth servers";
-      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.
-      '';
-      homepage = "https://fjordlauncher.org/";
-      license = lib.licenses.gpl3Only;
-      maintainers = with lib.maintainers; [
-        evan-goode
-      ];
-      mainProgram = "fjordlauncher";
-      platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    };
-  }
diff --git a/nix/pkg/wrapper.nix b/nix/pkg/wrapper.nix
deleted file mode 100644
index 10fcc68b7..000000000
--- a/nix/pkg/wrapper.nix
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-  lib,
-  stdenv,
-  symlinkJoin,
-  fjordlauncher-unwrapped,
-  addOpenGLRunpath,
-  flite,
-  gamemode,
-  glfw,
-  glfw-wayland-minecraft,
-  glxinfo,
-  jdk8,
-  jdk17,
-  jdk21,
-  kdePackages,
-  libGL,
-  libpulseaudio,
-  libusb1,
-  makeWrapper,
-  openal,
-  pciutils,
-  udev,
-  vulkan-loader,
-  xorg,
-  additionalLibs ? [],
-  additionalPrograms ? [],
-  controllerSupport ? stdenv.isLinux,
-  gamemodeSupport ? stdenv.isLinux,
-  jdks ? [
-    jdk21
-    jdk17
-    jdk8
-  ],
-  msaClientID ? null,
-  textToSpeechSupport ? stdenv.isLinux,
-  # Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
-  # when launched on wayland, allowing for the game to be run natively.
-  # Make sure to enable "Use system installation of GLFW" in instance settings
-  # for this to take effect
-  #
-  # Warning: This build of glfw may be unstable, and the launcher
-  # itself can take slightly longer to start
-  withWaylandGLFW ? false,
-}:
-assert lib.assertMsg (
-  controllerSupport -> stdenv.isLinux
-) "controllerSupport only has an effect on Linux.";
-assert lib.assertMsg (
-  textToSpeechSupport -> stdenv.isLinux
-) "textToSpeechSupport only has an effect on Linux.";
-assert lib.assertMsg (
-  withWaylandGLFW -> stdenv.isLinux
-) "withWaylandGLFW is only available on Linux."; let
-  fjordlauncher' = fjordlauncher-unwrapped.override {inherit msaClientID gamemodeSupport;};
-in
-  symlinkJoin {
-    name = "fjordlauncher-${fjordlauncher'.version}";
-
-    paths = [fjordlauncher'];
-
-    nativeBuildInputs =
-      [kdePackages.wrapQtAppsHook]
-      # purposefully using a shell wrapper here for variable expansion
-      # see https://github.com/NixOS/nixpkgs/issues/172583
-      ++ lib.optional withWaylandGLFW makeWrapper;
-
-    buildInputs =
-      [
-        kdePackages.qtbase
-        kdePackages.qtsvg
-      ]
-      ++ lib.optional (
-        lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
-      )
-      kdePackages.qtwayland;
-
-    env = {
-      waylandPreExec = lib.optionalString withWaylandGLFW ''
-        if [ -n "$WAYLAND_DISPLAY" ]; then
-          export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
-        fi
-      '';
-    };
-
-    postBuild =
-      lib.optionalString withWaylandGLFW ''
-        qtWrapperArgs+=(--run "$waylandPreExec")
-      ''
-      + ''
-        wrapQtAppsHook
-      '';
-
-    qtWrapperArgs = let
-      runtimeLibs =
-        [
-          # lwjgl
-          glfw
-          libpulseaudio
-          libGL
-          openal
-          stdenv.cc.cc.lib
-
-          vulkan-loader # VulkanMod's lwjgl
-
-          udev # oshi
-
-          xorg.libX11
-          xorg.libXext
-          xorg.libXcursor
-          xorg.libXrandr
-          xorg.libXxf86vm
-        ]
-        ++ lib.optional textToSpeechSupport flite
-        ++ lib.optional gamemodeSupport gamemode.lib
-        ++ lib.optional controllerSupport libusb1
-        ++ additionalLibs;
-
-      runtimePrograms =
-        [
-          glxinfo
-          pciutils # need lspci
-          xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-        ]
-        ++ additionalPrograms;
-    in
-      ["--prefix FJORDLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
-      ++ lib.optionals stdenv.isLinux [
-        "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
-        "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
-      ];
-
-    meta = {
-      inherit
-        (fjordlauncher'.meta)
-        description
-        longDescription
-        homepage
-        changelog
-        license
-        maintainers
-        mainProgram
-        platforms
-        ;
-    };
-  }
diff --git a/nix/unwrapped.nix b/nix/unwrapped.nix
new file mode 100644
index 000000000..b1d1dd7c1
--- /dev/null
+++ b/nix/unwrapped.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  cmark,
+  darwin,
+  extra-cmake-modules,
+  gamemode,
+  ghc_filesystem,
+  jdk17,
+  kdePackages,
+  ninja,
+  nix-filter,
+  self,
+  stripJavaArchivesHook,
+  tomlplusplus,
+  zlib,
+  msaClientID ? null,
+  gamemodeSupport ? stdenv.isLinux,
+  version,
+  libnbtplusplus,
+}:
+assert lib.assertMsg (
+  gamemodeSupport -> stdenv.isLinux
+) "gamemodeSupport is only available on Linux.";
+stdenv.mkDerivation {
+  pname = "fjordlauncher-unwrapped";
+  inherit version;
+
+  src = nix-filter.lib {
+    root = self;
+    include = [
+      "buildconfig"
+      "cmake"
+      "launcher"
+      "libraries"
+      "program_info"
+      "tests"
+      ../COPYING.md
+      ../CMakeLists.txt
+    ];
+  };
+
+  postUnpack = ''
+    rm -rf source/libraries/libnbtplusplus
+    ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    extra-cmake-modules
+    jdk17
+    stripJavaArchivesHook
+  ];
+
+  buildInputs =
+    [
+      cmark
+      ghc_filesystem
+      kdePackages.qtbase
+      kdePackages.qtnetworkauth
+      kdePackages.quazip
+      tomlplusplus
+      zlib
+    ]
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
+    ++ lib.optional gamemodeSupport gamemode;
+
+  hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ];
+
+  cmakeFlags =
+    [ (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs") ]
+    ++ lib.optionals (msaClientID != null) [
+      (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
+    ]
+    ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
+      (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # we wrap our binary manually
+      (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
+      # disable built-in updater
+      (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
+      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
+    ];
+
+  doCheck = true;
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Prism Launcher fork with support for alternative auth servers";
+    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.
+    '';
+    homepage = "https://github.com/unmojang/FjordLauncher";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      evan-goode
+    ];
+    mainProgram = "fjordlauncher";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}
diff --git a/nix/wrapper.nix b/nix/wrapper.nix
new file mode 100644
index 000000000..3cb77aa03
--- /dev/null
+++ b/nix/wrapper.nix
@@ -0,0 +1,147 @@
+{
+  lib,
+  stdenv,
+  symlinkJoin,
+  fjordlauncher-unwrapped,
+  addOpenGLRunpath,
+  flite,
+  gamemode,
+  glfw,
+  glfw-wayland-minecraft,
+  glxinfo,
+  jdk8,
+  jdk17,
+  jdk21,
+  kdePackages,
+  libGL,
+  libpulseaudio,
+  libusb1,
+  makeWrapper,
+  openal,
+  pciutils,
+  udev,
+  vulkan-loader,
+  xorg,
+  additionalLibs ? [ ],
+  additionalPrograms ? [ ],
+  controllerSupport ? stdenv.isLinux,
+  gamemodeSupport ? stdenv.isLinux,
+  jdks ? [
+    jdk21
+    jdk17
+    jdk8
+  ],
+  msaClientID ? null,
+  textToSpeechSupport ? stdenv.isLinux,
+  # Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
+  # when launched on wayland, allowing for the game to be run natively.
+  # Make sure to enable "Use system installation of GLFW" in instance settings
+  # for this to take effect
+  #
+  # Warning: This build of glfw may be unstable, and the launcher
+  # itself can take slightly longer to start
+  withWaylandGLFW ? false,
+}:
+assert lib.assertMsg (
+  controllerSupport -> stdenv.isLinux
+) "controllerSupport only has an effect on Linux.";
+assert lib.assertMsg (
+  textToSpeechSupport -> stdenv.isLinux
+) "textToSpeechSupport only has an effect on Linux.";
+assert lib.assertMsg (
+  withWaylandGLFW -> stdenv.isLinux
+) "withWaylandGLFW is only available on Linux.";
+let
+  fjordlauncher' = fjordlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; };
+in
+symlinkJoin {
+  name = "fjordlauncher-${fjordlauncher'.version}";
+
+  paths = [ fjordlauncher' ];
+
+  nativeBuildInputs =
+    [
+      kdePackages.wrapQtAppsHook
+    ]
+    # purposefully using a shell wrapper here for variable expansion
+    # see https://github.com/NixOS/nixpkgs/issues/172583
+    ++ lib.optional withWaylandGLFW makeWrapper;
+
+  buildInputs =
+    [
+      kdePackages.qtbase
+      kdePackages.qtsvg
+    ]
+    ++ lib.optional (
+      lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
+    ) kdePackages.qtwayland;
+
+  env = {
+    waylandPreExec = lib.optionalString withWaylandGLFW ''
+      if [ -n "$WAYLAND_DISPLAY" ]; then
+        export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
+      fi
+    '';
+  };
+
+  postBuild =
+    lib.optionalString withWaylandGLFW ''
+      qtWrapperArgs+=(--run "$waylandPreExec")
+    ''
+    + ''
+      wrapQtAppsHook
+    '';
+
+  qtWrapperArgs =
+    let
+      runtimeLibs =
+        [
+          # lwjgl
+          glfw
+          libpulseaudio
+          libGL
+          openal
+          stdenv.cc.cc.lib
+
+          vulkan-loader # VulkanMod's lwjgl
+
+          udev # oshi
+
+          xorg.libX11
+          xorg.libXext
+          xorg.libXcursor
+          xorg.libXrandr
+          xorg.libXxf86vm
+        ]
+        ++ lib.optional textToSpeechSupport flite
+        ++ lib.optional gamemodeSupport gamemode.lib
+        ++ lib.optional controllerSupport libusb1
+        ++ additionalLibs;
+
+      runtimePrograms = [
+        glxinfo
+        pciutils # need lspci
+        xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+      ] ++ additionalPrograms;
+    in
+    [
+      "--prefix FJORDLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
+      "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
+    ];
+
+  meta = {
+    inherit (fjordlauncher'.meta)
+      description
+      longDescription
+      homepage
+      changelog
+      license
+      maintainers
+      mainProgram
+      platforms
+      ;
+  };
+}
diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index e95f86a19..f8c5bd7b5 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -14,8 +14,8 @@ set(Launcher_DisplayName "Fjord Launcher")
 set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
 set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
 
-set(Launcher_Copyright "© 2024-2024 Fjord Launcher Contributors\\n© 2022-2024 PollyMC Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
-set(Launcher_Copyright_Mac "© 2024-2024 Fjord Launcher Contributors, © 2022-2024 PollyMC Contributors, © 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors, and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
+set(Launcher_Copyright "© 2024-2024 Fjord Launcher Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
+set(Launcher_Copyright_Mac "© 2024-2024 Fjord Launcher Contributors, © 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
 set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
 set(Launcher_Domain "" PARENT_SCOPE)
 set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE)
@@ -32,7 +32,7 @@ set(Launcher_Branding_ICNS "program_info/fjordlauncher.icns" PARENT_SCOPE)
 set(Launcher_Branding_ICO "program_info/fjordlauncher.ico")
 set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)
 set(Launcher_Branding_WindowsRC "program_info/fjordlauncher.rc" PARENT_SCOPE)
-set(Launcher_Branding_LogoQRC "program_info/prismlauncher.qrc" PARENT_SCOPE)
+set(Launcher_Branding_LogoQRC "program_info/fjordlauncher.qrc" PARENT_SCOPE)
 
 set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE)
 
@@ -41,6 +41,31 @@ configure_file(org.unmojang.FjordLauncher.metainfo.xml.in org.unmojang.FjordLaun
 configure_file(fjordlauncher.rc.in fjordlauncher.rc @ONLY)
 configure_file(fjordlauncher.manifest.in fjordlauncher.manifest @ONLY)
 configure_file(fjordlauncher.ico fjordlauncher.ico COPYONLY)
+
+if(MSVC)
+    set(Launcher_MSVC_Redist_NSIS_Section [=[
+!ifdef haveNScurl
+Section "Visual Studio Runtime"
+    Var /GLOBAL vc_redist_exe
+    ${If} ${IsNativeARM64}
+        StrCpy $vc_redist_exe "vc_redist.arm64.exe"
+    ${Else}
+        StrCpy $vc_redist_exe "vc_redist.x64.exe"
+    ${EndIf}
+    DetailPrint 'Downloading Microsoft Visual C++ Redistributable...'
+    NScurl::http GET "https://aka.ms/vs/17/release/$vc_redist_exe" "$INSTDIR\vc_redist\$vc_redist_exe" /INSIST /CANCEL /Zone.Identifier /END
+    Pop $0
+    ${If} $0 == "OK"
+        DetailPrint "Download successful"
+        ExecWait "$INSTDIR\vc_redist\$vc_redist_exe /install /passive /norestart"
+    ${Else}
+        DetailPrint "Download failed with error $0"
+    ${EndIf}
+SectionEnd
+!endif
+]=])
+endif()
+
 configure_file(win_install.nsi.in win_install.nsi @ONLY)
 
 if(SCDOC_FOUND)
diff --git a/program_info/fjordlauncher.manifest.in b/program_info/fjordlauncher.manifest.in
index 1b964a18f..15afc5390 100644
--- a/program_info/fjordlauncher.manifest.in
+++ b/program_info/fjordlauncher.manifest.in
@@ -5,7 +5,7 @@
         <ws2:longPathAware>true</ws2:longPathAware>
     </windowsSettings>
   </application>
-  <assemblyIdentity name="Fjord Launcher" type="win32" version="@Launcher_VERSION_NAME4@" />
+  <assemblyIdentity name="FjordLauncher.Application.1" type="win32" version="@Launcher_VERSION_NAME4@" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>
diff --git a/program_info/prismlauncher.qrc b/program_info/fjordlauncher.qrc
similarity index 100%
rename from program_info/prismlauncher.qrc
rename to program_info/fjordlauncher.qrc
diff --git a/program_info/org.unmojang.FjordLauncher.desktop.in b/program_info/org.unmojang.FjordLauncher.desktop.in
index 09c509aa1..083573ec7 100755
--- a/program_info/org.unmojang.FjordLauncher.desktop.in
+++ b/program_info/org.unmojang.FjordLauncher.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=Fjord Launcher
+Name=@Launcher_DisplayName@
 Comment=Discover, manage, and play Minecraft instances
 Type=Application
 Terminal=false
@@ -9,5 +9,5 @@ StartupNotify=true
 Icon=org.unmojang.FjordLauncher
 Categories=Game;ActionGame;AdventureGame;Simulation;
 Keywords=game;minecraft;mc;
-StartupWMClass=PrismLauncher
-MimeType=application/zip;application/x-modrinth-modpack+zip;x-scheme-handler/curseforge;
+StartupWMClass=@Launcher_CommonName@
+MimeType=application/zip;application/x-modrinth-modpack+zip;x-scheme-handler/curseforge;x-scheme-handler/@Launcher_APP_BINARY_NAME@;
diff --git a/program_info/shell.nix b/program_info/shell.nix
index cf728874b..631832d96 100644
--- a/program_info/shell.nix
+++ b/program_info/shell.nix
@@ -1,4 +1,11 @@
-{pkgs ? import <nixos-unstable> {}}:
+{
+  pkgs ? import <nixos-unstable> { },
+}:
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [inkscape icoutils imagemagick nodePackages_latest.svgo];
+  nativeBuildInputs = with pkgs; [
+    inkscape
+    icoutils
+    imagemagick
+    nodePackages_latest.svgo
+  ];
 }
diff --git a/program_info/win_install.nsi.in b/program_info/win_install.nsi.in
index 8fe916fb9..fc7a7dac3 100644
--- a/program_info/win_install.nsi.in
+++ b/program_info/win_install.nsi.in
@@ -2,6 +2,8 @@
 !include "LogicLib.nsh"
 !include "MUI2.nsh"
 
+!include "x64.nsh"
+
 Unicode true
 
 Name "@Launcher_DisplayName@"
@@ -112,6 +114,16 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "@Launcher_Copyright@"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "@Launcher_VERSION_NAME4@"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@"
 
+;--------------------------------
+; Conditional comp with file exist
+
+!macro CompileTimeIfFileExist path define
+!tempfile tmpinc
+!system 'IF EXIST "${path}" echo !define ${define} > "${tmpinc}"'
+!include "${tmpinc}"
+!delfile "${tmpinc}"
+!undef tmpinc
+!macroend
 
 ;--------------------------------
 ; Shell Associate Macros
@@ -175,7 +187,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
 
 !macroend
 
-!macro APP_UNASSOCIATE EXT APP_ID
+!macro APP_UNASSOCIATE EXT APP_ID APP_EXE
 
   # Unregister file type
   ClearErrors
@@ -336,6 +348,19 @@ Section "" UninstallPrevious
 
 SectionEnd
 
+;------------------------------------
+; include nice plugins
+
+; NScurl - curl in NSIS
+; used for MSVS redist download
+; extract to ../NSISPlugins/NScurl
+; https://github.com/negrutiu/nsis-nscurl/releases/latest/download/NScurl.zip
+!insertmacro CompileTimeIfFileExist "../NSISPlugins/NScurl/Plugins/" haveNScurl
+!ifdef haveNScurl
+!AddPluginDir /x86-unicode     "../NSISPlugins/NScurl/Plugins/x86-unicode"
+!AddPluginDir /x86-ansi        "../NSISPlugins/NScurl/Plugins/x86-ansi"
+!AddPluginDir /amd64-unicode   "../NSISPlugins/NScurl/Plugins/amd64-unicode"
+!endif
 
 ;------------------------------------
 
@@ -367,6 +392,10 @@ Section "@Launcher_DisplayName@"
   WriteRegStr HKCU Software\Classes\curseforge "URL Protocol" ""
   WriteRegStr HKCU Software\Classes\curseforge\shell\open\command "" '"$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" "%1"'
 
+; Write the URL Handler into registry for prismlauncher
+  WriteRegStr HKCU Software\Classes\prismlauncher "URL Protocol" ""
+  WriteRegStr HKCU Software\Classes\prismlauncher\shell\open\command "" '"$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" "%1"'
+
   ; Write the uninstall keys for Windows
   ${GetParameters} $R0
   ${GetOptions} $R0 "/NoUninstaller" $R1
@@ -391,6 +420,8 @@ Section "@Launcher_DisplayName@"
 
 SectionEnd
 
+@Launcher_MSVC_Redist_NSIS_Section@
+
 Section "Start Menu Shortcut" SM_SHORTCUTS
 
   CreateShortcut "$SMPROGRAMS\@Launcher_DisplayName@.lnk" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" "" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" 0
@@ -458,8 +489,8 @@ Section -un.ShellAssoc
   
   !insertmacro APP_TEARDOWN_DEFAULT `${APPID}` `${APPNAME}` `${APPEXE}`
 
-  !insertmacro APP_UNASSOCIATE ".zip" `${APPID}`
-  !insertmacro APP_UNASSOCIATE ".mrpack" `${APPID}`
+  !insertmacro APP_UNASSOCIATE ".zip" `${APPID}` `${APPEXE}`
+  !insertmacro APP_UNASSOCIATE ".mrpack" `${APPID}` `${APPEXE}`
 
   !insertmacro NotifyShell_AssocChanged
 SectionEnd
diff --git a/scripts/getToken.py b/scripts/getToken.py
deleted file mode 100644
index 92a2f5260..000000000
--- a/scripts/getToken.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Reimplementation of https://git.sakamoto.pl/domi/curseme/-/blob/meow/getToken.sh in python
-
-import io
-import requests
-from re import search
-
-# i have no idea why this is ripping the key from 4chan but what works works i guess
-token = requests.get("https://arch.b4k.co/vg/thread/388569358").text
-token = search("and put .*? ", token).group(0)
-token = search("\$.*$", token).group(0).strip()
-
-output = io.open("token", "w")
-output.write(token)
-output.close()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ccf340521..a0afec42a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -60,5 +60,8 @@ ecm_add_test(Index_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}:
 ecm_add_test(Version_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME Version)
 
+ecm_add_test(MetaComponentParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+    TEST_NAME MetaComponentParse)
+
 ecm_add_test(CatPack_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME CatPack)
diff --git a/tests/Library_test.cpp b/tests/Library_test.cpp
index 8b8d4c55c..9826abbdf 100644
--- a/tests/Library_test.cpp
+++ b/tests/Library_test.cpp
@@ -95,8 +95,8 @@ class LibraryTest : public QObject {
         auto downloads = test.getDownloads(r, cache.get(), failedFiles, QString());
         QCOMPARE(downloads.size(), 1);
         QCOMPARE(failedFiles, {});
-        NetAction::Ptr dl = downloads[0];
-        QCOMPARE(dl->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion.jar"));
+        Net::NetRequest::Ptr dl = downloads[0];
+        QCOMPARE(dl->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion.jar"));
     }
     void test_legacy_url_local_broken()
     {
@@ -147,7 +147,7 @@ class LibraryTest : public QObject {
             QCOMPARE(dls.size(), 1);
             QCOMPARE(failedFiles, {});
             auto dl = dls[0];
-            QCOMPARE(dl->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux.jar"));
+            QCOMPARE(dl->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux.jar"));
         }
     }
     void test_legacy_native_arch()
@@ -170,8 +170,8 @@ class LibraryTest : public QObject {
             auto dls = test.getDownloads(r, cache.get(), failedFiles, QString());
             QCOMPARE(dls.size(), 2);
             QCOMPARE(failedFiles, {});
-            QCOMPARE(dls[0]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux-32.jar"));
-            QCOMPARE(dls[1]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux-64.jar"));
+            QCOMPARE(dls[0]->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux-32.jar"));
+            QCOMPARE(dls[1]->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-linux-64.jar"));
         }
         r.system = "windows";
         {
@@ -185,8 +185,8 @@ class LibraryTest : public QObject {
             auto dls = test.getDownloads(r, cache.get(), failedFiles, QString());
             QCOMPARE(dls.size(), 2);
             QCOMPARE(failedFiles, {});
-            QCOMPARE(dls[0]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-windows-32.jar"));
-            QCOMPARE(dls[1]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-windows-64.jar"));
+            QCOMPARE(dls[0]->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-windows-32.jar"));
+            QCOMPARE(dls[1]->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-windows-64.jar"));
         }
         r.system = "osx";
         {
@@ -200,8 +200,8 @@ class LibraryTest : public QObject {
             auto dls = test.getDownloads(r, cache.get(), failedFiles, QString());
             QCOMPARE(dls.size(), 2);
             QCOMPARE(failedFiles, {});
-            QCOMPARE(dls[0]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-osx-32.jar"));
-            QCOMPARE(dls[1]->m_url, QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-osx-64.jar"));
+            QCOMPARE(dls[0]->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-osx-32.jar"));
+            QCOMPARE(dls[1]->url(), QUrl("file://foo/bar/test/package/testname/testversion/testname-testversion-osx-64.jar"));
         }
     }
     void test_legacy_native_arch_local_override()
@@ -244,7 +244,7 @@ class LibraryTest : public QObject {
             auto dls = test->getDownloads(r, cache.get(), failedFiles, QString());
             QCOMPARE(dls.size(), 1);
             QCOMPARE(failedFiles, {});
-            QCOMPARE(dls[0]->m_url, QUrl("https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"));
+            QCOMPARE(dls[0]->url(), QUrl("https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"));
         }
         r.system = "osx";
         test->setHint("local");
@@ -300,7 +300,7 @@ class LibraryTest : public QObject {
         auto dls = test->getDownloads(r, cache.get(), failedFiles, QString());
         QCOMPARE(dls.size(), 1);
         QCOMPARE(failedFiles, {});
-        QCOMPARE(dls[0]->m_url, QUrl("https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/"
+        QCOMPARE(dls[0]->url(), QUrl("https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/"
                                      "lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"));
     }
     void test_onenine_native_arch()
@@ -317,9 +317,9 @@ class LibraryTest : public QObject {
         auto dls = test->getDownloads(r, cache.get(), failedFiles, QString());
         QCOMPARE(dls.size(), 2);
         QCOMPARE(failedFiles, {});
-        QCOMPARE(dls[0]->m_url,
+        QCOMPARE(dls[0]->url(),
                  QUrl("https://libraries.minecraft.net/tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-32.jar"));
-        QCOMPARE(dls[1]->m_url,
+        QCOMPARE(dls[1]->url(),
                  QUrl("https://libraries.minecraft.net/tv/twitch/twitch-platform/5.16/twitch-platform-5.16-natives-windows-64.jar"));
     }
 
diff --git a/tests/Manifest_test.cpp b/tests/Manifest_test.cpp
index 6d2882d83..e0ce02405 100644
--- a/tests/Manifest_test.cpp
+++ b/tests/Manifest_test.cpp
@@ -1,7 +1,7 @@
 #include <QTest>
 #include <QTimer>
 
-#include <iostream>
+#include <sstream>
 
 #include "Manifest.h"
 
@@ -93,7 +93,7 @@ A-Name-That-Is-Way-Too-Loooooooooooooooooooooooooooooooooooooooooooooooonooooooo
         }
         QVERIFY(caught);
     }
-    void test_misingColon()
+    void test_missingColon()
     {
         std::istringstream iss{ "Manifest-Version 1.0" };
         bool caught = false;
@@ -104,7 +104,7 @@ A-Name-That-Is-Way-Too-Loooooooooooooooooooooooooooooooooooooooooooooooonooooooo
         }
         QVERIFY(caught);
     }
-    void test_misingSpace()
+    void test_missingSpace()
     {
         std::istringstream iss{ "Manifest-Version:1.0" };
         bool caught = false;
diff --git a/tests/MetaComponentParse_test.cpp b/tests/MetaComponentParse_test.cpp
new file mode 100644
index 000000000..9979a9fa6
--- /dev/null
+++ b/tests/MetaComponentParse_test.cpp
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QTest>
+#include <QTimer>
+
+#include <FileSystem.h>
+
+#include <minecraft/mod/tasks/LocalResourcePackParseTask.h>
+
+class MetaComponentParseTest : public QObject {
+    Q_OBJECT
+
+    void doTest(QString name)
+    {
+        QString source = QFINDTESTDATA("testdata/MetaComponentParse");
+
+        QString comp_rp = FS::PathCombine(source, name);
+
+        QFile file;
+        file.setFileName(comp_rp);
+        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+        QString data = file.readAll();
+        file.close();
+
+        QJsonDocument doc = QJsonDocument::fromJson(data.toUtf8());
+        QJsonObject obj = doc.object();
+
+        QJsonValue description_json = obj.value("description");
+        QJsonValue expected_json = obj.value("expected_output");
+
+        QVERIFY(!description_json.isUndefined());
+        QVERIFY(expected_json.isString());
+
+        QString expected = expected_json.toString();
+
+        QString processed = ResourcePackUtils::processComponent(description_json);
+
+        QCOMPARE(processed, expected);
+    }
+
+   private slots:
+    void test_parseComponentBasic() { doTest("component_basic.json"); }
+    void test_parseComponentWithFormat() { doTest("component_with_format.json"); }
+    void test_parseComponentWithExtra() { doTest("component_with_extra.json"); }
+    void test_parseComponentWithLink() { doTest("component_with_link.json"); }
+    void test_parseComponentWithMixed() { doTest("component_with_mixed.json"); }
+};
+
+QTEST_GUILESS_MAIN(MetaComponentParseTest)
+
+#include "MetaComponentParse_test.moc"
diff --git a/tests/testdata/MetaComponentParse/component_basic.json b/tests/testdata/MetaComponentParse/component_basic.json
new file mode 100644
index 000000000..908cb353c
--- /dev/null
+++ b/tests/testdata/MetaComponentParse/component_basic.json
@@ -0,0 +1,8 @@
+{
+    "description": [
+        {
+            "text": "Hello, Component!"
+        }
+    ],
+    "expected_output": "Hello, Component!"
+}
diff --git a/tests/testdata/MetaComponentParse/component_with_extra.json b/tests/testdata/MetaComponentParse/component_with_extra.json
new file mode 100644
index 000000000..887becdbe
--- /dev/null
+++ b/tests/testdata/MetaComponentParse/component_with_extra.json
@@ -0,0 +1,21 @@
+{
+    "description": [
+        {
+            "text": "Hello, ",
+            "color": "red",
+            "bold": true,
+            "italic": true,
+            "extra": [
+                {
+                    "extra": [
+                        "Component!"
+                    ],
+                    "bold": false,
+                    "italic": false
+                }
+            ]
+        }
+    ],
+    "expected_output":
+        "<span style=\"color: red; font-weight: bold; font-style: italic;\">Hello, <span style=\"font-weight: normal; font-style: normal;\">Component!</span></span>"
+}
\ No newline at end of file
diff --git a/tests/testdata/MetaComponentParse/component_with_format.json b/tests/testdata/MetaComponentParse/component_with_format.json
new file mode 100644
index 000000000..1078886a6
--- /dev/null
+++ b/tests/testdata/MetaComponentParse/component_with_format.json
@@ -0,0 +1,13 @@
+{
+    "description": [
+        {
+            "text": "Hello, Component!",
+            "color": "blue",
+            "bold": true,
+            "italic": true,
+            "underlined": true,
+            "strikethrough": true
+        }
+    ],
+    "expected_output": "<span style=\"color: blue; font-weight: bold; font-style: italic;\"><s><u>Hello, Component!</u></s></span>"
+}
\ No newline at end of file
diff --git a/tests/testdata/MetaComponentParse/component_with_link.json b/tests/testdata/MetaComponentParse/component_with_link.json
new file mode 100644
index 000000000..188c004cd
--- /dev/null
+++ b/tests/testdata/MetaComponentParse/component_with_link.json
@@ -0,0 +1,12 @@
+{
+    "description": [
+        {
+            "text": "Hello, Component!",
+            "clickEvent": {
+                "action": "open_url",
+                "value": "https://google.com"
+            }
+        }
+    ],
+    "expected_output": "<a href=\"https://google.com\">Hello, Component!</a>"
+}
diff --git a/tests/testdata/MetaComponentParse/component_with_mixed.json b/tests/testdata/MetaComponentParse/component_with_mixed.json
new file mode 100644
index 000000000..661fc1a3e
--- /dev/null
+++ b/tests/testdata/MetaComponentParse/component_with_mixed.json
@@ -0,0 +1,45 @@
+{
+    "description": [
+        {
+            "text": "The quick ",
+            "color": "blue",
+            "italic": true
+        },
+        {
+            "text": "brown fox ",
+            "color": "#873600",
+            "bold": true,
+            "underlined": true,
+            "extra": [
+                {
+                    "text": "jumped over ",
+                    "color": "blue",
+                    "bold": false,
+                    "underlined": false,
+                    "italic": true,
+                    "strikethrough": true
+                }
+            ]
+        },
+        {
+            "text": "the lazy dog's back. ",
+            "color": "green",
+            "bold": true,
+            "italic": true,
+            "underlined": true,
+            "strikethrough": true,
+            "extra": [
+                {
+                    "text": "1234567890 ",
+                    "color": "black",
+                    "strikethrough": false,
+                    "extra": [
+                        "How vexingly quick daft zebras jump!"
+                    ]
+                }
+            ]
+        }
+    ],
+    "expected_output":
+        "<span style=\"color: blue; font-style: italic;\">The quick </span><span style=\"color: #873600; font-weight: bold;\"><u>brown fox </u><span style=\"color: blue; font-weight: normal; font-style: italic;\"><s>jumped over </s></span></span><span style=\"color: green; font-weight: bold; font-style: italic;\"><s><u>the lazy dog's back. </u></s><span style=\"color: black;\"><u>1234567890 </u>How vexingly quick daft zebras jump!</span></span>"
+}