chore: dry-run only for now

Merge branch 'main' into gui
headers and packaging stuff
2026-10-21 09:47:01 +02:00 · 2023-06-04 18:25:35 -05:00 · 2023-06-04 18:23:06 -05:00 · 2023-04-07 09:59:14 -05:00 · 2023-04-06 15:45:00 -05:00 · 2023-04-05 22:19:57 -05:00
59 changed files with 2449 additions and 3691 deletions
@@ -1,12 +0,0 @@
-name: No Template
-description: Create a standard issue, no template involved.
-labels: [palera1n help]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description:
-      placeholder: Anyone else has issues with ...? If so, I found a solution.
-    validations:
-      required: true
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Mention us on X (formerly known as Twitter)
-    url: https://twitter.com/palera1n
-    about: Mention us about your issue if you're not comfortable with using Github issues.
@@ -1,21 +0,0 @@
-name: Feature Request
-description: Request a feature in palera1n!
-labels: [enhancement]
-body:
-  - type: textarea
-    id: feature-request
-    attributes:
-      label: Feature Description
-      description:
-      placeholder: I want ... to be added to palera1n, because ...
-    validations:
-      required: true
-  - type: textarea
-    id: detailed-description
-    attributes:
-      label: Start going into detail..
-      description:
-      placeholder: I think it should also include ..., because of convenience.
-    validations:
-      required: false
-      
@@ -1,52 +0,0 @@
-name: Create Issue
-description: Ask help for palera1n regarding support or generally how it works! 
-labels: [palera1n help]
-body:
-  - type: input
-    id: device
-    attributes:
-      label: Device
-      description: What is the device that you're using with palera1n? (iPhone, iPad, iPod Touch, appleTV, iBridge (T2))
-      placeholder: iPhone X
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: What is version you're running? (i.e. iOS, iPadOS, tvOS, bridgeOS
-      placeholder: iOS 15.6
-    validations:
-      required: true
-  - type: checkboxes
-    id: passcode-enabled
-    attributes:
-      label: Passcode?
-      description: Is your passcode enabled? 
-      options:
-        - label: Passcode is enabled.
-          required: false
-  - type: textarea
-    id: detailed-description
-    attributes:
-      label: Start going into detail..
-      description:
-      placeholder: My device couldn't boot jailbroken. I have checked ... using ..., none of the solutions I've been given are working for me. I don't know what to do.
-    validations:
-      required: true
-  - type: checkboxes
-    id: familiarity
-    attributes:
-      label: Familiarity with palera1n
-      description: Are you familiar with palera1n and how to use it?
-      options:
-        - label: I am familiar with palera1n and how to use it!
-          required: false
-  - type: checkboxes
-    id: familiarity-command-line
-    attributes:
-      label: Familiarity with CLI
-      description: Are you familiar with the command-line in anyway? (i.e. Terminal.app, Konsole)
-      options:
-        - label: I am familiar with the command-line!
-          required: false
@@ -26,7 +26,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Install dependencies (packages)
        run: |
@@ -36,12 +36,12 @@ jobs:
      - name: Build Documentation
        run: |
          make -j$(nproc) docs
-          mkdir -p ready/docs
-          cp docs/*.html docs/mandoc.css docs/palera1n.1 ready/docs
+          mkdir ready
+          cp docs/*.html docs/mandoc.css docs/palera1n.1 ready

      - name: Get branch name
        id: branch-name
-        uses: tj-actions/branch-names@v9
+        uses: tj-actions/branch-names@v7

      - name: Upload artifact
        if: ${{ github.event_name != 'pull_request' }}
@@ -50,9 +50,9 @@ jobs:
          host: ${{ secrets.NICKCHAN_FTP_HOST }}
          port: ${{ secrets.NICKCHAN_FTP_PORT }}
          username: palera1n
-          password: ${{ secrets.NICKCHAN_FTP_PASS }}
+          privateKey: ${{ secrets.NICKCHAN_FTP_KEY }}
          forceUpload: true
-          dryRun: false
+          dryRun: true
          localDir: 'ready/'
          remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref_name }}/${{ github.run_number }}"

@@ -72,26 +72,24 @@ jobs:
            gnu_triple: aarch64-apple-darwin
            os: iphoneos
            minos: 7.0
-    runs-on: macos-15
+    runs-on: macos-12
    env:
-      MBEDTLS_VERSION: 3.5.2
+      MBEDTLS_VERSION: 3.4.0
      READLINE_VERSION: 8.2
-      LIBIMOBILEDEVICE_COMMIT: ed0d66d0341562731bb19928dfe48155509fa7a7
-      LIBIRECOVERY_COMMIT: 7ce02c347b7c26e59498e6af31c9da51018d0fa1
-      LIBIMOBILEDEVICE_GLUE_COMMIT: 362f7848ac89b74d9dd113b38b51ecb601f76094
-      LIBPLIST_COMMIT: 2117b8fdb6b4096455bd2041a63e59a028120136
-      LIBUSBMUXD_COMMIT: a7f0543fb1ecb20ac7121c0fd77297200e0e43fc
+      SLANG_VERSION: 2.3.3
+      NEWT_VERSION: 0.52.23
+      POPT_VERSION: 1.19

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

      - name: Install dependencies (packages)
        run: |
          sudo /usr/local/bin/pip3 install jsonschema jinja2
-          brew install make autoconf automake pkg-config gnu-sed gettext libtool
+          brew install make autoconf automake pkg-config gnu-sed gettext
          sudo rm -rf /usr/local/Frameworks/Python*
          curl -LO https://github.com/ProcursusTeam/ldid/releases/download/v2.1.5-procursus7/ldid_macosx_x86_64
          sudo install -m755 ldid_macosx_x86_64 /usr/local/bin/ldid
@@ -100,9 +98,29 @@ jobs:
        run: |
          echo "SDK=$(xcrun -sdk ${{ matrix.os }} --show-sdk-path)" >> $GITHUB_ENV

+      - name: Download dependencies (source code)
+        run: |
+          curl -LOOOOOO \
+            https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
+            https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \
+            https://www.jedsoft.org/releases/slang/slang-${{ env.SLANG_VERSION }}.tar.bz2 \
+            https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz \
+            https://github.com/rpm-software-management/popt/archive/refs/tags/popt-${{ env.POPT_VERSION }}-release.tar.gz
+
+          tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
+          tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz
+          tar -xjf slang-${{ env.SLANG_VERSION }}.tar.bz2
+          tar -xf newt-${{ env.NEWT_VERSION }}.tar.gz
+          tar -xf popt-${{ env.POPT_VERSION }}-release.tar.gz
+          git clone --depth=1 https://github.com/libimobiledevice/libplist
+          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
+          git clone --depth=1 https://github.com/libimobiledevice/libirecovery
+          git clone --depth=1 https://github.com/libimobiledevice/libusbmuxd
+          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
+
      - name: Select correct Xcode
        run: |
-          sudo xcode-select -s /Applications/Xcode_16.2.app
+          sudo xcode-select -s /Applications/Xcode_14.2.app

      - name: Setup environment
        run: |
@@ -114,14 +132,16 @@ jobs:
          echo "CC=$(xcrun --find cc)" >> $GITHUB_ENV
          echo "CXX=$(xcrun --find c++)" >> $GITHUB_ENV
          echo "CPP=$(xcrun --find cc) -E" >> $GITHUB_ENV
-          echo "CFLAGS=-g -Os -isystem ${{ env.SDK }}/usr/include/c++/v1 -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isysroot ${{ env.SDK }} -isystem $(pwd)/sysroot/usr/local/include -Os -g -flto=full -Wl,-object_path_lto,lto.o -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" >> $GITHUB_ENV
-          echo "CPPFLAGS=-g -Os -isystem ${{ env.SDK }}/usr/include/c++/v1 -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isysroot ${{ env.SDK }} -isystem $(pwd)/sysroot/usr/local/include -Wno-error-implicit-function-declaration -Os -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" >> $GITHUB_ENV
-          echo "CXXFLAGS=-stdlib=libc++ -g -Os -isystem$(TARGET_SYSROOT)/usr/include/c++/v1 -isysroot ${{ env.SDK }} -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isystem $(pwd)/sysroot/usr/local/include -Os -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" >> $GITHUB_ENV
+          echo "CFLAGS=-g -Os -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isysroot ${{ env.SDK }} -isystem $(pwd)/sysroot/usr/local/include -Os -g -flto=full -Wl,-object_path_lto,lto.o" >> $GITHUB_ENV
+          echo "CPPFLAGS=-g -Os -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isysroot ${{ env.SDK }} -isystem $(pwd)/sysroot/usr/local/include -Wno-error-implicit-function-declaration -Os" >> $GITHUB_ENV
+          echo "CXXFLAGS=-stdlib=libc++ -g -Os -isysroot ${{ env.SDK }} -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isystem $(pwd)/sysroot/usr/local/include -Os" >> $GITHUB_ENV
          echo "LDFLAGS=-g -Wl,-dead_strip -arch ${{ matrix.arch }} -isysroot ${{ env.SDK }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -L$(pwd)/sysroot/usr/local/lib" >> $GITHUB_ENV
          echo "CFLAGS_FOR_BUILD=-arch $(uname -m) -isysroot $(xcrun -sdk macosx --show-sdk-path) -Os" >> $GITHUB_ENV
          echo "CXXFLAGS_FOR_BUILD=-stdlib=libc++ -arch $(uname -m) -isysroot $(xcrun -sdk macosx --show-sdk-path) -Os" >> $GITHUB_ENV
          echo "CPPFLAGS_FOR_BUILD=-arch $(uname -m) -isysroot $(xcrun -sdk macosx --show-sdk-path) -Wno-error-implicit-function-declaration -Os" >> $GITHUB_ENV
          echo "LDFLAGS_FOR_BUILD=-Wl,-dead_strip" >> $GITHUB_ENV
+          mkdir -p $(pwd)/sysroot/usr/local/lib
+          ln -sf $(pwd)/sysroot/usr/local/lib{,64}

      - name: Prepare iPhoneOS environment
        if: matrix.os == 'iphoneos'
@@ -162,59 +182,7 @@ jobs:
          gsed -E /'__API_UNAVAILABLE'/d < ${TARGET_SYSROOT}/usr/include/pthread.h > sysroot/usr/local/include/pthread.h
          gsed -i -E s/'__API_UNAVAILABLE\(.*\)'// sysroot/usr/local/include/IOKit/IOKitLib.h

-      - name: Check dependencies cache
-        run: |
-          echo "target: ${{ matrix.os }}-${{ matrix.arch }}" > cache.txt
-          echo "mbedtls ${{ env.MBEDTLS_VERSION }}" >> cache.txt
-          echo "readline: ${{ env.READLINE_VERSION }}" >> cache.txt
-          echo "libimobiledevice: ${{ env.LIBIMOBILEDEVICE_COMMIT }}" >> cache.txt
-          echo "libirecovery: ${{ env.LIBIRECOVERY_COMMIT }}" >> cache.txt
-          echo "libimobiledevice-glue: ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }}" >> cache.txt
-          echo "libplist: ${{ env.LIBPLIST_COMMIT }}" >> cache.txt
-          echo "libusbmuxd: ${{ env.LIBUSBMUXD_COMMIT }}" >> cache.txt
-          echo "cc: $($(xcrun --find cc) --version)" >> cache.txt
-          echo "CACHE_TXT_CHECKSUM=sysroot-$(shasum -a 512 cache.txt | cut -d' ' -f1)" >> $GITHUB_ENV
-
-      - name: Download cached sysroot
-        id: sysroot_cache
-        uses: actions/cache@v3
-        with:
-          path: sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
-          key: sysroot-${{ env.CACHE_TXT_CHECKSUM }}
-
-      - name: Extract cached sysroot
-        if: steps.sysroot_cache.outputs.cache-hit == 'true'
-        run: |
-          xz -dcT0 sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz | tar -x
-
-      - name: Setup sysroot
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p $(pwd)/sysroot/usr/local/lib
-          ln -sf $(pwd)/sysroot/usr/local/lib{,64}
-
-      - name: Download dependencies (source code)
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
-        run: |
-          curl -LOOOOOO \
-            https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
-            https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz
-
-          tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
-          tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz
-          git clone --depth=1 https://github.com/libimobiledevice/libplist
-          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
-          git clone --depth=1 https://github.com/libimobiledevice/libirecovery
-          git clone --depth=1 https://github.com/libimobiledevice/libusbmuxd
-          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
-          cd libplist && git fetch origin ${{ env.LIBPLIST_COMMIT }} && git reset --hard ${{ env.LIBPLIST_COMMIT }} && cd ..
-          cd libirecovery && git fetch origin ${{ env.LIBIRECOVERY_COMMIT }} && git reset --hard ${{ env.LIBIRECOVERY_COMMIT }} && cd ..
-          cd libimobiledevice-glue && git fetch origin ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && cd ..
-          cd libimobiledevice && git fetch origin ${{ env.LIBIMOBILEDEVICE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_COMMIT }} && cd ..
-          cd libusbmuxd && git fetch origin ${{ env.LIBUSBMUXD_COMMIT }} && git reset --hard ${{ env.LIBUSBMUXD_COMMIT }} && cd ..
-
      - name: Build Mbed TLS
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd mbedtls-${{ env.MBEDTLS_VERSION }}
          cat ../patches/mbedtls/0001-Allow-empty-x509-cert-issuer.patch | patch -sN -d . -p1
@@ -239,7 +207,6 @@ jobs:
          cd ..

      - name: Build readline
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd readline-${{ env.READLINE_VERSION }}
          CC=clang CXX=clang++ ./configure ${{ env.CONFIGURE_ARGS }} ac_cv_type_sig_atomic_t=no
@@ -247,8 +214,52 @@ jobs:
          gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
          cd ..

+      - name: Build S-Lang
+        run: |
+          cd slang-${{ env.SLANG_VERSION }}
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --without-x \
+            --without-pcre \
+            --without-onig \
+            --without-z \
+            --without-png \
+            --without-iconv
+          gmake -j$(sysctl -n hw.ncpu) static
+          gmake -j$(sysctl -n hw.ncpu) install-static DESTDIR=${{ env.DESTDIR }}
+          cd ..
+
+      - name: Build popt
+        run: |
+          cd popt-popt-${{ env.POPT_VERSION }}-release
+          autoreconf -fiv
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --without-libiconv-prefix \
+            --without-libintl-prefix \
+            --disable-nls \
+            --disable-werror
+          gmake -j$(sysctl -n hw.ncpu)
+          gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
+          cd ..
+
+      - name: Build newt
+        run: |
+          cd newt-${{ env.NEWT_VERSION }}
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --with-readline=gnu \
+            --without-python \
+            --without-tcl \
+            --disable-nls
+          gmake -j$(sysctl -n hw.ncpu) libnewt.a
+          mkdir -p ${{ env.DESTDIR }}/usr/local/{lib/pkgconfig,include}
+          install -m644 libnewt.pc ${{ env.DESTDIR }}/usr/local/lib/pkgconfig
+          install -m644 libnewt.a ${{ env.DESTDIR }}/usr/local/lib
+          install -m644 newt.h ${{ env.DESTDIR }}/usr/local/include
+          cd ..
+
      - name: Build libplist
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libplist
          autoreconf -fiv
@@ -258,7 +269,6 @@ jobs:
          cd ..

      - name: Build libimobiledevice-glue
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libimobiledevice-glue
          autoreconf -fiv
@@ -268,7 +278,6 @@ jobs:
          cd ..

      - name: Build libirecovery
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          sudo cp -a sysroot/usr/local/* /usr/local
          cd libirecovery
@@ -284,7 +293,6 @@ jobs:
          cd ..

      - name: Build libusbmuxd
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libusbmuxd
          autoreconf -fiv
@@ -294,11 +302,10 @@ jobs:
          cd ..

      - name: Build libimobiledevice
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libimobiledevice
          autoreconf -fiv
-          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --disable-debug --disable-wireless-pairing
+          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --enable-debug
          echo -e 'all:\ninstall:' > tools/Makefile
          gmake -j$(sysctl -n hw.ncpu)
          gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
@@ -309,30 +316,22 @@ jobs:
          cp -a sysroot/${{ env.PREFIX }}/{include,lib} dep_root
          find dep_root -name '*.dylib' -delete
          find dep_root -name '*.la' -delete
-          gmake -j$(sysctl -n hw.ncpu) ROOTFUL=1
-          cp src/palera1n palera1n-${{ matrix.os }}-${{ matrix.arch }}
+          gmake -j$(sysctl -n hw.ncpu)
+          mkdir -p ready
+          mv src/palera1n palera1n-${{ matrix.os }}-${{ matrix.arch }}
          dsymutil palera1n-${{ matrix.os }}-${{ matrix.arch }}
          strip palera1n-${{ matrix.os }}-${{ matrix.arch }}
-
-      - name: Build palera1n (Development)
-        run: |
-          gmake -j$(sysctl -n hw.ncpu) clean
-          gmake -j$(sysctl -n hw.ncpu) DEV_BUILD=1 TUI=1 ROOTFUL=1
-          cp src/palera1n palera1n-${{ matrix.os }}-${{ matrix.arch }}.development
-
-      - name: Prepare artifact
-        run: |
-          mkdir -p ready/build_depends
-          tar -zcf ready/build_depends/dep_root-${{ matrix.os }}-${{ matrix.arch }}.tgz dep_root
          if [ "${{ matrix.os }}" == "macosx" ]; then
-            ldid -S palera1n-${{ matrix.os }}-${{ matrix.arch }}{,.development}
+            ldid -S palera1n-${{ matrix.os }}-${{ matrix.arch }}
          else
-            ldid -Ssrc/usb.xml palera1n-${{ matrix.os }}-${{ matrix.arch }}{,.development}
+            ldid -Ssrc/usb.xml palera1n-${{ matrix.os }}-${{ matrix.arch }}
          fi
+          mkdir -p ready
+          tar -zcf ready/dep_root-${{ matrix.os }}-${{ matrix.arch }}.tgz dep_root

      - name: Get branch name
        id: branch-name
-        uses: tj-actions/branch-names@v9
+        uses: tj-actions/branch-names@v7

      - name: Upload artifact
        if: ${{ github.event_name != 'pull_request' }}
@@ -341,49 +340,35 @@ jobs:
          host: ${{ secrets.NICKCHAN_FTP_HOST }}
          port: ${{ secrets.NICKCHAN_FTP_PORT }}
          username: palera1n
-          password: ${{ secrets.NICKCHAN_FTP_PASS }}
+          privateKey: ${{ secrets.NICKCHAN_FTP_KEY }}
          forceUpload: true
-          dryRun: false
+          dryRun: true
          localDir: 'ready/'
-          remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref_name }}/${{ github.run_number }}"
+          remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref }}/${{ github.run_number }}"

      - name: Upload ${{ matrix.os }} thin ${{ matrix.arch }} build
        if: ${{ github.event_name != 'pull_request' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: palera1n-${{ matrix.os }}-${{ matrix.arch }}
          path: palera1n-${{ matrix.os }}-${{ matrix.arch }}
          retention-days: 1

-      - name: Upload ${{ matrix.os }} thin ${{ matrix.arch }} build (Development)
-        if: ${{ github.event_name != 'pull_request' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: palera1n-${{ matrix.os }}-${{ matrix.arch }}.development
-          path: palera1n-${{ matrix.os }}-${{ matrix.arch }}.development
-          retention-days: 1
-
-
      - name: Upload ${{ matrix.os }} thin ${{ matrix.arch }} debug symbols
        if: ${{ github.event_name != 'pull_request' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: palera1n-${{ matrix.os }}-${{ matrix.arch }}.dSYM
          path: palera1n-${{ matrix.os }}-${{ matrix.arch }}.dSYM
          retention-days: 1
-
-      - name: Generate cached sysroot archive
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
-        run: |
-          tar -c sysroot | xz -zce9T 0 > sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
-
+      
  darwin-dist:
    if: ${{ github.event_name != 'pull_request' }}
    runs-on: macos-latest
    needs: build-darwin
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

@@ -392,31 +377,25 @@ jobs:
        with:
          packages: sed coreutils
          cache: true
-          mirror: 'https://apt.procurs.us/'
+          mirror: 'https://procursus.itsnebula.net/'

      - name: Download all Darwin artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3

      - name: Prepare artifact
        run: |
+          find .
          lipo -create -arch arm64 ./palera1n-macosx-arm64/palera1n-macosx-arm64 -arch x86_64 ./palera1n-macosx-x86_64/palera1n-macosx-x86_64 -output palera1n-macos
-          lipo -create -arch arm64 ./palera1n-macosx-arm64.development/palera1n-macosx-arm64.development -arch x86_64 ./palera1n-macosx-x86_64.development/palera1n-macosx-x86_64.development -output palera1n-macos.development
          mkdir -p palera1n-macos.dSYM/Contents/Resources/DWARF
          cp ./palera1n-macosx-x86_64.dSYM/Contents/Info.plist palera1n-macos.dSYM/Contents
          lipo -create -arch arm64 palera1n-macosx-arm64.dSYM/Contents/Resources/DWARF/palera1n-macosx-arm64 -arch x86_64 palera1n-macosx-x86_64.dSYM/Contents/Resources/DWARF/palera1n-macosx-x86_64 -output palera1n-macos.dSYM/Contents/Resources/DWARF/palera1n-macos
-          mkdir -p ready/{debian,binaries,debug_symbols,binaries_development}
-          cp palera1n-macos.development ready/binaries_development/palera1n-macos-universal.development
-          cp palera1n-macos ready/binaries/palera1n-macos-universal
-          cp ./palera1n-macosx-x86_64/palera1n-macosx-x86_64 ready/binaries/palera1n-macos-x86_64
-          cp ./palera1n-macosx-arm64/palera1n-macosx-arm64 ready/binaries/palera1n-macos-arm64
-          cp ./palera1n-iphoneos-arm64/palera1n-iphoneos-arm64 ready/binaries/palera1n-iphoneos-arm64
-          cp ./palera1n-macosx-x86_64.development/palera1n-macosx-x86_64.development ready/binaries_development/palera1n-macos-x86_64.development
-          cp ./palera1n-macosx-arm64.development/palera1n-macosx-arm64.development ready/binaries_development/palera1n-macos-arm64.development
-          cp ./palera1n-iphoneos-arm64.development/palera1n-iphoneos-arm64.development ready/binaries_development/palera1n-iphoneos-arm64.development
-          zip -r9 ready/debug_symbols/palera1n-iphoneos-arm64.dSYM.zip palera1n-iphoneos-arm64.dSYM
-          zip -r9 ready/debug_symbols/palera1n-macosx-arm64.dSYM.zip palera1n-macosx-arm64.dSYM
-          zip -r9 ready/debug_symbols/palera1n-macosx-x86_64.dSYM.zip palera1n-macosx-x86_64.dSYM
-          zip -r9 ready/debug_symbols/palera1n-macos.dSYM.zip palera1n-macos.dSYM
+          mkdir ready
+          cp palera1n-macos ready/palera1n-macos-universal
+          cp ./palera1n-macosx-x86_64/palera1n-macosx-x86_64 ready/palera1n-macos-x86_64
+          cp ./palera1n-macosx-arm64/palera1n-macosx-arm64 ready/palera1n-macos-arm64
+          cp ./palera1n-iphoneos-arm64/palera1n-iphoneos-arm64 ready/palera1n-ios
+          zip -r9 ready/palera1n-ios.dSYM.zip palera1n-iphoneos-arm64.dSYM
+          zip -r9 ready/palera1n-macos.dSYM.zip palera1n-macos.dSYM

      - name: Build debs
        run: |
@@ -432,12 +411,12 @@ jobs:
          gsed 's|@DEB_ARCH@|darwin-amd64|g' -i stage/DEBIAN/control
          gsed "s|@DEB_VERSION@|$version|g" -i stage/DEBIAN/control
          
-          ginstall -Dm644 ready/binaries/palera1n-macos-x86_64 stage/opt/procursus/bin/palera1n
-          zstd -c19 docs/palera1n.1 > stage/opt/procursus/usr/share/man/man1/palera1n.1.zst
-          chmod 644 stage/opt/procursus/usr/share/man/man1/palera1n.1.zst
-          chmod 755 stage/opt/procursus/bin/palera1n
+          ginstall -Dm644 ready/palera1n-macos-x86_64 stage/opt/procursus/bin/palera1n
+          ginstall -Dm644 docs/palera1n.1 stage/opt/procursus/usr/share/man/man1/palera1n.1
+          chmod +x stage/opt/procursus/bin/palera1n

-          dpkg-deb --root-owner-group -Zzstd -b stage palera1n_darwin-amd64.deb
+          dpkg-deb -Zzstd -b stage palera1n_darwin-amd64.deb
+          mv palera1n*.deb ready/
          rm -rf stage

          # Darwin arm64
@@ -449,12 +428,12 @@ jobs:
          gsed 's|@DEB_ARCH@|darwin-arm64|g' -i stage/DEBIAN/control
          gsed "s|@DEB_VERSION@|$version|g" -i stage/DEBIAN/control
          
-          ginstall -Dm644 ready/binaries/palera1n-macos-arm64 stage/opt/procursus/bin/palera1n
-          zstd -c19 docs/palera1n.1 > stage/opt/procursus/usr/share/man/man1/palera1n.1.zst
-          chmod 644 stage/opt/procursus/usr/share/man/man1/palera1n.1.zst
-          chmod 755 stage/opt/procursus/bin/palera1n
+          ginstall -Dm644 ready/palera1n-macos-arm64 stage/opt/procursus/bin/palera1n
+          ginstall -Dm644 docs/palera1n.1 stage/opt/procursus/usr/share/man/man1/palera1n.1
+          chmod +x stage/opt/procursus/bin/palera1n

-          dpkg-deb --root-owner-group -Zzstd -b stage palera1n_darwin-arm64.deb
+          dpkg-deb -Zzstd -b stage palera1n_darwin-arm64.deb
+          mv palera1n*.deb ready/
          rm -rf stage

          # iPhoneOS
@@ -466,12 +445,12 @@ jobs:
          gsed 's|@DEB_ARCH@|iphoneos-arm|g' -i stage/DEBIAN/control
          gsed "s|@DEB_VERSION@|$version|g" -i stage/DEBIAN/control
          
-          ginstall -Dm644 ready/binaries/palera1n-iphoneos-arm64 stage/usr/bin/palera1n
-          zstd -c19 docs/palera1n.1 > stage/usr/share/man/man1/palera1n.1.zst
-          chmod 644 stage/usr/share/man/man1/palera1n.1.zst
-          chmod 755 stage/usr/bin/palera1n
+          ginstall -Dm644 ready/palera1n-ios stage/usr/bin/palera1n
+          ginstall -Dm644 docs/palera1n.1 stage/usr/share/man/man1/palera1n.1
+          chmod +x stage/usr/bin/palera1n

-          dpkg-deb --root-owner-group -Zzstd -b stage palera1n_iphoneos-arm.deb
+          dpkg-deb -Zzstd -b stage palera1n_iphoneos-arm.deb
+          mv palera1n*.deb ready/
          rm -rf stage

          # iPhoneOS (rootless)
@@ -483,28 +462,26 @@ jobs:
          gsed 's|@DEB_ARCH@|iphoneos-arm64|g' -i stage/DEBIAN/control
          gsed "s|@DEB_VERSION@|$version|g" -i stage/DEBIAN/control
          
-          ginstall -Dm644 ready/binaries/palera1n-iphoneos-arm64 stage/var/jb/usr/bin/palera1n
-          zstd -c19 docs/palera1n.1 > stage/var/jb/usr/share/man/man1/palera1n.1.zst
-          chmod 644 stage/var/jb/usr/share/man/man1/palera1n.1.zst
-          chmod 755 stage/var/jb/usr/bin/palera1n
+          ginstall -Dm644 ready/palera1n-ios stage/var/jb/usr/bin/palera1n
+          ginstall -Dm644 docs/palera1n.1 stage/var/jb/usr/share/man/man1/palera1n.1
+          chmod +x stage/var/jb/usr/bin/palera1n

-          dpkg-deb --root-owner-group -Zzstd -b stage palera1n_iphoneos-arm64.deb
+          dpkg-deb -Zzstd -b stage palera1n_iphoneos-arm64.deb
+          mv palera1n*.deb ready/
          rm -rf stage
-
-          mv palera1n*.deb ready/debian
      
      - name: Save build tag
        run: echo "$(git describe --dirty --tags --abbrev=7 | sed 's|-dirty||')" > build-tag.txt
      
      - name: Upload build tag
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: build-tag
          path: build-tag.txt

      - name: Get branch name
        id: branch-name
-        uses: tj-actions/branch-names@v9
+        uses: tj-actions/branch-names@v7

      - name: Upload artifact
        if: ${{ github.event_name != 'pull_request' }}
@@ -513,11 +490,11 @@ jobs:
          host: ${{ secrets.NICKCHAN_FTP_HOST }}
          port: ${{ secrets.NICKCHAN_FTP_PORT }}
          username: palera1n
-          password: ${{ secrets.NICKCHAN_FTP_PASS }}
+          privateKey: ${{ secrets.NICKCHAN_FTP_KEY }}
          forceUpload: true
-          dryRun: false
+          dryRun: true
          localDir: 'ready/'
-          remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref_name }}/${{ github.run_number }}"
+          remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref }}/${{ github.run_number }}"

  build-Linux:
    strategy:
@@ -529,20 +506,17 @@ jobs:
        - aarch64-linux-musl
    runs-on: ubuntu-latest
    env:
-      MBEDTLS_VERSION: 3.5.2
-      LIBUSB_VERSION: 1.0.27
+      MBEDTLS_VERSION: 3.4.0
+      LIBUSB_VERSION: 1.0.26
      READLINE_VERSION: 8.2
+      SLANG_VERSION: 2.3.3
+      NEWT_VERSION: 0.52.23
      GPM_VERSION: 1.20.7
-      LIBIMOBILEDEVICE_COMMIT: ed0d66d0341562731bb19928dfe48155509fa7a7
-      LIBIRECOVERY_COMMIT: 7ce02c347b7c26e59498e6af31c9da51018d0fa1
-      LIBIMOBILEDEVICE_GLUE_COMMIT: 362f7848ac89b74d9dd113b38b51ecb601f76094
-      USBMUXD_COMMIT: bc0b91ca856811f4393318dc83db6dc3c1ac326d
-      LIBPLIST_COMMIT: 2117b8fdb6b4096455bd2041a63e59a028120136
-      LIBUSBMUXD_COMMIT: a7f0543fb1ecb20ac7121c0fd77297200e0e43fc
+      POPT_VERSION: 1.19

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

@@ -554,7 +528,7 @@ jobs:

      - name: Download toolchain checksum
        run: |
-          curl -u ${{ secrets.ACTIONS_RESOURCES_LOGIN }} -LO https://static.palera.in/action-resources/musl-cross/SHA512SUMS
+          curl -LO https://musl.cc/SHA512SUMS
          echo "TOOLCHAIN_CHECKSUM="$(grep ${{ matrix.triple }}-cross.tgz SHA512SUMS | cut -d' ' -f1) >> $GITHUB_ENV

      - name: Download toolchain (cached)
@@ -567,7 +541,7 @@ jobs:
      - name: Download toolchain
        if: steps.toolchain_cache.outputs.cache-hit != 'true'
        run: |
-          curl -u ${{ secrets.ACTIONS_RESOURCES_LOGIN }} -LO https://static.palera.in/action-resources/musl-cross/${{ matrix.triple }}-cross.tgz
+          curl -LO https://musl.cc/${{ matrix.triple }}-cross.tgz

      - name: Setup environment
        run: |
@@ -593,80 +567,46 @@ jobs:
              ;;
          esac
          echo "PKG_CONFIG_PATH=$(pwd)/sysroot/usr/local/lib/pkgconfig" >> $GITHUB_ENV
-          echo "CFLAGS=-g -fdata-sections -ffunction-sections -I$(pwd)/sysroot/usr/local/include -L$(pwd)/sysroot/usr/local/lib -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" >> $GITHUB_ENV
-          echo "CXXFLAGS=-g -fdata-sections -ffunction-sections -I$(pwd)/sysroot/usr/local/include -L$(pwd)/sysroot/usr/local/lib -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" >> $GITHUB_ENV
+          echo "CFLAGS=-g -fdata-sections -ffunction-sections -I$(pwd)/sysroot/usr/local/include -L$(pwd)/sysroot/usr/local/lib" >> $GITHUB_ENV
+          echo "CXXFLAGS=-g -fdata-sections -ffunction-sections -I$(pwd)/sysroot/usr/local/include -L$(pwd)/sysroot/usr/local/lib" >> $GITHUB_ENV
          echo "LDFLAGS=-g -Wl,--gc-sections -fdata-sections -ffunction-sections -I$(pwd)/sysroot/usr/local/include -L$(pwd)/sysroot/usr/local/lib" >> $GITHUB_ENV
          echo "INSTALL=$(command -v install) --strip-program=${{ matrix.triple }}-strip" >> $GITHUB_ENV
          echo "DESTDIR=$(pwd)/sysroot" >> $GITHUB_ENV
          echo "PREFIX=/usr/local" >> $GITHUB_ENV
          echo "CONFIGURE_ARGS=--build=x86_64-linux-gnu --host=${{ matrix.triple }} --prefix=/usr/local --disable-shared --enable-static" >> $GITHUB_ENV
          echo "CROSS_COMPILE=${{ matrix.triple }}-" >> $GITHUB_ENV
-
-      - name: Check dependencies cache
-        run: |
-          echo "target: ${{ matrix.triple }}" > cache.txt
-          echo "mbedtls ${{ env.MBEDTLS_VERSION }}" >> cache.txt
-          echo "readline: ${{ env.READLINE_VERSION }}" >> cache.txt
-          echo "libimobiledevice: ${{ env.LIBIMOBILEDEVICE_COMMIT }}" >> cache.txt
-          echo "libirecovery: ${{ env.LIBIRECOVERY_COMMIT }}" >> cache.txt
-          echo "libimobiledevice-glue: ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }}" >> cache.txt
-          echo "libplist: ${{ env.LIBPLIST_COMMIT }}" >> cache.txt
-          echo "libusbmuxd: ${{ env.LIBUSBMUXD_COMMIT }}" >> cache.txt
-          echo "usbmuxd: ${{ env.USBMUXD_COMMIT }}" >> cache.txt
-          echo "cc: $(${{ env.CROSS_COMPILE }}gcc --version)" >> cache.txt
-          echo "CACHE_TXT_CHECKSUM=sysroot-$(sha512sum cache.txt | cut -d' ' -f1)" >> $GITHUB_ENV
-
-      - name: Download cached sysroot
-        id: sysroot_cache
-        uses: actions/cache@v3
-        with:
-          path: sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
-          key: sysroot-${{ env.CACHE_TXT_CHECKSUM }}
-
-      - name: Extract cached sysroot
-        if: steps.sysroot_cache.outputs.cache-hit == 'true'
-        run: |
-          xz -dcT0 sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz | tar -x
-
-      - name: Setup sysroot
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
-        run: |
          mkdir -p $(pwd)/sysroot/usr/local/lib
          ln -sf $(pwd)/sysroot/usr/local/lib{,64}

      - name: Download dependencies (source code)
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          curl -LOOOOOOO \
            https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
            https://github.com/libusb/libusb/releases/download/v${{ env.LIBUSB_VERSION }}/libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 \
            https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \
-            https://github.com/telmich/gpm/archive/refs/tags/${{ env.GPM_VERSION }}.tar.gz
+            https://www.jedsoft.org/releases/slang/slang-${{ env.SLANG_VERSION }}.tar.bz2 \
+            https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz \
+            https://github.com/telmich/gpm/archive/refs/tags/${{ env.GPM_VERSION }}.tar.gz \
+            https://github.com/rpm-software-management/popt/archive/refs/tags/popt-${{ env.POPT_VERSION }}-release.tar.gz

          tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
          tar -xjf libusb-${{ env.LIBUSB_VERSION }}.tar.bz2
          tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz
+          tar -xjf slang-${{ env.SLANG_VERSION }}.tar.bz2
+          tar -xf newt-${{ env.NEWT_VERSION }}.tar.gz
          tar -xf ${{ env.GPM_VERSION }}.tar.gz
+          tar -xf popt-${{ env.POPT_VERSION }}-release.tar.gz
          git clone --depth=1 https://github.com/libimobiledevice/libplist
          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
          git clone --depth=1 https://github.com/libimobiledevice/libirecovery
          git clone --depth=1 https://github.com/libimobiledevice/libusbmuxd
          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
-          git clone --depth=1 https://github.com/libimobiledevice/usbmuxd
-          cd libplist && git fetch origin ${{ env.LIBPLIST_COMMIT }} && git reset --hard ${{ env.LIBPLIST_COMMIT }} && cd ..
-          cd libirecovery && git fetch origin ${{ env.LIBIRECOVERY_COMMIT }} && git reset --hard ${{ env.LIBIRECOVERY_COMMIT }} && cd ..
-          cd libimobiledevice-glue && git fetch origin ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && cd ..
-          cd usbmuxd && git fetch origin ${{ env.USBMUXD_COMMIT }} && git reset --hard ${{ env.USBMUXD_COMMIT }} && cd ..
-          cd libimobiledevice && git fetch origin ${{ env.LIBIMOBILEDEVICE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_COMMIT }} && cd ..
-          cd libusbmuxd && git fetch origin ${{ env.LIBUSBMUXD_COMMIT }} && git reset --hard ${{ env.LIBUSBMUXD_COMMIT }} && cd ..

      - name: Build Mbed TLS
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd mbedtls-${{ env.MBEDTLS_VERSION }}
          cat ../patches/mbedtls/0001-Allow-empty-x509-cert-issuer.patch | patch -sN -d . -p1
          mkdir build
-          if [ "${{ matrix.triple }}" = "i486-linux-musl" ]; then sed -i '/define MBEDTLS_AESNI_C/d' include/mbedtls/mbedtls_config.h; fi
          cd build
          cmake .. \
            -DCMAKE_BUILD_TYPE=Release \
@@ -686,7 +626,6 @@ jobs:
          cd ..

      - name: Build libusb
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libusb-${{ env.LIBUSB_VERSION }}
          ./configure ${{ env.CONFIGURE_ARGS }} --disable-udev
@@ -695,7 +634,6 @@ jobs:
          cd ..

      - name: Build readline
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd readline-${{ env.READLINE_VERSION }}
          ./configure ${{ env.CONFIGURE_ARGS }}
@@ -703,8 +641,22 @@ jobs:
          make -j$(nproc) install DESTDIR=${{ env.DESTDIR }}
          cd ..

+      - name: Build S-Lang
+        run: |
+          cd slang-${{ env.SLANG_VERSION }}
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --without-x \
+            --without-pcre \
+            --without-onig \
+            --without-z \
+            --without-png \
+            --without-iconv
+          gmake -j$(sysctl -n hw.ncpu) static
+          gmake -j$(sysctl -n hw.ncpu) install-static DESTDIR=${{ env.DESTDIR }}
+          cd ..
+
      - name: Build GPM
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd gpm-${{ env.GPM_VERSION }}
          cat ../patches/gpm/*.patch | patch -sN -d . -p1
@@ -715,8 +667,38 @@ jobs:
          gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
          cd ..

+      - name: Build popt
+        run: |
+          cd popt-popt-${{ env.POPT_VERSION }}-release
+          autoreconf -fiv
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --without-libiconv-prefix \
+            --without-libintl-prefix \
+            --disable-nls \
+            --disable-werror
+          gmake -j$(sysctl -n hw.ncpu)
+          gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
+          cd ..
+
+      - name: Build newt
+        run: |
+          cd newt-${{ env.NEWT_VERSION }}
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --with-readline=gnu \
+            --without-python \
+            --without-tcl \
+            --disable-nls \
+            --with-gpm-support
+          gmake -j$(sysctl -n hw.ncpu) libnewt.a
+          mkdir -p ${{ env.DESTDIR }}/usr/local/{lib/pkgconfig,include}
+          install -m644 libnewt.pc ${{ env.DESTDIR }}/usr/local/lib/pkgconfig
+          install -m644 libnewt.a ${{ env.DESTDIR }}/usr/local/lib
+          install -m644 newt.h ${{ env.DESTDIR }}/usr/local/include
+          cd ..
+
      - name: Build libplist
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libplist
          autoreconf -fiv
@@ -726,7 +708,6 @@ jobs:
          cd ..

      - name: Build libimobiledevice-glue
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libimobiledevice-glue
          autoreconf -fiv
@@ -736,7 +717,6 @@ jobs:
          cd ..

      - name: Build libirecovery (sorta)
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          sudo mv /usr/local /usr/local.bak
          sudo ln -s ${{ env.DESTDIR }}${{ env.PREFIX }} /usr/local
@@ -750,7 +730,6 @@ jobs:
          cd ..

      - name: Build libusbmuxd
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libusbmuxd
          autoreconf -fiv
@@ -760,11 +739,10 @@ jobs:
          cd ..

      - name: Build libimobiledevice
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
        run: |
          cd libimobiledevice
          autoreconf -fiv
-          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --disable-debug --disable-wireless-pairing
+          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --enable-debug
          echo -e 'all:\ninstall:' > tools/Makefile
          make -j$(nproc)
          make -j$(nproc) install DESTDIR=${{ env.DESTDIR }}
@@ -772,53 +750,26 @@ jobs:
          sudo rm /usr/local
          sudo mv /usr/local.bak /usr/local

-      - name: Build usbmuxd
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
-        run: |
-          cd usbmuxd
-          autoreconf -fiv
-          ./configure ${{ env.CONFIGURE_ARGS }} --without-systemd
-          ${{ matrix.triple }}-gcc ${{ env.CFLAGS }} -I${{ env.DESTDIR }}/${{ env.PREFIX }}/include/libusb-1.0 src/*.c \
-            -DHAVE_CONFIG_H -no-pie \
-            -I. -static ${{ env.LDFLAGS }}} -limobiledevice-1.0 -lusbmuxd-2.0 -limobiledevice-glue-1.0  \
-            -lplist-2.0 -lusb-1.0 -lmbedtls -lmbedcrypto -lmbedx509 -lpthread -o usbmuxd
-          mkdir -p ${{ env.DESTDIR }}/${{ env.PREFIX }}/sbin
-          ${{ matrix.triple }}-objcopy --only-keep-debug usbmuxd usbmuxd.debug
-          ${{ matrix.triple }}-strip --strip-debug --strip-unneeded usbmuxd
-          ${{ matrix.triple }}-objcopy --add-gnu-debuglink=usbmuxd.debug usbmuxd
-          install -m755 usbmuxd usbmuxd.debug ${{ env.DESTDIR }}/${{ env.PREFIX }}/sbin
-          cd ..
-
      - name: Build palera1n
        run: |
-          cp -a ${{ env.DESTDIR }}/${{ env.PREFIX }}/{include,lib} dep_root
+          cp -a sysroot/${{ env.PREFIX }}/{include,lib} dep_root
          find dep_root -name '*.so' -delete
          find dep_root -name '*.la' -delete
-          CC="${{ matrix.triple }}-gcc" make -j$(nproc) ROOTFUL=1
-          cp src/palera1n palera1n.release
+          CC="${{ matrix.triple }}-gcc" make -j$(nproc)

      - name: Seperate debug symbols
        run: |
-          ${{ matrix.triple }}-objcopy --only-keep-debug palera1n.release palera1n.debug
-          ${{ matrix.triple }}-strip --strip-debug --strip-unneeded palera1n.release
-          ${{ matrix.triple }}-objcopy --add-gnu-debuglink=palera1n.debug palera1n.release
+          ${{ matrix.triple }}-objcopy --only-keep-debug src/palera1n palera1n.debug
+          ${{ matrix.triple }}-strip --strip-debug --strip-unneeded src/palera1n
+          ${{ matrix.triple }}-objcopy --add-gnu-debuglink=palera1n.debug src/palera1n
          chmod -x palera1n.debug
-
-      - name: Build palera1n (Development)
-        run: |
-          CC="${{ matrix.triple }}-gcc" make -j$(nproc) clean
-          CC="${{ matrix.triple }}-gcc" make -j$(nproc) DEV_BUILD=1 ROOTFUL=1
-          cp src/palera1n palera1n.development
-
+      
      - name: Prepare artifact
        run: |
-          mkdir -p ready/{binaries,debian,binaries_development,build_depends,debug_symbols} usbmuxd-static
-          mv palera1n.debug ready/debug_symbols/palera1n-${{ env.CHECKRA1N_NAME }}.debug
-          mv palera1n.release ready/binaries/palera1n-${{ env.CHECKRA1N_NAME }}
-          mv palera1n.development ready/binaries_development/palera1n-${{ env.CHECKRA1N_NAME }}.development
-          tar -zcf ready/build_depends/dep_root_${{ matrix.triple }}.tgz dep_root
-          install -m755 sysroot/${{ env.PREFIX }}/sbin/usbmuxd usbmuxd-static/usbmuxd-${{ env.CHECKRA1N_NAME }}
-          install -m755 sysroot/${{ env.PREFIX }}/sbin/usbmuxd.debug usbmuxd-static/usbmuxd-${{ env.CHECKRA1N_NAME }}.debug
+          mkdir ready
+          mv palera1n.debug ready/palera1n-${{ env.CHECKRA1N_NAME }}.debug
+          mv src/palera1n ready/palera1n-${{ env.CHECKRA1N_NAME }}
+          tar -zcf ready/dep_root_${{ matrix.triple }}.tgz dep_root

      - name: Build debs
        run: |
@@ -832,19 +783,18 @@ jobs:

          sed 's|@DEB_ARCH@|${{ env.ARCH_NAME }}|g' -i stage/DEBIAN/control
          sed "s|@DEB_VERSION@|$version|g" -i stage/DEBIAN/control
+          
+          install -Dm644 ready/palera1n-${{ env.CHECKRA1N_NAME }} stage/usr/bin/palera1n
+          install -Dm644 docs/palera1n.1 stage/usr/share/man/man1/palera1n.1
+          chmod +x stage/usr/bin/palera1n

-          install -Dm644 ready/binaries/palera1n-${{ env.CHECKRA1N_NAME }} stage/usr/bin/palera1n
-          gzip -c9 docs/palera1n.1 > stage/usr/share/man/man1/palera1n.1.gz
-          chmod 755 stage/usr/bin/palera1n
-          chmod 644 stage/usr/share/man/man1/palera1n.1.gz
-
-          dpkg-deb --root-owner-group -b stage palera1n_${{ env.ARCH_NAME }}.deb
-          mv palera1n*.deb ready/debian
+          dpkg-deb -b stage palera1n_${{ env.ARCH_NAME }}.deb
+          mv palera1n*.deb ready/
          rm -rf stage

      - name: Get branch name
        id: branch-name
-        uses: tj-actions/branch-names@v9
+        uses: tj-actions/branch-names@v7

      - name: Upload artifact
        if: ${{ github.event_name != 'pull_request' }}
@@ -853,29 +803,11 @@ jobs:
          host: ${{ secrets.NICKCHAN_FTP_HOST }}
          port: ${{ secrets.NICKCHAN_FTP_PORT }}
          username: palera1n
-          password: ${{ secrets.NICKCHAN_FTP_PASS }}
+          privateKey: ${{ secrets.NICKCHAN_FTP_KEY }}
          forceUpload: true
-          dryRun: false
+          dryRun: true
          localDir: 'ready/'
-          remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref_name }}/${{ github.run_number }}"
-
-      - name: Upload usbmuxd artifact
-        if: ${{ github.event_name != 'pull_request' }}
-        uses: wangyucode/[email protected]
-        with:
-          host: ${{ secrets.NICKCHAN_FTP_HOST }}
-          port: ${{ secrets.NICKCHAN_FTP_PORT }}
-          username: palera1n
-          password: ${{ secrets.NICKCHAN_FTP_PASS }}
-          forceUpload: true
-          dryRun: false
-          localDir: 'usbmuxd-static/'
-          remoteDir: "/palera1n/artifacts/usbmuxd-static"
-
-      - name: Generate cached sysroot archive
-        if: steps.sysroot_cache.outputs.cache-hit != 'true'
-        run: |
-          tar -c sysroot | xz -zce9T 0 > sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
+          remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref }}/${{ github.run_number }}"

  finish-build:
    runs-on: ubuntu-latest
@@ -883,24 +815,19 @@ jobs:
    needs: [build-docs, build-darwin, darwin-dist, build-Linux]
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      
      - name: Get branch name
        id: branch-name
-        uses: tj-actions/branch-names@v9
+        uses: tj-actions/branch-names@v7

      - name: Download build tag
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
        with:
          name: build-tag

-      - uses: geekyeggo/delete-artifact@v2
-        with:
-          name: '*'
-          failOnError: false
-
      - name: Send Discord build message
        run: |
          COMMITMESSAGE=`git log --pretty=format:'- \`%h\` %s' -1 --reverse` &&
-          (curl "${{ secrets.DISCORD_WEBHOOK }}" -sS -H "Content-Type:application/json" -X POST -d "{\"content\":null,\"embeds\":[{\"title\":\"[palera1n:${{ steps.branch-name.outputs.ref_branch }}] Nightly Build ${{ github.run_number }}\",\"url\":\"https://github.com/palera1n/palera1n/actions/runs/${GITHUB_RUN_ID}\",\"color\":2829617,\"fields\":[{\"name\":\"Build tag\",\"value\":\"- \`$(cat build-tag.txt | sed 's|\n||')\`\"},{\"name\":\"Destination\",\"value\":\"- https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}\"},{\"name\":\"Documentation\",\"value\":\"- [palera1n.1.html](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/docs/palera1n.1.html)\"},{\"name\":\"Main Artifacts\",\"value\":\"- [palera1n-iphoneos-arm64](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/binaries/palera1n-iphoneos-arm64)\n- [palera1n-linux-arm64](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/binaries/palera1n-linux-arm64)\n- [palera1n-linux-armel](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/binaries/palera1n-linux-armel)\n- [palera1n-linux-x86](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/binaries/palera1n-linux-x86)\n- [palera1n-linux-x86_64](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/binaries/palera1n-linux-x86_64)\n- [palera1n-macos-universal](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/binaries/palera1n-macos-universal)\"}],\"footer\":{\"text\":\"${{ github.actor }}\", \"icon_url\": \"https://github.com/${{ github.actor }}.png\",\"timestamp\":\"$(date -u +"%FT%TZ")\"}}],\"username\":\"GitHub Actions\",\"avatar_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}")
+          (curl "${{ secrets.DISCORD_WEBHOOK }}" -sS -H "Content-Type:application/json" -X POST -d "{\"content\":null,\"embeds\":[{\"title\":\"[palera1n:${{ steps.branch-name.outputs.ref_branch }}] Nightly Build ${{ github.run_number }}\",\"url\":\"https://github.com/palera1n/palera1n/actions/runs/${GITHUB_RUN_ID}\",\"color\":2829617,\"fields\":[{\"name\":\"Build tag\",\"value\":\"- \`$(cat build-tag.txt | sed 's|\n||')\`\"},{\"name\":\"Destination\",\"value\":\"- https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}\"},{\"name\":\"Documentation\",\"value\":\"- [palera1n.1.html](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/palera1n.1.html)\"},{\"name\":\"Main Artifacts\",\"value\":\"- [palera1n-ios](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/palera1n-ios)\n- [palera1n-linux-arm64](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/palera1n-linux-arm64)\n- [palera1n-linux-armel](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/palera1n-linux-armel)\n- [palera1n-linux-x86](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/$${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/palera1n-linux-x86)\n- [palera1n-linux-x86_64](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/palera1n-linux-x86_64)\n- [palera1n-macos-universal](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch }}/${{ github.run_number }}/palera1n-macos-universal)\"}],\"footer\":{\"text\":\"${{ github.actor }}\", \"icon_url\": \"https://github.com/${{ github.actor }}.png\",\"timestamp\":\"$(date -u +"%FT%TZ")\"}}],\"username\":\"GitHub Actions\",\"avatar_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}")
    
@@ -4,7 +4,6 @@ dep_root/**
 !contrib/.keep
 contrib/
 *.o
-dep_root*.tgz
 .vscode
 checkra1n*
 payload.c
@@ -12,7 +11,6 @@ src/palera1n
 !xxd-embedded.h
 src/binpack.dmg
 src/ramdisk.dmg
-src/ramdisk.dmg.lzma
 src/xxd-*.c
 .DS_Store
 !palera1n.1
@@ -25,5 +23,3 @@ src/*.dmg.c
 src/stage2/
 src/libcheckra1nhelper.dylib*
 src/Pongo.bin
-sysroot
-compile.sh
@@ -1,17 +1,18 @@
+NAME = bakepale
+
 SRC = $(shell pwd)
 DEP = $(SRC)/dep_root
 STRIP = strip
 CC ?= cc
-CFLAGS += -isystem $(DEP)/include -I$(SRC)/include -I$(SRC) -D_XOPEN_SOURCE=500
-CFLAGS += -Wall -Wextra -Wno-unused-parameter -DPALERAIN_VERSION=\"2.1\" -DHAVE_LIBIMOBILEDEVICE
+CXX ?= c++
+CFLAGS += -I$(DEP)/include -I$(SRC)/include -I$(SRC) -D_XOPEN_SOURCE=500
+CFLAGS += -Wall -Wextra -Wno-unused-parameter -DPALERAIN_VERSION=\"2.0.0\"
 CFLAGS += -Wno-unused-variable -I$(SRC)/src -std=c99 -pedantic-errors -D_C99_SOURCE -D_POSIX_C_SOURCE=200112L
+CXXFLAGS += -I$(DEP)/include -I$(SRC)/include -I$(SRC) -std=c++11
 LIBS += $(DEP)/lib/libimobiledevice-1.0.a $(DEP)/lib/libirecovery-1.0.a $(DEP)/lib/libusbmuxd-2.0.a
 LIBS += $(DEP)/lib/libimobiledevice-glue-1.0.a $(DEP)/lib/libplist-2.0.a -pthread -lm
 ifeq ($(TARGET_OS),)
 TARGET_OS = $(shell uname -s)
-UNAME = $(TARGET_OS)
-else
-UNAME = $(shell uname -s)
 endif
 ifeq ($(TARGET_OS),Darwin)
 CFLAGS += -Wno-nullability-extension
@@ -22,16 +23,23 @@ LDFLAGS += -Wl,-dead_strip
 LIBS += -framework CoreFoundation -framework IOKit
 else
 CFLAGS += -fdata-sections -ffunction-sections
-LDFLAGS += -Wl,--gc-sections
+LDFLAGS += -static -no-pie -Wl,--gc-sections
 endif
 LIBS += $(DEP)/lib/libmbedtls.a $(DEP)/lib/libmbedcrypto.a $(DEP)/lib/libmbedx509.a $(DEP)/lib/libreadline.a

 ifeq ($(TUI),1)
+LIBS += $(DEP)/lib/libnewt.a $(DEP)/lib/libpopt.a $(DEP)/lib/libslang.a
 ifeq ($(TARGET_OS),Linux)
 LIBS += $(DEP)/lib/libgpm.a
 endif
 endif
-
+ifeq ($(GUI),1)
+LIBS += $(DEP)/lib/libguira1n.a
+ifeq ($(TARGET_OS),Darwin)
+LIBS += -framework Foundation -framework AppKit
+CXXFLAGS += -x objective-c++ 
+endif
+endif
 ifeq ($(DEV_BUILD),1)
 CFLAGS += -O0 -g -DDEV_BUILD -fno-omit-frame-pointer
 ifeq ($(ASAN),1)
@@ -49,29 +57,23 @@ BUILD_STYLE = RELEASE
 endif
 LIBS += -lc

-ifeq ($(TARGET_OS),Linux)
-ifneq ($(shell echo '$(BUILD_STYLE)' | grep -q '[A-Z]\+SAN' && echo 1),1)
-LDFLAGS += -static -no-pie
-endif
-endif
-
 ifneq ($(BAKERAIN_DEVELOPE_R),)
 CFLAGS += -DBAKERAIN_DEVELOPE_R="\"$(BAKERAIN_DEVELOPE_R)\""
 endif

+BUILD_DATE := $(shell LANG=C date)
 BUILD_NUMBER := $(shell git rev-list --count HEAD)
 BUILD_TAG := $(shell git describe --dirty --tags --abbrev=7)
+BUILD_WHOAMI := $(shell whoami)
 BUILD_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 BUILD_COMMIT := $(shell git rev-parse HEAD)

-CFLAGS += -DBUILD_STYLE="\"$(BUILD_STYLE)\"" -DBUILD_TAG="\"$(BUILD_TAG)\""
+CFLAGS += -DBUILD_STYLE="\"$(BUILD_STYLE)\"" -DBUILD_DATE="\"$(BUILD_DATE)\""
+CFLAGS += -DBUILD_WHOAMI="\"$(BUILD_WHOAMI)\"" -DBUILD_TAG="\"$(BUILD_TAG)\""
 CFLAGS += -DBUILD_NUMBER="\"$(BUILD_NUMBER)\"" -DBUILD_BRANCH="\"$(BUILD_BRANCH)\""
 CFLAGS += -DBUILD_COMMIT="\"$(BUILD_COMMIT)\""

-CPATH =
-LIBRARY_PATH =
-
-export SRC DEP UNAME CC CFLAGS LDFLAGS LIBS SHELL TARGET_OS DEV_BUILD BUILD_DATE BUILD_TAG BUILD_WHOAMI BUILD_STYLE BUILD_NUMBER BUILD_BRANCH
+export SRC DEP CC CXX CFLAGS CXXFLAGS LDFLAGS LIBS TARGET_OS DEV_BUILD BUILD_DATE BUILD_TAG BUILD_WHOAMI BUILD_STYLE BUILD_NUMBER BUILD_BRANCH

 all: palera1n

@@ -83,13 +85,13 @@ clean:
 	$(MAKE) -C docs clean

 download-deps:
-	$(MAKE) -C src $(patsubst %, resources/%, checkra1n-macos checkra1n-linux-arm64 checkra1n-linux-armel checkra1n-linux-x86 checkra1n-linux-x86_64 checkra1n-kpf-pongo ramdisk.dmg binpack.dmg Pongo.bin)
+	$(MAKE) -C src checkra1n-macos checkra1n-linux-arm64 checkra1n-linux-armel checkra1n-linux-x86 checkra1n-linux-x86_64 checkra1n-kpf-pongo ramdisk.dmg binpack.dmg Pongo.bin

 docs:
 	$(MAKE) -C docs

 distclean: clean
-	$(MAKE) -C src distclean
+	rm -rf palera1n-* palera1n*.dSYM src/checkra1n-* src/checkra1n-kpf-pongo src/ramdisk.dmg src/binpack.dmg src/Pongo.bin

 .PHONY: all palera1n clean docs distclean

@@ -1,133 +1,75 @@
-# palera1n
-[![GitHub Release](https://img.shields.io/github/v/release/palera1n/palera1n?include_prereleases)](https://github.com/palera1n/palera1n/releases)
-[![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/palera1n/palera1n/total)](https://github.com/palera1n/palera1n/releases)
-[![GitHub License](https://img.shields.io/github/license/palera1n/palera1n?color=%23C96FAD)](https://github.com/palera1n/palera1n/blob/main/LICENSE)
+<picture>
+	<source media="(prefers-color-scheme: light)" srcset="https://cdn.discordapp.com/attachments/1028398976640229380/1088049124441604136/IMG_0033.png">
+	<img align="left" height="120" src="https://cdn.discordapp.com/attachments/1017854329887129611/1073858292159352862/thing.png" alt="palera1n logo" style="float: left;"/>
+</picture>

+<br clear="both"/>

-Jailbreak for A8 through A11, T2 devices, on iOS/iPadOS/tvOS 15.0, bridgeOS 5.0 and higher.
+## Information
+- Guides to palera1n can be found [here](https://ios.cfw.guide/installing-palera1n).
+- Full documentation can be also found [here](https://cdn.nickchan.lol/palera1n/artifacts/c-rewrite/palera1n.1.html).

+## Warnings
+- We are **NOT** responsible for any data loss, or the result of a device being bricked. The user of this program accepts responsibility should something happen to their device. While nothing should happen, jailbreaking has risks in itself.
+  - If your device is stuck in recovery, please run futurerestore `--exit-recovery`, or use `irecovery -n`.

+- palera1n will never work in VirtualBox, VMware or any virtual machine that doesn't support PCI passthrough.

+## Requirements
+- A checkm8 vulnerable iOS device on iOS 15.x or 16.x (`A8` - `A11`)
+	-	If using rootful, you will need **5-10GB of space** for the fakefs. This means 16GB devices cannot use the full fakefs creation. However, you can change the arguments to `-Bf` to create a fakefs with bind mounts, so it uses a smaller size, at the expense having unwritable parts in rarely-written paths, and then boot it
+	- On `A11`, **you must disable your passcode while in the jailbroken state** (on iOS 16, you need to **reset your device** before proceeding with palera1n).

-| ![Screenshot of macOS Terminal.app](assets/image-1.png)	| 
-|:--:												| 
-| A screenshot of palera1n being used in a Terminal | 
+- **USB-A** cables are recommended to use, USB-C may have issues with palera1n and getting into DFU mode.<details><summary>Technical explanation</summary>The BootROM will only enter DFU if it detects USB voltage, which boils down to checking whether a certain pin is asserted from the Tristar chip. The Tristar does this based on the cable's accessory ID, and apparently USB-A and USB-C cables have different accessory IDs, and the one of the USB-C cables makes the Tristar not assert the USB voltage pin.</details>

-## Device Support
+- A Linux or macOS computer
+	- AMD CPUs (not AMD Mobile) have an issue [with (likely) their USB controllers] that causes them to have a very low success rate with checkm8. It is not recommended that you use them with palera1n.
+		- If your device does not successfully jailbreak, try a computer with an Intel or other CPU
+    
+- Apple Silicon Macs with USB-C
+	- USB-C port on Apple Silicon Macs may require manual unplugging and replugging of the lightning cable after checkm8 exploit.
+	- This problem may be solved by connecting via USBHub.

-<!--- Mobile --->
+## Need help?

-| iPhone(s)                 | iPad(s)                        		| iPod(s)   					| Apple TV(s) 					|
-|-							|-										|-								|-								|
-| iPhone 6s                 | iPad mini 4							| iPod Touch (7th generation)	| Apple TV HD                 	|
-| iPhone 6s Plus            | iPad (5th generation)					|								| Apple TV 4K (1st generation)	|
-| iPhone SE (2016)          | iPad (6th generation)					|								|								|
-| iPhone 7                  | iPad (7th generation)					|								|								|
-| iPhone 7 Plus             | iPad Pro (9.7")						|								|								|
-| iPhone 8                  | iPad Pro (12.9") (1st generation)		|								|								|
-| iPhone 8 Plus             | iPad Pro (10.5")						|								|								|
-| iPhone X                  | iPad Pro (12.9") (2nd generation)		|								|								|
-|                           | iPad Air 2		|								|								|
-
-
-> Note that on `A11` (iPhone X, 8, 8 Plus), **you must disable your passcode while in the jailbroken state** (on iOS 16, you need to **reset your device** before proceeding with palera1n).
-
-<!--- T2 --->
-<details>
-<summary>Apple T2 Device Support (click to expand)</summary>
-
-| Apple T2              	|
-|-							|
-| Apple T2 iMac20,1         |
-| Apple T2 iMac20,2         |
-| 			              	|
-| Apple T2 MacBookAir8,1    |
-| Apple T2 MacBookAir8,2    |
-| Apple T2 MacBookAir9,1    |
-| 			              	|
-| Apple T2 MacBookPro15,1   |
-| Apple T2 MacBookPro15,2   |
-| Apple T2 MacBookPro15,3   |
-| Apple T2 MacBookPro15,4   |
-| Apple T2 MacBookPro16,1   |
-| Apple T2 MacBookPro16,2   |
-| Apple T2 MacBookPro16,3   |
-| Apple T2 MacBookPro16,4   |
-| 			              	|
-| Apple T2 iMacPro1,1       |
-| Apple T2 Macmini8,1       |
-| Apple T2 MacPro7,1        |
-|			              	|
-| iBridge2,11 (Unknown Mac) |
-| iBridge2,13 (Unknown Mac) |
-
-
-
-</details>
-
-
-## Computer Requirements
-1. **USB-A** cables are recommended to use, USB-C to may have issues with palera1n and getting into DFU mode.
-> Due to USB-C cables having different accessory IDs, your device may not be able to be recognized when using USB-C due to not being able to assert to its USB voltage pin.
-
-2. **Linux or macOS computer**
-> AMD CPUs (not AMD Mobile) have an issue where it causes them to have a very low success rate with checkm8 exploit. It is not recommended that you use them with palera1n.
-
-> USB-C port on Apple Silicon Macs *may* require manual unplugging and replugging of the lightning cable after checkm8 exploit. This problem may be solved by connecting via USB hub, though extensions can vary.
-
-## Usage 
-```
-Usage: palera1n [-DEhpvVdsSLRnPI] [-e boot arguments] [-k Pongo image] [-o overlay file] [-r ramdisk file] [-K KPF file] [-i checkra1n file]
-
-	--version				Print version
-	--force-revert				Remove jailbreak
-	-d, --demote				Demote
-	-D, --dfuhelper				Exit after entering DFU
-	-e, --boot-args <boot arguments>	XNU boot arguments
-	-E, --enter-recovery			Enter recovery mode
-	-h, --help				Show this help
-	-i, --override-checkra1n <file>		Override checkra1n
-	-k, --override-pongo <file>		Override Pongo image
-	-K, --override-kpf <file>		Override kernel patchfinder
-	-L, --jbinit-log-to-file		Make jbinit log to /cores/jbinit.log (can be read from sandbox while jailbroken)
-	-n, --exit-recovery			Exit recovery mode
-	-I, --device-info			Print info about the connected device
-	-o, --override-overlay <file>		Override overlay
-	-p, --pongo-shell			Boots to PongoOS shell
-	-P, --pongo-full			Boots to a PongoOS shell with default images already uploaded
-	-r, --override-ramdisk <file>		Override ramdisk
-	-R, --reboot-device			Reboot connected device in normal mode
-	-s, --safe-mode				Enter safe mode
-	-S, --no-colors				Disable colors on the command line
-	-v, --debug-logging			Enable debug logging
-		  This option can be repeated for extra verbosity.
-	-V, --verbose-boot			Verbose boot
-
-Environmental variables:
-	TMPDIR		temporary diretory (path the built-in checkra1n will be extracted to)
-```
-
-## Installing
-Visit https://palera.in
-
-## Disclaimers
-We are **NOT** responsible for any data loss, or the result of a device being bricked. When using palera1n, the user should accept responsibility if anything happens to their device during the process.
- If your device is stuck in recovery, please run futurerestore `--exit-recovery`, or use `irecovery -n`, or `palera1n -n`.
- If you're unable to get out of recovery via these methods please restore with iTunes or Finder.
- palera1n **will not work** in VirtualBox, VMware or any virtual machine that doesn't support PCI passthrough.
-
-## Troubleshooting
-Make sure you're following the guides provided [here](https://palera.in), also when asking for support make sure you provide full details on your device, such as:
- iPhone/iPad/iPod/Apple TV
+Make sure you provide full details on your device, such as:
+- iDevice
 - iOS Version
 - Passcode enabled?
- Verbose from palera1n (specifying `-Vv` within palera1n)
- Panic logs, if panicked then send latest `panic-full` log from your device.
+- Logs, if panicked then send latest `panic-full` log from your iDevice.

-Create an issue here: https://github.com/palera1n/palera1n/issues/new/choose
+Using `-VvL` would help with debugging.
+
+Join the [Support Discord](https://dsc.gg/palera1n), and create a thread in [#support](https://discord.com/channels/1028398973452570725/1028730487700738130) or ask in [#general](https://discord.com/channels/1028398973452570725/1028398976640229380).

 ## Credits
+<details><summary>Credits</summary>
+<p>

-[All credits for palera1n can be found here](https://palera.in/)
+- [Lakhan Lothiyi](https://github.com/llsc12) for older palera1n loader app
+- [checkra1n](https://github.com/checkra1n) for the base of the kpf
+- [the Procursus Team](https://github.com/ProcursusTeam) for the amazing [bootstrap](https://github.com/ProcursusTeam/Procursus)
+- [Évelyne](https://github.com/evelyneee) for [ElleKit](https://github.com/evelyneee/ellekit), rootless tweak injection
+- [Sam Bingner](https://github.com/sbingner) for [Substitute](https://github.com/sbingner/substitute), rootful tweak injection

-If proper credit isn't shown please message us or create an issue.
+</details>
+</p>
+
+<br>
+<p align="center">
+Thank you so much to our Patreons that make the future development possible! You may sub <a href="https://patreon.com/palera1n">here</a>, if you'd like to.</br>
+</p>
+<p align="center">
+<a href="https://github.com/samh06"><img width=64 style="border-radius: 25%;" src="https://user-images.githubusercontent.com/18669106/206333607-881d7ca1-f3bf-4e18-b620-25de0c527315.png"></img></a>
+<a href="https://havoc.app"><img width=64 style="border-radius: 25%;" src="https://docs.havoc.app/img/standard_icon.png"></img></a>
+<a href="https://twitter.com/yyyyyy_public"><img width=64 style="border-radius: 25%;" src="https://cdn.discordapp.com/attachments/1054239098006683688/1072587455779328040/image.png?size=400"></img></a>
+<a href="https://twitter.com/0xSp00kyb0t"><img width=64 style="border-radius: 25%;" src="https://pbs.twimg.com/profile_images/1603601553226620935/1t4yD1bD_400x400.jpg"></img></a>
+<a href="https://chariz.com"><img width=64 src="https://chariz.com/img/favicon.png"></img></a>
+<a href="https://twitter.com/stars6220"><img width=64 style="border-radius: 25%;" src="https://pbs.twimg.com/profile_images/1621062976982728706/pWVZQ-NO_400x400.jpg"></img></a>
+<a href="https://github.com/TheFunnyMan16"><img width=64 style="border-radius: 25%;" src="https://cdn.discordapp.com/attachments/1050068822473842778/1082867264807772281/IMG_3942.jpg">
+<a href="https://github.com/beast9265"><img width=64 style="border-radius: 25%;" src="https://avatars.githubusercontent.com/u/79794946?v=4"></img></a>
+<a href="https://twitter.com/0x7FF7"><img width=64 style="border-radius: 25%;" src="https://pbs.twimg.com/profile_images/1630818481191919618/8MWaJ1F7_400x400.jpg"></img></a>
+<a href="https://sideloadly.io/"><img width=64 style="border-radius: 25%;" src="https://sideloadly.io/icon.png"></img></a>
+<a href="https://blog.stevesec.com/"><img width=64 style="border-radius: 25%;" src="https://blog.stevesec.com/img/avatar.jpg"></img>
+<a href="https://github.com/0xilis/"><img width=64 style="border-radius: 25%;" src="https://github.com/0xilis.png"></img></a>
+</p>
@@ -1,9 +1,9 @@
-PAGES = palera1n.1.html p1ctl.8.html
+PAGES = palera1n.1.html

 all: $(PAGES)

-%.html: %
-	mandoc -T html -O style=mandoc.css $< > $@
+%.1.html: %.1
+	mandoc -T html -O style=mandoc.css palera1n.1 > palera1n.1.html

 clean:
 	rm -f $(PAGES)
@@ -1,109 +0,0 @@
-.\"-
-.\" Copyright (c.Xc 2024 Nick Chan
-.\" SPDX-License-Identifier: MIT
-.\"
-.Dd "6 April 2024"
-.Dt p1ctl 8
-.Sh NAME
-.Nm p1ctl
-.Nd command-line access to palera1n loader
-.Sh SYNOPSIS
-.Nm
-.Ar subcommand
-.Op subcommand options
-.Op subcommand arguments
-.Sh DESCRIPTION
-.Nm
-provide a command-line interface to the graphical palera1n loader.
-.Pp
-.Nm
-interfaces with the palera1n daemon as well as palera1n's launchd hook.
-
-.Sh SUBCOMMANDS
-.Bl -tag -width -indent
-.It Xo Ar bootstrap Op Fl s
-.Op Fl S Ar password
-.Ar bootstrap-file
-.Xc
-Deploy a bootstrap from a zstd compressed tarball. With no additional options specified,
-a new password for the mobile user will be prompted for. The bootstrap you are deploying
-must match the jailbreak type (rootful or rootless) you are using.
-.Bl -tag -width -indent
-.It Fl s
-Do not prompt for the password and do not set the mobile password.
-.It Fl S Ar password
-Do not prompt and set the mobile password to the password specified.
-.El
-.Pp
-.Em NOTE:
-Unlike the graphical palera1n loader, this command only deploys the bootstrap itself,
-it does not add additional repositories nor install additional packages.
-.It Xo Ar exitsafe
-.Xc
-Exit
-.Nm palera1n
-safe mode, and trigger a userspace reboot. This command will succeed
-even if the device is not currently in safe mode. In this case, a userspace reboot
-is still triggered.
-.Pp
-.Em NOTE:
-Many tweak injection packages also provide their own safe mode, p1ctl does not
-recognize and cannot control those safe modes.
-.It Xo Ar help Op Ar subcommand
-.Xc
-Prints help text. If
-.Ar subcommand
-is specified, print help about the subcommand.
-.It Xo Ar kbase
-.Xc
-Print a hexadecimal representation of the kernel base.
-.It Xo Ar kslide
-.Xc
-Print a hexadecimal representation of the kernel slide.
-.It Xo Ar palera1n_flags
-.Xc
-Print a representation of the palera1n flags, which corresponds to the options passed
-to
-.Xr palera1n 1
-as well as hints to the palera1n userspace stack set by
-.Nm PongoOS
-\[char46]
-By default, a hexadecimal representation of the flags will be printed.
-.Bl -tag -width -indent
-.It Fl d
-Read the flags from the ramdisk block device instead of getting them by interfacing with palera1n daemon.
-.It Fl s
-Print a string representation of the flags. Each line will contain one flag, and the strings always start
-with palerain_option_, and unknown flags are represented as palerain_option_undefined.
-.El
-.It Xo Ar reboot-userspace
-.Xc
-Unmount /Developer if mounted and then reboot the userspace.
-This command exists because the /Developer mount will be broken
-after a plain userspace reboot, which breaks debugging in Xcode.
-.Nm palera1n
-also hooks the
-.Xr reboot3 3
-call so that rebooting userspace using
-.Xr launchctl 1
-does not break the /Developer mount.
-.It Xo Ar reload
-.Xc
-Causes the
-.Nm palera1n
-launchd hook to re-probe the environment and update its internal state.
-This will affect the internal environmental variables passed onto new processes,
-and is typically used after bootstrapping or reverting installs.
-.It Xo Ar revert-install
-.Xc
-Remove jailbreak files from the device. This command is not supported on rootful with fakefs. On rootful with realfs, the device will reboot after issuing this command.
-.Pp
-To remove jailbreak files on rootful with fakefs, use
-.Xr palera1n 1
-on your computer with the
-.Fl -force-revert
-.Fl f
-options instead.
-.El
-.Sh SEE ALSO
-.Xr palera1n 1
@@ -1,15 +1,15 @@
 .\"-
-.\" Copyright (c) 2024 Nick Chan
+.\" Copyright (c) 2023 Nick Chan
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd "23 December 2024"
+.Dd "20 March 2023"
 .Dt palera1n 1
 .Sh NAME
 .Nm palera1n
-.Nd arm64 iOS/iPadOS/tvOS 15.0-26.0, bridgeOS 5.0-10.0 jailbreaking tool
+.Nd iOS 15.0-16.5 arm64 iOS/iPadOS jailbreaking tool
 .Sh SYNOPSIS
 .Nm
-.Op Fl cCdDEfhIlLnpRsSTvV
+.Op Fl cCdDEfhIlLnpRsSvV
 .Op Fl e Ar Boot arguments
 .Op Fl k Ar Pongo image
 .Op Fl o Ar overlay file
@@ -20,21 +20,14 @@
 .Op Fl -force-revert
 .Sh DESCRIPTION
 .Nm
-jailbreaks an arm64 (arm64e excluded) iOS/iPadOS/tvOS 15.0-26.0, bridgeOS 5.0-10.0 device,
+jailbreaks any iOS/iPadOS device with an arm64 (arm64e excluded) on iOS 15.0-16.5,
 utilizing the
 .Em checkm8
 bootROM exploit.
 .Pp
 .Nm
-provides rootful and rootless jailbreak modes.
-On iOS/iPadOS 15.0 and later and on tvOS 18.2 or later,
-.Nm
 is able to jailbreak the device in fakefs-rootful mode, where /
 is writable, as well as rootless mode, where / cannot be written to.
-On tvOS and bridgeOS,
-only rootful is supported. On versions where fakefs-rootful is not
-applicable, palera1n modifies the actual root filesystem instead
-of making a fakefs
 .Pp
 Due to the nature of the
 .Em checkm8
@@ -59,7 +52,7 @@ In the remainder of this document, the term "iOS" and "iPadOS" will be used inte
 as the difference is negligible as far as the jailbreak is concerened.
 .Pp
 .Sh SUPPORTED DEVICES
-As described above, arm64 iOS 15.0-18.0 devices are supported, here is an explicit
+As described above, arm64 iOS 15.0-16.5 devices are supported, here is an explicit
 list of supported devicecs:

 .Bl -tag -compact
@@ -89,32 +82,8 @@ list of supported devicecs:
 .It iPod Touch (7th generation)
 .El

-.Bl -tag -compact
-.It Apple TV HD
-.It Apple TV 4K (1st generation)
-.El
-
-.Bl -tag -compact
-.It Apple T2 iMacPro1,1
-.It Apple T2 MacBookPro15,1
-.It Apple T2 MacBookPro15,2
-.It Apple T2 Macmini8,1
-.It Apple T2 MacPro7,1
-.It Apple T2 MacBookPro15,3
-.It Apple T2 MacBookAir8,1
-.It Apple T2 MacBookPro15,4
-.It Apple T2 MacBookAir8,2
-.It Apple T2 MacBookPro16,1
-.It Apple T2 MacBookAir9,1
-.It Apple T2 MacBookPro16,2
-.It Apple T2 iMac20,1
-.It Apple T2 iMac20,2
-.It Apple T2 MacBookPro16,3
-.It Apple T2 MacBookPro16,4
-.El
-
-Support for the A8 HomePod on Darwin 21 and above could be added,
-but it is currently unsupported.
+Support for other arm64 Darwin devices, including Apple TV, HomePod and iBridge
+on Darwin 21 and above could be added, but they are currently unsupported.

 arm64e devices will NEVER be supported.

@@ -124,7 +93,7 @@ arm64e devices will NEVER be supported.
 Prints the program version and exit.
 .It Fl -force-revert
 Remove the jailbreak while keeping user data. Some jailbreak files may remain
-after running this command. Additionally, jailbreak apps may remain on the
+after running this command. Additionally, jailbreak apps will remain on the 
 home screen on for a while even when the files are deleted as the icon cache
 still has their icons. When used with
 .Fl f , -fakefs ,
@@ -139,31 +108,40 @@ Like
 but the size of the created fakefs is smaller at the expense of having unwritable
 parts in rarely-written paths. When jailbreaking 16 GB devices, this option must be used
 when setting up fakefs for rootful, as they do not have enough storage for full fakefs.
-This flag is supported on iOS/iPadOS 15.0 or later and tvOS 18.2 or later, as they
-require fakefs for rootful.
+This option currently does not work on iOS 16.
 .It Fl c , -setup-fakefs
 When used with
 .Fl f , -fakefs ,
 creates the new APFS volume required for rootful. Will fail if one already exists.
-This flag is supported on iOS/iPadOS 15.0 or later and tvOS 18.2 or later, as they
-require fakefs for rootful.
 .It Fl C , -clean-fakefs
-This option is not currently supported and is a no-operation in this version of
-.Nm
-\[char46]
+This reverts the fakefs to the 
+.Em orig-fs
+snapshot that is created when the fakefs
+is first created, then the device will continue to boot jailbroken. This option 
+allows resetting the rootful environment without deleting the entire fakefs. 
+Note that this option will not work if the fakefs is created in an older version
+of palera1n that does not create the
+.Em orig-fs
+snapshot on the fakefs. This option will also remove some jailbreak files inside
+of /var. The files in /var will not be deleted when a userspace reboot is done
+with this flag set.
 .It Fl d , -demote
 Set the effective production fuse to 0, so as to enable hardware debugging features.
 .It Fl D , -dfuhelper
 Execute the DFU helper to guide the user into putting the device into DFU mode
 then exit.
 .It Fl e , -boot-args Ar boot arguments
-Specify custom XNU kernel command line. Additionally, the
+Specify custom XNU kernel command line. The
+.Em rootdev=md0
+argument is used by
+.Nm
+and cannot be overriden. Additionally, the
 .Em wdt=-1
 argument is used during fakefs setup.
 .It Fl E , -enter-recovery
 Exit after entering recovery mode.
 .It Fl f , -fakefs
-Proceed in rootful mode. Despite its name, this applies to both full, partial fakefs, as well as realfs, and it still applies even when trying to force revert.
+Proceed in rootful mode. This applies to both full fakefs and partial fakefs.
 .It Fl h , -help
 Prints help text.
 .It Fl i , -checkra1n-file Ar checkra1n file
@@ -180,7 +158,15 @@ command. If in doubt, use
 .Sy https://github.com/palera1n/PongoOS
 iOS15 branch or your own fork of it.
 .It Fl l , -rootless
-Proceed in rootless mode. This option is only supported on iOS/iPadOS.
+Proceed in rootless mode, this is the default when neither
+.Fl l , -rootless
+and
+.Fl f , -fakefs
+is specified.
+.Fl L , -jbinit-log-to-file
+Makes jbinit log to
+.Em /cores/jbinit.log
+This file may be viewed from sandboxed applications while jailbroken.
 .It Fl n , -exit-recovery
 Exit recovery mode and exit.
 .It Fl o , -override-overlay Ar overlay file
@@ -199,23 +185,21 @@ Like
 .Fl p , -pongo-shell
 but default images and options have been uploaded and applied respectively.
 .It Fl r , -override-ramdisk Ar ramdisk file
-Override the ramdisk. At a very minimum, it should contain
-.Em /cores/ploosh
+Override the ramdisk. At a very minimum, it should contain a
+.Em /sbin/launchd
 as well as a fake dyld
 .Em /usr/lib/dyld
 where the logic is expected to be in.
 .It Fl R , -reboot-device
 Reboot device in normal mode and exit.
 .It Fl s , -safe-mode
-Enter safe mode. An alert will be displayed on iOS/iPadOS/tvOS. Jailbreak daemons nor early boot executable files
+Enter safe mode. An alert will be displayed. Jailbreak daemons nor early boot executable files
 specified (see
 .Sy FILES
 section below) will be executed. The loader app and the built in SSH server can still be used,
 as well as any jailbreak-specific apps you have installed.
 .It Fl S , -no-colors
 Disable colors on the command line. External programs like checkra1n clones may still output colors.
-.It Fl T , -telnetd
-Enable the TELNET daemon on port 46, all interfaces. Please note that there is no authentication and is therefore insecure.
 .It Fl v , -debug-logging
 Enable debug logging. The option may be repeated for extra verbosity.
 .It Fl V , -verbose-boot
@@ -235,13 +219,13 @@ is extracted and executed here. When not set, /tmp is used.
 .Sh EXAMPLES
 To (re-)jailbreak in rootless mode:
 .Pp
-.Dl "palera1n -l"
+.Dl "palera1n"
 .Pp
 To setup fakefs for rootful mode:
 .Pp
 .Dl "palera1n -fc"
 .Pp
-After the device has rebooted into recovery mode, follow the following example.
+After the device has rebooted, follow the following example.
 .Pp
 To re-jailbreak in rootful mode:
 .Pp
@@ -290,34 +274,17 @@ When using rootful mode, the
 .Fl f , -fakefs
 flag must be specified at all times. It does not matter whether you want to create fakefs,
 create partial fakefs, rejailbreak or remove jailbreak.
-.Pp
-Due to a stock bug, using the
-.Fl V , -verbose-boot
-option might cause some versions for tvOS to crash and not boot.
-.Pp
-Offical Apple USB-C cables as well as some other USB-C cables cannot be used to enter DFU mode.
-USB-A cable with male USB-C to female USB-A adapter works fine.
-.Sh POST INSTALLATION (iOS/iPadOS)
-The palera1n loader app will take up to 1 minute to appear on the homescreen after the
+.Sh POST INSTALLATION
+The palera1n loader app will take up to 30 seconds to appear on the homescreen after the
 device has booted. If it does not appear, you can try using the shortcut:
 .Pp
 .Lk https://www.icloud.com/shortcuts/8cd5f489c8854ee0ab9ee38f2e62f87d
 .Pp
-to open it. After opening the loader app, select a package manager to install.
-This will also bootstrap your device.
-.Pp
-A built-in SSH server runs on port 44 on loopback interfaces.
-.Sh POST INSTALLATION (tvOS)
-.Pp
-The palera1n loader app will appear on homescreen. Open the loader and select a package manager to install.
-This will also bootstrap your device.
-.Pp
-A built-in SSH server runs on port 44 on all interfaces.
-.Sh POST INSTALLATION (bridgeOS)
-.Pp
-A built-in SSH server runs on port 44 on all interfaces.
-.Pp
-Bootstrapping is currently not supported on this device.
+to open it. After opening the loader app, press install to install a bootstrap as well as
+the
+.Em Sileo
+package manager.
+You can install other package managers from settings of the loader app.
 .Sh FILES
 During the jailbreak process, a temporary filesystem is mounted on /cores as a place
 to stash jailbreak files needed during the boot process. No files are ever written
@@ -326,7 +293,11 @@ loader app to install additional jailbreak files.

 .Bl -tag -width "/var/jb/Library/LaunchDaemons"
 .It Pa /cores
-The location of the temporary filesystem where jailbreak files are stashed during boot.
+The location of the temporary filesystem where jailbreak files are stash during boot.
+.It Pa /cores/jbinit.log
+When
+.Fl L
+is used, the log file of jbinit.
 .It Pa /Library/LaunchDaemons
 The directory where jailbreak-specific
 .Xr launchd.plist 5
@@ -346,25 +317,20 @@ has been mounted.
 .El
 .Sh BUGS
 .Nm
-may crash if the machine it is running on has non-compliant USB devices plugged in.
+may crash if the machine it is running on:
 .Pp
-.Nm
-will fail to initialize on Linux when there are no USB devices plugged in.
-Usually this is not a problem on PCs since the built-in root hubs are also
-USB devices. However, on platforms such as Apple Silicon Macs in Linux, since
-there are no built-in USB hubs, at least one USB device needs to be manually
-plugged in for palera1n to be initialized.
+.Dl "- Has non-compliant USB devices plugged in"
 .Pp
 The exploit may also work less reliably on some hosts, like AMD desktops, or some MediaTek devices.
 .Pp
-The built-in SSH server might be not accessible with password after bootstrapping rootful,
-since the bootstrap uses a custom crypt() function that is not supported
-by the built-in SSH server.
-.Pp
-There are no DFU instructions for iBridge T2 as there are no known ways to connect to the T2's USB
-interface when macOS has been booted.
+The device may randomly crash and reboot due to launchd exiting with code 7.
+.Sh NOTES
+.Nm
+injects a dylib into launchd to allow the
+.Sy launchctl runstats
+command to be used on the device.
 .Sh DEPRECATED AND REMOVED FUNCTIONALITY
-There was an option in
+There was an option in 
 .Nm
 to force create the fakefs even when one already exists (which would overwrite
 the existing fakefs), by setting the palerain_option_setup_rootful_forced flag
@@ -373,15 +339,10 @@ in palera1n flags. This option was removed because using
 and
 .Fl c
 at the same time has exactly the same effect.
-.Pp
-The hook that enabled
-.Sy launchctl runstats
-has been removed, since it leaks memory in launchd.
 .Sh SEE ALSO
 .Xr launchd 8
 .Xr launchd.plist 5
 .Xr ldid 1
-.Xr p1ctl 8
 .Sh HISTORY
 The
 .Nm
@@ -392,5 +353,4 @@ December 13, 2022. Later, the first attempt to rewrite palera1n into C begins on
 01 2023. The
 .Nm
 utility described here is the second attempt, which first started on January 16, 2023,
-using checkra1n 1337 and a custom KPF.
-Something happened on August 15, 2023.
+using checkra1n 1337 and the plush KPF.
@@ -0,0 +1,20 @@
+curl -LOOOOOO \
+            https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v3.3.0.tar.gz \
+            https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2 \
+            https://mirror-hk.koddos.net/gnu/readline/readline-8.2.tar.gz \
+            https://www.jedsoft.org/releases/slang/slang-2.3.3.tar.bz2 \
+            https://releases.pagure.org/newt/newt-0.52.23.tar.gz \
+            https://github.com/rpm-software-management/popt/archive/master-release.tar.gz
+
+tar xf v3.3.0.tar.gz
+tar xf libusb-1.0.26.tar.bz2
+tar xf readline-8.2.tar.gz
+tar xf slang-2.3.3.tar.bz2
+tar xf newt-0.52.23.tar.gz
+tar xf master-release.tar.gz
+
+git clone --depth=1 https://github.com/libimobiledevice/libplist
+git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
+git clone --depth=1 https://github.com/libimobiledevice/libirecovery
+git clone --depth=1 https://github.com/libimobiledevice/libusbmuxd
+git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
@@ -0,0 +1,33 @@
+#ifndef COMMON_H
+#define COMMON_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
+extern "C" {
+	#include <palerain.h>
+	#include <gui.h>
+}
+
+#define DISCONNECTED 0
+#define NORMAL 1
+#define RECOVERY 2
+#define DFU 3
+#define rest(a) std::this_thread::sleep_for(std::chrono::seconds(a))
+#define FLOAT_TO_INT(x) ((x)>=0?(int)((x)+0.5):(int)((x)-0.5))
+
+void guifree(void);
+void dfuhelper();
+void send_alert(const char *title, const char *msg);
+
+extern devinfo_t dev;
+extern bool waiting_for_device;
+extern bool unsupported_device;
+extern bool supported_device;
+extern bool recovery_wait;
+extern bool jailbreak;
+extern bool enter_dfu;
+extern bool dfu_helper;
+extern int device_status;
+
+#endif
@@ -0,0 +1,55 @@
+#ifndef DESIGN_H
+#define DESIGN_H
+
+#define set_pos(a,b) ImGui::SetCursorPos(ImVec2(a,b))
+#define font(a) ImGui::PushFont(io.Fonts->Fonts[a])
+#define btn_text_on colors[ImGuiCol_Text] = ImVec4{.05f, .05f, .05f, 1.0f}
+#define btn_text_off colors[ImGuiCol_Text] = ImVec4{1.0f, 1.0f, 1.0f, 1.0f}
+#define dfu_text_light colors[ImGuiCol_Text] = ImVec4{1.0f, 1.0f, 1.0f, 1.0f}
+#define dfu_text_dark colors[ImGuiCol_Text] = ImVec4{1.0f, 1.0f, 1.0f, 0.3f}
+#define size(x,y) ImVec2(x,y)
+#define pos(x,y) ImVec2(x,y)
+
+/* Fonts we have loaded into memory */
+#define SF_Reg 0 
+#define SF_Med 2
+#define SF_Bold 1 
+#define SF_Sm_Bold 3
+#define Hack 4
+#define SF_RoundBold 5
+#define SF_RegMed 6
+#define SF_BoldLarge 7
+#define WHITE ImVec4{1.0f, 1.0f, 1.0f, 1.0f}
+
+void ImageRotated(ImTextureID tex_id, ImVec2 center, ImVec2 size, float angle);
+void draw_box(ImVec2 location, ImVec2 size, ImVec4 color, float radius);
+void reset_design(void);
+void reset_views(void);
+bool is_hovered(const char* id, int w, int h);
+bool is_pressed(const char* id, int w, int h);
+void anim_btn(const char* id, ImVec2 size, ImVec2 size_to, ImVec2 pos, ImVec2 pos_to);
+void anim_box(const char* id, ImVec2 size, ImVec2 size_to, ImVec2 pos, ImVec2 pos_to);
+void label(const char *text, ImVec2 location, ImVec4 color, int font);
+void rotate_image(const char *image, ImVec2 pos, ImVec2 size, float angle, float speed);
+std::string addstr2(const char *str1, const char *str2);
+std::string addstr3(const char *str1, const char *str2, const char *str3);
+std::string addstr4(const char *str1, const char *str2, const char *str3, const char *str4);
+
+void image_btn_style_alt(void);
+void init_style(void);
+void init_colors(void);
+ImVec4 hex_color(int hex, float alpha);
+ImColor hex_imcolor(int hex, float alpha);
+void image_btn_style();
+
+extern float btn_w;
+extern float btn_h;
+extern float btn_x;
+extern float btn_y;
+
+extern float box_w;
+extern float box_h;
+extern float box_x;
+extern float box_y;
+
+#endif
@@ -0,0 +1,36 @@
+#ifndef GUI_H
+#define GUI_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+
+#define WINDOW_X 0
+#define WINDOW_Y 0
+#define WINDOW_SIZE_X 550
+#define WINDOW_SIZE_Y 300
+
+#define WINDOW_TITLE "palera1n"
+#define WINDOW_RESIZE false
+#define WINDOW_RESTORE true
+#define WINDOW_ALLOW_FULLSCREEN false
+#define WINDOW_BORDERLESS false
+#define WINDOW_DECORATIONS true
+
+#define IDLE false
+#define TARGET_FPS 60
+#define CONFIG_FILE "palera1n.ini"
+#define EMBED_ASSETS true
+#define ASSETS_DIRECTORY "assets"
+
+#define NORMAL_MODE 1
+#define RECOVERY_MODE 2
+#define DFU_MODE 3
+#define NONE 4
+#define PONGO_MODE 5
+
+int palera1n(int argc, char *argv[]);
+
+#endif
@@ -0,0 +1,135 @@
+/*
+ * pongoOS - https://checkra.in
+ *
+ * Copyright (C) 2019-2022 checkra1n team
+ *
+ * This file is part of pongoOS.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR 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.
+ *
+ */
+#ifndef _KERNINFO_H
+#define _KERNINFO_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#define MAX_BOOTARGS_LEN 256
+
+#define checkrain_option_none               0x00000000
+#define checkrain_option_all                0x7fffffff
+#define checkrain_option_failure            0x80000000
+
+// Host options
+#define checkrain_option_verbose_logging    (1 << 0)
+#define checkrain_option_demote             (1 << 1)
+#define checkrain_option_early_exit         (1 << 2)
+#define checkrain_option_quick_mode         (1 << 3)
+#define checkrain_option_pongo_shell        (1 << 4)
+#define checkrain_option_pongo_full         (1 << 5)
+
+// KPF options
+#define checkrain_option_verbose_boot       (1 << 0)
+
+// Global options
+#define checkrain_option_safemode           (1 << 0)
+#define checkrain_option_bind_mount         (1 << 1)
+#define checkrain_option_overlay            (1 << 2)
+#define checkrain_option_force_revert       (1 << 7) /* keep this at 7 */
+
+// palera1n option
+#define palerain_option_rootful              (1 << 0) /* rootful jailbreak */
+#define palerain_option_jbinit_log_to_file   (1 << 1) /* log to /cores/jbinit.log */
+#define palerain_option_setup_rootful        (1 << 2) /* create fakefs */
+#define palerain_option_setup_rootful_forced (1 << 3) /* create fakefs over an existing one */
+#define palerain_option_setup_partial_root   (1 << 4) /* fakefs creating should be partial */
+#define palerain_option_checkrain_is_clone   (1 << 5) /* supplied checkra1n is checkra1n clone */
+#define palerain_option_rootless_livefs      (1 << 6) /* mount root livefs on rootless */
+/* reserved values */
+// #define palerain_option_no_ssv               (1 << 7) /* no signed system volume */
+// #define palerain_option_force_fakefs         (1 << 8) /* force fakefs, even without SSV */
+// #define palerain_option_rootless             (1 << 9) /* rootless jailbreak */
+#define palerain_option_clean_fakefs        (1 << 10) /* clean fakefs, but does not delete it */
+
+#ifdef DEV_BUILD
+#define palerain_option_test1               (1 << 29)
+#define palerain_option_test2               (1 << 30)
+#endif
+
+// palerain host options
+#define host_option_dfuhelper_only       (1 << 0) /* dfuhelper only */
+#define host_option_pongo_exit           (1 << 1) /* boot to clean pongo shell */
+#ifdef TUI
+#define host_option_tui                  (1 << 2) /* use terminal user interface */
+#else
+#define host_option_res1                 (1 << 2) /* reserved */
+#endif
+#define host_option_demote               (1 << 3) /* Demote effective production fuse status */
+// (1 << 4) is removed
+#define host_option_pongo_full           (1 << 5) /* Boot to pongo with default images and options */
+#define host_option_palerain_version     (1 << 6) /* Print version */
+#define host_option_exit_recovery        (1 << 7) /* Exit recovery mode */
+#define host_option_reboot_device        (1 << 8) /* Reboot device in normal mode */
+#define host_option_enter_recovery       (1 << 9) /* Enter recovery mode */
+#define host_option_device_info          (1 << 10) /* Print device info */
+#define host_option_no_colors            (1 << 11) /* no colors */
+
+#define PALEINFO_MAGIC 'PLSH'
+#define PALEINFO_CIGAM 'HSLP'
+
+typedef uint32_t checkrain_option_t, *checkrain_option_p;
+
+typedef enum {
+    jailbreak_capability_tfp0               = 1 << 0,
+    jailbreak_capability_userspace_reboot   = 1 << 1,
+    jailbreak_capability_dyld_ignore_os     = 1 << 2, // TODO: This needs a better name
+} jailbreak_capability_t, *jailbreak_capability_p;
+
+#define DEFAULT_CAPABILITIES (jailbreak_capability_tfp0|jailbreak_capability_userspace_reboot)
+struct kerninfo {
+    uint64_t size;
+    uint64_t base;
+    uint64_t slide;
+    checkrain_option_t flags;
+};
+struct paleinfo {
+    uint32_t magic; // 'PLSH' / 0x504c5348
+    uint32_t version; // 1
+    checkrain_option_t flags;
+    char rootdev[0x10];
+};
+struct kpfinfo {
+    struct kerninfo k;
+    checkrain_option_t kpf_flags;
+    char bootargs[MAX_BOOTARGS_LEN];
+};
+
+#define checkrain_set_option(options, option, enabled) do { \
+    if (enabled)                                            \
+        options = (checkrain_option_t)(options | option);   \
+    else                                                    \
+        options = (checkrain_option_t)(options & ~option);  \
+} while (0);
+
+static inline bool checkrain_options_enabled(checkrain_option_t flags, checkrain_option_t opt)
+{
+    return (flags & opt) != 0;
+}
+
+#endif
@@ -1,73 +0,0 @@
-/*
- * jbinit - https://github.com/palera1n/jbinit
- *
- * This file is part of jbinit
- * 
- * SPDX-License-Identifier: MIT
- */
-
-#ifndef PALEINFO_H
-#define PALEINFO_H
-
-#include <stdint.h>
-
-#define PALEINFO_VERSION 2U
-typedef uint64_t palerain_option_t;
-
-// unified palera1n options
-#define palerain_option_rootful              (UINT64_C(1) << 0) /* rootful jailbreak */
-#define palerain_option_rootless             (UINT64_C(1) << 1) /* rootless jailbreak */
-#define palerain_option_setup_rootful        (UINT64_C(1) << 2) /* create fakefs */
-// (UINT64_C(1) << 3) /* Deprecated and removed */
-#define palerain_option_setup_partial_root   (UINT64_C(1) << 4) /* fakefs creating should be partial */
-#define palerain_option_checkrain_is_clone   (UINT64_C(1) << 5) /* supplied checkra1n is checkra1n clone */
-#define palerain_option_rootless_livefs      (UINT64_C(1) << 6) /* mount root livefs on rootless */
-#define palerain_option_ssv                  (UINT64_C(1) << 7) /* has signed system volume */
-// (UINT64_C(1) << 8) /* reserved */
-#define palerain_option_clean_fakefs         (UINT64_C(1) << 9) /* clean fakefs, but does not delete it */
-#define palerain_option_tui                  (UINT64_C(1) << 10) /* terminal user interface */
-// #define palerain_option_gui               (UINT64_C(1) << 11) /* graphical user interface*/
-#define palerain_option_dfuhelper_only       (UINT64_C(1) << 12) /* dfuhelper only */
-#define palerain_option_pongo_exit           (UINT64_C(1) << 13) /* boot to clean pongo shell */
-#define palerain_option_demote               (UINT64_C(1) << 14) /* Demote effective production fuse status */
-#define palerain_option_pongo_full           (UINT64_C(1) << 15) /* Boot to pongo with default images and options */
-#define palerain_option_palerain_version     (UINT64_C(1) << 16) /* Print version */
-#define palerain_option_exit_recovery        (UINT64_C(1) << 17) /* Exit recovery mode */
-#define palerain_option_reboot_device        (UINT64_C(1) << 18) /* Reboot device in normal mode */
-#define palerain_option_enter_recovery       (UINT64_C(1) << 19) /* Enter recovery mode */
-#define palerain_option_device_info          (UINT64_C(1) << 20) /* Print device info */
-#define palerain_option_no_colors            (UINT64_C(1) << 21) /* no colors */
-#define palerain_option_bind_mount           (UINT64_C(1) << 22) /* bind mounts should be used (always true iOS 15+)*/
-#define palerain_option_overlay              (UINT64_C(1) << 23) /* there is an overlay (should always be true) */
-#define palerain_option_force_revert         (UINT64_C(1) << 24) /* Unjailbreak */
-#define palerain_option_safemode             (UINT64_C(1) << 25) /* Enter safe mode */
-#define palerain_option_verbose_boot         (UINT64_C(1) << 26) /* verbose boot */
-// #define palerain_option_sf_ssh            (UINT64_C(1) << 27) /* safe mode with bootstrap ssh */
-// #define palerain_option_sf_launchdaemons  (UINT64_C(1) << 28) /* safe mode with launchdaemons */
-// #define palerain_option_emerg_mode        (UINT64_C(1) << 29) /* emergency mode (early boot usb shell) */
-#define palerain_option_jbinit_log_to_file   (UINT64_C(1) << 30) /* deprecated (kept for compatibility) */
-#define palerain_option_cli                  (UINT64_C(1) << 31) /* CLI mode */
-#define palerain_option_telnetd              (UINT64_C(1) << 32) /* Enable TELNET daemon */
-
-#define palerain_option_flower_chain         (UINT64_C(1) << 61) /* Flower chain */
-#define palerain_option_test1                (UINT64_C(1) << 62) /* Developer test option 1 */
-#define palerain_option_test2                (UINT64_C(1) << 63) /* Developer test option 2 */
-
-#define PALEINFO_MAGIC 'PLSH'
-
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wpadded"
-
-/* paleinfo version 2, appended to ramdisk */
-struct paleinfo {
-    uint32_t magic; /* 'PLSH' */
-    uint32_t version; /* 2 */
-    uint64_t kbase; /* kernel base */
-    uint64_t kslide; /* kernel slide */
-    uint64_t flags; /* unified palera1n flags */
-    char rootdev[0x10]; /* ex. disk0s1s8 */
-};
-
-#pragma clang diagnostic pop
-
-#endif
@@ -6,7 +6,7 @@
 #endif

 #include "xxd-embedded.h"
-#include "paleinfo.h"
+#include "kerninfo.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -24,9 +24,6 @@

 #define palerain_option_case_version      palerain_option_case(0)
 #define palerain_option_case_force_revert palerain_option_case(1)
-#define palerain_option_case_libcheckra1nhelper_path palerain_option_case(2)
-#define palerain_option_case_cli		  palerain_option_case(3)
-

 #ifdef USE_LIBUSB
 #include <libusb-1.0/libusb.h>
@@ -35,7 +32,7 @@
 #define USB_RET_NOT_RESPONDING  LIBUSB_ERROR_OTHER
 #define USB_RET_IO              LIBUSB_ERROR_IO
 #define USB_RET_NO_DEVICE		LIBUSB_ERROR_NO_DEVICE
-typedef int32_t usb_ret_t;
+typedef int usb_ret_t;
 typedef libusb_device_handle *usb_device_handle_t;

 typedef struct stuff
@@ -72,7 +69,7 @@ usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, uint32_t len);
 #endif

 #ifndef PALERAIN_VERSION
-#define PALERAIN_VERSION "2.2.1"
+#define PALERAIN_VERSION "2.0.0"
 #endif

 #if defined(__APPLE__)
@@ -83,8 +80,8 @@ usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, uint32_t len);
 #define MH_CIGAM_64 0xcffaedfe
 #define MH_KEXT_BUNDLE 0xb

-typedef int32_t cpu_type_t;
-typedef int32_t cpu_subtype_t;
+typedef int cpu_type_t;
+typedef int cpu_subtype_t;

 #define CPU_ARCH_ABI64          0x01000000
 #define CPU_TYPE_ARM            ((cpu_type_t) 12)
@@ -134,7 +131,7 @@ typedef struct {

 typedef struct {
 	int mode;
-	int cpid;
+	unsigned int cpid;
 	char product_type[0x20];
 	char display_name[0x20];
 	char iboot_ver[0x20];
@@ -143,9 +140,9 @@ typedef struct {
 typedef struct {
 	uint32_t magic; /* 0xd803b376*/
 	unsigned char* ptr; /* pointer to the override file in memory */
-	uint32_t len; /* length of override file */
+	unsigned int len; /* length of override file */
 	unsigned char* orig_ptr; /* pointer to the overriden file */
-	uint32_t orig_len; /* length of the overriden file */
+	unsigned int orig_len; /* length of the overriden file */
 	int fd; /* file descriptor of the override file */
 } override_file_t;

@@ -158,8 +155,8 @@ extern char* pongo_path;
 extern bool tui_started;
 #endif

-extern uint64_t palerain_flags;
-extern uint64_t* palerain_flags_p;
+extern checkrain_option_t host_flags;
+extern checkrain_option_p host_flags_p;

 extern pthread_t dfuhelper_thread, pongo_thread;
 extern int pongo_thr_running, dfuhelper_thr_running;
@@ -168,7 +165,7 @@ extern niarelap_file_t *kpf_to_upload_1, *ramdisk_to_upload_1, *overlay_to_uploa
 extern niarelap_file_t **kpf_to_upload, **ramdisk_to_upload, **overlay_to_upload;
 extern override_file_t override_ramdisk, override_kpf, override_overlay;

-extern uint64_t palerain_flags;
+extern uint32_t checkrain_flags, palerain_flags, kpf_flags;
 extern pthread_mutex_t log_mutex;

 extern pthread_mutex_t spin_mutex, found_pongo_mutex, ecid_dfu_wait_mutex;
@@ -176,7 +173,11 @@ extern pthread_mutex_t spin_mutex, found_pongo_mutex, ecid_dfu_wait_mutex;
 extern int pongo_thr_running, dfuhelper_thr_running;
 extern bool device_has_booted;
 extern char xargs_cmd[0x270];
-extern char palerain_flags_cmd[0x30];
+extern char checkrain_flags_cmd[0x20];
+extern char palerain_flags_cmd[0x20];
+extern char kpf_flags_cmd[0x20];
+extern char dtpatch_cmd[0x20];
+extern char rootfs_cmd[512];
 extern char* ext_checkra1n;

 void thr_cleanup(void* ptr);
@@ -204,9 +205,12 @@ boyermoore_horspool_memmem(const unsigned char* haystack, size_t hlen,
                           const unsigned char* needle,   size_t nlen);


+extern void* pongo_usb_callback(stuff_t* arg);
 usb_ret_t USBControlTransfer(usb_device_handle_t handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint32_t wLength, void *data, uint32_t *wLenDone);
 const char *usb_strerror(usb_ret_t err);
 int wait_for_pongo(void);
+int upload_pongo_file(usb_device_handle_t, unsigned char*, unsigned int);
+int issue_pongo_command(usb_device_handle_t, char*);
 int tui(void);
 int optparse(int argc, char* argv[]);

@@ -218,9 +222,15 @@ bool set_found_pongo(bool val);
 uint64_t get_ecid_wait_for_dfu(void);
 uint64_t set_ecid_wait_for_dfu(uint64_t ecid);

+void write_stdout(char *buf, uint32_t len);
 void io_start(stuff_t *stuff);
 void io_stop(stuff_t *stuff);

 void print_credits(void);

+#ifdef TUI
+#include <newt.h>
+newtComponent get_tui_log();
+newtComponent set_tui_log(newtComponent co);
+#endif
 #endif
@@ -10,61 +10,17 @@
 #include <string.h>
 #include <locale.h>
 #include <unistd.h>
-#include <paleinfo.h>
-#include <pthread.h>
-#include <semaphore.h>
+#include <newt.h>
+#include <kerninfo.h>

 #define WIDTH 76
 #define HEIGHT 19

-#define CHECKBOX_STATE(flags, opt) (flags & opt) != 0 ? '*' : ' '
+#define PI_LOG_COLOR NEWT_COLORSET_CUSTOM(0)
+#define PI_STEP_CURRENT NEWT_COLORSET_CUSTOM(1)
+#define PI_STEP_OTHER NEWT_COLORSET_CUSTOM(2)

-#define STR_HELPER(x) #x
-#define STR(x) STR_HELPER(x)
-
-#define CLEAR_SCREEN printf("\033[2J")
-#define RESETFONT printf("\x1b[0m")
-#define PRINTAT(x, y, str) printf("\x1b[%d;%dH%s", y, x, str)
-#define PRINTATT(x, y, str) PRINTAT(tui_x_offset + x, tui_y_offset + y, str)
-#define PRINTATLEN(x, y, str, len) printf("\x1b[%d;%dH%." STR(len) "s", y, x, str)
-#define PRINTATLENT(x, y, str, len) PRINTATLEN(tui_x_offset + x, tui_y_offset + y, str, len)
-#define MOVETO(x, y) printf("\x1b[%d;%dH", y, x)
-#define MOVETOT(x, y) MOVETO(tui_x_offset + x, tui_y_offset + y)
-#define SETCOLOR(fg, bg) printf("\x1b[%d;%dm", fg, bg)
-#define SETCOLORA(fg, bg, a) printf("\x1b[" STR(fg) ";" STR(bg) ";" STR(a) "m")
-#define COLOR(fg, bg) "\x1b[" STR(fg) ";" STR(bg) "m"
-#define FG_BLACK 30
-#define FG_YELLOW 33
-#define FG_BLUE 34
-#define FG_WHITE 37
-#define BG_BLACK 40
-#define BG_YELLOW 43
-#define BG_BLUE 44
-#define BG_WHITE 47
-#define NONE 0
-#define BOLD 1
-extern bool supports_bright_colors;
-#define FG_BRIGHT_BLACK 90
-#define FG_BRIGHT_WHITE 97
-#define BG_BRIGHT_BLACK 100
-#define BG_BRIGHT_WHITE 107
-#define G1D4(set) printf("\x1b\x29%c", set)
-#define DSGON putchar('\x0e'); G1D4('0')
-#define DSGOFF putchar('\x0f'); G1D4('B')
-#define MOUSEON printf("\x1b[?1003h")
-#define MOUSEOFF printf("\x1b[?1003l")
-#define CIVIS printf("\x1b[?25l")
-#define CNORM printf("\x1b[?25h")
-#define SMCUP printf("\x1b[?1049h")
-#define RMCUP printf("\x1b[?1049l")
-#define DRAWLINE(x, y, len) \
-    MOVETO(x, y); \
-    DSGON; \
-    for (int i = 0; i < len; i++) { \
-        putchar(0x71); \
-    } \
-    DSGOFF;
-#define DRAWLINET(x, y, len) DRAWLINE(tui_x_offset + x, tui_y_offset + y, len)
+#define CHECKBOX_STATE(flags, opt) checkrain_options_enabled(flags, opt) ? '*' : ' '

 typedef enum tui_screens {
    ERROR_SCREEN = -1,
@@ -72,113 +28,22 @@ typedef enum tui_screens {
    MAIN_SCREEN = 1,
    OPTIONS_SCREEN = 2,
    ENTER_DFU_SCREEN = 3,
-    JAILBREAK_SCREEN = 4,
+    JAILBREAKING_SCREEN = 4,
    ENTER_RECOVERY_SCREEN = 5
 } tui_screen_t;

 typedef struct bitfield_checkbox_info {
-    uint64_t* flags_p;
-    uint64_t opt;
+    checkrain_option_p flags_p;
+    checkrain_option_t opt;
 } tui_bit_info_t;

-tui_screen_t tui_screen_main(void);
-void tui_screen_main_redraw(void);
-tui_screen_t tui_screen_options(void);
-void tui_screen_options_redraw(void);
-tui_screen_t tui_screen_enter_recovery(void);
-void tui_screen_enter_recovery_redraw(void);
-tui_screen_t tui_screen_enter_dfu(void);
-void tui_screen_enter_dfu_redraw(void);
-tui_screen_t tui_screen_jailbreak(void);
-void tui_screen_jailbreak_redraw(void);
+tui_screen_t tui_screen_main();
+tui_screen_t tui_screen_options();
+tui_screen_t tui_screen_enter_recovery();
+tui_screen_t tui_screen_enter_dfu();
+tui_screen_t tui_screen_jailbreak();

-int redraw_screen(void);
+int redraw_screen();

-void tui_draw_rectangle(int x1, int y1, int x2, int y2);
-
-#ifdef BUILD_TAG
-#define TUI_VERSION BUILD_TAG
-#else
-#define TUI_VERSION "Unknown Version"
-#endif
-
-extern int tui_x_offset;
-extern int tui_y_offset;
-
-extern int tui_mouse_x;
-extern int tui_mouse_y;
-
-enum {
-    TUI_INPUT_NONE,
-    TUI_INPUT_LEFT,
-    TUI_INPUT_RIGHT,
-    TUI_INPUT_UP,
-    TUI_INPUT_DOWN,
-    TUI_INPUT_MOUSE_MOVE,
-    TUI_INPUT_MOUSE_DOWN,
-    TUI_INPUT_MOUSE_UP,
-    TUI_INPUT_SELECT,
-    TUI_INPUT_TAB,
-    TUI_INPUT_TAB_BACK,
-    TUI_INPUT_BACKSPACE,
-    TUI_INPUT_ESCAPE,
-};
-
-enum {
-    TUI_EVENT_INPUT,
-    TUI_EVENT_CONNECTED_DEVICES_CHANGED,
-    TUI_EVENT_JAILBREAK_STATUS_CHANGED
-};
-
-int tui_get_input(void);
-void *tui_input_thread(void *arg);
-int tui_get_event(void);
-int tui_try_get_event(void);
-
-extern int tui_last_event;
-extern int tui_last_input;
-extern sem_t *tui_event_semaphore;
-extern char tui_last_key;
-
-void tui_devhelper(void);
-
-enum tui_device_mode {
-    TUI_DEVICE_MODE_NORMAL,
-    TUI_DEVICE_MODE_RECOVERY,
-    TUI_DEVICE_MODE_DFU
-};
-
-struct tui_connected_device {
-    uint64_t ecid;
-    char udid[44];
-    char version[0x20];
-    bool arm64;
-    enum tui_device_mode mode;
-    char product_type[0x20];
-	char display_name[0x20];
-    unsigned int cpid;
-    bool requires_passcode_disabled;
-    bool passcode_state;
-    struct tui_connected_device *next;
-};
-
-extern struct tui_connected_device *tui_connected_devices;
-
-void tui_jailbreak(void);
-extern bool tui_is_jailbreaking;
-extern int tui_jailbreak_stage;
-extern char *tui_jailbreak_status;
-
-void tui_jailbreak_status_changed(void);
-
-extern bool tui_is_restarting;
-void tui_terminate(int sig);
-
-extern bool tui_options_safe_mode;
-extern bool tui_options_verbose_boot;
-extern bool tui_options_force_revert;
-extern bool tui_options_flower_chain;
-
-extern char tui_options_boot_args[0x1e0 + 1];

 #endif
@@ -5,26 +5,24 @@
 #include <TargetConditionals.h>
 #endif

-#include <stdint.h>
+extern unsigned char checkra1n[];
+extern unsigned int checkra1n_len;

-extern uint8_t checkra1n[];
-extern uint32_t checkra1n_len;
+extern unsigned char checkra1n_kpf_pongo[];
+extern unsigned int checkra1n_kpf_pongo_len;

-extern uint8_t checkra1n_kpf_pongo_lzma[];
-extern uint32_t checkra1n_kpf_pongo_lzma_len;
+extern unsigned char ramdisk_dmg[];
+extern unsigned int ramdisk_dmg_len;

-extern uint8_t ramdisk_dmg_lzma[];
-extern uint32_t ramdisk_dmg_lzma_len;
+extern unsigned char binpack_dmg[];
+extern unsigned int binpack_dmg_len;

-extern uint8_t binpack_dmg[];
-extern uint32_t binpack_dmg_len;
+extern unsigned char Pongo_bin[];
+extern unsigned int Pongo_bin_len;

-extern uint8_t Pongo_bin[];
-extern uint32_t Pongo_bin_len;
-
-#if defined(__APPLE__) && (TARGET_OS_IPHONE || defined(DEV_BUILD) || defined(FORCE_HELPER))
-extern uint8_t libcheckra1nhelper_dylib[];
-extern uint32_t libcheckra1nhelper_dylib_len;
+#if defined(__APPLE__) && (TARGET_OS_IPHONE || defined(DEV_BUILD))
+extern unsigned char libcheckra1nhelper_dylib[];
+extern unsigned int libcheckra1nhelper_dylib_len;
 #endif

 #endif
@@ -8,15 +8,10 @@ Depends: usbmuxd
 Section: Utilities
 Priority: optional
 Homepage: https://palera.in
-Description: iOS 15.0+ semi-tethered checkm8 jailbreak
- palera1n is an iOS/iPadOS 15.0+ semi tethered jailbreak
+Description: iOS 15.0-16.5 semi-tethered checkm8 jailbreak
+ palera1n is an iOS/iPadOS 15.0-16.5 semi tethered jailbreak
 based on the checkm8 exploit.
 .
 palera1n is able to jailbreak the device in fakefs-rootful mode,
 where / is writable, as well as rootless mode, where / cannot be
 written to.
- .
- IMPORTANT: This does NOT make palera1n untethered or allow you to
- jailbreak your current device without a computer. It just allows
- you to jailbreak another iDevice using this device, given you have
- an appropriate cable. Also, the success rate is likely to be bad.
@@ -7,8 +7,8 @@ Author: palera1n team
 Section: Utilities
 Priority: optional
 Homepage: https://palera.in
-Description: iOS 15.0+ semi-tethered checkm8 jailbreak
- palera1n is an iOS/iPadOS 15.0+ semi tethered jailbreak
+Description: iOS 15.0-16.5 semi-tethered checkm8 jailbreak
+ palera1n is an iOS/iPadOS 15.0-16.5 semi tethered jailbreak
 based on the checkm8 exploit.
 .
 palera1n is able to jailbreak the device in fakefs-rootful mode,
@@ -0,0 +1,27 @@
+class Palera1n < Formula
+  desc "iOS 15.0-16.3.1 semi-tethered checkm8 jailbreak"
+  homepage "https://palera.in/"
+  url ""
+  version "2.0.0"
+  sha256 ""
+  license "MIT"
+
+  depends_on "cmake" => :build
+  depends_on "libimobiledevice" => :build
+  depends_on "libirecovery" => :build
+  depends_on "libusb" => :build
+  depends_on "libusbmuxd" => :build
+  depends_on "mbedtls" => :build
+  depends_on "pkg-config" => :build
+  depends_on "readline" => :build
+
+  def install
+    system "cmake", "."
+    system "make"
+    bin.install "output/palera1n" => "palera1n"
+  end
+
+  test do
+    system "false"
+  end
+end
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=palera1n
+Exec=~/usr/local/bin
+Icon=~/.palera1n/icon.ico
+Terminal=false
+Type=Application
@@ -1,91 +1,87 @@
 all: palera1n

-OBJDIR = obj
-GENDIR = gen
-RESOURCES_DIR = resources
-
-C_SRC = $(wildcard *.c)
-OBJS = $(patsubst %,$(OBJDIR)/%,$(C_SRC:.c=.c.o))
+OBJECTS  = main.o dfuhelper.o devhelper.o lockdown_helper.o
+OBJECTS += optparse.o override_file.o log.o lock_vars.o credits.o
+OBJECTS += fake_embedded.o exec_checkra1n.o pongo_helper.o
+OBJECTS += boyermoore_memmem.o

 ifeq (,$(findstring macosx, $(CFLAGS)))
 ifneq (,$(findstring version-min=, $(CFLAGS)))
-ifneq ($(NO_EMBED_HELPER),1)
-C_SRC += $(GENDIR)/gen-libcheckra1nhelper.dylib.c
+OBJECTS += xxd-libcheckra1nhelper.dylib.o
 endif
 endif
-endif
-
-ifeq ($(NO_EMBED_HELPER),1)
-CFLAGS += -DNO_EMBED_HELPER
-endif
-
-ifeq ($(DFUHELPER_AUTO_ONLY),1)
-CFLAGS += -DDFUHELPER_AUTO_ONLY
-endif

 ifeq ($(FORCE_HELPER),1)
-ifneq ($(NO_EMBED_HELPER),1)
-C_SRC += $(GENDIR)/gen-libcheckra1nhelper.dylib.c
-endif
+OBJECTS += xxd-libcheckra1nhelper.dylib.o
 CFLAGS += -DFORCE_HELPER
 BUILD_OPTIONS += FORCE_HELPER
 endif

 ifneq ($(NO_RAMDISK),1)
-C_SRC += $(GENDIR)/gen-ramdisk.dmg.lzma.c
+OBJECTS += xxd-ramdisk.dmg.o
 else
-CFLAGS += -DNO_RAMDISK -DRAMDISK_COMPRESSED_SIZE=\"0\"
+CFLAGS += -DNO_RAMDISK
 BUILD_OPTIONS += NO_RAMDISK
 endif
 ifneq ($(NO_KPF),1)
-C_SRC += $(GENDIR)/gen-checkra1n-kpf-pongo.lzma.c
+OBJECTS += xxd-checkra1n-kpf-pongo.o
 else
 CFLAGS += -DNO_KPF
 BUILD_OPTIONS += NO_KPF
 endif
 ifneq ($(NO_OVERLAY),1)
-C_SRC += $(GENDIR)/gen-binpack.dmg.c
+OBJECTS += xxd-binpack.dmg.o
 else
 CFLAGS += -DNO_OVERLAY
 BUILD_OPTIONS += NO_OVERLAY
 endif
 ifneq ($(NO_CHECKRAIN),1)
-C_SRC += $(GENDIR)/gen-checkra1n.c
+OBJECTS += xxd-checkra1n.o
 else
 CFLAGS += -DNO_CHECKRAIN
 BUILD_OPTIONS += NO_CHECKRAIN
 endif

 ifneq ($(NO_CUSTOM_PONGO),1)
-C_SRC += $(GENDIR)/gen-Pongo.bin.c
+OBJECTS += xxd-Pongo.bin.o
 else
 CFLAGS += -DNO_CUSTOM_PONGO
 BUILD_OPTIONS += NO_CUSTOM_PONGO
 endif

 ifeq ($(TUI),1)
+OBJECTS += tui_screen_enter_recovery.o tui_screen_enter_dfu.o tui_main.o
+OBJECTS += tui_screen_jailbreak.o tui_screen_main.o tui_screen_options.o
 BUILD_OPTIONS += TUI
 CFLAGS += -DTUI
 endif

-CHECKRA1N_VERSION ?= 0.1337.3
+ifeq ($(GUI),1)
+CXXOBJECTS = gui_alerts.o gui_design.o gui_device.o gui_main.o
+BUILD_OPTIONS += GUI
+CFLAGS += -DGUI
+endif
+
+CHECKRA1N_VERSION ?= 0.1337.1
 LIPO = lipo
 LDID = ldid

 ifeq ($(TARGET_OS),Darwin)
 ifneq ($(USE_LIBUSB),1)
+OBJECTS += usb_iokit.o
 else
 LIBS += -framework SystemConfiguration -framework Security
 BUILD_OPTIONS += USE_LIBUSB
 endif
 # add lto and debug symbols for lto
 CFLAGS += -flto=full -g
-LDFLAGS += -Wl,-object_path_lto,obj/lto.o
+LDFLAGS += -Wl,-object_path_lto,lto.o
 else
 USE_LIBUSB = 1
 endif

 ifeq ($(USE_LIBUSB),1)
+OBJECTS += usb_libusb.o
 CFLAGS += -DUSE_LIBUSB=1
 LIBS += $(DEP)/lib/libusb-1.0.a
 endif
@@ -101,97 +97,71 @@ endif

 CFLAGS += -DBUILD_OPTIONS=\""$(BUILD_OPTIONS)"\"

-ifeq ($(TARGET_OS),Linux)
-ifeq ($(UNAME),Linux)
-ifeq ($(CHECKRA1N_NAME),)
-ifeq ($(shell arch),x86_64)
-CHECKRA1N_NAME := linux-x86_64
-else ifeq ($(shell arch | grep -q 'i[3-7]86' && echo 1),1)
-CHECKRA1N_NAME := linux-x86
-else ifeq ($(shell arch | grep -v '\(arm\|aarch\)[a-z]\?\+64' | grep -q arm && echo 1),1)
-CHECKRA1N_NAME := linux-armel
-else ifeq  ($(shell arch | grep -q '\(arm\|aarch\)[a-z]\?\+64' && echo 1),1)
-CHECKRA1N_NAME := linux-arm64
-endif
-endif
-endif
-endif
-
-$(RESOURCES_DIR)/checkra1n-%:
-	curl -Lfo $@ https://assets.checkra.in/downloads/preview/$(CHECKRA1N_VERSION)/$$(echo $@ | cut -d/ -f2)
+checkra1n-%:
+	curl -LO https://assets.checkra.in/downloads/preview/$(CHECKRA1N_VERSION)/$@
 	chmod 755 $@

-$(RESOURCES_DIR)/checkra1n: $(RESOURCES_DIR)/checkra1n-macos usb.xml
+checkra1n: checkra1n-macos usb.xml
 ifeq ($(TARGET_OS),Darwin)
 ifneq (,$(findstring arm64, $(CFLAGS)))
-	$(LIPO) -thin arm64 -output $(RESOURCES_DIR)/checkra1n $(RESOURCES_DIR)/checkra1n-macos
+	$(LIPO) -thin arm64 -output checkra1n checkra1n-macos
 else ifneq (,$(findstring x86_64, $(CFLAGS)))
-	$(LIPO) -thin x86_64 -output $(RESOURCES_DIR)/checkra1n $(RESOURCES_DIR)/checkra1n-macos
+	$(LIPO) -thin x86_64 -output checkra1n checkra1n-macos
 else ifeq ($(shell arch),i386)
-	$(LIPO) -thin x86_64 -output $(RESOURCES_DIR)/checkra1n $(RESOURCES_DIR)/checkra1n-macos
+	$(LIPO) -thin x86_64 -output checkra1n checkra1n-macos
 else
-	$(LIPO) -thin $(shell arch) -output $(RESOURCES_DIR)/checkra1n $(RESOURCES_DIR)/checkra1n-macos
+	$(LIPO) -thin $(shell arch) -output checkra1n checkra1n-macos
 endif
 ifeq (,$(findstring macosx, $(CFLAGS)))
 ifneq (,$(findstring version-min=, $(CFLAGS)))
-	vtool -remove-build-version 1 -replace -output $(RESOURCES_DIR)/checkra1n $(RESOURCES_DIR)/checkra1n
-	vtool -set-build-version $(FAKE_PLATFORM) $(FAKE_MINOS) $(FAKE_SDK) -replace -output $(RESOURCES_DIR)/checkra1n $(RESOURCES_DIR)/checkra1n
-	install_name_tool -change /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit /System/Library/Frameworks/IOKit.framework/IOKit $(RESOURCES_DIR)/checkra1n
-	install_name_tool -change /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation $(RESOURCES_DIR)/checkra1n
-	$(LDID) -Susb.xml $(RESOURCES_DIR)/checkra1n
+	vtool -remove-build-version 1 -replace -output checkra1n checkra1n
+	vtool -set-build-version $(FAKE_PLATFORM) $(FAKE_MINOS) $(FAKE_SDK) -replace -output checkra1n checkra1n
+	install_name_tool -change /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit /System/Library/Frameworks/IOKit.framework/IOKit checkra1n
+	install_name_tool -change /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation checkra1n
+	$(LDID) -Susb.xml checkra1n
 endif
 endif
 else
-	cp $(RESOURCES_DIR)/checkra1n-$(CHECKRA1N_NAME) $(RESOURCES_DIR)/checkra1n
+	cp checkra1n-$(CHECKRA1N_NAME) checkra1n
 endif

-$(GENDIR)/gen-%.c: $(RESOURCES_DIR)/%
-	echo '#include <stdint.h>' > $(RESOURCES_DIR)/../$@
-	cd $(RESOURCES_DIR) && xxd -iC $$(echo $< | cut -d/ -f2) | sed -e 's/unsigned int/uint32_t/' -e 's/unsigned char/uint8_t/' >> ../$@
+xxd-%.c: %
+	xxd -iC $< > $@

+%.o: %.c $(wildcard ../include/*.h)
+	$(CC) -c $(CFLAGS) $<

-$(OBJDIR)/pongo_helper.c.o: pongo_helper.c $(wildcard ../include/*.h) $(RESOURCES_DIR)/ramdisk.dmg $(RESOURCES_DIR)/checkra1n-kpf-pongo
-	$(CC) -c -o $@ $(CFLAGS) -DRAMDISK_UNCOMPRESSED_SIZE="\"$$(wc -c < $(RESOURCES_DIR)/ramdisk.dmg | tr -d ' ')\"" -DKPF_UNCOMPRESSED_SIZE="\"$$(wc -c < $(RESOURCES_DIR)/checkra1n-kpf-pongo | tr -d ' ')\"" $<
+%.o: %.cpp $(wildcard ../include/*.h)
+	$(CXX) -c $(CXXFLAGS) $<

-$(OBJDIR)/%.c.o: $(GENDIR)/gen-%.c $(wildcard ../include/*.h)
-	$(CC) $(CFLAGS) -c -o $<
-
-$(OBJDIR)/%.c.o: %.c $(wildcard ../include/*.h)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-palera1n: $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o palera1n
+palera1n: $(OBJECTS)
+ifeq ($(GUI),1)
+	$(CXX) $(LDFLAGS) $(OBJECTS) $(CXXOBJECTS) $(LIBS) -o palera1n
+else
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o palera1n
+endif
 ifeq (,$(findstring macosx, $(CFLAGS)))
 ifneq (,$(findstring version-min=, $(CFLAGS)))
 	$(LDID) -Susb.xml palera1n
 endif
 endif

-$(RESOURCES_DIR)/libcheckra1nhelper.dylib: chkstk.S
-	$(CC) $(CFLAGS) $(LDFLAGS) -shared chkstk.S -o $@
+libcheckra1nhelper.dylib: chkstk.S
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared chkstk.S -o libcheckra1nhelper.dylib

-$(RESOURCES_DIR)/checkra1n-kpf-pongo:
-	curl -Lfo $@ https://cdn.nickchan.lol/palera1n/artifacts/kpf/iOS15/checkra1n-kpf-pongo
+checkra1n-kpf-pongo:
+	curl -LO https://cdn.nickchan.lol/palera1n/artifacts/kpf/checkra1n-kpf-pongo

-$(RESOURCES_DIR)/ramdisk.dmg.lzma: $(RESOURCES_DIR)/ramdisk.dmg
-	xz --format=lzma -vfc6ekT 0 $< > $@
+ramdisk.dmg:
+	curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg

-$(RESOURCES_DIR)/checkra1n-kpf-pongo.lzma: $(RESOURCES_DIR)/checkra1n-kpf-pongo
-	xz --format=lzma -vfc6ekT 0 $< > $@
+binpack.dmg:
+	curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg

-$(RESOURCES_DIR)/ramdisk.dmg:
-	curl -Lfo $@ https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg
-
-$(RESOURCES_DIR)/binpack.dmg:
-	curl -Lfo $@ https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg
-
-$(RESOURCES_DIR)/Pongo.bin:
-	curl -Lfo $@ https://cdn.nickchan.lol/palera1n/artifacts/kpf/iOS15/Pongo.bin
+Pongo.bin:
+	curl -LO https://cdn.nickchan.lol/palera1n/artifacts/kpf/Pongo.bin

 clean:
-	rm -rf $(OBJDIR)/*.o $(GENDIR)/*.c $(GENDIR)/*.o palera1n palera1n.dSYM libcheckra1nhelper.dylib
-
-distclean: clean
-	rm -rf $(RESOURCES_DIR)/*
+	rm -rf *.o palera1n checkra1n checkra1n.c palera1n.dSYM libcheckra1nhelper.dylib

 .PHONY: all clean
@@ -5,21 +5,19 @@
 #endif
 #define THE_PLUSH "Ploosh"

-#define NEKO_DEVELOPE_R "HAHALOSAH"
-
 #define T void
 #define R print_credits(void) {
-#define O fprintf(
-#define U stderr,
-#define B "#\n# palera1n: " BUILD_TAG " \n#\n"
-#define L "# ========  Made by  =======\n"
-#define E "# Made by: Nick Chan, " THE_PLUSH ", Khcrysalis, Mineek, staturnz, " BAKERAIN_DEVELOPE_R ", " NEKO_DEVELOPE_R " \n"
-#define M "# ======== Thanks to =======\n"
-#define A "# Thanks to: llsc12, Nebula, Lrdsnow, nikias (libimobiledevice),\n"
-#define K "# checkra1n team (Siguza, axi0mx, littlelailo et al.),\n"
-#define I "# Procursus Team (Hayden Seay, Cameron Katri, Keto et.al)\n"
-#define N "# ==========================\n\n"
-#define G );
+#define O fprintf
+#define U (
+#define B stderr
+#define L ,
+#define E "# == palera1n-c == \n#\n"
+#define M "# Made by: Nick Chan, " THE_PLUSH ", Samara, Nebula, staturnz, " BAKERAIN_DEVELOPE_R " \n#\n"
+#define A "# Thanks to: pythonplayer123, llsc12, Mineek, tihmstar, nikias\n"
+#define K "# (libimobiledevice), checkra1n team (Siguza, axi0mx, littlelailo\n"
+#define I "# et al.), Procursus Team (Hayden Seay, Cameron Katri, Keto et.al)\n\n"
+#define N )
+#define G ;
 #define S }

 T R O U B L E M A K I N G S
@@ -28,6 +28,8 @@
 #include <libimobiledevice/diagnostics_relay.h>
 #include <plist/plist.h>

+#include "lockdown_helper.h"
+
 #ifdef HAVE_LIB_TV_CONTROL
 #include <libtvcontrol.h>
 #endif
@@ -102,7 +104,6 @@ int unsubscribe_cmd(void)

 int devinfo_cmd(devinfo_t *dev, const char *udid)
 {
-	int ret;
 	uint64_t this_ecid = 0;
 	char *productType = NULL;
 	char *productVersion = NULL;
@@ -111,67 +112,67 @@ int devinfo_cmd(devinfo_t *dev, const char *udid)
 	char *CPUArchitecture = NULL;
 	idevice_t device = NULL;
 	lockdownd_client_t lockdown = NULL;
-	if ((ret = idevice_new_with_options(&device, udid, IDEVICE_LOOKUP_USBMUX)) != IDEVICE_E_SUCCESS)
+	if (idevice_new(&device, udid) != IDEVICE_E_SUCCESS)
 	{
-		LOG(LOG_ERROR, "Error connecting to device: %d (%s)", ret, lockdownd_strerror(ret));
+		LOG(LOG_ERROR, "Error connecting to device.");
 		return -1;
 	}
-	if ((ret = lockdownd_client_new_with_handshake(device, &lockdown, "palera1n")) != LOCKDOWN_E_SUCCESS)
+	if (lockdownd_client_new(device, &lockdown, "palera1n") != LOCKDOWN_E_SUCCESS)
 	{
 		(void)idevice_free(device);
-		LOG(LOG_ERROR, "Device is not in normal mode: %d (%s)", ret, lockdownd_strerror(ret));
+		LOG(LOG_ERROR, "Device is not in normal mode.");
 		return -1;
 	}
 	plist_t node = NULL;
-	if ((ret = lockdownd_get_value(lockdown, NULL, "UniqueChipID", &node)) != LOCKDOWN_E_SUCCESS)
+	if (lockdownd_get_value(lockdown, NULL, "UniqueChipID", &node) != LOCKDOWN_E_SUCCESS)
 	{
 		(void)lockdownd_client_free(lockdown);
 		(void)idevice_free(device);
-		LOG(LOG_ERROR, "Error getting ECID: %d (%s)", ret, lockdownd_strerror(ret));
+		LOG(LOG_ERROR, "Error getting ECID");
 		return -1;
 	}
 	plist_get_uint_val(node, &this_ecid);
 	plist_free(node);

 	node = NULL;
-	if ((ret = lockdownd_get_value(lockdown, NULL, "ProductType", &node)) != LOCKDOWN_E_SUCCESS)
+	if (lockdownd_get_value(lockdown, NULL, "ProductType", &node) != LOCKDOWN_E_SUCCESS)
 	{
 		(void)lockdownd_client_free(lockdown);
 		(void)idevice_free(device);
-		LOG(LOG_ERROR, "Error getting product type: %d (%s)", ret, lockdownd_strerror(ret));
+		LOG(LOG_ERROR, "Error getting product type");
 		return -1;
 	}
 	plist_get_string_val(node, &productType);
 	plist_free(node);

 	node = NULL;
-	if ((ret = lockdownd_get_value(lockdown, NULL, "CPUArchitecture", &node)) != LOCKDOWN_E_SUCCESS)
+	if (lockdownd_get_value(lockdown, NULL, "CPUArchitecture", &node) != LOCKDOWN_E_SUCCESS)
 	{
 		(void)lockdownd_client_free(lockdown);
 		(void)idevice_free(device);
-		LOG(LOG_ERROR, "Error getting CPU type: %d (%s)", ret, lockdownd_strerror(ret));
+		LOG(LOG_ERROR, "Error getting CPU type");
 		return -1;
 	}
 	plist_get_string_val(node, &CPUArchitecture);
 	plist_free(node);

 	node = NULL;
-	if ((ret = lockdownd_get_value(lockdown, NULL, "ProductVersion", &node)) != LOCKDOWN_E_SUCCESS)
+	if (lockdownd_get_value(lockdown, NULL, "ProductVersion", &node) != LOCKDOWN_E_SUCCESS)
 	{
 		(void)lockdownd_client_free(lockdown);
 		(void)idevice_free(device);
-		LOG(LOG_ERROR, "Error getting product version: %d (%s)", ret, lockdownd_strerror(ret));
+		LOG(LOG_ERROR, "Error getting product version");
 		return -1;
 	}
 	plist_get_string_val(node, &productVersion);
 	plist_free(node);

 	node = NULL;
-	if ((ret = lockdownd_get_value(lockdown, NULL, "BuildVersion", &node)) != LOCKDOWN_E_SUCCESS)
+	if (lockdownd_get_value(lockdown, NULL, "BuildVersion", &node) != LOCKDOWN_E_SUCCESS)
 	{
 		(void)lockdownd_client_free(lockdown);
 		(void)idevice_free(device);
-		LOG(LOG_ERROR, "Error getting build version: %d (%s)", ret, lockdownd_strerror(ret));
+		LOG(LOG_ERROR, "Error getting build version");
 		return -1;
 	}
 	plist_get_string_val(node, &buildVersion);
@@ -30,20 +30,14 @@
 #define FORMAT_KEY_VALUE 1
 #define FORMAT_XML 2

-#define NO_PHYSICAL_HOME_BUTTON (cpid == 0x8015 || (cpid == 0x8010 && (bdid == 0x08 || bdid == 0x0a || bdid == 0x0c || bdid == 0x0e)))
-#define IS_APPLE_TV_HD (cpid == 0x7000 && bdid == 0x34)
-#define IS_APPLE_TV_4K (cpid == 0x8011 && bdid == 0x02)
-#define IS_APPLE_HOME1 (cpid == 0x7000 && bdid == 0x38)
-#define IS_APPLE_HOME2 (cpid == 0x7000 && bdid == 0x1a)
-#define IS_APPLE_HOME  (IS_APPLE_HOME1 || IS_APPLE_HOME1)
-#define IS_APPLETV (IS_APPLE_TV_4K || IS_APPLE_TV_HD || IS_APPLE_HOME)
+#define NOHOME (cpid == 0x8015 || (cpid == 0x8010 && (bdid == 0x08 || bdid == 0x0a || bdid == 0x0c || bdid == 0x0e)))

 int dfuhelper_thr_running = false;

-static void step(int time, int time2, char *text, bool (*cond)(uint64_t), uint64_t cond_arg) {
+void step(int time, int time2, char *text, bool (*cond)(uint64_t), uint64_t cond_arg) {
    for (int i = time2; i < time; i++) {
 		printf(
-			(palerain_flags & palerain_option_no_colors) 
+			checkrain_options_enabled(host_flags, host_option_no_colors) 
 			? "\r\033[K%s (%d)" 
 			: BCYN "\r\033[K%s (%d)" CRESET, text, time - i + time2
 		);
@@ -52,14 +46,14 @@ static void step(int time, int time2, char *text, bool (*cond)(uint64_t), uint64
 		if (cond != NULL && cond(cond_arg)) pthread_exit(NULL);
    }
    printf(
-		(palerain_flags & palerain_option_no_colors)
+		checkrain_options_enabled(host_flags, host_option_no_colors)
 		? "\r%s (%d)" 
 		: CYN "\r%s (%d)" CRESET, text, time2
 	);
 	if (time2 == 0) puts("");
 }

-static int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
+int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
 	devinfo_t dev;
 	int ret;
 	ret = devinfo_cmd(&dev, usbmuxd_device->udid);
@@ -67,14 +61,32 @@ static int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
 		LOG(LOG_ERROR, "Unable to get device information");
 		return 0;
 	}
-	if (strcmp(dev.CPUArchitecture, "arm64")) {
+	if (strncmp(dev.CPUArchitecture, "arm64", strlen("arm64"))) {
 		devinfo_free(&dev);
 		LOG(LOG_WARNING, "Ignoring non-arm64 device...");
 		LOG(LOG_WARNING, "palera1n doesn't and never will work on A12+ (arm64e)");
 		return -1;
 	}
+	if (!strncmp(dev.productType, "iPhone10,", strlen("iPhone10,"))) {
+		if (!checkrain_options_enabled(host_flags, host_option_device_info))
+			LOG(LOG_VERBOSE2, "Product %s requires passcode to be disabled", dev.productType);
+		unsigned char passcode_state = 0;
+		ret = passstat_cmd(&passcode_state, usbmuxd_device->udid);
+		if (ret != 0) {
+			LOG(LOG_ERROR, "Failed to get passcode state");
+			devinfo_free(&dev);
+			return -1;
+		}
+		if (passcode_state) {
+			LOG(LOG_ERROR, "Passcode must be disabled on this device");
+			if (!checkrain_options_enabled(host_flags, host_option_device_info))
+				LOG(LOG_ERROR, "Additionally, passcode must never be set since a restore on iOS 16+");
+			devinfo_free(&dev);
+			return -1;
+		}
+	}

-	if ((palerain_flags & palerain_option_device_info)) {
+	if (checkrain_options_enabled(host_flags, host_option_device_info)) {
 		printf("Mode: normal\n");
 		printf("ProductType: %s\n", dev.productType);
 		printf("Architecture: %s\n", dev.CPUArchitecture);
@@ -86,42 +98,10 @@ static int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
 		unsubscribe_cmd();
 		return 0;
 	}
-
-	/* For Booting Linux etc */
-	if (!getenv("PALERA1N_BYPASS_PASSCODE_CHECK") &&
-		!strncmp(dev.productType, "iPhone10,", strlen("iPhone10,")
-		)) {
-		if (!(palerain_flags & palerain_option_device_info))
-			LOG(LOG_VERBOSE2, "Product %s requires passcode to be disabled", dev.productType);
-		unsigned char passcode_state = 0;
-		ret = passstat_cmd(&passcode_state, usbmuxd_device->udid);
-		if (ret != 0) {
-			LOG(LOG_ERROR, "Failed to get passcode state");
-			devinfo_free(&dev);
-			return -1;
-		}
-		if (passcode_state) {
-			LOG(LOG_ERROR, "Passcode must be disabled on this device");
-			if (!(palerain_flags & palerain_option_device_info))
-				LOG(LOG_ERROR, "Additionally, passcode must never be set since a restore on iOS 16+");
-			devinfo_free(&dev);
-			return -1;
-		}
-	}
-	
-	if (getenv("PALERA1N_BYPASS_PASSCODE_CHECK"))
-		LOG(LOG_WARNING, "Bypassed passcode check");	
-
-	if (verbose > 1) {
-		/* (LOG_VERBOSE - 3) or below*/
-		LOG(LOG_INFO, "Telling device with udid %s to enter recovery mode immediately", usbmuxd_device->udid);
-	} else {
-		/* At least (LOG_VERBOSE2 - 3) */
-		LOG(LOG_INFO, "Entering recovery mode");
-	}
+	LOG(LOG_INFO, "Telling device with udid %s to enter recovery mode immediately", usbmuxd_device->udid);
 	enter_recovery_cmd(usbmuxd_device->udid);
 	devinfo_free(&dev);
-	if ((palerain_flags & palerain_option_enter_recovery)) {
+	if (checkrain_options_enabled(host_flags, host_option_enter_recovery)) {
 		device_has_booted = true;
 		set_spin(0);
 		unsubscribe_cmd();
@@ -133,7 +113,7 @@ static bool conditional(uint64_t ecid) {
 	return get_ecid_wait_for_dfu() != ecid;
 }

-static void* connected_recovery_mode(struct irecv_device_info* info) {
+void* connected_recovery_mode(struct irecv_device_info* info) {
 	int ret;
 	uint64_t ecid;
 	uint32_t cpid, bdid;
@@ -151,66 +131,27 @@ static void* connected_recovery_mode(struct irecv_device_info* info) {
 		LOG(LOG_ERROR, "Cannot set auto-boot back to true");
 		return NULL;
 	}
-#if !defined(DFUHELPER_AUTO_ONLY)
-	if (IS_APPLE_TV_4K) {
-		LOG(LOG_INFO, "Depending on your connection method, you might need to press a button on your cable/board during reboot");
-	}
 	LOG(LOG_INFO, "Press Enter when ready for DFU mode");
 	getchar();
-#endif
-	if (IS_APPLETV) {
-		if (IS_APPLE_TV_HD) {
-			step(10, 8, "Hold menu + play button", NULL, 0);
-			set_ecid_wait_for_dfu(ecid);
-			ret = exitrecv_cmd(ecid);
-			if (ret) {
-				LOG(LOG_ERROR, "Cannot exit recovery mode");
-				set_ecid_wait_for_dfu(0);
-				return NULL;
-			}
-			printf("\r\033[K");
-			step(8, 0, "Hold menu + play button", conditional, ecid);
-		} else if (IS_APPLE_TV_4K) {
-			step(2, 0, "About to reboot device", NULL, 0);
-			set_ecid_wait_for_dfu(ecid);
-			ret = exitrecv_cmd(ecid);
-			if (ret) {
-				LOG(LOG_ERROR, "Cannot exit recovery mode");
-				set_ecid_wait_for_dfu(0);
-				return NULL;
-			}
-			step(4, 0, "Waiting for device to reconnect in DFU mode", conditional, ecid);
-		} else if (IS_APPLE_HOME) {
-			step(6, 4, "Put device in upside down orientation", NULL, 0);
-			set_ecid_wait_for_dfu(ecid);
-			ret = exitrecv_cmd(ecid);
-			if (ret) {
-				LOG(LOG_ERROR, "Cannot exit recovery mode");
-				set_ecid_wait_for_dfu(0);
-				return NULL;
-			}
-			step(4, 0, "Put device upside down orientation", conditional, ecid);
-		}
-	} else if (cpid != 0x8012) {
-		if (NO_PHYSICAL_HOME_BUTTON)
-			step(4, 2, "Hold volume down + side button", NULL, 0);
-		else
-			step(4, 2, "Hold home + power button", NULL, 0);
-		set_ecid_wait_for_dfu(ecid);
-		ret = exitrecv_cmd(ecid);
-		if (ret) {
-			LOG(LOG_ERROR, "Cannot exit recovery mode");
-			set_ecid_wait_for_dfu(0);
-			return NULL;
-		}
-		printf("\r\033[K");
-		if (NO_PHYSICAL_HOME_BUTTON) {
-			step(2, 0, "Hold volume down + side button", NULL, 0);
-			step(10, 0, "Hold volume down button", conditional, ecid);
-		} else {
-			step(2, 0, "Hold home + power button", NULL, 0);
-			step(10, 0, "Hold home button", conditional, ecid);
-		}
+	step(3, 0, "Get ready", NULL, 0);
+	if (NOHOME) 
+		step(4, 2, "Hold volume down + side button", NULL, 0);
+	else
+		step(4, 2, "Hold home + power button", NULL, 0);
+	set_ecid_wait_for_dfu(ecid);
+	ret = exitrecv_cmd(ecid);
+	if (ret) {
+		LOG(LOG_ERROR, "Cannot exit recovery mode");
+		set_ecid_wait_for_dfu(0);
+		return NULL;
+	}
+	printf("\r\033[K");
+	if (NOHOME) {
+		step(2, 0, "Hold volume down + side button", NULL, 0);
+		step(10, 0, "Hold volume down button", conditional, ecid);
+	} else {
+		step(2, 0, "Hold home + power button", NULL, 0);
+		step(10, 0, "Hold home button", conditional, ecid);
 	}
 	if (get_ecid_wait_for_dfu() == ecid) {
 		LOG(LOG_WARNING, "Whoops, device did not enter DFU mode");
@@ -223,31 +164,26 @@ static void* connected_recovery_mode(struct irecv_device_info* info) {
 	return NULL;
 }

-static void* connected_dfu_mode(struct irecv_device_info* info) {
+void* connected_dfu_mode(struct irecv_device_info* info) {
 	if (get_ecid_wait_for_dfu() == info->ecid) {
 		set_ecid_wait_for_dfu(0);
 		puts("");
 		LOG(LOG_INFO, "Device entered DFU mode successfully");
 	}
-	unsigned int bdid = info->bdid;
-	unsigned int cpid = info->cpid;
-	if (IS_APPLE_HOME) {
-		step(2, 0, "Put device in upright orientation", NULL, 0);
-	}
 	set_spin(0);
 	unsubscribe_cmd();
 	pthread_exit(NULL);
 	return NULL;
 }

-static void device_event_cb(const usbmuxd_event_t *event, void* userdata) {
+void device_event_cb(const usbmuxd_event_t *event, void* userdata) {
 	if (event->device.conn_type != CONNECTION_TYPE_USB) return;
 	switch (event->event) {
 	case UE_DEVICE_ADD:
 		LOG(LOG_VERBOSE, "Normal mode device connected");
-		if ((palerain_flags & palerain_option_exit_recovery)) {
+		if (checkrain_options_enabled(host_flags, host_option_exit_recovery)) {
 			break;
-		} else if ((palerain_flags & palerain_option_reboot_device)) {
+		} else if (checkrain_options_enabled(host_flags, host_option_reboot_device)) {
 			int ret = reboot_cmd(event->device.udid);
 			if (!ret) {
 				LOG(LOG_INFO, "Restarted device");
@@ -265,7 +201,7 @@ static void device_event_cb(const usbmuxd_event_t *event, void* userdata) {
 	}
 }

-static void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) {
+void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) {
 	pthread_t recovery_thread, dfu_thread;
 	int ret;
 	
@@ -275,9 +211,9 @@ static void irecv_device_event_cb(const irecv_device_event_t *event, void* userd
 				event->mode == IRECV_K_RECOVERY_MODE_2 || 
 				event->mode == IRECV_K_RECOVERY_MODE_3 || 
 				event->mode == IRECV_K_RECOVERY_MODE_4) {
-				if (!(palerain_flags & palerain_option_device_info))
-					LOG(LOG_VERBOSE, "Recovery mode device %" PRIu64 " connected", event->device_info->ecid);
-				if ((palerain_flags & palerain_option_exit_recovery)) {
+				if (!checkrain_options_enabled(host_flags, host_option_device_info))
+					LOG(LOG_VERBOSE, "Recovery mode device %ld connected", event->device_info->ecid);
+				if (checkrain_options_enabled(host_flags, host_option_exit_recovery)) {
 					ret = exitrecv_cmd(event->device_info->ecid);
 					if (!ret) {
 						LOG(LOG_INFO, "Exited recovery mode");
@@ -292,7 +228,7 @@ static void irecv_device_event_cb(const irecv_device_event_t *event, void* userd
 					break;
 				}

-				if ((palerain_flags & palerain_option_device_info)) {
+				if (checkrain_options_enabled(host_flags, host_option_device_info)) {
 					recvinfo_t info;
 					ret = recvinfo_cmd(&info, event->device_info->ecid);
 					if (ret) {
@@ -311,14 +247,14 @@ static void irecv_device_event_cb(const irecv_device_event_t *event, void* userd
 					break;
 				}

-				if ((palerain_flags & palerain_option_enter_recovery) ||
-					(palerain_flags & palerain_option_reboot_device)) return;
+				if (checkrain_options_enabled(host_flags, host_option_enter_recovery) ||
+					checkrain_options_enabled(host_flags, host_option_reboot_device)) return;
 				pthread_create(&recovery_thread, NULL, (pthread_start_t)connected_recovery_mode, event->device_info);
 			} else if (event->mode == IRECV_K_DFU_MODE) {
-				if (!(palerain_flags & palerain_option_device_info))
-					LOG(LOG_VERBOSE, "DFU mode device %" PRIu64 " connected", event->device_info->ecid);
+				if (!checkrain_options_enabled(host_flags, host_option_device_info))
+					LOG(LOG_VERBOSE, "DFU mode device %ld connected", event->device_info->ecid);

-				if ((palerain_flags & palerain_option_device_info)) {
+				if (checkrain_options_enabled(host_flags, host_option_device_info)) {
 					recvinfo_t info;
 					ret = recvinfo_cmd(&info, event->device_info->ecid);
 					if (ret) {
@@ -338,9 +274,9 @@ static void irecv_device_event_cb(const irecv_device_event_t *event, void* userd
 				}

 				if (
-					(palerain_flags & palerain_option_exit_recovery) ||
-					(palerain_flags & palerain_option_enter_recovery) ||
-					(palerain_flags & palerain_option_reboot_device)) {
+					checkrain_options_enabled(host_flags, host_option_exit_recovery) ||
+					checkrain_options_enabled(host_flags, host_option_enter_recovery) ||
+					checkrain_options_enabled(host_flags, host_option_reboot_device)) {
 						break;
 				}
 				pthread_create(&dfu_thread, NULL, (pthread_start_t)connected_dfu_mode, event->device_info);
@@ -15,7 +15,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <inttypes.h>
 #include <sys/utsname.h>

 #if defined(__APPLE__)
@@ -23,12 +22,8 @@
 #endif

 extern char **environ;
-extern char* gOverrideLibcheckra1nHelper;

 #include <palerain.h>
-#ifdef TUI
-#include <tui.h>
-#endif
 #include <xxd-embedded.h>
 char* pongo_path = NULL;
 bool external_pongo = false;
@@ -40,13 +35,13 @@ int exec_checkra1n(void) {
 	LOG(LOG_INFO, "About to execute checkra1n");
 	int fd_checkra1n, fd_pongo, ret;
 	char* checkra1n_path = NULL;
+	if (ext_checkra1n != NULL) {
+		checkra1n_path = ext_checkra1n;
+		goto checkra1n_exec;
+	}
 #ifndef NO_CUSTOM_PONGO
 	if (pongo_path == NULL) {
 		pongo_path = malloc(strlen(tmpdir) + 20);
-		if (pongo_path == NULL) {
-			LOG(LOG_FATAL, "memory allocation failed\n");
-			return -1;
-		}
 		snprintf(pongo_path, strlen(tmpdir) + 20, "%s/Pongo.bin.XXXXXX", tmpdir);
 		fd_pongo = mkstemp(pongo_path);
 		if (fd_pongo == -1) {
@@ -56,7 +51,7 @@ int exec_checkra1n(void) {
 		}
 		ssize_t didWrite_Pongo_bin = write(fd_pongo, Pongo_bin, Pongo_bin_len);
 		if (didWrite_Pongo_bin != (ssize_t)Pongo_bin_len) {
-			LOG(LOG_FATAL, "Size written to %s does not match expected: %zd != %" PRIu32 ": %d (%s)", pongo_path, didWrite_Pongo_bin, Pongo_bin_len, errno, strerror(errno));
+			LOG(LOG_FATAL, "Size written to %s does not match expected: %lld != %d: %d (%s)", pongo_path, didWrite_Pongo_bin, Pongo_bin_len, errno, strerror(errno));
 			close(fd_pongo);
 			unlink(pongo_path);
 			free(pongo_path);
@@ -65,40 +60,32 @@ int exec_checkra1n(void) {
 		}
 	} else external_pongo = true;
 #endif
-	if (ext_checkra1n != NULL) {
-		checkra1n_path = ext_checkra1n;
-	} else {
-		checkra1n_path = malloc(strlen(tmpdir) + 20);
-		if (checkra1n_path == NULL) {
-			LOG(LOG_FATAL, "memory allocation failed\n");
-			return -1;
-		}
-		snprintf(checkra1n_path, strlen(tmpdir) + 20, "%s/checkra1n.XXXXXX", tmpdir);
-		fd_checkra1n = mkstemp(checkra1n_path);
-		if (fd_checkra1n == -1) {
-			LOG(LOG_FATAL, "Cannot open temporary file %s: %d (%s)", checkra1n_path, errno, strerror(errno));
-			free(checkra1n_path);
-			checkra1n_path = NULL;
-			return -1;
-		}
-		ssize_t didWrite_checkra1n = write(fd_checkra1n, checkra1n, checkra1n_len);
-		if (didWrite_checkra1n != (ssize_t)checkra1n_len) {
-			LOG(LOG_FATAL, "Size written to %s does not match expected: %zd != %" PRIu32 ": %d (%s)", checkra1n_path, didWrite_checkra1n, checkra1n_len, errno, strerror(errno));
-			close(fd_checkra1n);
-			unlink(checkra1n_path);
-			free(checkra1n_path);
-			checkra1n_path = NULL;
-			return -1;
-		}
+	checkra1n_path = malloc(strlen(tmpdir) + 20);
+	snprintf(checkra1n_path, strlen(tmpdir) + 20, "%s/checkra1n.XXXXXX", tmpdir);
+	fd_checkra1n = mkstemp(checkra1n_path);
+	if (fd_checkra1n == -1) {
+		LOG(LOG_FATAL, "Cannot open temporary file %s: %d (%s)", checkra1n_path, errno, strerror(errno));
+		free(checkra1n_path);
+		checkra1n_path = NULL;
+		return -1;
+	}
+	ssize_t didWrite_checkra1n = write(fd_checkra1n, checkra1n, checkra1n_len);
+	if (didWrite_checkra1n != (ssize_t)checkra1n_len) {
+		LOG(LOG_FATAL, "Size written to %s does not match expected: %lld != %d: %d (%s)", checkra1n_path, didWrite_checkra1n, checkra1n_len, errno, strerror(errno));
 		close(fd_checkra1n);
-		ret = chmod(checkra1n_path, 0700);
-		if (ret) {
-			LOG(LOG_FATAL, "Cannot chmod %s: %d (%s)", checkra1n_path, errno, strerror(errno));
-			unlink(checkra1n_path);
-			free(checkra1n_path);
-			checkra1n_path = NULL;
-			return -1;
-		}
+		unlink(checkra1n_path);
+		free(checkra1n_path);
+		checkra1n_path = NULL;
+		return -1;
+	}
+	close(fd_checkra1n);
+	ret = chmod(checkra1n_path, 0700);
+	if (ret) {
+		LOG(LOG_FATAL, "Cannot chmod %s: %d (%s)", checkra1n_path, errno, strerror(errno));
+		unlink(checkra1n_path);
+		free(checkra1n_path);
+		checkra1n_path = NULL;
+		return -1;
 	}
 #if defined(__APPLE__) && defined(__arm64__) && (TARGET_OS_IPHONE || defined(FORCE_HELPER))
 	char* libcheckra1nhelper_dylib_path = NULL;
@@ -110,15 +97,7 @@ int exec_checkra1n(void) {
 #if !defined(FORCE_HELPER)
 		if (darwinMajor < 20) {
 #endif
-		if (gOverrideLibcheckra1nHelper) {
-			libcheckra1nhelper_dylib_path = gOverrideLibcheckra1nHelper;
-			goto setenv_ra1n;
-		}
 			libcheckra1nhelper_dylib_path = malloc(strlen(tmpdir) + 40);
-			if (libcheckra1nhelper_dylib_path == NULL) {
-				LOG(LOG_FATAL, "memory allocation failed\n");
-				return -1;
-			}
 			snprintf(libcheckra1nhelper_dylib_path, strlen(tmpdir) + 40, "%s/libcheckra1nhelper.dylib.XXXXXX", tmpdir);
 			int helper_fd = mkstemp(libcheckra1nhelper_dylib_path);
 			if (helper_fd == -1) {
@@ -127,7 +106,7 @@ int exec_checkra1n(void) {
 			}
 			ssize_t didWrite_libcheckra1nhelper = write(helper_fd, libcheckra1nhelper_dylib, libcheckra1nhelper_dylib_len);
 			if ((unsigned int)didWrite_libcheckra1nhelper != libcheckra1nhelper_dylib_len) {
-				LOG(LOG_FATAL, "Size written does not match expected: %zd != %" PRIu32 ": %d (%s)", didWrite_libcheckra1nhelper, libcheckra1nhelper_dylib_len, errno, strerror(errno));
+				LOG(LOG_FATAL, "Size written does not match expected: %lld != %d: %d (%s)", didWrite_libcheckra1nhelper, libcheckra1nhelper_dylib_len, errno, strerror(errno));
 				close(helper_fd);
 				unlink(libcheckra1nhelper_dylib_path);
 				return -1;
@@ -139,42 +118,40 @@ int exec_checkra1n(void) {
 				unlink(libcheckra1nhelper_dylib_path);
 				return -1;
 			}
-setenv_ra1n:
 			setenv("DYLD_INSERT_LIBRARIES", libcheckra1nhelper_dylib_path, 1);
 #if !defined(FORCE_HELPER)
 		}
 #endif
 	}
 #endif
+checkra1n_exec: {};
 	char args[0x10] = "-E";
-	if ((palerain_flags & palerain_option_demote)) strncat(args, "d", 0xf);
-	if (!(palerain_flags & palerain_option_checkrain_is_clone)) {
+	if (checkrain_options_enabled(host_flags, host_option_demote)) strncat(args, "d", 0xf);
+	if (!checkrain_options_enabled(host_flags, palerain_option_checkrain_is_clone)) {
 		strncat(args, "p", 0xf);
 		if (verbose >= 2) strncat(args, "v", 0xf);
-		if ((palerain_flags & palerain_option_no_colors)) strncat(args, "n", 0xf);
+		if (checkrain_options_enabled(host_flags, host_option_no_colors)) strncat(args, "n", 0xf);
 	} else {
 		strncat(args, "R", 0xf);
 	}
 	LOG(LOG_VERBOSE5, args);
 	if (pongo_path != NULL) LOG(LOG_VERBOSE5, pongo_path);
 	pid_t pid;
-	posix_spawn_file_actions_t action;
-    posix_spawn_file_actions_init(&action);
-#ifdef TUI
-	if (tui_is_jailbreaking) {
-		// silence checkra1n
-		posix_spawn_file_actions_addopen(&action, 1, "/dev/null", O_WRONLY, 0);
-		posix_spawn_file_actions_addopen(&action, 2, "/dev/null", O_WRONLY, 0);
+	if (pongo_path != NULL) {
+		ret = posix_spawn(&pid, checkra1n_path, NULL, NULL, (char* []){
+			checkra1n_path,
+			args,
+			"-k",
+			pongo_path,
+			NULL
+		}, environ);
+	} else {
+		ret = posix_spawn(&pid, checkra1n_path, NULL, NULL, (char* []){
+			checkra1n_path,
+			args,
+			NULL
+		}, environ);
 	}
-#endif
-	ret = posix_spawn(&pid, checkra1n_path, &action, NULL, (char* []){
-		checkra1n_path,
-		args,
-		"-k",
-		pongo_path,
-		NULL
-	}, environ);
-	posix_spawn_file_actions_destroy(&action);
 	if (ret) {
 		LOG(LOG_FATAL, "Cannot posix spawn %s: %d (%s)", checkra1n_path, errno, strerror(errno));
 		if (ext_checkra1n != NULL) unlink(checkra1n_path);
@@ -195,10 +172,10 @@ setenv_ra1n:
 	pongo_path = NULL;
 #if defined(__APPLE__) && defined(__arm64__) && (TARGET_OS_IPHONE || defined(FORCE_HELPER))
 	if (libcheckra1nhelper_dylib_path != NULL) {
-		if (!gOverrideLibcheckra1nHelper) unlink(libcheckra1nhelper_dylib_path);
+		unlink(libcheckra1nhelper_dylib_path);
 		unsetenv("DYLD_INSERT_LIBRARIES");
 		unsetenv("DYLD_FORCE_FLAT_NAMESPACE");
-		if (!gOverrideLibcheckra1nHelper) free(libcheckra1nhelper_dylib_path);
+		free(libcheckra1nhelper_dylib_path);
 		libcheckra1nhelper_dylib_path = NULL;
 	}
 #endif
@@ -1,13 +1,13 @@
 #include <stdlib.h>

 #ifdef NO_KPF
-unsigned char* checkra1n_kpf_pongo_lzma = NULL;
-unsigned int checkra1n_kpf_pongo_lzma_len = 0;
+unsigned char* checkra1n_kpf_pongo = NULL;
+unsigned int checkra1n_kpf_pongo_len = 0;
 #endif

 #ifdef NO_RAMDISK
-unsigned char* ramdisk_dmg_lzma = NULL;
-unsigned int ramdisk_dmg_lzma_len = 0;
+unsigned char* ramdisk_dmg = NULL;
+unsigned int ramdisk_dmg_len = 0;
 #endif

 #ifdef NO_CHECKRAIN
@@ -24,8 +24,3 @@ unsigned int binpack_dmg_len = 0;
 unsigned char* Pongo_bin = NULL;
 unsigned int Pongo_bin_len = 0;
 #endif
-
-#ifdef NO_EMBED_HELPER
-unsigned char* libcheckra1nhelper_dylib = NULL;
-unsigned int libcheckra1nhelper_dylib_len = 0;
-#endif
@@ -1 +0,0 @@
-*.o
@@ -1 +0,0 @@
-.
@@ -0,0 +1,67 @@
+#include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include <gui.h>
+
+// 50/50 chance this will be removed for in-window alerts
+#if __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#define IDOK 1
+#define IDCANCEL 2
+#define AL kCFUserNotificationNoteAlertLevel
+#elif _WIN32
+#include <windows.h>
+#include <winuser.h>
+#elif __linux__
+// #include <gtk/gtk.h>
+#elif BSD
+#elif __ANDROID__
+#else
+#endif
+
+void send_alert(const char *title, const char *msg) {
+#if __APPLE__
+    CFStringRef header_ref = CFStringCreateWithCString(NULL, title, strlen(title));
+    CFStringRef message_ref = CFStringCreateWithCString(NULL, msg, strlen(msg));
+    // CFStringRef url_ref = CFStringCreateWithCString( NULL, "",  strlen("") );
+    CFURLRef icon_ref = CFURLCreateWithString(kCFAllocatorDefault, NULL, NULL);
+    CFOptionFlags result;
+
+    CFUserNotificationDisplayAlert(0, AL, icon_ref, NULL, NULL, header_ref, message_ref, NULL, NULL, NULL, &result);
+    CFRelease(header_ref);
+    CFRelease(message_ref);
+#elif _WIN32
+    MessageBox(0, msg, title, MB_OK);
+#elif __linux__
+    char line[256];
+    FILE *fp;
+
+    fp=popen("zenity --version","r");
+    if (fp==NULL) {
+        perror("Pipe returned a error");
+    } else {
+        while (fgets(line,sizeof(line),fp)) printf("%s",line);
+        pclose(fp);
+    }
+
+    char *str_msg = (char*)malloc(40+strlen(title)+strlen(msg)+1);
+    sprintf(str_msg, "zenity --info --title '%s' --text '%s'", title, msg);
+    fp=popen(str_msg, "r");
+
+    if (fp==NULL) {
+        perror("Pipe returned a error");
+    } else {
+        printf("Exit code: %i\n",WEXITSTATUS(pclose(fp)));
+    }
+#elif BSD
+#elif __ANDROID__
+#else
+#endif
+}
@@ -0,0 +1,372 @@
+#include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <hello_imgui/hello_imgui.h>
+#include <imgui/imgui_internal.h>
+
+#include <common.h>
+#include <design.h>
+
+
+/* -----------------  [  Animation Varibles ]  ----------------- */
+
+float btn_w = 0.0f;
+float btn_h = 0.0f;
+float btn_x = 0.0f;
+float btn_y = 0.0f;
+float box_w = 0.0f;
+float box_h = 0.0f;
+float box_x = 0.0f;
+float box_y = 0.0f;
+
+
+/* -----------------  [  UI Init/Reset  ]  ----------------- */
+
+void init_colors() {
+    auto &colors = ImGui::GetStyle().Colors;
+    colors[ImGuiCol_WindowBg] = ImVec4{0.21f, 0.23f, 0.31f, 1.0f};
+    colors[ImGuiCol_MenuBarBg] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+
+    // Border
+    colors[ImGuiCol_Border] = ImVec4{0.44f, 0.37f, 0.61f, 0.0f};
+    colors[ImGuiCol_BorderShadow] = ImVec4{0.0f, 0.0f, 0.0f, 0.0f};
+
+    // Text
+    colors[ImGuiCol_Text] = ImVec4{1.0f, 1.0f, 1.0f, 1.0f};
+    colors[ImGuiCol_TextDisabled] = ImVec4{0.5f, 0.5f, 0.5f, 1.0f};
+
+    // Headers
+    colors[ImGuiCol_Header] = ImVec4{0.13f, 0.13f, 0.17, 1.0f};
+    colors[ImGuiCol_HeaderHovered] = ImVec4{0.19f, 0.2f, 0.25f, 1.0f};
+    colors[ImGuiCol_HeaderActive] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+
+    // Buttons
+    colors[ImGuiCol_Button] = ImVec4{0.9f, 0.9f, 0.9f, 1.0f};
+    colors[ImGuiCol_ButtonHovered] = ImVec4{0.9f, 0.9f, 0.9f, 1.0f};
+    colors[ImGuiCol_ButtonActive] = ImVec4{0.9f, 0.9f, 0.9f, 1.0f};
+    colors[ImGuiCol_CheckMark] = ImVec4{0.9f, 0.9f, 0.9f, 1.0f};
+
+    // Popups
+    colors[ImGuiCol_PopupBg] = ImVec4{0.1f, 0.1f, 0.13f, 0.92f};
+
+    // Slider
+    colors[ImGuiCol_SliderGrab] = ImVec4{0.44f, 0.37f, 0.61f, 0.54f};
+    colors[ImGuiCol_SliderGrabActive] = ImVec4{0.74f, 0.58f, 0.98f, 0.54f};
+
+    // Frame BG
+    colors[ImGuiCol_FrameBg] = ImVec4{0.13f, 0.13f, 0.15f, 0.7f};
+    colors[ImGuiCol_FrameBgHovered] = ImVec4{0.13f, 0.13f, 0.15f, 0.7f};
+    colors[ImGuiCol_FrameBgActive] = ImVec4{0.13f, 0.13f, 0.15f, 0.7f};
+
+    // Tabs
+    colors[ImGuiCol_Tab] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+    colors[ImGuiCol_TabHovered] = ImVec4{0.24, 0.24f, 0.32f, 1.0f};
+    colors[ImGuiCol_TabActive] = ImVec4{0.2f, 0.22f, 0.27f, 1.0f};
+    colors[ImGuiCol_TabUnfocused] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+    colors[ImGuiCol_TabUnfocusedActive] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+
+    // Title
+    colors[ImGuiCol_TitleBg] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+    colors[ImGuiCol_TitleBgActive] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+    colors[ImGuiCol_TitleBgCollapsed] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+
+    // Scrollbar
+    colors[ImGuiCol_ScrollbarBg] = ImVec4{0.1f, 0.1f, 0.13f, 1.0f};
+    colors[ImGuiCol_ScrollbarGrab] = ImVec4{0.16f, 0.16f, 0.21f, 1.0f};
+    colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4{0.19f, 0.2f, 0.25f, 1.0f};
+    colors[ImGuiCol_ScrollbarGrabActive] = ImVec4{0.24f, 0.24f, 0.32f, 1.0f};
+
+    // Seperator
+    colors[ImGuiCol_Separator] = ImVec4{0.44f, 0.37f, 0.61f, 1.0f};
+    colors[ImGuiCol_SeparatorHovered] = ImVec4{0.74f, 0.58f, 0.98f, 1.0f};
+    colors[ImGuiCol_SeparatorActive] = ImVec4{0.84f, 0.58f, 1.0f, 1.0f};
+
+    // Resize Grip
+    colors[ImGuiCol_ResizeGrip] = ImVec4{0.44f, 0.37f, 0.61f, 0.29f};
+    colors[ImGuiCol_ResizeGripHovered] = ImVec4{0.74f, 0.58f, 0.98f, 0.29f};
+    colors[ImGuiCol_ResizeGripActive] = ImVec4{0.84f, 0.58f, 1.0f, 0.29f};
+
+    // Docking
+    colors[ImGuiCol_DockingPreview] = ImVec4{0.44f, 0.37f, 0.61f, 1.0f};
+}
+
+void init_style() {
+    auto &style = ImGui::GetStyle();
+    style.TabRounding = 0;
+    style.ScrollbarRounding = 0;
+    style.WindowRounding = 0;
+    style.GrabRounding = 0;
+    style.FrameRounding = 20;
+    style.PopupRounding = 0;
+    style.ChildRounding = 0;
+}
+
+void reset_design() {
+    ImGui::SetCursorPos(ImVec2(0, 0));
+    init_colors();
+    init_style();
+}
+
+void reset_views() {
+    waiting_for_device = false;
+    unsupported_device = false;
+    supported_device = false;
+    recovery_wait = false;
+    jailbreak = false;
+    enter_dfu = false;
+    dfu_helper = false;
+}
+
+
+
+/* -----------------  [  UI Element Styles  ]  ----------------- */
+
+void image_btn_style() {
+    auto &colors = ImGui::GetStyle().Colors;
+    colors[ImGuiCol_Button] = ImVec4{1.0f, 1.0f, 1.0f, 1.0f};
+    colors[ImGuiCol_ButtonHovered] = ImVec4{0.95f, 0.95f, 0.95f, 1.0f};
+    colors[ImGuiCol_ButtonActive] = ImVec4{0.95f, 0.95f, 0.95f, 1.0f};
+    colors[ImGuiCol_CheckMark] = ImVec4{0.95f, 0.95f, 0.95f, 1.0f};
+    colors[ImGuiCol_Text] = ImVec4{0.1f, 0.1f, 0.1f, 1.0f};
+}
+
+void image_btn_style_alt() {
+    auto &colors = ImGui::GetStyle().Colors;
+    colors[ImGuiCol_Button] = ImVec4{0.0f, 0.0f, 0.0f, 0.0f};
+    colors[ImGuiCol_ButtonHovered] = ImVec4{0.0f, 0.0f, 0.0f, 0.0f};
+    colors[ImGuiCol_ButtonActive] = ImVec4{0.0f, 0.0f, 0.0f, 0.0f};
+    colors[ImGuiCol_CheckMark] = ImVec4{0.0f, 0.0f, 0.0f, 0.0f};
+    colors[ImGuiCol_Text] = ImVec4{0.0f, 0.0f, 0.0f, 0.0f};
+}
+
+
+
+/* -----------------  [  IDK Anymore  ]  ----------------- */
+
+std::string addstr2(const char *str1, const char *str2) {
+    size_t str1_len = strlen(str1);
+    size_t str2_len = strlen(str2);
+    int buf_size = (int)str1_len + (int)str2_len + 1;
+    char buffer[buf_size];
+    sprintf(buffer, str1, str2);
+    return buffer;
+}
+
+std::string addstr3(const char *str1, const char *str2, const char *str3) {
+    size_t str1_len = strlen(str1);
+    size_t str2_len = strlen(str2);
+    size_t str3_len = strlen(str3);
+    int buf_size = (int)str1_len + (int)str2_len + (int)str3_len + 1;
+    char buffer[buf_size];
+    sprintf(buffer, str1, str2, str3);
+    return buffer;
+}
+
+std::string addstr4(const char *str1, const char *str2, const char *str3, const char *str4) {
+    size_t str1_len = strlen(str1);
+    size_t str2_len = strlen(str2);
+    size_t str3_len = strlen(str3);
+    size_t str4_len = strlen(str4);
+    int buf_size = (int)str1_len + (int)str2_len + (int)str3_len + (int)str4_len + 1;
+    char buffer[buf_size];
+    sprintf(buffer, str1, str2, str3, str4);
+    return buffer;
+}
+
+
+
+/* -----------------  [  UI Colors  ]  ----------------- */
+
+ImVec4 hex_color(int hex, float alpha) {
+    float r = ((hex >> 16) & 0xFF) / 255.0f;
+    float g = ((hex >> 8) & 0xFF) / 255.0f;
+    float b = ((hex) & 0xFF) / 255.0f;
+
+    return ImVec4{r, g, b, alpha};
+}
+
+ImColor hex_imcolor(int hex, float alpha) {
+    float r = ((hex >> 16) & 0xFF) / 255.0f;
+    float g = ((hex >> 8) & 0xFF) / 255.0f;
+    float b = ((hex) & 0xFF) / 255.0f;
+
+    return ImColor{r, g, b, alpha};
+}
+
+
+
+/* -----------------  [  UI Element States  ]  ----------------- */
+
+bool is_hovered(const char* id, int w, int h) {
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    ImGuiID btn_id = window->GetID(id);
+    const ImRect bb(window->DC.CursorPos, ImVec2(window->DC.CursorPos.x + w, window->DC.CursorPos.x + h));
+    bool hovered = false;
+    ImGui::ButtonBehavior(bb,btn_id,&hovered,NULL);
+    return hovered;
+}
+
+bool is_pressed(const char* id, int w, int h) {
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    ImGuiID btn_id = window->GetID(id);
+    const ImRect bb(window->DC.CursorPos, ImVec2(window->DC.CursorPos.x + w, window->DC.CursorPos.x + h));
+    bool pressed = false;
+    ImGui::ButtonBehavior(bb,btn_id,NULL,&pressed);
+    return pressed;
+}
+
+
+
+/* -----------------  [  Common UI Types  ]  ----------------- */
+
+void label(const char *text, ImVec2 location, ImVec4 color, int font) {
+    auto &style = ImGui::GetStyle();
+    ImGuiIO &io = ImGui::GetIO();
+
+    ImGui::SetCursorPos(location);
+    ImGui::PushFont(io.Fonts->Fonts[font]);
+
+    auto &colors = ImGui::GetStyle().Colors;
+    colors[ImGuiCol_Text] = color;
+    
+
+    ImGui::Text(text);
+    ImGui::PopFont();
+    reset_design();
+}
+
+void draw_box(ImVec2 location, ImVec2 size, ImVec4 color, float radius) {
+    auto &colors = ImGui::GetStyle().Colors;
+    auto &style = ImGui::GetStyle();
+
+    float temp_rounding = style.FrameRounding;
+    ImVec4 temp_color_idle = colors[ImGuiCol_FrameBg];
+    ImVec4 temp_color_hover = colors[ImGuiCol_FrameBgHovered];
+    ImVec4 temp_color_active = colors[ImGuiCol_FrameBgActive];
+
+    style.FrameRounding = radius;
+    colors[ImGuiCol_FrameBg] = color;
+    colors[ImGuiCol_FrameBgHovered] = color;
+    colors[ImGuiCol_FrameBgActive] = color;
+
+    ImGui::SetCursorPos(location);
+    ImGui::ProgressBar(0.0f, size, "");
+
+    style.FrameRounding = temp_rounding;
+    colors[ImGuiCol_FrameBg] = temp_color_idle;
+    colors[ImGuiCol_FrameBgHovered] = temp_color_hover;
+    colors[ImGuiCol_FrameBgActive] = temp_color_active;
+}
+
+
+
+/* -----------------  [  Animation Systems  ]  ----------------- */
+
+void anim_btn(const char* id, ImVec2 size, ImVec2 size_to, ImVec2 pos, ImVec2 pos_to) {
+    ImGuiIO &io = ImGui::GetIO();
+    float global = 25.0f;
+    bool new_w_positive,new_h_positive,new_x_positive,new_y_positive = false;
+    float new_w,new_h,new_x,new_y = 0.0f;
+    float lrg_size,lrg_pos,lrg = 0.0f;
+
+    if (size.x > size_to.x) {new_w = size.x - size_to.x; new_w_positive = false;} 
+    else {new_w = size_to.x - size.x; new_w_positive = true;}
+    if (size.y > size_to.y) {new_h = size.y - size_to.y; new_h_positive = false;}
+    else {new_h = size_to.y - size.y;new_h_positive = true;}
+    if (pos.x > pos_to.x) {new_x = pos.x - pos_to.x; new_x_positive = false;}
+    else {new_x = pos_to.x - pos.x;new_x_positive = true;}
+    if (pos.y > pos_to.y) {new_y = pos.y - pos_to.y; new_y_positive = false;} 
+    else {new_y = pos_to.y - pos.y;new_y_positive = true;}
+
+    if (new_w > new_h) lrg_size = new_w;
+    else lrg_size = new_h;
+    if (new_x > new_y) lrg_pos = new_x;
+    else lrg_pos = new_y;
+    if (lrg_size > lrg_pos) lrg = lrg_size;
+    else lrg = lrg_pos;
+
+    if (new_w_positive) {if (btn_w < size_to.x) btn_w += (new_w / lrg) * global * io.DeltaTime;}
+    else {if (btn_w > size_to.x) btn_w -= (new_w / lrg) * global * io.DeltaTime;}
+    if (new_h_positive) {if (btn_h < size_to.y) btn_h += (new_h / lrg) * global * io.DeltaTime;} 
+    else {if (btn_h > size_to.y) btn_h -= (new_h / lrg) * global * io.DeltaTime;}
+    if (new_x_positive) {if (btn_x < pos_to.x) btn_x += (new_x / lrg) * global * io.DeltaTime;} 
+    else {if (btn_x > pos_to.x) btn_x -= (new_x / lrg) * global * io.DeltaTime;}
+    if (new_y_positive) {if (btn_y < pos_to.y) btn_y += (new_y / lrg) * global * io.DeltaTime;} 
+    else {if (btn_y > pos_to.y) btn_y -= (new_y / lrg) * global * io.DeltaTime;}
+}
+
+void anim_box(const char* id, ImVec2 size, ImVec2 size_to, ImVec2 pos, ImVec2 pos_to) {
+    ImGuiIO &io = ImGui::GetIO();
+    float global = 500.0f;
+    bool new_w_positive,new_h_positive,new_x_positive,new_y_positive = false;
+    float new_w,new_h,new_x,new_y = 0.0f;
+    float lrg_size,lrg_pos,lrg = 0.0f;
+
+    if (size.x > size_to.x) {new_w = size.x - size_to.x; new_w_positive = false;} 
+    else {new_w = size_to.x - size.x; new_w_positive = true;}
+    if (size.y > size_to.y) {new_h = size.y - size_to.y; new_h_positive = false;}
+    else {new_h = size_to.y - size.y;new_h_positive = true;}
+    if (pos.x > pos_to.x) {new_x = pos.x - pos_to.x; new_x_positive = false;}
+    else {new_x = pos_to.x - pos.x;new_x_positive = true;}
+    if (pos.y > pos_to.y) {new_y = pos.y - pos_to.y; new_y_positive = false;} 
+    else {new_y = pos_to.y - pos.y;new_y_positive = true;}
+
+    if (new_w > new_h) lrg_size = new_w;
+    else lrg_size = new_h;
+    if (new_x > new_y) lrg_pos = new_x;
+    else lrg_pos = new_y;
+    if (lrg_size > lrg_pos) lrg = lrg_size;
+    else lrg = lrg_pos;
+
+    if (new_w_positive) {if (box_w < size_to.x) box_w += (new_w / lrg) * global * io.DeltaTime;}
+    else {if (box_w > size_to.x) box_w -= (new_w / lrg) * global * io.DeltaTime;}
+    if (new_h_positive) {if (box_h < size_to.y) box_h += (new_h / lrg) * global * io.DeltaTime;} 
+    else {if (box_h > size_to.y) box_h -= (new_h / lrg) * global * io.DeltaTime;}
+    if (new_x_positive) {if (box_x < pos_to.x) box_x += (new_x / lrg) * global * io.DeltaTime;} 
+    else {if (box_x > pos_to.x) box_x -= (new_x / lrg) * global * io.DeltaTime;}
+    if (new_y_positive) {if (box_y < pos_to.y) box_y += (new_y / lrg) * global * io.DeltaTime;} 
+    else {if (box_y > pos_to.y) box_y -= (new_y / lrg) * global * io.DeltaTime;}
+}
+
+static inline ImVec2 operator+(const ImVec2 &lhs, const ImVec2 &rhs) {
+    return ImVec2(lhs.x + rhs.x, lhs.y + rhs.y);
+}
+
+void ImageRotated(ImTextureID tex_id, ImVec2 center, ImVec2 size, float angle) {
+    ImDrawList *draw_list = ImGui::GetWindowDrawList();
+    float cos_a = cosf(angle);
+    float sin_a = sinf(angle);
+
+    ImVec2 pos[4] = {
+        center + ImRotate(ImVec2(-size.x * 0.5f, -size.y * 0.5f), cos_a, sin_a),
+        center + ImRotate(ImVec2(+size.x * 0.5f, -size.y * 0.5f), cos_a, sin_a),
+        center + ImRotate(ImVec2(+size.x * 0.5f, +size.y * 0.5f), cos_a, sin_a),
+        center + ImRotate(ImVec2(-size.x * 0.5f, +size.y * 0.5f), cos_a, sin_a)};
+
+    ImVec2 uvs[4] = {
+        ImVec2(0.0f, 0.0f),
+        ImVec2(1.0f, 0.0f),
+        ImVec2(1.0f, 1.0f),
+        ImVec2(0.0f, 1.0f)};
+
+    draw_list->AddImageQuad(tex_id, pos[0], pos[1], pos[2], pos[3], uvs[0], uvs[1], uvs[2], uvs[3], IM_COL32_WHITE);
+}
+
+void rotate_image(const char *image, ImVec2 pos, ImVec2 size, float angle, float speed) {
+    ImGuiIO &io = ImGui::GetIO();
+    ImTextureID image_texture = HelloImGui::ImTextureIdFromAsset(image);
+
+    static float image_angle = angle;
+    image_angle += io.DeltaTime * speed;
+    ImVec2 image_center = ImVec2(pos.x, pos.y);
+
+    ImGui::SetCursorPos(pos);
+    ImageRotated(image_texture, image_center, size, image_angle);
+}
@@ -0,0 +1,133 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include <libimobiledevice/libimobiledevice.h>
+#include <libimobiledevice/lockdown.h>
+#include <libimobiledevice/diagnostics_relay.h>
+#include <plist/plist.h>
+#include <libirecovery.h>
+#include <usbmuxd.h>
+#include <common.h>
+
+extern "C" {
+	#include <palerain.h>
+	#include <gui.h>
+}
+
+
+/* 
+	This will all be removed and merged 
+	into devhelper.c and dfuhelper.c 
+	later on, so for now it stays ig
+*/
+
+
+irecv_device_event_context_t irecvctx_gui = NULL;
+usbmuxd_subscription_context_t usbmuxdctx_gui = NULL;
+int device_status = DISCONNECTED;
+devinfo_t dev;
+char const *udid_gui;
+
+int connected_normal_mode_gui(const usbmuxd_device_info_t *usbmuxd_device) {
+	int ret;
+	ret = devinfo_cmd(&dev, usbmuxd_device->udid);
+	if (ret != 0) {
+		LOG(LOG_ERROR, "Unable to get device information");
+		return 0;
+	}
+	udid_gui = usbmuxd_device->udid;
+	device_status = NORMAL;
+	if (strcmp(dev.CPUArchitecture, "arm64")) {
+		LOG(LOG_WARNING, "Ignoring non-arm64 device...");
+		return -1;
+	}
+	if (!strncmp(dev.productType, "iPhone10,", strlen("iPhone10,"))) {
+		if (!checkrain_option_enabled(host_flags, host_option_device_info))
+			LOG(LOG_VERBOSE2, "Product %s requires passcode to be disabled", dev.productType);
+		unsigned char passcode_state = 0;
+		ret = passstat_cmd(&passcode_state, usbmuxd_device->udid);
+		if (ret != 0) {
+			LOG(LOG_ERROR, "Failed to get passcode state");
+			devinfo_free(&dev);
+			return -1;
+		}
+		if (passcode_state) {
+			LOG(LOG_ERROR, "Passcode must be disabled on this device");
+			if (!checkrain_option_enabled(host_flags, host_option_device_info))
+				LOG(LOG_ERROR, "Additionally, passcode must never be set since restore on iOS 16+");
+			devinfo_free(&dev);
+			return -1;
+		}
+	}
+}
+
+void device_event_cb_gui(const usbmuxd_event_t *event, void* userdata) {
+	if (event->device.conn_type != CONNECTION_TYPE_USB) return;
+	switch (event->event) {
+	case UE_DEVICE_ADD:
+		fprintf(stderr, "Normal mode device connected\n");
+		connected_normal_mode_gui(&event->device);
+		break;
+	case UE_DEVICE_REMOVE:
+		fprintf(stderr, "Normal mode device disconnected\n");
+		device_status = DISCONNECTED;
+				devinfo_free(&dev);
+		if (supported_device || unsupported_device) {
+			supported_device = false;
+			unsupported_device = false;
+			waiting_for_device = true;
+		}
+		break;
+	}
+}
+
+void irecv_device_event_cb_gui(const irecv_device_event_t *event, void* userdata) {
+	switch(event->type) {
+		case IRECV_DEVICE_ADD:
+		if (event->mode == IRECV_K_RECOVERY_MODE_1 || event->mode == IRECV_K_RECOVERY_MODE_2 || event->mode == IRECV_K_RECOVERY_MODE_3 || event->mode == IRECV_K_RECOVERY_MODE_4) {
+			fprintf(stderr, "Recovery mode device %llu connected\n", event->device_info->ecid);
+			recvinfo_t info;
+			recvinfo_cmd(&info, event->device_info->ecid);
+			printf("Mode: recovery\n");
+			printf("ProductType: %s\n", info.product_type);
+			printf("DisplayName: %s\n", info.display_name);
+			device_status = RECOVERY;
+
+			if (waiting_for_device) {
+				device_status = RECOVERY;
+				exitrecv_cmd(event->device_info->ecid);
+				send_alert("Device in Recovery", "Exiting recovery, device must start from normal mode.");
+			}
+
+		} else if (event->mode == IRECV_K_DFU_MODE) {
+			device_status == DFU;
+            fprintf(stderr, "DFU mode device %llu connected\n", event->device_info->ecid);
+		}
+		break;
+		case IRECV_DEVICE_REMOVE:
+			fprintf(stderr, "Recovery mode device disconnected\n");
+			device_status = DISCONNECTED;
+			if (enter_dfu) {
+				device_status = DISCONNECTED;
+				enter_dfu = false;
+				waiting_for_device = true;
+			}
+		break;
+	}
+}
+
+void dfuhelper() {
+	subscribe_cmd(device_event_cb_gui, irecv_device_event_cb_gui);
+}
+
+void guifree() {
+	devinfo_free(&dev);
+	unsubscribe_cmd();
+}
@@ -0,0 +1,350 @@
+#include <thread>
+#include <iostream>
+#include <math.h>
+#include<unistd.h>
+
+#include <imgui/imgui_internal.h>
+#include <hello_imgui/hello_imgui.h>
+#include <hello_imgui/app_window_params.h>
+
+#include <design.h>
+#include <common.h>
+extern "C" {
+#include <gui.h>
+}
+
+/*    Bools for which view to show    */
+bool waiting_for_device = true;
+bool unsupported_device = false;
+bool supported_device = false;
+bool recovery_wait = false;
+bool jailbreak = false;
+bool enter_dfu = false;
+bool dfu_helper = false;
+bool settings = false;
+bool execjb = false;
+
+uint64_t ms() {
+    using namespace std::chrono;
+    return duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
+}
+
+/* -----------------  [  Main Function  ]  ----------------- */
+
+int main(int argc, char *argv[]) {
+    if (argc >= 2) {
+        // temp for testing
+        return palera1n(argc, argv);
+    }
+   
+    dfuhelper();
+
+    /*    Vars for DFU Healper    */
+    int dfu_step1 = 3;
+    int dfu_step2 = 5;
+    int dfu_step3 = 10;
+    bool dfu_done = false;
+    bool set_ms = true;
+    auto desired = ms() + 1000;
+
+    /*    HelloImGui Stuff    */
+    HelloImGui::RunnerParams params;
+    params.fpsIdling.fpsIdle = 60.f;
+    params.appWindowParams.borderless = false;
+    params.appWindowParams.resizable = false;
+    params.appWindowParams.windowGeometry.size = {550, 300};
+    params.appWindowParams.windowTitle = "palera1n";
+    params.appWindowParams.restorePreviousGeometry = false;
+    params.imGuiWindowParams.defaultImGuiWindowType = HelloImGui::DefaultImGuiWindowType::NoDefaultWindow;
+
+    /*    Color & Size Stuff    */
+    bool open = true;
+    ImColor grad_color_left = ImColor(255, 177, 35);
+    ImColor grad_color_right = ImColor(4, 121, 168);
+
+    int grad_color_left_r = 255;
+    float text_alpha = 0.0f;
+    bool reverse_gradient = false;
+
+
+    /*    ImGui Loop    */
+    params.callbacks.ShowGui = [&]() {
+        {
+            /*    Init colors, style, and fonts    */
+            auto &colors = ImGui::GetStyle().Colors;
+            auto &style = ImGui::GetStyle();
+            ImGuiIO &io = ImGui::GetIO();
+            init_colors();
+            init_style();
+
+            /*    Init window size and start ImGui    */
+            ImGui::SetNextWindowSize(ImVec2(560, 300));
+            ImGui::SetNextWindowPos(ImVec2(-5, 0));
+            ImGui::Begin("palera1n", &open, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar);
+
+            /*    Set our background gradient   */
+            ImGui::SetCursorPos(ImVec2(0, 0));
+            ImGuiWindow* window = ImGui::GetCurrentWindow();
+            if (!reverse_gradient) grad_color_left_r -= FLOAT_TO_INT(io.DeltaTime * 100.f) /2;
+            else grad_color_left_r += FLOAT_TO_INT(io.DeltaTime * 100.f) /2;
+            if (grad_color_left_r <= 140) reverse_gradient = true;
+            if (grad_color_left_r >= 255) reverse_gradient = false;
+            grad_color_left = ImColor(135, 63, grad_color_left_r) ;
+            grad_color_right = ImColor(4, 160, grad_color_left_r) ;
+
+            auto dl(ImGui::GetWindowDrawList());
+            dl->AddRectFilledMultiColor(ImVec2(0, 0), // pos - x y
+                                        ImVec2(560, 300), // size - width height
+                                        grad_color_left, // color top left
+                                        hex_imcolor(0x2390b4, 1.0f), // color 
+                                        hex_imcolor(0x04c2a8, 1.0f), // color
+                                        grad_color_right); // color
+
+
+            if (!recovery_wait && !dfu_helper && !jailbreak) {
+                ImTextureID settings_icon = HelloImGui::ImTextureIdFromAsset("s60.png"); // pngs will be embedded soon
+                ImTextureID about_icon = HelloImGui::ImTextureIdFromAsset("i60.png"); // pngs will be embedded soon
+                image_btn_style_alt();
+                ImGui::SetCursorPos(ImVec2(455, 245));
+                ImGui::ImageButton(about_icon, ImVec2(33.0f, 33.0f));
+                ImGui::SetCursorPos(ImVec2(500, 245));
+                ImGui::ImageButton(settings_icon, ImVec2(33.0f, 33.0f)); 
+                reset_design();
+            }
+
+            /*    Waiting for device view    */
+            if (waiting_for_device) {
+                if (device_status == NORMAL) {
+                    const char *name = dev.displayName;
+                    char *arch = dev.CPUArchitecture;
+                    char *type = dev.productType;
+                    char *version = dev.productVersion;
+                    if (strcmp("arm64", arch) != 0) {
+                        waiting_for_device = false;
+                        unsupported_device = true;
+                        btn_x = 213.0f;
+                        btn_y = 190.0f;
+                        btn_w = 125.0f;
+                        btn_h = 35.0f;
+                    } else if (strstr(version, "15") != 0 || strstr(version, "16") != 0) {        
+                        waiting_for_device = false;
+                        supported_device = true;
+                        btn_x = 213.0f;
+                        btn_y = 190.0f;
+                        btn_w = 125.0f;
+                        btn_h = 35.0f;
+                    }
+                }
+                box_x = 55.0f; box_y = 75.0f; box_w = 450.0f; box_h = 150.0f;
+
+                draw_box(pos(55, 75), size(450, 150), hex_color(0x000000, 0.25f), 20.0f); // box in center
+                rotate_image("spinner.png", pos(95, 150), size(40, 40), 0.0f, 4.0f); // loading anim in box
+                label("Waiting for connection...", pos(135,122), WHITE, SF_BoldLarge); // Large title
+                label("Connect your device in normal mode to get started!", pos(138, 157), WHITE, SF_Reg); // Sub title
+
+
+            /*    Unsupported device view    */
+            } else if (unsupported_device) {
+              
+                anim_box("Jailbreak", ImVec2(450,150),ImVec2(300,200),ImVec2(54,75),ImVec2(129,50));
+                draw_box(ImVec2(box_x, box_y),ImVec2(box_w, box_h), hex_color(0x000000, 0.25f), 20.0f);
+   
+                set_pos(167, 90); font(SF_Bold);
+                ImGui::Text("%s", dev.displayName);
+                ImGui::PopFont();
+
+                set_pos(167, 120); font(SF_RegMed);
+                ImGui::Text("%s running iOS %s (%s)", dev.productType, dev.productVersion, dev.CPUArchitecture);
+                
+                colors[ImGuiCol_Text] = hex_color(0xEB5160, 1.0f);
+                set_pos(167, 147); ImGui::Text(ICON_FA_BAN);
+                colors[ImGuiCol_Text] = hex_color(0xFFFFFF, 1.0f);
+
+                ImGui::SameLine(); ImGui::Text("Unsupported device connected");
+                ImGui::PopFont();
+                
+                set_pos(213, 190); font(SF_RoundBold); btn_text_on;
+                bool hovered = is_hovered("Exit", 125, 35);
+                bool pressed = is_pressed("Exit", 125, 35);
+                ImVec2 btn_size = ImVec2(120, 30);
+
+                if (hovered) {
+                    anim_btn("Exit", ImVec2(125,35),ImVec2(127,37),ImVec2(213,190),ImVec2(212,189));
+                    btn_size = ImVec2(btn_w, btn_h);
+                    ImGui::SetCursorPos(ImVec2(btn_x,btn_y));
+                } else {
+                    anim_btn("Exit", ImVec2(127,37),ImVec2(125,35),ImVec2(212,189),ImVec2(213,190));
+                    btn_size = ImVec2(btn_w, btn_h);
+                    ImGui::SetCursorPos(ImVec2(btn_x,btn_y));
+                }
+                
+                ImGui::Button("Exit", btn_size);
+                if (pressed) {
+                    exit(0);
+                }
+
+
+            /*    Supported device view     */
+            } else if (supported_device) {
+                anim_box("Jailbreak", ImVec2(450,150),ImVec2(300,200),ImVec2(54,75),ImVec2(129,50));
+                draw_box(ImVec2(box_x, box_y),ImVec2(box_w, box_h), hex_color(0x000000, 0.25f), 20.0f);
+   
+                set_pos(167, 90); font(SF_Bold);
+                ImGui::Text("%s", dev.displayName);
+                ImGui::PopFont();
+
+                set_pos(167, 120); font(SF_RegMed);
+                ImGui::Text("%s running iOS %s (%s)", dev.productType, dev.productVersion, dev.CPUArchitecture);
+                
+                colors[ImGuiCol_Text] = hex_color(0x3CFF55, 1.0f);
+                set_pos(167, 147); ImGui::Text(ICON_FA_CHECK_CIRCLE);
+                colors[ImGuiCol_Text] = hex_color(0xFFFFFF, 1.0f);
+
+                ImGui::SameLine(); ImGui::Text("Connected and ready.");
+                ImGui::PopFont();
+
+                set_pos(213, 190); font(SF_RoundBold); btn_text_on;
+                bool hovered = is_hovered("Jailbreak", 125, 35);
+                bool pressed = is_pressed("Jailbreak", 125, 35);
+                ImVec2 btn_size = ImVec2(120, 30);
+
+                if (hovered) {
+                    anim_btn("Jailbreak", ImVec2(125,35),ImVec2(127,37),ImVec2(213,190),ImVec2(212,189));
+                    btn_size = ImVec2(btn_w, btn_h);
+                    ImGui::SetCursorPos(ImVec2(btn_x,btn_y));
+                } else {
+                    anim_btn("Jailbreak", ImVec2(127,37),ImVec2(125,35),ImVec2(212,189),ImVec2(213,190));
+                    btn_size = ImVec2(btn_w, btn_h);
+                    ImGui::SetCursorPos(ImVec2(btn_x,btn_y));
+                }
+                
+                ImGui::Button("Jailbreak", btn_size);
+                if (pressed) {
+                    enter_recovery_cmd(0);
+                    box_x = 140.0f; box_y = 55.0f; box_w = 320.0f; box_h = 240.0f;
+                    supported_device = false;
+                    recovery_wait = true;
+                    btn_text_off;
+                    ImGui::PopFont();
+                }
+
+
+            /*    Waiting for recovery view     */
+            } else if (recovery_wait) {
+
+                draw_box(ImVec2(125, 105),ImVec2(300, 90), hex_color(0x000000, 0.25f), 20.0f);
+                //ImageRotated(loader, ImVec2(160, 150), ImVec2(40.0f, 40.0f), angle);
+
+                set_pos(210, 138); font(SF_Bold);
+                ImGui::Text("Entering recovery...");
+                ImGui::PopFont();
+
+                if (device_status == RECOVERY) {
+                    recovery_wait = false;
+                    enter_dfu = true;
+                }
+
+            /*    Ready for DFU view     */
+            } else if (enter_dfu) {
+
+                draw_box(ImVec2(65, 105),ImVec2(450, 90), hex_color(0x000000, 0.25f), 20.0f);
+
+                set_pos(110, 128); font(SF_Bold);
+                ImGui::Text("Time to enter DFU mode!");
+                ImGui::PopFont();
+
+                set_pos(110, 153); font(SF_Reg);
+                ImGui::Text("Locate the power and volume down button before you proceed.");
+
+                set_pos(108, 210); font(SF_Sm_Bold); btn_text_on;
+                if (ImGui::Button("Start", ImVec2(125, 35))) {
+                    enter_dfu = false;
+                    dfu_helper = true;
+                    btn_text_off;
+                    ImGui::PopFont();
+                }
+
+            /*    DFU helper view     */
+            } else if (dfu_helper) {
+                draw_box(ImVec2(75, 65),ImVec2(450, 220), hex_color(0x000000, 0.5f), 20.0f);
+
+                if (dfu_step1 > 0) dfu_text_light;
+                else dfu_text_dark;
+                set_pos(110, 110); font(SF_Reg);
+                ImGui::Text("1. Get Ready! %d", dfu_step1);
+
+                if (dfu_step2 > 0 && dfu_step1 == 0) dfu_text_light;
+                else dfu_text_dark;
+                set_pos(110, 160); ImGui::Text("2. Hold volume down + side button %d", dfu_step2);
+
+                if (dfu_step3 > 0 && dfu_step2 == 0) dfu_text_light;
+                else dfu_text_dark;;
+                set_pos(110, 210);ImGui::Text("3. Release side button, but keep holding volume down %d", dfu_step3);
+                ImGui::PopFont();
+
+                if (!dfu_done) {
+                    if (set_ms) {
+                        desired = ms() + 1000;
+                        set_ms = false;
+                    }
+                    if (ms() >= desired) {
+                        set_ms = true;
+                    if (dfu_step1 > 0) dfu_step1 -= 1;
+                    else if (dfu_step2 > 0) dfu_step2 -= 1;
+                    else if (dfu_step3 > 0) dfu_step3 -= 1;
+                    else dfu_done = true;
+                    }
+                }
+
+                if (dfu_step2 == 2) exitrecv_cmd(dev.ecid);
+                if (dfu_done) {
+                    if (device_status == DFU) {
+                        guifree();
+                        dfu_helper = false;
+                        jailbreak = true;
+                    } else {
+                        send_alert("Failed to enter DFU", "Device failed to enter DFU mode, please try again.");
+                        dfu_step1 = 3; dfu_step2 = 5; dfu_step3 = 10;
+                        dfu_done = false;
+                        dfu_helper = false;
+                        waiting_for_device = true;
+                    }
+                }
+
+            /*    Main Jailbreak view     */
+            } else if (jailbreak) {
+	            pthread_t jb;
+
+                draw_box(ImVec2(25, 70),ImVec2(500, 200), hex_color(0x000000, 0.25f), 20.0f);
+
+                set_pos(20, 15); font(SF_Bold);
+                ImGui::Text("Installing jailbreak...");
+                ImGui::PopFont();
+
+                set_pos(20, 40); font(SF_Reg);
+                ImGui::Text("This will take a moment to jailbreak, hang tight!");
+
+                set_pos(50, 100); font(Hack);
+                if (!execjb) {
+                    execjb = true;
+                    palera1n(1, NULL);
+                }
+           
+                // redirect logs here...
+                ImGui::Text("[*] Running...");
+                set_pos(50, 125); ImGui::Text("[*] Some epic log stuff will go here :3");
+                set_pos(50, 150); ImGui::Text("[*] lorem ipsum :frcoal:");
+                ImGui::PopFont();
+                
+            } else {
+            }
+            if (settings) {
+                draw_box(ImVec2(50.0f, 65.0f),ImVec2(230.0f, 230.0f), hex_color(0x000000, 0.5f), 20.0f);
+                draw_box(ImVec2(320.0f, 65.0f),ImVec2(230.0f, 230.0f), hex_color(0x000000, 0.5f), 20.0f);
+            }
+            ImGui::End();
+        }
+    };
+    HelloImGui::Run(params);
+    return 0;
+}
@@ -27,9 +27,14 @@
 #include <ANSI-color-codes.h>
 #include <palerain.h>
 #include <xxd-embedded.h>
-#include <paleinfo.h>
+#include <kerninfo.h>

 pthread_mutex_t spin_mutex, found_pongo_mutex, ecid_dfu_wait_mutex;
+#ifdef TUI
+#include <newt.h>
+pthread_mutex_t tui_log_mutex;
+newtComponent tui_log_output = NULL;
+#endif

 bool spin, found_pongo = 0;
 uint64_t ecid_wait_for_dfu = 0;
@@ -83,3 +88,19 @@ uint64_t set_ecid_wait_for_dfu(uint64_t ecid) {
    pthread_mutex_unlock(&ecid_dfu_wait_mutex);
    return ecid;
 }
+
+#ifdef TUI
+newtComponent get_tui_log() {
+    pthread_mutex_lock(&tui_log_mutex);
+    newtComponent ret = tui_log_output;
+    pthread_mutex_unlock(&tui_log_mutex);
+    return ret;
+}
+
+newtComponent set_tui_log(newtComponent co) {
+    pthread_mutex_lock(&tui_log_mutex);
+    tui_log_output = co;
+    pthread_mutex_unlock(&tui_log_mutex);
+    return co;
+}
+#endif
@@ -0,0 +1,245 @@
+#ifndef HAVE_LIBIMOBILEDEVICE
+#include "lockdown_helper.h"
+#include <usbmuxd.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef DEBUG
+#define log_debug(...) fprintf(stderr, __VA_ARGS__); fputc('\n', stderr)
+#else
+#define log_debug(...) do {} while (0)
+#endif
+#define log_error(...) fprintf(stderr, __VA_ARGS__); fputc('\n', stderr)
+
+int lockdown_connect_handle(uint32_t handle) {
+	int fd = usbmuxd_connect(handle, 62078);
+	if (fd < 0) {
+		log_debug("Can't connect to lockownd on device #%u", handle);
+	}
+	return fd;
+}
+
+int lockdown_connect_udid(const char* udid) {
+	usbmuxd_device_info_t device;
+	if (usbmuxd_get_device_by_udid(udid, &device) < 0) {
+		log_debug("Can't find device %s", udid);
+		return -ENOENT;
+	}
+	return lockdown_connect_handle(device.handle);
+}
+
+void lockdown_disconnect(int fd) {
+	usbmuxd_disconnect(fd);
+}
+
+int lockdown_check_type(int fd, const char* type_match);
+
+static const char QUERY_TYPE_REQUEST[] = "____<plist version=\"1.0\"><dict><key>Label</key><string>palera1n</string><key>Request</key><string>QueryType</string></dict></plist>";
+static const char GET_VALUE_DOMAIN_REQUEST_FMT[] = "____<plist version=\"1.0\"><dict><key>Label</key><string>palera1n</string><key>Domain</key><string>%s</string><key>Key</key><string>%s</string><key>Request</key><string>GetValue</string></dict></plist>";
+static const char GET_VALUE_REQUEST_FMT[] = "____<plist version=\"1.0\"><dict><key>Label</key><string>palera1n</string><key>Key</key><string>%s</string><key>Request</key><string>GetValue</string></dict></plist>";
+static const char VALUE_KEY_NODE[] = "<key>Value</key>";
+static const char INTEGER_NODE[] = "<integer>";
+static const char STRING_NODE[] = "<string>";
+static const char ENTER_RECOVERY_REQUEST[] = "____<plist version=\"1.0\"><dict><key>Label</key><string>palera1n</string><key>Request</key><string>EnterRecovery</string></dict></plist>";
+static const char ERROR_KEY_NODE[] = "<key>Error</key>";
+static const char ENTER_RECOVERY_STRING_NODE[] = "<string>EnterRecovery</string>";
+static const int VALUE_KEY_NODE_SIZE = sizeof(VALUE_KEY_NODE)-1;
+static const int INTEGER_NODE_SIZE = sizeof(INTEGER_NODE)-1;
+static const int STRING_NODE_SIZE = sizeof(STRING_NODE)-1;
+static const int ERROR_KEY_NODE_SIZE = sizeof(ERROR_KEY_NODE)-1;
+
+static void skip_ws(char** cur, char* end) {
+    char* p = *cur;
+    while (p < end && ((*p == ' ') || (*p == '\t') || (*p == '\r') || (*p == '\n'))) {
+        p++;
+    }
+    *cur = p;
+}
+
+static char* _send_request_and_get_reply(int fd, const char* request, uint32_t len, uint32_t* received) {
+	uint32_t sent_bytes = 0;
+	usbmuxd_send(fd, request, len, &sent_bytes);
+	if (sent_bytes != len) {
+		usbmuxd_disconnect(fd);
+		log_error("Failed to send data payload");
+		return NULL;
+	}
+
+	uint32_t recv_bytes = 0;
+	uint32_t besize = 0;
+	int r = usbmuxd_recv(fd, (char*)&besize, sizeof(besize), &recv_bytes);
+	if (recv_bytes != sizeof(besize)) {
+		usbmuxd_disconnect(fd);
+		log_error("Failed to get size of packet (%d)", r);
+		return NULL;
+	}
+
+	uint32_t resp_size = ntohl(besize);
+	char* resp = (char*)malloc(resp_size+1);
+
+	recv_bytes = 0;
+	usbmuxd_recv(fd, resp, resp_size, &recv_bytes);
+	if (recv_bytes != resp_size) {
+		usbmuxd_disconnect(fd);
+		free(resp);
+		log_error("Failed to receive payload");
+		return NULL;
+	}
+	resp[resp_size] = '\0';
+	*received = resp_size;
+	return resp;
+}
+
+int lockdown_check_type(int fd, const char* type_match) {
+	unsigned char tmp[512];
+	uint32_t len = (uint32_t)snprintf((char*)tmp, 512, QUERY_TYPE_REQUEST);
+	uint32_t belen = htonl(len-4);
+	*(uint32_t*)tmp = belen;
+	uint32_t resp_size = 0;
+	char* resp = _send_request_and_get_reply(fd, (char*)tmp, len, &resp_size);
+	if (!resp) {
+		log_error("Failed to get lockdown type");
+		return -1;
+	}
+
+	int result = (strstr(resp, type_match) == NULL) ? -1 : 0;
+	free(resp);
+
+	return result;
+}
+
+int lockdown_get_uint_value(int fd, const char* domain, const char* key, uint64_t* value) {
+	char tmp[1024];
+	uint32_t len;
+	if (domain) {
+		len = snprintf(tmp, 1024, GET_VALUE_DOMAIN_REQUEST_FMT, domain, key);
+	} else {
+		len = snprintf(tmp, 1024, GET_VALUE_REQUEST_FMT, key);
+	}
+	*(uint32_t*)&tmp = htonl(len-4);
+
+	uint32_t resp_size = 0;
+	char* resp = _send_request_and_get_reply(fd, tmp, len, &resp_size);
+	if (!resp) {
+		log_error("Failed to get value for key %s", key);
+		return -1;
+	}
+
+	char* p = strstr(resp, VALUE_KEY_NODE);
+	if (!p) {
+		log_debug("Failed to get Value key node?!");
+		return -1;
+	}
+	p += VALUE_KEY_NODE_SIZE;
+	skip_ws(&p, resp+resp_size);
+	if (p >= resp+resp_size) {
+		log_debug("Failed to get value node");
+		return -1;
+	}
+	if (strncmp(p, INTEGER_NODE, INTEGER_NODE_SIZE) != 0) {
+		log_debug("Failed to parse value node");
+		return -1;
+	}
+	p += INTEGER_NODE_SIZE;
+	*value = (uint64_t)strtoll(p, NULL, 10);
+	free(resp);
+
+	return 0;
+}
+
+int lockdown_get_string_value(int fd, const char* domain, const char* key, char** value) {
+	char tmp[1024];
+	uint32_t len;
+	if (domain) {
+		len = snprintf(tmp, 1024, GET_VALUE_DOMAIN_REQUEST_FMT, domain, key);
+	} else {
+		len = snprintf(tmp, 1024, GET_VALUE_REQUEST_FMT, key);
+	}
+	*(uint32_t*)&tmp = htonl(len-4);
+
+	uint32_t resp_size = 0;
+	char* resp = _send_request_and_get_reply(fd, tmp, len, &resp_size);
+	if (!resp) {
+		log_error("Failed to get value for key %s", key);
+		return -1;
+	}
+
+	char* p = strstr(resp, VALUE_KEY_NODE);
+	if (!p) {
+		log_debug("Failed to get Value key node?!");
+		free(resp);
+		return -1;
+	}
+	p += VALUE_KEY_NODE_SIZE;
+	skip_ws(&p, resp+resp_size);
+	if (p >= resp+resp_size) {
+		log_debug("Failed to get value node");
+		free(resp);
+		return -1;
+	}
+	if (strncmp(p, STRING_NODE, STRING_NODE_SIZE) != 0) {
+		log_debug("Failed to parse value node");
+		free(resp);
+		return -1;
+	}
+	p += STRING_NODE_SIZE;
+	char* str_start = p;
+	while (*p != '<' && *p != '\0') p++;
+	if (*p == '\0') {
+		log_debug("Failed to parse string value node");
+		free(resp);
+		return -1;
+	}
+	size_t str_len = p - str_start;
+	*value = (char*)malloc(str_len + 1);
+	snprintf(*value, str_len, "%s", str_start);
+	(*value)[str_len] = '\0';
+	free(resp);
+
+	return 0;
+}
+
+int lockdown_enter_recovery(int fd) {
+	char tmp[512];
+	uint32_t len = (uint32_t)snprintf(tmp, 512, ENTER_RECOVERY_REQUEST);
+	*(uint32_t*)&tmp = htonl(len-4);
+	uint32_t resp_size = 0;
+	char* resp = _send_request_and_get_reply(fd, tmp, len, &resp_size);
+	if (!resp) {
+		log_error("Failed to enter recover?");
+		return -1;
+	}
+
+	int result = -1;
+	char* p = strstr(resp, ERROR_KEY_NODE);
+	if (p) {
+		char* str_start = NULL;
+		size_t str_len = 0;
+		p += ERROR_KEY_NODE_SIZE;
+		skip_ws(&p, resp+resp_size);
+		if (*p && !strncmp(p, STRING_NODE, STRING_NODE_SIZE)) {
+			p += STRING_NODE_SIZE;
+			str_start = p;
+			while (*p != '<' && *p != '\0') p++;
+			if (*p == '<') {
+				str_len = p - str_start;
+			}
+		}
+		if (str_start && str_len > 0) {
+			log_error("ERROR: Failed to make device enter recovery mode: %.*s", (int)str_len, str_start);
+		} else {
+			log_error("ERROR: Failed to make device enter recovery mode: (unknown error)");
+		}
+		result = -2;
+	} else {
+		result = (strstr(resp, ENTER_RECOVERY_STRING_NODE) == NULL) ? -1 : 0;
+	}
+	free(resp);
+	return result;
+}
+
+#endif
@@ -0,0 +1,30 @@
+#ifndef __LOCKDOWN_HELPER_H
+#define __LOCKDOWN_HELPER_H
+
+#ifndef HAVE_LIBIMOBILEDEVICE
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int lockdown_connect_udid(const char* udid);
+int lockdown_connect_handle(uint32_t handle);
+
+void lockdown_disconnect(int fd);
+
+int lockdown_check_type(int fd, const char* type_match);
+
+int lockdown_get_uint_value(int fd, const char* domain, const char* key, uint64_t* value);
+int lockdown_get_string_value(int fd, const char* domain, const char* key, char** value);
+
+int lockdown_enter_recovery(int fd);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif
@@ -8,18 +8,11 @@
 #include <ANSI-color-codes.h>
 #include <palerain.h>

-#ifdef TUI
-#include <tui.h>
-#endif
-
 int p1_log(log_level_t loglevel, const char *fname, int lineno, const char *fxname, const char *__restrict format, ...)
 {
-#ifdef TUI
-	if (tui_started) return 0;
-#endif
    if (verbose >= 5 
 #ifdef TUI
-	&& !(palerain_flags & palerain_option_tui)
+	&& !checkrain_options_enabled(host_flags, host_option_tui)
 #endif
 	) fprintf(stderr, "p1_log: loglevel %d from %s:%d:%s()\n", loglevel, fname, lineno, fxname);
 	int ret = 0;
@@ -64,36 +57,48 @@ int p1_log(log_level_t loglevel, const char *fname, int lineno, const char *fxna
 		snprintf(colour_bold, 0x10, "%s", BWHT);
 		break;
 	}
-	if ((palerain_flags & palerain_option_no_colors)) {
+	if (checkrain_options_enabled(host_flags, host_option_no_colors)) {
 		colour[0] = '\0';
 		colour_bold[0] = '\0';
 	}
+#ifdef TUI
+	if (checkrain_options_enabled(host_flags, host_option_tui) && tui_started) {
+		newtComponent co = get_tui_log();
+		if (co == NULL) {
+			return 0; /* 0 bytes printed */
+		}
+		char printbuf[0x200];
+		ret = vsnprintf(printbuf, 0x200, format, args);
+	    pthread_mutex_lock(&log_mutex);
+		newtTextboxSetText(co, printbuf);
+	} else
+#endif
 	{
 		pthread_mutex_lock(&log_mutex);
 		char timestring[0x80];
 		time_t curtime;
 		time(&curtime);
 		struct tm* timeinfo = localtime(&curtime);
-		if (!(palerain_flags & palerain_option_no_colors))
+		if (!checkrain_options_enabled(host_flags, host_option_no_colors))
 			snprintf(timestring, 0x80, "%s[%s%02d/%02d/%d %02d:%02d:%02d%s]", CRESET, HBLK, timeinfo->tm_mon + 1, timeinfo->tm_mday, timeinfo->tm_year - 100, timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, CRESET);
 		else
 			snprintf(timestring, 0x80, "[%02d/%02d/%d %02d:%02d:%02d]", timeinfo->tm_mon + 1, timeinfo->tm_mday, timeinfo->tm_year - 100, timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-		if (verbose >= 2 && !(palerain_flags & palerain_option_no_colors)) {
+		if (verbose >= 2 && !checkrain_options_enabled(host_flags, host_option_no_colors)) {
 			printf("%s| - %s%s <%s> " CRESET "%s" HBLU "%s" CRESET ":" BLU "%d" CRESET ":" BMAG "%s()" CRESET ": \n%s| ----> ", colour_bold, timestring, colour_bold, type, WHT, fname, lineno, fxname, colour_bold);
-		} else if (!(palerain_flags & palerain_option_no_colors)) {
+		} else if (!checkrain_options_enabled(host_flags, host_option_no_colors)) {
 			printf(" - %s %s<%s>%s: ", timestring, colour_bold, type, CRESET);
-		} else if (verbose >= 2 && (palerain_flags & palerain_option_no_colors)) {
+		} else if (verbose >= 2 && checkrain_options_enabled(host_flags, host_option_no_colors)) {
 			printf("%s| - %s%s <%s> %s:%d:%s(): \n%s| ----> ", colour_bold, timestring, colour_bold, type, fname, lineno, fxname, colour_bold);
-		} else if ((palerain_flags & palerain_option_no_colors)) {
+		} else if (checkrain_options_enabled(host_flags, host_option_no_colors)) {
 			printf(" - %s %s<%s>: ", timestring, colour_bold, type);
 		}
 		printf("%s", colour);
 		ret = vprintf(format, args);
 		va_end(args);
 	
-		if (verbose < 2 && !(palerain_flags & palerain_option_no_colors))
+		if (verbose < 2 && !checkrain_options_enabled(host_flags, host_option_no_colors))
 			printf(CRESET "\n");
-		else if (!(palerain_flags & palerain_option_no_colors))
+		else if (!checkrain_options_enabled(host_flags, host_option_no_colors))
 			printf("\n%s-%s\n", colour, CRESET);
 		else if (verbose < 2) 
 			printf("\n");
@@ -27,19 +27,19 @@
 #include <ANSI-color-codes.h>
 #include <palerain.h>
 #include <xxd-embedded.h>
-#include <paleinfo.h>
+#include <kerninfo.h>
+#include <gui.h>

 #define CMD_LEN_MAX 512
 #define OVERRIDE_MAGIC 0xd803b376

 unsigned int verbose = 0;
-/* we want to write to them so don't use string literals */
-char xargs_cmd[0x270] = { 'x', 'a', 'r', 'g', 's', '\0' }, 
-	palerain_flags_cmd[0x30] = { 'd', 'e', 'a', 'd', 'b', 'e', 'e', 'f', '\0' };
+char xargs_cmd[0x270] = "xargs ", checkrain_flags_cmd[0x20] = "deadbeef", palerain_flags_cmd[0x20] = "deadbeef";
+char kpf_flags_cmd[0x20] = "deadbeef", dtpatch_cmd[0x20] = "deadbeef", rootfs_cmd[512] = "deadbeef";
 extern char** environ;

-niarelap_file_t* kpf_to_upload_1 = &checkra1n_kpf_pongo_lzma;
-niarelap_file_t* ramdisk_to_upload_1 = &ramdisk_dmg_lzma;
+niarelap_file_t* kpf_to_upload_1 = &checkra1n_kpf_pongo;
+niarelap_file_t* ramdisk_to_upload_1 = &ramdisk_dmg;
 niarelap_file_t* overlay_to_upload_1 = &binpack_dmg;

 niarelap_file_t** kpf_to_upload = &kpf_to_upload_1;
@@ -48,7 +48,7 @@ niarelap_file_t** overlay_to_upload = &overlay_to_upload_1;

 override_file_t override_ramdisk, override_kpf, override_overlay;

-uint64_t palerain_flags = 0;
+uint32_t checkrain_flags = 0, palerain_flags = 0, kpf_flags = 0;

 pthread_mutex_t log_mutex;
 pthread_t dfuhelper_thread, pongo_thread;
@@ -57,7 +57,7 @@ void thr_cleanup(void* ptr) {
 	*(int*)ptr = 0;
 }

-static int build_checks(void) {
+int build_checks(void) {
 #ifndef NO_CHECKRAIN
 #if defined(__APPLE__)
 	struct mach_header_64* c1_header = (struct mach_header_64*)&checkra1n[0];
@@ -74,7 +74,20 @@ static int build_checks(void) {
 		LOG(LOG_FATAL, "checkra1n too small");
 	}
 	if (boyermoore_horspool_memmem(&checkra1n[0], checkra1n_len, (const unsigned char *)"[ra1npoc15-part] thanks to", strlen("[ra1npoc15-part] thanks to")) != NULL) {
-		palerain_flags |= palerain_option_checkrain_is_clone;
+		host_flags |= palerain_option_checkrain_is_clone;
+	}
+#endif
+#ifndef NO_KPF
+	struct mach_header_64 *kpf_hdr = (struct mach_header_64 *)checkra1n_kpf_pongo;
+	if (kpf_hdr->magic != MH_MAGIC_64 && kpf_hdr->magic != MH_CIGAM_64) {
+		LOG(LOG_FATAL, "Broken build: Invalid kernel patchfinder: Not thin 64-bit Mach-O");
+		return -1;
+	} else if (kpf_hdr->filetype != MH_KEXT_BUNDLE) {
+		LOG(LOG_FATAL, "Broken build: Invalid kernel patchfinder: Not a kext bundle");
+		return -1;
+	} else if (kpf_hdr->cputype != CPU_TYPE_ARM64) {
+		LOG(LOG_FATAL, "Broken build: Invalid kernel patchfinder: CPU type is not arm64");
+		return -1;
 	}
 #endif
 	return 0;
@@ -90,17 +103,7 @@ void log_cb(libusb_context *ctx, enum libusb_log_level level, const char *str) {
 }
 #endif

-// save argc, argv, and envp for restarting
-
-int saved_argc;
-char** saved_argv;
-char** saved_envp;
-
-static int palera1n(int argc, char *argv[], char *envp[]) {
-	saved_argc = argc;
-	saved_argv = argv;
-	saved_envp = envp;
-	
+int palera1n(int argc, char *argv[]) {
 	print_credits();
 	int ret = 0;
 	pthread_mutex_init(&log_mutex, NULL);
@@ -109,9 +112,9 @@ static int palera1n(int argc, char *argv[], char *envp[]) {
 	pthread_mutex_init(&ecid_dfu_wait_mutex, NULL);
 	if ((ret = build_checks())) return ret;
 	if ((ret = optparse(argc, argv))) goto cleanup;
-	if (!(palerain_flags & palerain_option_device_info) && (palerain_flags & palerain_option_palerain_version)) goto normal_exit;
+	if (!checkrain_options_enabled(host_flags, host_option_device_info) && checkrain_options_enabled(host_flags, host_option_palerain_version)) goto normal_exit;
 #ifdef TUI
-	if ((palerain_flags & palerain_option_tui) || (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO) && !(palerain_flags & palerain_option_cli))) {
+	if (checkrain_options_enabled(host_flags, host_option_tui)) {
 		ret = tui();
 		if (ret) goto cleanup;
 		else goto normal_exit;
@@ -131,28 +134,26 @@ static int palera1n(int argc, char *argv[], char *envp[]) {
 	}
 #endif

-	if (!(palerain_flags & palerain_option_device_info))
+	if (!checkrain_options_enabled(host_flags, host_option_device_info))
 		LOG(LOG_INFO, "Waiting for devices");

-	if (getenv("USBMUXD_SOCKET_ADDRESS") == NULL && access("/var/run/usbmuxd", F_OK) != 0) 
+	if (access("/var/run/usbmuxd", F_OK) != 0) 
 		LOG(LOG_WARNING, "/var/run/usbmuxd not found, normal mode device detection will not work.");
 	
 	pthread_create(&pongo_thread, NULL, pongo_helper, NULL);
 	pthread_create(&dfuhelper_thread, NULL, dfuhelper, NULL);
 	pthread_join(dfuhelper_thread, NULL);
 	set_spin(0);
-	if ((palerain_flags & (palerain_option_dfuhelper_only | 
-											  palerain_option_reboot_device  | 
-											  palerain_option_exit_recovery  | 
-											  palerain_option_enter_recovery | 
-											  palerain_option_device_info)
+	if (checkrain_options_enabled(host_flags, host_option_dfuhelper_only | 
+											  host_option_reboot_device  | 
+											  host_option_exit_recovery  | 
+											  host_option_enter_recovery | 
+											  host_option_device_info
 								 ) || device_has_booted)
 		goto normal_exit;
-	pthread_cancel(pongo_thread);
-	pthread_join(pongo_thread, NULL);
 	if (exec_checkra1n()) goto cleanup;

-	if ((palerain_flags & (palerain_option_pongo_exit | palerain_option_demote)))
+	if (checkrain_options_enabled(host_flags, host_option_pongo_exit | host_option_demote))
 		goto normal_exit;
 	set_spin(1);
 	sleep(2);
@@ -185,6 +186,8 @@ cleanup:
 }


-int main (int argc, char* argv[], char* envp[]) {
-	return palera1n(argc, argv, envp);
+#ifndef GUI
+int main (int argc, char* argv[]) {
+	return palera1n(argc, argv);
 }
+#endif
@@ -1 +0,0 @@
-*.o
@@ -1 +0,0 @@
-.
@@ -13,18 +13,15 @@
 #include <errno.h>
 #include <palerain.h>
 #include <sys/mman.h>
-#include <inttypes.h>
-#ifdef TUI
-#include <tui.h>
-#endif

-uint64_t* palerain_flags_p = &palerain_flags;
-char* gOverrideLibcheckra1nHelper = NULL;
+checkrain_option_t host_flags = 0;
+checkrain_option_p host_flags_p = &host_flags;
+static bool force_use_verbose_boot = false;

 static struct option longopts[] = {
 	{"setup-partial-fakefs", no_argument, NULL, 'B'},
 	{"setup-fakefs", no_argument, NULL, 'c'},
-	{"clean-fakefs", no_argument, NULL, 'C'},
+	{"clean-fakefs", no_argument, NULL, 'c'},
 	{"dfuhelper", no_argument, NULL, 'D'},
 	{"help", no_argument, NULL, 'h'},
 	{"pongo-shell", no_argument, NULL, 'p'},
@@ -34,13 +31,12 @@ static struct option longopts[] = {
 	{"boot-args", required_argument, NULL, 'e'},
 	{"fakefs", no_argument, NULL, 'f'},
 	{"rootless", no_argument, NULL, 'l'},
+	{"jbinit-log-to-file", no_argument, NULL, 'L'},
 	{"demote", no_argument, NULL, 'd'},
 	{"force-revert", no_argument, NULL, palerain_option_case_force_revert},
 	{"no-colors", no_argument, NULL, 'S'},
 	{"safe-mode", no_argument, NULL, 's'},
-	{"telnetd", no_argument, NULL, 'T'},
 	{"version", no_argument, NULL, palerain_option_case_version},
-	{"override-libcheckra1nhelper", required_argument, NULL, palerain_option_case_libcheckra1nhelper_path},
 	{"override-pongo", required_argument, NULL, 'k'},
 	{"override-overlay", required_argument, NULL, 'o'},
 	{"override-ramdisk", required_argument, NULL, 'r'},
@@ -57,7 +53,6 @@ static struct option longopts[] = {
 #ifdef TUI
 	{"tui", no_argument, NULL, 't'},
 #endif
-	{"cli", no_argument, NULL, palerain_option_case_cli},
 	{NULL, 0, NULL, 0}
 };

@@ -65,7 +60,7 @@ static int usage(int e, char* prog_name)
 {
 	fprintf(stderr,
 	"Usage: %s [-"
-	"DEhpvVldsSTLRnPI"
+	"DEhpvVldsSLRnPI"
 #ifdef DEV_BUILD
 			"12"
 #endif
@@ -76,8 +71,8 @@ static int usage(int e, char* prog_name)
 			"t"
 #endif
 			"] [-e boot arguments] [-k Pongo image] [-o overlay file] [-r ramdisk file] [-K KPF file] [-i checkra1n file]\n"
-			"Copyright (C) 2024, palera1n team, All Rights Reserved.\n\n"
-			"iOS/iPadOS/tvOS 15.0-26.0, bridgeOS 5.0-10.0 arm64 jailbreaking tool\n\n"
+			"Copyright (C) 2023, palera1n team, All Rights Reserved.\n\n"
+			"iOS/iPadOS 15.0-16.5 arm64 jailbreaking tool\n\n"
 			"\t--version\t\t\t\tPrint version\n"
 			"\t--force-revert\t\t\t\tRemove jailbreak\n"
 #ifdef DEV_BUILD
@@ -100,9 +95,7 @@ static int usage(int e, char* prog_name)
 			"\t-i, --override-checkra1n <file>\t\tOverride checkra1n\n"
 			"\t-k, --override-pongo <file>\t\tOverride Pongo image\n"
 			"\t-K, --override-kpf <file>\t\tOverride kernel patchfinder\n"
-#ifdef ROOTFUL
 			"\t-l, --rootless\t\t\t\tBoots rootless. This is the default\n"
-#endif
 			"\t-L, --jbinit-log-to-file\t\tMake jbinit log to /cores/jbinit.log (can be read from sandbox while jailbroken)\n"
 			"\t-n, --exit-recovery\t\t\tExit recovery mode\n"
 			"\t-I, --device-info\t\t\tPrint info about the connected device\n"
@@ -113,14 +106,12 @@ static int usage(int e, char* prog_name)
 			"\t-R, --reboot-device\t\t\tReboot connected device in normal mode\n"
 			"\t-s, --safe-mode\t\t\t\tEnter safe mode\n"
 			"\t-S, --no-colors\t\t\t\tDisable colors on the command line\n"
-			"\t-T, --telnetd\t\t\t\tEnable TELNET daemon on port 46 (insecure)\n"
 			"\t-v, --debug-logging\t\t\tEnable debug logging\n"
 			"\t\tThis option can be repeated for extra verbosity.\n"
 			"\t-V, --verbose-boot\t\t\tVerbose boot\n"

 #ifdef TUI
-			"\t-t, --tui\t\t\t\tForce interactive TUI\n"
-			"\t--cli\t\t\t\t\tForce cli mode\n"
+			"\t-t, --tui\t\t\t\tTerminal user interface\n"
 #endif
 		"\nEnvironmental variables:\n"
 		"\tTMPDIR\t\ttemporary diretory (path the built-in checkra1n will be extracted to)\n"
@@ -133,36 +124,34 @@ int optparse(int argc, char* argv[]) {
 	int opt;
 	int index;
 	while ((opt = getopt_long(argc, argv,
-	"DEhpvVlLdsSTtRnPIe:o:r:K:k:i:"
+	"DEhpvVldsSLtRnPIe:o:r:K:k:i:"
 #ifdef DEV_BUILD
 	"12"
 #endif
-#ifdef ROOTFUL
 	"fCcB"
-#endif
 	,longopts, NULL)) != -1)
 	{
 		switch (opt) {
-#ifdef ROOTFUL
 		case 'B':
 			palerain_flags |= palerain_option_setup_partial_root;
 			palerain_flags |= palerain_option_setup_rootful;
+			kpf_flags |= checkrain_option_verbose_boot;
 			break;
 		case 'c':
 			palerain_flags |= palerain_option_setup_rootful;
+			kpf_flags |= checkrain_option_verbose_boot;
 			break;
 		case 'C':
 			palerain_flags |= palerain_option_clean_fakefs;
 			break;
-#endif
 		case 'p':
-			palerain_flags |= palerain_option_pongo_exit;
+			host_flags |= host_option_pongo_exit;
 			break;
 		case 'P':
-			palerain_flags |= palerain_option_pongo_full;
+			host_flags |= host_option_pongo_full;
 			break;
 		case 'D':
-			palerain_flags |= palerain_option_dfuhelper_only;
+			host_flags |= host_option_dfuhelper_only;
 			break;
 		case 'h':
 			usage(0, argv[0]);
@@ -171,48 +160,38 @@ int optparse(int argc, char* argv[]) {
 			verbose++;
 			break;
 		case 'V':
-			palerain_flags |= palerain_option_verbose_boot;
-#ifdef TUI
-			tui_options_verbose_boot = true;
-#endif
+			kpf_flags |= checkrain_option_verbose_boot;
+			force_use_verbose_boot = true;
 			break;
 		case 'e':
-			if (strlen(optarg) > (sizeof(xargs_cmd) - 0x20)) {
+			if (strstr(optarg, "rootdev=") != NULL) {
+				LOG(LOG_FATAL, "The boot arg rootdev= is already used by palera1n and cannot be overriden");
+				return -1;
+			} else if (strlen(optarg) > (sizeof(xargs_cmd) - 0x20)) {
                LOG(LOG_FATAL, "Boot arguments too long");
                return -1;
            }
 			snprintf(xargs_cmd, sizeof(xargs_cmd), "xargs %s", optarg);
-#ifdef TUI
-			snprintf(tui_options_boot_args, sizeof(tui_options_boot_args), "%s", optarg);
-#endif
 			break;
-#ifdef ROOTFUL
 		case 'f':
+			snprintf(rootfs_cmd, sizeof(rootfs_cmd), "rootfs %s", optarg);
+			snprintf(dtpatch_cmd, 0x20, "dtpatch %s", optarg);
 			palerain_flags |= palerain_option_rootful;
-			palerain_flags &= ~palerain_option_rootless;
 			break;
-#endif
 		case 'l':
 			palerain_flags &= ~palerain_option_rootful;
-			palerain_flags |= palerain_option_rootless;
 			break;
 		case 'L':
 			palerain_flags |= palerain_option_jbinit_log_to_file;
 			break;
 		case 'd':
-			palerain_flags |= palerain_option_demote;
+			host_flags |= host_option_demote;
 			break;
 		case 'E':
-			palerain_flags |= palerain_option_enter_recovery;
+			host_flags |= host_option_enter_recovery;
 			break;
 		case 's':
-			palerain_flags |= palerain_option_safemode;
-#ifdef TUI
-			tui_options_safe_mode = true;
-#endif
-			break;
-		case 'T':
-			palerain_flags |= palerain_option_telnetd;
+			checkrain_flags |= checkrain_option_safemode;
 			break;
 		case 'k':
 			if (access(optarg, F_OK) != 0) {
@@ -220,22 +199,18 @@ int optparse(int argc, char* argv[]) {
 				return -1;
 			}
 			pongo_path = malloc(strlen(optarg) + 1);
-			if (pongo_path == NULL) {
-				LOG(LOG_FATAL, "memory allocation failed");
-				return -1;
-			}
-			snprintf(pongo_path, strlen(optarg) + 1, "%s", optarg);
+			strcpy(pongo_path, optarg);
 			break;
 		case 'o':
 			if (override_file(&override_overlay, overlay_to_upload, &binpack_dmg_len, optarg))
 				return 1;
 			break;
 		case 'r':
-			if (override_file(&override_ramdisk, ramdisk_to_upload, &ramdisk_dmg_lzma_len, optarg))
+			if (override_file(&override_ramdisk, ramdisk_to_upload, &ramdisk_dmg_len, optarg))
 				return 1;
 			break;
 		case 'K':
-			if (override_file(&override_kpf, kpf_to_upload, &checkra1n_kpf_pongo_lzma_len, optarg))
+			if (override_file(&override_kpf, kpf_to_upload, &checkra1n_kpf_pongo_len, optarg))
 				return 1;
 			struct mach_header_64* hdr = (struct mach_header_64*)override_kpf.ptr;
 			if (hdr->magic != MH_MAGIC_64 && hdr->magic != MH_CIGAM_64) {
@@ -277,12 +252,12 @@ int optparse(int argc, char* argv[]) {
 			}
 			if (boyermoore_horspool_memmem(addr, st.st_size, (const unsigned char*)"[ra1npoc15-part] thanks to", strlen("[ra1npoc15-part] thanks to")) != NULL) 
 				{
-					palerain_flags |= palerain_option_checkrain_is_clone;
+					host_flags |= palerain_option_checkrain_is_clone;
 					LOG(LOG_VERBOSE3, "%s is checkra1n clone", optarg);
 				}
 			else
 			{
-				palerain_flags &= ~palerain_option_checkrain_is_clone;
+				host_flags &= ~palerain_option_checkrain_is_clone;
 				LOG(LOG_VERBOSE3, "%s is checkra1n", optarg);
 			}
 			munmap(addr, st.st_size);
@@ -291,25 +266,22 @@ int optparse(int argc, char* argv[]) {
 			snprintf(ext_checkra1n, strlen(optarg) + 1, "%s", optarg);
 			break;
 		case 'R':
-			palerain_flags |= palerain_option_reboot_device;
+			host_flags |= host_option_reboot_device;
 			break;
 		case 'n':
-			palerain_flags |= palerain_option_exit_recovery;
+			host_flags |= host_option_exit_recovery;
 			break;
 		case 'I':
-			palerain_flags |= palerain_option_device_info;
+			host_flags |= host_option_device_info;
 			break;
 		case 'S':
-			palerain_flags |= palerain_option_no_colors;
+			host_flags |= host_option_no_colors;
 			break;
 #ifdef TUI
 		case 't':
-			palerain_flags |= palerain_option_tui;
+			host_flags |= host_option_tui;
 			break;
 #endif
-		case palerain_option_case_cli:
-			palerain_flags |= palerain_option_cli;
-			break;
 #ifdef DEV_BUILD
 		case '1':
 			palerain_flags |= palerain_option_test1;
@@ -319,33 +291,24 @@ int optparse(int argc, char* argv[]) {
 			break;
 #endif
 		case palerain_option_case_force_revert:
-			palerain_flags |= palerain_option_force_revert;
-#ifdef TUI
-			tui_options_force_revert = true;
-#endif
+			checkrain_flags |= checkrain_option_force_revert;
 			break;
 		case palerain_option_case_version:
-			palerain_flags |= palerain_option_palerain_version;
-			break;
-		case palerain_option_case_libcheckra1nhelper_path:
-			printf("meow\n");
-			gOverrideLibcheckra1nHelper = calloc(1, strlen(optarg) + 1);
-			if (!gOverrideLibcheckra1nHelper) {
-				return -1;
-			}
-			snprintf(gOverrideLibcheckra1nHelper, strlen(optarg) + 1, "%s", optarg);
+			host_flags |= host_option_palerain_version;
 			break;
 		default:
 			usage(1, argv[0]);
 			break;
 		}
 	}
-	if ((palerain_flags & palerain_option_palerain_version)) {
+	if (checkrain_options_enabled(host_flags, host_option_palerain_version)) {
 		printf(
 			"palera1n " PALERAIN_VERSION "\n"
 			BUILD_COMMIT " " BUILD_NUMBER " (" BUILD_BRANCH ")\n\n"
+			"Build date: " BUILD_DATE "\n"
 			"Build style: " BUILD_STYLE "\n"
 			"Build tag: " BUILD_TAG "\n"
+			"Built by: " BUILD_WHOAMI "\n"
 #ifdef USE_LIBUSB
 			"USB backend: libusb\n"
 #else
@@ -356,56 +319,41 @@ int optparse(int argc, char* argv[]) {
 		return 0;
 	}

-	if (palerain_flags & palerain_option_telnetd) {
-		LOG(LOG_WARNING, "telnetd is enabled, this is a security hole");
-	}
-
-	if ((palerain_flags & (palerain_option_tui)) && (palerain_flags & (palerain_option_cli))) {
-		LOG(LOG_FATAL, "cannot specify both --tui and --cli");
-		return -1;
-	}
-
-	if ((palerain_flags & (palerain_option_exit_recovery | palerain_option_enter_recovery | palerain_option_reboot_device | palerain_option_device_info | palerain_option_dfuhelper_only | palerain_option_pongo_exit | palerain_option_pongo_full)) > 0) {
-		palerain_flags &= ~palerain_option_tui;
-		palerain_flags |= palerain_option_cli;
-	} else {
-#ifdef ROOTFUL
-		if ((palerain_flags & (palerain_option_rootless | palerain_option_rootful)) == 0) {
-			LOG(LOG_FATAL, "Please specify rootful (-f) or rootless (-l)");
-			return -1;
-		}
-#else
-		palerain_flags |= palerain_option_rootless;
-#endif
+	if ((strstr(xargs_cmd, "serial=") != NULL) && !force_use_verbose_boot && checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful)) {
+		kpf_flags &= ~checkrain_option_verbose_boot;
 	}
    
-	snprintf(palerain_flags_cmd, 0x30, "palera1n_flags 0x%" PRIx64, palerain_flags);
+	snprintf(checkrain_flags_cmd, 0x20, "checkra1n_flags 0x%x", checkrain_flags);
+	snprintf(palerain_flags_cmd, 0x20, "palera1n_flags 0x%x", palerain_flags);
+	snprintf(kpf_flags_cmd, 0x20, "kpf_flags 0x%x", kpf_flags);
+	LOG(LOG_VERBOSE3, "checkrain_flags: %s", checkrain_flags_cmd);
 	LOG(LOG_VERBOSE3, "palerain_flags: %s", palerain_flags_cmd);
+	LOG(LOG_VERBOSE3, "kpf_flags: %s", kpf_flags_cmd);
+	LOG(LOG_VERBOSE3, "host_flags: 0x%x", host_flags);
 	if (override_kpf.magic == OVERRIDE_MAGIC) {
-		LOG(LOG_VERBOSE4, "kpf override length %" PRIu32 " -> %" PRIu32, override_kpf.orig_len, checkra1n_kpf_pongo_lzma_len);
+		LOG(LOG_VERBOSE4, "kpf override length %u -> %u", override_kpf.orig_len, checkra1n_kpf_pongo_len);
 		LOG(LOG_VERBOSE4, "kpf override ptr %p -> %p", override_kpf.orig_ptr, **kpf_to_upload);
 	}
 	if (override_ramdisk.magic == OVERRIDE_MAGIC) {
-		LOG(LOG_VERBOSE4, "ramdisk override length %" PRIu32 " -> %" PRIu32, override_ramdisk.orig_len, ramdisk_dmg_lzma_len);
+		LOG(LOG_VERBOSE4, "ramdisk override length %u -> %u", override_ramdisk.orig_len, ramdisk_dmg_len);
 		LOG(LOG_VERBOSE4, "ramdisk override ptr %p -> %p", override_ramdisk.orig_ptr, **ramdisk_to_upload);
 	}
 	if (override_overlay.magic == OVERRIDE_MAGIC) {
-		LOG(LOG_VERBOSE4, "overlay override length %" PRIu32 " -> %" PRIu32, override_overlay.orig_len, binpack_dmg_len);
+		LOG(LOG_VERBOSE4, "overlay override length %u -> %u", override_overlay.orig_len, binpack_dmg_len);
 		LOG(LOG_VERBOSE4, "overlay override ptr %p -> %p", override_overlay.orig_ptr, **overlay_to_upload);
 	}
-#ifdef ROOTFUL
-	if (!(palerain_flags & palerain_option_rootful)) {
-		if ((palerain_flags & palerain_option_setup_rootful)) {
+
+	if (!checkrain_options_enabled(palerain_flags, palerain_option_rootful)) {
+		if (checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful) || checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful_forced)) {
 			LOG(LOG_FATAL, "Cannot setup rootful when rootless is requested. Use -f to enable rootful mode.");
 			return -1;
 		}
 	}
-#endif
 	if (!(
-			(palerain_flags & palerain_option_dfuhelper_only) ||
-			(palerain_flags & palerain_option_enter_recovery) ||
-			(palerain_flags & palerain_option_exit_recovery) ||
-			(palerain_flags & palerain_option_reboot_device)))
+			checkrain_options_enabled(host_flags, host_option_dfuhelper_only) ||
+			checkrain_options_enabled(host_flags, host_option_enter_recovery) ||
+			checkrain_options_enabled(host_flags, host_option_exit_recovery) ||
+			checkrain_options_enabled(host_flags, host_option_reboot_device)))
 	{
 #ifdef NO_CHECKRAIN
 		if (checkra1n_len == 0 && ext_checkra1n == NULL)
@@ -413,10 +361,10 @@ int optparse(int argc, char* argv[]) {
 			LOG(LOG_FATAL, "checkra1n omitted in build but no override specified");
 			return -1;
 		}
-		if (!((palerain_flags & palerain_option_pongo_exit) || (palerain_flags & palerain_option_pongo_exit)))
+		if (!(checkrain_options_enabled(host_flags, host_option_pongo_exit) || checkrain_options_enabled(host_flags, host_option_pongo_exit)))
 		{
 #ifdef NO_KPF
-			if (checkra1n_kpf_pongo_lzma_len == 0)
+			if (checkra1n_kpf_pongo_len == 0)
 			{
 				LOG(LOG_FATAL, "kernel patchfinder omitted in build but no override specified");
 				return -1;
@@ -424,13 +372,6 @@ int optparse(int argc, char* argv[]) {
 #endif
 		}
 #endif
-
-#ifdef NO_EMBED_HELPER
-	if (libcheckra1nhelper_dylib_len == 0 && gOverrideLibcheckra1nHelper == NULL) {
-			LOG(LOG_FATAL, "checkra1n helper omitted in build but no override specified");
-			return -1;
-	}
-#endif
 	}

 	for (index = optind; index < argc; index++)
@@ -14,6 +14,7 @@
 #include <sys/mman.h>
 #include <errno.h>

+
 int override_file(override_file_t *finfo, niarelap_file_t** orig, unsigned int *orig_len, char *filename) {
 	int ret = 0;
 	int fd = open(filename, O_RDONLY);
@@ -11,9 +11,6 @@
 #include <sys/stat.h>           // fstst

 #include <palerain.h>
-#ifdef TUI
-#include <tui.h>
-#endif
 #include <ANSI-color-codes.h>

 bool device_has_booted = 0;
@@ -21,10 +18,6 @@ int pongo_thr_running = 0;

 #define ERR(...) LOG(LOG_VERBOSE, __VA_ARGS__)

-static int issue_pongo_command(usb_device_handle_t, char*);
-static int upload_pongo_file(usb_device_handle_t, unsigned char*, unsigned int);
-static void write_stdout(char *buf, uint32_t len);
-
 void* pongo_helper(void* ptr) {
 	pongo_thr_running = 1;
 	pthread_cleanup_push(thr_cleanup, &pongo_thr_running);
@@ -36,112 +29,59 @@ void* pongo_helper(void* ptr) {
 	return NULL;
 }

-static void *pongo_usb_callback(stuff_t *arg) {
+void *pongo_usb_callback(stuff_t *arg) {
 	if (get_found_pongo())
 		return NULL;
 	set_found_pongo(1);
-#ifdef ROOTFUL
-	if ((palerain_flags & palerain_option_setup_rootful)) {
+	if (checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful)) {
 		strncat(xargs_cmd, " wdt=-1", 0x270 - strlen(xargs_cmd) - 1);	
 	}
-#endif
 	LOG(LOG_INFO, "Found PongoOS USB Device");
-	if (palerain_flags & palerain_option_pongo_exit)
-		goto done;
-
 	usb_device_handle_t handle = arg->handle;
-#ifdef TUI
-	if (tui_is_jailbreaking) {
-		tui_jailbreak_stage = 4;
-    	tui_jailbreak_status = "Sending PongoOS commands";
-    	tui_jailbreak_status_changed();
-	}
-#endif
 	issue_pongo_command(handle, NULL);	
 	issue_pongo_command(handle, "fuse lock");
 	issue_pongo_command(handle, "sep auto");
-#ifdef TUI
-	if (tui_is_jailbreaking) {
-		tui_jailbreak_stage = 5;
-    	tui_jailbreak_status = "Sending KPF";
-    	tui_jailbreak_status_changed();
-	}
-#endif
-	upload_pongo_file(handle, **kpf_to_upload, checkra1n_kpf_pongo_lzma_len);
-	if (*kpf_to_upload == &checkra1n_kpf_pongo_lzma) {
-		issue_pongo_command(handle, "modload " KPF_UNCOMPRESSED_SIZE);
-	} else {
-		issue_pongo_command(handle, "modload");
-	}
+	upload_pongo_file(handle, **kpf_to_upload, checkra1n_kpf_pongo_len);
+	issue_pongo_command(handle, "modload");
+	issue_pongo_command(handle, kpf_flags_cmd);
+	issue_pongo_command(handle, checkrain_flags_cmd);
 	issue_pongo_command(handle, palerain_flags_cmd);
+	if (checkrain_options_enabled(palerain_flags, palerain_option_rootful))
+	{
+		issue_pongo_command(handle, "rootfs");
+	}
 #ifdef NO_RAMDISK
-	if (ramdisk_dmg_lzma_len != 0)
+	if (ramdisk_dmg_len != 0)
 #endif
 	{
-#ifdef TUI
-		if (tui_is_jailbreaking) {
-			tui_jailbreak_stage = 6;
-			tui_jailbreak_status = "Sending ramdisk";
-			tui_jailbreak_status_changed();
-		}
-#endif
-		upload_pongo_file(handle, **ramdisk_to_upload, ramdisk_dmg_lzma_len);
-		if ((*ramdisk_to_upload) == &ramdisk_dmg_lzma)
-			issue_pongo_command(handle, "ramdisk " RAMDISK_UNCOMPRESSED_SIZE);
-		else {
-			issue_pongo_command(handle, "ramdisk");
-		}
+		strncat(xargs_cmd, " rootdev=md0", 0x270 - strlen(xargs_cmd) - 1);
+		upload_pongo_file(handle, **ramdisk_to_upload, ramdisk_dmg_len);
+		issue_pongo_command(handle, "ramdisk");
 	}
 #ifdef NO_OVERLAY
 	if (binpack_dmg_len != 0)
 #endif
 	{
-#ifdef TUI
-		if (tui_is_jailbreaking) {
-			tui_jailbreak_stage = 7;
-			tui_jailbreak_status = "Sending binpack";
-			tui_jailbreak_status_changed();
-		}
-#endif
 		upload_pongo_file(handle, **overlay_to_upload, binpack_dmg_len);
 		issue_pongo_command(handle, "overlay");
 	}
 	issue_pongo_command(handle, xargs_cmd);
-	if ((palerain_flags & palerain_option_pongo_full)) goto done;
-
-#ifdef TUI
-	if (tui_is_jailbreaking) {
-		tui_jailbreak_stage = 8;
-		tui_jailbreak_status = "Booting";
-		tui_jailbreak_status_changed();
-	}
-#endif
+	if (checkrain_options_enabled(host_flags, host_option_pongo_full)) goto done;
 	issue_pongo_command(handle, "bootx");
 	LOG(LOG_INFO, "Booting Kernel...");
-#ifdef ROOTFUL
-	if ((palerain_flags & palerain_option_setup_partial_root)) {
+	if (checkrain_options_enabled(palerain_flags, palerain_option_setup_partial_root)) {
 		LOG(LOG_INFO, "Please wait up to 5 minutes for the bindfs to be created.");
-		LOG(LOG_INFO, "Once the device reboots into recovery mode, run again without the -B (Create BindFS) option to jailbreak.");
-	} else if ((palerain_flags & palerain_option_setup_rootful)) {
+		LOG(LOG_INFO, "Once the device boots up to iOS, run again without the -B (Create BindFS) option to jailbreak.");
+	} else if (checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful)) {
 		LOG(LOG_INFO, "Please wait up to 10 minutes for the fakefs to be created.");
-		LOG(LOG_INFO, "Once the device reboots into recovery mode, run again without the -c (Create FakeFS) option to jailbreak.");
+		LOG(LOG_INFO, "Once the device boots up to iOS, run again without the -c (Create FakeFS) option to jailbreak.");
 	}
-#endif
 	if (dfuhelper_thr_running) {
 		pthread_cancel(dfuhelper_thread);
 		dfuhelper_thr_running = false;
 	}
 done:
 	device_has_booted = true;
-
-#ifdef TUI
-	if (tui_is_jailbreaking) {
-		tui_jailbreak_stage = 9;
-		tui_jailbreak_status = "All Done";
-		tui_is_jailbreaking = false;
-		tui_jailbreak_status_changed();
-	}
-#endif
 #ifdef USE_LIBUSB
 	libusb_unref_device(arg->dev);
 #endif
@@ -149,7 +89,7 @@ done:
 	return NULL;
 }

-static int issue_pongo_command(usb_device_handle_t handle, char *command)
+int issue_pongo_command(usb_device_handle_t handle, char *command)
 {
 	uint32_t outpos = 0;
 	uint32_t outlen = 0;
@@ -211,7 +151,7 @@ bad:
 		return ret;
 }

-static int upload_pongo_file(usb_device_handle_t handle, unsigned char *buf, unsigned int buf_len)
+int upload_pongo_file(usb_device_handle_t handle, unsigned char *buf, unsigned int buf_len)
 {
 	int ret = 0;
 	ret = USBControlTransfer(handle, 0x21, 1, 0, 0, 4, &buf_len, NULL);
@@ -223,7 +163,7 @@ static int upload_pongo_file(usb_device_handle_t handle, unsigned char *buf, uns
 		    if (verbose < 3 || verbose > 4) {
 				LOG(LOG_VERBOSE, "Uploaded %llu bytes to PongoOS", (unsigned long long)buf_len);
    		} else {
-				if ((palerain_flags & palerain_option_no_colors))
+				if (checkrain_options_enabled(host_flags, host_option_no_colors))
 				    printf("/send mem:%p:%p\nUploaded %llu bytes]\n", (void*)buf, (void*)(buf + buf_len), (unsigned long long)buf_len);
 				else
        			printf("/send mem:%p:%p\n" BCYN "[Uploaded %llu bytes]\n" CRESET, (void*)buf, (void*)(buf + buf_len), (unsigned long long)buf_len);
@@ -267,7 +207,7 @@ void io_stop(stuff_t *stuff)
 #endif
 }

-static void write_stdout(char *buf, uint32_t len)
+void write_stdout(char *buf, uint32_t len)
 {
    while(len > 0) {
        if (verbose >= 3) {
@@ -1,2 +0,0 @@
-*
-!.gitignore
@@ -1,220 +0,0 @@
-#ifdef TUI
-
-#include <palerain.h>
-#include <tui.h>
-
-static irecv_device_t tui_get_recovery_device(uint64_t ecid) {
-    irecv_client_t client = NULL;
-	for (int i = 0; i <= 5; i++) {
-		irecv_error_t err = irecv_open_with_ecid(&client, ecid);
-		if (err == IRECV_E_UNSUPPORTED) {
-			return NULL;
-		}
-		else if (err != IRECV_E_SUCCESS)
-			sleep(1);
-		else
-			break;
-
-		if (i == 5) {
-			return NULL;
-		}
-	}
-
-	irecv_device_t device = NULL;
-	irecv_devices_get_device_by_client(client, &device);
-    irecv_close(client);
-    return device;
-}
-
-struct tui_connected_device *tui_connected_devices = NULL;
-
-static void* tui_connected_recovery_mode(struct irecv_device_info* info) {
-    //printf("Recovery mode device %" PRIu64 " connected\n", info->ecid);
-    tui_last_event = TUI_EVENT_CONNECTED_DEVICES_CHANGED;
-    sem_post(tui_event_semaphore);
-	pthread_exit(NULL);
-	return NULL;
-}
-
-static void* tui_disconnected_recovery_mode(struct irecv_device_info* info) {
-    //printf("Recovery mode device %" PRIu64 " disconnected\n", info->ecid);
-    tui_last_event = TUI_EVENT_CONNECTED_DEVICES_CHANGED;
-    sem_post(tui_event_semaphore);
-	pthread_exit(NULL);
-	return NULL;
-}
-
-static void* tui_connected_dfu_mode(struct irecv_device_info* info) {
-    //printf("DFU mode device %" PRIu64 " connected\n", info->ecid);
-    tui_last_event = TUI_EVENT_CONNECTED_DEVICES_CHANGED;
-    sem_post(tui_event_semaphore);
-	pthread_exit(NULL);
-	return NULL;
-}
-
-static void* tui_disconnected_dfu_mode(struct irecv_device_info* info) {
-    //printf("DFU mode device %" PRIu64 " disconnected\n", info->ecid);
-    tui_last_event = TUI_EVENT_CONNECTED_DEVICES_CHANGED;
-    sem_post(tui_event_semaphore);
-    pthread_exit(NULL);
-    return NULL;
-}
-
-static int tui_connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
-    struct tui_connected_device *tui_dev = malloc(sizeof(struct tui_connected_device));
-    strcpy(tui_dev->udid, usbmuxd_device->udid);
-    tui_dev->next = tui_connected_devices;
-    tui_dev->mode = TUI_DEVICE_MODE_NORMAL;
-    tui_connected_devices = tui_dev;
-	devinfo_t dev;
-	int ret;
-	ret = devinfo_cmd(&dev, usbmuxd_device->udid);
-	if (ret != 0) {
-		LOG(LOG_ERROR, "Unable to get device information");
-        free(tui_dev);
-		return 0;
-	}
-    snprintf(tui_dev->product_type, sizeof(tui_dev->product_type), "%s", dev.productType);
-    snprintf(tui_dev->display_name, sizeof(tui_dev->display_name), "%s", dev.displayName);
-    tui_dev->ecid = dev.ecid;
-    if (strncmp(dev.CPUArchitecture, "arm64", strlen("arm64"))) {
-        tui_dev->arm64 = false;
-    } else {
-        tui_dev->arm64 = true;
-    }
-    sprintf(tui_dev->version, "%s", dev.productVersion);
-	if (!strncmp(dev.productType, "iPhone10,", strlen("iPhone10,"))) {
-		tui_dev->requires_passcode_disabled = true;
-		unsigned char passcode_state = 0;
-		ret = passstat_cmd(&passcode_state, usbmuxd_device->udid);
-		if (ret != 0) {
-			LOG(LOG_ERROR, "Failed to get passcode state");
-			devinfo_free(&dev);
-            free(tui_dev);
-			return -1;
-		}
-		tui_dev->passcode_state = passcode_state;
-    }
-
-	//enter_recovery_cmd(usbmuxd_device->udid);
-	devinfo_free(&dev);
-	
-    tui_last_event = TUI_EVENT_CONNECTED_DEVICES_CHANGED;
-    sem_post(tui_event_semaphore);
-
-	return 0;
-}
-
-static void tui_disconnected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
-    struct tui_connected_device *cur = tui_connected_devices;
-    struct tui_connected_device *prev = NULL;
-    while (cur) {
-        if (!strcmp(cur->udid, usbmuxd_device->udid)) {
-            if (prev) {
-                prev->next = cur->next;
-            } else {
-                tui_connected_devices = cur->next;
-            }
-            free(cur);
-            break;
-        }
-        prev = cur;
-        cur = cur->next;
-    }
-
-    tui_last_event = TUI_EVENT_CONNECTED_DEVICES_CHANGED;
-    sem_post(tui_event_semaphore);
-}
-
-static void tui_device_event_cb(const usbmuxd_event_t *event, void* userdata) {
-	if (event->device.conn_type != CONNECTION_TYPE_USB) return;
-	switch (event->event) {
-	case UE_DEVICE_ADD:
-		LOG(LOG_VERBOSE, "Normal mode device connected");
-		tui_connected_normal_mode(&event->device);
-		break;
-	case UE_DEVICE_REMOVE:
-		LOG(LOG_VERBOSE, "Normal mode device disconnected");
-        tui_disconnected_normal_mode(&event->device);
-		break;
-	}
-}
-
-static void tui_irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) {
-	pthread_t recovery_thread, dfu_thread;
-	int ret;
-	
-	switch(event->type) {
-		case IRECV_DEVICE_ADD: {
-            struct tui_connected_device *dev = malloc(sizeof(struct tui_connected_device));
-            dev->ecid = event->device_info->ecid;
-            dev->next = tui_connected_devices;
-            dev->arm64 = cpid_is_arm64(event->device_info->cpid);
-            /*recvinfo_t info;
-			ret = recvinfo_cmd(&info, event->device_info->ecid);
-            if (ret) {
-                LOG(LOG_WARNING, "Could not get info from device");
-            } else {
-                snprintf(dev->product_type, sizeof(dev->product_type), "%s", info.product_type);
-                snprintf(dev->display_name, sizeof(dev->display_name), "%s", info.display_name);
-            }*/
-            irecv_device_t device = tui_get_recovery_device(event->device_info->ecid);
-            if (!device) {
-                LOG(LOG_WARNING, "Could not get info from device");
-                free(dev);
-                return;
-            }
-            snprintf(dev->product_type, sizeof(dev->product_type), "%s", device->product_type);
-            snprintf(dev->display_name, sizeof(dev->display_name), "%s", device->display_name);
-            dev->cpid = device->chip_id;
-            tui_connected_devices = dev;
-
-			if (event->mode == IRECV_K_RECOVERY_MODE_1 || 
-				event->mode == IRECV_K_RECOVERY_MODE_2 || 
-				event->mode == IRECV_K_RECOVERY_MODE_3 || 
-				event->mode == IRECV_K_RECOVERY_MODE_4) {
-				
-                dev->mode = TUI_DEVICE_MODE_RECOVERY;
-				pthread_create(&recovery_thread, NULL, (pthread_start_t)tui_connected_recovery_mode, event->device_info);
-			} else if (event->mode == IRECV_K_DFU_MODE) {
-                dev->mode = TUI_DEVICE_MODE_DFU;
-				pthread_create(&dfu_thread, NULL, (pthread_start_t)tui_connected_dfu_mode, event->device_info);
-			}
-			break;
-        }
-		case IRECV_DEVICE_REMOVE: {
-            struct tui_connected_device *cur = tui_connected_devices;
-            struct tui_connected_device *prev = NULL;
-            while (cur) {
-                if (cur->ecid == event->device_info->ecid) {
-                    if (prev) {
-                        prev->next = cur->next;
-                    } else {
-                        tui_connected_devices = cur->next;
-                    }
-                    if (cur->mode == TUI_DEVICE_MODE_RECOVERY) {
-                        LOG(LOG_VERBOSE, "Recovery mode device %" PRIu64 " disconnected", event->device_info->ecid);
-				        pthread_create(&recovery_thread, NULL, (pthread_start_t)tui_disconnected_recovery_mode, event->device_info);
-                    } else if (cur->mode == TUI_DEVICE_MODE_DFU) {
-                        LOG(LOG_VERBOSE, "DFU mode device %" PRIu64 " disconnected", event->device_info->ecid);
-				        pthread_create(&dfu_thread, NULL, (pthread_start_t)tui_disconnected_dfu_mode, event->device_info);
-                    }
-                    free(cur);
-                    break;
-                }
-                prev = cur;
-                cur = cur->next;
-            }
-		    break;
-        }
-	}
-}
-
-void tui_devhelper(void) {
-    subscribe_cmd(tui_device_event_cb, tui_irecv_device_event_cb);
-}
-
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
@@ -1,166 +0,0 @@
-#ifdef TUI
-
-#include <tui.h>
-
-#ifdef __linux__
-#include <gpm.h>
-#endif
-
-int tui_mouse_x = 0;
-int tui_mouse_y = 0;
-int tui_mouse_button = -1;
-
-int tui_last_event = -1;
-int tui_last_input = -1;
-sem_t *tui_event_semaphore;
-char tui_last_key = 0;
-
-#ifdef __linux__
-bool using_gpm = false;
-#endif
-
-int tui_get_input(void) {
-    char c = getc(stdin);
-    if (c == '\x1b' && getc(stdin) == '[') {
-        char c3 = getc(stdin);
-        switch (c3) {
-        case 'D':
-            return TUI_INPUT_LEFT;
-        case 'C':
-            return TUI_INPUT_RIGHT;
-        case 'A':
-            return TUI_INPUT_UP;
-        case 'B':
-            return TUI_INPUT_DOWN;
-        case 'Z':
-            return TUI_INPUT_TAB_BACK;
-        case 'M': {
-            char c4 = getc(stdin);
-            char c5 = getc(stdin);
-            char c6 = getc(stdin);
-
-            int new_mouse_x = c5 - 33;
-            if (new_mouse_x < 0) new_mouse_x += 256;
-            int new_mouse_y = c6 - 33;
-            if (new_mouse_y < 0) new_mouse_y += 256;
-            int mouse_button = c4 & 3;
-
-            if (tui_mouse_x != new_mouse_x || tui_mouse_y != new_mouse_y) {
-                tui_mouse_x = new_mouse_x;
-                tui_mouse_y = new_mouse_y;
-                return TUI_INPUT_MOUSE_MOVE;
-            }
-
-            if (tui_mouse_button != (c4 & 1)) {
-                tui_mouse_button = c4 & 1;
-                if (tui_mouse_button == 0) {
-                    return TUI_INPUT_MOUSE_DOWN;
-                } else {
-                    return TUI_INPUT_MOUSE_UP;
-                }
-            }
-
-            break;
-        }
-        }
-    }
-    
-    tui_last_key = c;
-
-    if (c == '\x0d' || c == ' ') {
-        return TUI_INPUT_SELECT;
-    }
-
-    if (c == '\t') {
-        return TUI_INPUT_TAB;
-    }
-
-    if (c == '\x7f') {
-        return TUI_INPUT_BACKSPACE;
-    }
-
-    if (c == '\x1b') {
-        return TUI_INPUT_ESCAPE;
-    }
-
-    return TUI_INPUT_NONE;
-}
-
-#ifdef __linux__
-void *tui_gpm_thread(void *arg) {
-    Gpm_Event event;
-    while (1) {
-        if (Gpm_GetEvent(&event) == -1) {
-            exit(1);
-        }
-        tui_mouse_x = event.x - 1;
-        tui_mouse_y = event.y - 1;
-        if (event.type & GPM_MOVE) {
-            tui_last_event = TUI_EVENT_INPUT;
-            tui_last_input = TUI_INPUT_MOUSE_MOVE;
-            sem_post(tui_event_semaphore);
-        }
-        if (event.buttons & 4) {
-            if (event.type & GPM_DOWN) {
-                tui_mouse_button = 1;
-                tui_last_event = TUI_EVENT_INPUT;
-                tui_last_input = TUI_INPUT_MOUSE_DOWN;
-                sem_post(tui_event_semaphore);
-            } else if (event.type & GPM_UP) {
-                tui_mouse_button = 0;
-                tui_last_event = TUI_EVENT_INPUT;
-                tui_last_input = TUI_INPUT_MOUSE_UP;
-                sem_post(tui_event_semaphore);
-            }
-            continue;
-        }
-    }
-}
-#endif
-
-void *tui_input_thread(void *arg) {
-#ifdef __linux__
-    if (strncmp(getenv("TERM"), "linux", 5) == 0) {
-        Gpm_Connect conn;
-        Gpm_Event event;
-        conn.eventMask = GPM_UP | GPM_DOWN;
-        conn.defaultMask = ~0;
-        conn.minMod = 0;
-        conn.maxMod = 0xffff;
-        if (Gpm_Open(&conn, 0) != -1) {
-            using_gpm = true;
-            pthread_t gpm_thread;
-            pthread_create(&gpm_thread, NULL, tui_gpm_thread, NULL);
-        }
-    }
-#endif
-    while (1) {
-        int input = tui_get_input();
-        tui_last_event = TUI_EVENT_INPUT;
-        tui_last_input = input;
-        sem_post(tui_event_semaphore);
-    }
-    return 0;
-}
-
-int tui_get_event(void) {
-    sem_wait(tui_event_semaphore);
-    int last_event = tui_last_event;
-    tui_last_event = -1;
-    return last_event;
-}
-
-int tui_try_get_event(void) {
-    int ret = sem_trywait(tui_event_semaphore);
-    if (ret == 0) {
-        int last_event = tui_last_event;
-        tui_last_event = -1;
-        return last_event;
-    }
-    return -1;
-}
-
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
@@ -1,13 +1,6 @@
-#ifdef TUI
-#ifdef __APPLE__
-#define _DARWIN_C_SOURCE
-#else
-#define _DEFAULT_SOURCE
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <signal.h>
 #include <inttypes.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -15,242 +8,94 @@
 #include <locale.h>
 #include <unistd.h>
 #include <assert.h>
-#include <sys/ioctl.h>
-#include <termios.h>
-#include <unistd.h>
-#include <time.h>

 #include <palerain.h>
 #include <tui.h>

-#ifdef __APPLE__
-int proc_pidpath(int pid, void * buffer, uint32_t buffersize);
-char random_sem_name[sizeof("palera1n.tui_event_semaphore") + 16 + 1];
-#endif
-
-static int tui_state = 0;
-
-int tui_x_offset = 0;
-int tui_y_offset = 0;
-
-bool supports_bright_colors = true;
-
-static struct termios saved_termios;
-
-int redraw_screen(void) {
-    SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-    CLEAR_SCREEN;
-    MOVETO(0, 0);
-    
-    struct winsize w;
-    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
-    if (w.ws_col < 80 || w.ws_row < 24) {
-        LOG(LOG_FATAL, "Terminal size must be at least 80x24");
-        printf("\033[37;41mERROR: Terminal size must be at least 80x24!");
-        fflush(stdout);
-        return -1;
-    }
-    tui_y_offset = (w.ws_row - 24) / 2;
-    for (int i = 0; i < tui_y_offset; i++) {
-        printf("\n");
-    }
-    tui_x_offset = (w.ws_col - 80) / 2;
-    
-    const char* tui_version = TUI_VERSION;
-    if (tui_version[0] == 'v') tui_version++;
-
-    tui_draw_rectangle(0, 0, 79, 23);
-    MOVETOT((int)(80 - (strlen("[palera1n - Version ]") + strlen(tui_version) ) - 1), 1);
-    printf("[palera1n - Version %s]", tui_version);
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    switch(tui_state) {
-    case MAIN_SCREEN:
-        tui_screen_main_redraw();
-        break;
-    case OPTIONS_SCREEN:
-        tui_screen_options_redraw();
-        break;
-    case ENTER_RECOVERY_SCREEN:
-        tui_screen_enter_recovery_redraw();
-        break;
-    case ENTER_DFU_SCREEN:
-        tui_screen_enter_dfu_redraw();
-        break;
-    case JAILBREAK_SCREEN:
-        tui_screen_jailbreak_redraw();
-        break;
-    }
-    fflush(stdout);
+int redraw_screen() {
    return 0;
 }

-static int destroy_window(void) {
-    if (!tui_started) return 0;
-    tui_started = false;
-    tcsetattr(STDIN_FILENO, 0, &saved_termios);
-    MOUSEOFF;
-    CLEAR_SCREEN;
-
-    MOVETO(0, 0);
-    RMCUP;
-    CNORM;
-    
+int destroy_window() {
    return 0;
 }

-static int init_window(void) {
+int init_window() {
    setlocale(LC_ALL, NULL);
+    setenv(
+        "NEWT_COLORS",
+        "root=,black\n"
+        "border=lightgray,black\n"
+        "title=lightgray,black\n"
+        "roottext=red,black\n"
+        "label=lightgray,black\n"
+        "entry=lightgray,black\n"
+        "window=red,black\n"
+        "textbox=lightgray,black\n"
+        "button=black,lightgray\n"
+        "compactbutton=lightgray,black\n"
+        "listbox=lightgray,black\n"
+        "actlistbox=black,lightgray\n"
+        "actsellistbox=black,lightgray\n"
+        "checkbox=lightgray,black\n"
+        "actcheckbox=black,lightgray\n",
+        0);

    tui_started = true;
-    struct winsize w;
-    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
-    if (w.ws_col < 80 || w.ws_row < 24) {
+    newtInit();
+    int cols, rows;
+    newtGetScreenSize(&cols, &rows);
+    if (cols < 80 || rows < 24) {
+        newtFinished();
        tui_started = false;
        LOG(LOG_FATAL, "Terminal size must be at least 80x24");
        return -1;
    }
-    LOG(LOG_VERBOSE3, "cols: %d, rows: %d\n", w.ws_col, w.ws_row);
-    SMCUP;
-    CIVIS;
-    fflush(stdout);
-    struct termios term;
-    tcgetattr(STDIN_FILENO, &term);
-    tcgetattr(STDIN_FILENO, &saved_termios);
-    cfmakeraw(&term);
-    term.c_lflag |= ISIG;
-    tcsetattr(STDIN_FILENO, 0, &term);
-
-    MOUSEON;
-
+    LOG(LOG_VERBOSE3, "cols: %d, rows: %d\n", cols, rows);
+    newtCls();
+    newtSetColor(PI_LOG_COLOR, "yellow", "black");
+    newtSetColor(PI_STEP_CURRENT, "lightgray", "black");
+    newtSetColor(PI_STEP_OTHER, "gray", "black");
+    newtDrawRootText(0, 0, "palera1n version 2.0.0");
+    newtPushHelpLine(NULL);
    return 0;
 }

-bool tui_is_restarting = false;
-
-extern int saved_argc;
-extern char** saved_argv;
-extern char** saved_envp;
-
-void tui_terminate(int sig) {
-    destroy_window();
-    if (tui_is_restarting) {
-#ifdef __APPLE__
-    sem_close(tui_event_semaphore);
-    sem_unlink(random_sem_name);
-    char pathbuf[4096];
-    if (proc_pidpath(getpid(), pathbuf, sizeof(pathbuf)) <= 0) {
-        LOG(LOG_FATAL, "Failed to get path of running executable");
-        exit(1);
-    }
-    
-    execve(pathbuf, saved_argv, saved_envp);
-#elif defined(__linux__)
-    execve("/proc/self/exe", saved_argv, saved_envp);
-#endif
-    } else {
-        exit(0);
-    }
-}
-
-static void resize_handler(int sig) {
-    redraw_screen();
-}
-
-int tui(void) {
-    if (strncmp(getenv("TERM"), "xterm", 5) != 0) {
-        supports_bright_colors = false;
-    }
-    srand(time(NULL));
+int tui() {
    int ret = 0;
    if ((ret = init_window())) return ret;
-    signal(SIGINT, tui_terminate);
-    signal(SIGTERM, tui_terminate);
-    signal(SIGQUIT, tui_terminate);
-    signal(SIGWINCH, resize_handler);
-
-#ifdef __APPLE__
-    // generate a 16 character random hex string from urandom
-    int fd = open("/dev/urandom", O_RDONLY);
-    if (fd < 0) {
-        LOG(LOG_FATAL, "Failed to open /dev/urandom");
-        return -1;
-    }
-    uint8_t random[8];
-    if (read(fd, random, 8) != 8) {
-        LOG(LOG_FATAL, "Failed to read from /dev/urandom");
-        return -1;
-    }
-    close(fd);
-    for (int i = 0; i < 8; i++) {
-        sprintf(&random_sem_name[i * 2], "%02x", random[i]);
-    }
-    sem_unlink(random_sem_name);
-    tui_event_semaphore = sem_open(random_sem_name, O_CREAT, 0644, 0);
-#else
-    tui_event_semaphore = malloc(sizeof(sem_t));
-    sem_init(tui_event_semaphore, 0, 0);
-#endif
-    pthread_t input_thread;
-    pthread_create(&input_thread, NULL, tui_input_thread, NULL);
-
-    tui_devhelper();
-
-    tui_state = MAIN_SCREEN;
+    ret = MAIN_SCREEN;
    while (1) {
-        switch (tui_state) {
+        switch (ret) {
        case ERROR_SCREEN:
+            goto out;
+            break;
        case EXIT_SCREEN:
            goto out;
            break;
        case MAIN_SCREEN:
-            tui_state = tui_screen_main();
+            ret = tui_screen_main();
            break;
        case OPTIONS_SCREEN:
-            tui_state = tui_screen_options();
+            ret = tui_screen_options();
            break;
        case ENTER_RECOVERY_SCREEN:
-            tui_state = tui_screen_enter_recovery();
+            ret = tui_screen_enter_recovery();
            break;
        case ENTER_DFU_SCREEN:
-            tui_state = tui_screen_enter_dfu();
+            ret = tui_screen_enter_dfu();
            break;
-        case JAILBREAK_SCREEN:
-            tui_state = tui_screen_jailbreak();
+        case JAILBREAKING_SCREEN:
+            ret = tui_screen_jailbreak();
            break;
        default:
            assert(0);
            goto out;
        }
+        newtPopWindow();
    }
 out:
-    destroy_window();
+    newtFinished();
+    tui_started = false;
    return 0;
 }
-
-void tui_draw_rectangle(int x1, int y1, int x2, int y2) {
-    if (x1 == x2 || y1 == y2) return;
-    DSGON;
-    MOVETOT(x1 + 1, y1 + 1);
-    printf("%c", 0x6C);
-    for (int x = x1 + 1; x < x2; x++) {
-        putchar(0x71);
-    }
-    putchar(0x6B);
-    MOVETOT(x1 + 1, y2 + 1);
-    putchar(0x6D);
-    for (int x = x1 + 1; x < x2; x++) {
-        putchar(0x71);
-    }
-    putchar(0x6A);
-    for (int y = y1 + 1; y < y2; y++) {
-        PRINTATT(x1 + 1, y + 1, "\x78");
-        PRINTATT(x2 + 1, y + 1, "\x78");
-    }
-    DSGOFF;
-    fflush(stdout);
-}
-
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
@@ -1,4 +1,3 @@
-#ifdef TUI
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -13,461 +12,4 @@
 #include <palerain.h>
 #include <tui.h>

-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <locale.h>
-#include <unistd.h>
-#include <assert.h>
-#include <time.h>
-
-#include <palerain.h>
-#include <tui.h>
-
-static int tui_enter_dfu_nav_selection = 1;
-static bool tui_device_is_entering_dfu = false;
-static int tui_enter_dfu_status = 0;
-
-enum {
-    DEVICE_TYPE_IPHONE_SE,
-    DEVICE_TYPE_IPHONE_6S,
-    DEVICE_TYPE_IPHONE_7_8,
-    DEVICE_TYPE_IPHONE_X,
-    DEVICE_TYPE_IPAD,
-    DEVICE_TYPE_IPOD_TOUCH
-} device_type;
-
-static int tui_product_type_to_device_type(char *product_type) {
-    if (strcmp(product_type, "iPhone8,1") == 0 || strcmp(product_type, "iPhone8,2") == 0) {
-        return DEVICE_TYPE_IPHONE_6S;
-    }
-    if (strcmp(product_type, "iPhone8,4") == 0) return DEVICE_TYPE_IPHONE_SE;
-    if (strcmp(product_type, "iPhone9,1") == 0 || strcmp(product_type, "iPhone9,2") == 0
-        || strcmp(product_type, "iPhone9,3") == 0 || strcmp(product_type, "iPhone9,4") == 0) {
-        return DEVICE_TYPE_IPHONE_7_8;
-    }
-    if (strcmp(product_type, "iPhone10,1") == 0 || strcmp(product_type, "iPhone10,2") == 0
-        || strcmp(product_type, "iPhone10,4") == 0 || strcmp(product_type, "iPhone10,5") == 0) {
-        return DEVICE_TYPE_IPHONE_7_8;
-    }
-    if (strcmp(product_type, "iPhone10,3") == 0 || strcmp(product_type, "iPhone10,6") == 0) {
-        return DEVICE_TYPE_IPHONE_X;
-    }
-    if (strncmp(product_type, "iPad", strlen("iPad")) == 0) {
-        return DEVICE_TYPE_IPAD;
-    }
-    if (strcmp(product_type, "iPod9,1") == 0) {
-        return DEVICE_TYPE_IPOD_TOUCH;
-    }
-
-    // Not found
-    return DEVICE_TYPE_IPHONE_SE;
-}
-
-static int tui_enter_dfu_device_type = DEVICE_TYPE_IPHONE_SE;
-
-static int tui_enter_dfu_loading_progress = 1;
-
-static void tui_screen_enter_dfu_nav(void) {
-    MOVETOT(80 - 22, 23);
-    printf("%s[ Cancel ]" COLOR(FG_WHITE, BG_BLACK) " %s[  %s ]" COLOR(FG_WHITE, BG_BLACK),
-        tui_device_is_entering_dfu || tui_enter_dfu_status == 1 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : tui_enter_dfu_nav_selection == 0 ? "\033[30;107m" : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 23 && tui_mouse_x <= tui_x_offset + 80 - 23 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ),
-        tui_device_is_entering_dfu || tui_enter_dfu_status == 1 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : tui_enter_dfu_nav_selection == 1 ? "\033[30;107m" : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 12 && tui_mouse_x <= tui_x_offset + 80 - 12 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ),
-        tui_enter_dfu_status == 2 ? "Retry" : "Start"
-    );
-}
-
-void tui_screen_enter_dfu_redraw(void) {
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    switch(tui_enter_dfu_status) {
-    case 0:
-        PRINTATT(3, 3, "Time to put the device into DFU mode. Locate the buttons as marked below on");
-        PRINTATT(3, 4, "your device and check the instructions on the right *before* clicking Start.");
-        break;
-    case 1:
-        PRINTATT(3, 3, "Device entered DFU mode successfully.");
-        break;
-    case 2:
-        PRINTATT(3, 3, "Whoops, the device didn't enter DFU mode. Click Retry to try again.");
-        break;
-    }
-    
-    tui_screen_enter_dfu_nav();
-
-    switch(tui_enter_dfu_device_type) {
-    case DEVICE_TYPE_IPHONE_SE:
-    case DEVICE_TYPE_IPAD:
-        if (tui_enter_dfu_loading_progress > 0 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 6, "1. Click Start");
-        if (tui_enter_dfu_loading_progress > 0) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-
-        if (!tui_device_is_entering_dfu || tui_enter_dfu_loading_progress > 4 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 7, "2. Press and hold the Top and");
-        MOVETOT(54, 8);
-        printf("Home buttons together (%d)", tui_enter_dfu_loading_progress > 4 ? 0 : tui_enter_dfu_loading_progress < 1 ? 4 : 5 - tui_enter_dfu_loading_progress);
-        if (!tui_device_is_entering_dfu || tui_enter_dfu_loading_progress > 4) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-
-        if (tui_enter_dfu_loading_progress < 5 || tui_enter_dfu_loading_progress > 14 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 9, "3. Release the Top button BUT");
-        PRINTATT(54, 10, "KEEP HOLDING the Home");
-        MOVETOT(54, 11);
-        printf("button (%d)", tui_enter_dfu_loading_progress > 14 ? 0 : tui_enter_dfu_loading_progress < 5 ? 10 : 15 - tui_enter_dfu_loading_progress);
-        if (tui_enter_dfu_loading_progress < 5 || tui_enter_dfu_loading_progress > 14) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-        break;
-    case DEVICE_TYPE_IPHONE_6S:
-        if (tui_enter_dfu_loading_progress > 0 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 6, "1. Click Start");
-        if (tui_enter_dfu_loading_progress > 0) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-
-        if (!tui_device_is_entering_dfu || tui_enter_dfu_loading_progress > 4 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 7, "2. Press and hold the Side");
-        PRINTATT(54, 8, "and Home buttons together");
-        MOVETOT(54, 9);
-        printf("(%d)", tui_enter_dfu_loading_progress > 4 ? 0 : tui_enter_dfu_loading_progress < 1 ? 4 : 5 - tui_enter_dfu_loading_progress);
-        if (!tui_device_is_entering_dfu || tui_enter_dfu_loading_progress > 4) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-
-        if (tui_enter_dfu_loading_progress < 5 || tui_enter_dfu_loading_progress > 14 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 10, "3. Release the Side button");
-        PRINTATT(54, 11, "BUT KEEP HOLDING the Home");
-        MOVETOT(54, 12);
-        printf("button (%d)", tui_enter_dfu_loading_progress > 14 ? 0 : tui_enter_dfu_loading_progress < 5 ? 10 : 15 - tui_enter_dfu_loading_progress);
-        if (tui_enter_dfu_loading_progress < 5 || tui_enter_dfu_loading_progress > 14) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-        break;
-    case DEVICE_TYPE_IPHONE_7_8:
-    case DEVICE_TYPE_IPHONE_X:
-        tui_draw_rectangle(17, 5, 33, 21);
-        PRINTATT(17, 10, "|");
-        MOVETOT(5, 11);
-        printf("%sVolume down-", tui_enter_dfu_loading_progress > 14 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        putchar('|');
-        DSGON;
-        MOVETOT(35, 10);
-        putchar(0x78);
-        DSGOFF;
-        printf("%s-Side button", tui_enter_dfu_loading_progress > 4 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-
-        if (tui_enter_dfu_loading_progress > 0 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 6, "1. Click Start");
-        if (tui_enter_dfu_loading_progress > 0) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-
-        if (!tui_device_is_entering_dfu || tui_enter_dfu_loading_progress > 4 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 7, "2. Press and hold the Side");
-        PRINTATT(54, 8, "and Volume down buttons");
-        MOVETOT(54, 9);
-        printf("together (%d)", tui_enter_dfu_loading_progress > 4 ? 0 : tui_enter_dfu_loading_progress < 1 ? 4 : 5 - tui_enter_dfu_loading_progress);
-        if (!tui_device_is_entering_dfu || tui_enter_dfu_loading_progress > 4) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-
-        if (tui_enter_dfu_loading_progress < 5 || tui_enter_dfu_loading_progress > 14 || tui_enter_dfu_status == 2) {
-            if (supports_bright_colors) {
-                SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-            } else {
-                SETCOLOR(FG_BLUE, BG_BLACK);
-            }
-        }
-        PRINTATT(51, 10, "3. Release the Side button");
-        PRINTATT(54, 11, "BUT KEEP HOLDING the");
-        MOVETOT(54, 12);
-        printf("Volume down button (%d)", tui_enter_dfu_loading_progress > 14 ? 0 : tui_enter_dfu_loading_progress < 5 ? 10 : 15 - tui_enter_dfu_loading_progress);
-        if (tui_enter_dfu_loading_progress < 5 || tui_enter_dfu_loading_progress > 14) {
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-        break;
-    }
-
-    switch(tui_enter_dfu_device_type) {
-    case DEVICE_TYPE_IPHONE_SE:
-        tui_draw_rectangle(18, 6, 32, 21);
-        tui_draw_rectangle(24, 19, 26, 20);
-        for (int y = 9; y < 20; y++) {
-            SETCOLOR(FG_BLACK, BG_BRIGHT_BLACK);
-            PRINTATT(20, y, "             ");
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-        PRINTATT(23, 8, "o ===");
-        PRINTATT(18, 11, "|");
-        PRINTATT(18, 12, "|");
-        MOVETOT(30, 6);
-        printf("__ %s-Top button", tui_enter_dfu_loading_progress > 4 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        MOVETOT(31, 20);
-        printf("%s-Home button", tui_enter_dfu_loading_progress > 14 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-
-        break;
-    case DEVICE_TYPE_IPHONE_6S:
-        tui_draw_rectangle(17, 5, 33, 21);
-        tui_draw_rectangle(24, 19, 26, 20);
-        for (int y = 8; y < 20; y++) {
-            SETCOLOR(FG_BLACK, BG_BRIGHT_BLACK);
-            PRINTATT(19, y, "               ");
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-        PRINTATT(23, 7, "o ===");
-        PRINTATT(17, 10, "|");
-        PRINTATT(17, 11, "|");
-        MOVETOT(35, 10);
-        printf("|%s-Side button", tui_enter_dfu_loading_progress > 4 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        MOVETOT(30, 20);
-        printf("%s-Home button", tui_enter_dfu_loading_progress > 14 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        break;
-    case DEVICE_TYPE_IPHONE_7_8:
-        tui_draw_rectangle(24, 19, 26, 20);
-        for (int y = 8; y < 20; y++) {
-            SETCOLOR(FG_BLACK, BG_BRIGHT_BLACK);
-            PRINTATT(19, y, "               ");
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-        PRINTATT(23, 7, "o ===");
-
-        break;
-    case DEVICE_TYPE_IPHONE_X:
-        SETCOLOR(FG_BLACK, BG_BRIGHT_BLACK);
-        PRINTATT(19, 7, "    ");
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        printf("       ");
-        SETCOLOR(FG_BLACK, BG_BRIGHT_BLACK);
-        printf("    ");
-        SETCOLOR(FG_BLACK, BG_BRIGHT_BLACK);
-        for (int y = 8; y < 22; y++) {
-            PRINTATT(19, y, "               ");
-        }
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-
-        DSGON;
-        MOVETOT(35, 11);
-        putchar(0x78);
-        DSGOFF;
-        
-        break;
-    case DEVICE_TYPE_IPAD:
-        tui_draw_rectangle(14, 6, 36, 21);
-        tui_draw_rectangle(24, 19, 26, 20);
-        for (int y = 9; y < 20; y++) {
-            SETCOLOR(FG_BLACK, BG_BRIGHT_BLACK);
-            PRINTATT(16, y, "                     ");
-            SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        }
-        PRINTATT(23, 8, "o ===");
-        PRINTATT(14, 11, "|");
-        PRINTATT(14, 12, "|");
-        MOVETOT(33, 6);
-        printf("__  %s-Top button", tui_enter_dfu_loading_progress > 4 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-        MOVETOT(29, 21);
-        printf("%s-Home button", tui_enter_dfu_loading_progress > 14 ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : COLOR(FG_YELLOW, BG_BLACK));
-        SETCOLOR(FG_BRIGHT_WHITE, BG_BLACK);
-
-        break;
-    }
-    fflush(stdout);
-}
-
-// TODO: IMPLEMENT REAL ENTER RECOVERY
-static int dfu_time = 0;
-
-static tui_screen_t tui_enter_dfu(void) {
-    if (tui_connected_devices && !tui_connected_devices->next) {
-        if (tui_connected_devices->mode == TUI_DEVICE_MODE_NORMAL) {
-            tui_enter_dfu_status = 0;
-            return ENTER_RECOVERY_SCREEN;
-        }
-    }
-    int i = 0;
-    tui_enter_dfu_loading_progress = 1;
-    while(1) {
-        if (++i % 10 == 0) {
-            tui_enter_dfu_loading_progress++;
-        }
-        redraw_screen();
-        usleep(100000);
-        int event = tui_try_get_event();
-        if (event == TUI_EVENT_CONNECTED_DEVICES_CHANGED) {
-            if (tui_connected_devices && !tui_connected_devices->next) {
-                if (tui_connected_devices->mode == TUI_DEVICE_MODE_RECOVERY || tui_connected_devices->mode == TUI_DEVICE_MODE_NORMAL) {
-                    tui_enter_dfu_status = 2;
-                    tui_device_is_entering_dfu = false;
-                    return ENTER_DFU_SCREEN;
-                } else {
-                    tui_enter_dfu_status = 1;
-                    tui_device_is_entering_dfu = false;
-                    tui_enter_dfu_loading_progress = 15;
-                    redraw_screen();
-                    sleep(3);
-                    tui_jailbreak();
-                    return JAILBREAK_SCREEN;
-                }
-            }
-        }
-        if (i > 10 * (60 + 15)) {
-            return MAIN_SCREEN;
-        }
-        if (i == 10 * 2) {
-            exitrecv_cmd(tui_connected_devices->ecid);
-        }
-    }
-    redraw_screen();
-    fflush(stdout);
-    sleep(3);
-    return JAILBREAK_SCREEN;
-}
-
-static int tui_enter_dfu_nav_mouse_select = -1;
-
-tui_screen_t tui_screen_enter_dfu(void) {
-    if (tui_connected_devices && !tui_connected_devices->next) {
-        tui_enter_dfu_device_type = tui_product_type_to_device_type(tui_connected_devices->product_type);
-    }
-
-    tui_device_is_entering_dfu = false;
-    tui_enter_dfu_loading_progress = 0;
-    tui_enter_dfu_nav_selection = 1;
-    redraw_screen();
-    
-    tui_device_is_entering_dfu = false;
-    tui_enter_dfu_loading_progress = 0;
-
-    while(1) {
-        int event = tui_get_event();
-        switch (event) {
-            case TUI_EVENT_CONNECTED_DEVICES_CHANGED:
-                break;
-            case TUI_EVENT_INPUT: {
-                int input = tui_last_input;
-                if (input == TUI_INPUT_NONE) continue;
-                if (tui_device_is_entering_dfu) continue;
-
-                switch (input) {
-                    case TUI_INPUT_LEFT:
-                    case TUI_INPUT_RIGHT:
-                        tui_enter_dfu_nav_selection = !tui_enter_dfu_nav_selection;
-                        redraw_screen();
-                        break;
-                    case TUI_INPUT_SELECT:
-                        switch(tui_enter_dfu_nav_selection) {
-                        case 0:
-                            return MAIN_SCREEN;
-                        case 1:
-                            tui_device_is_entering_dfu = true;
-                            redraw_screen();
-                            return tui_enter_dfu();
-                        }
-                    case TUI_INPUT_MOUSE_MOVE:
-                        tui_screen_enter_dfu_nav();
-                        fflush(stdout);
-                        break;
-                    case TUI_INPUT_MOUSE_DOWN:
-                        if (tui_mouse_y == tui_y_offset + 22) {
-                            if (tui_mouse_x >= tui_x_offset + 80 - 23 && tui_mouse_x <= tui_x_offset + 80 - 23 + 10) {
-                                tui_enter_dfu_nav_selection = 0;
-                                tui_enter_dfu_nav_mouse_select = 0;
-                                redraw_screen();
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 12 && tui_mouse_x <= tui_x_offset + 80 - 12 + 10) {
-                                tui_enter_dfu_nav_selection = 1;
-                                tui_enter_dfu_nav_mouse_select = 1;
-                                redraw_screen();
-                            }
-                        }
-                        break;
-                    case TUI_INPUT_MOUSE_UP:
-                        if (tui_mouse_y == tui_y_offset + 22) {
-                            if (tui_mouse_x >= tui_x_offset + 80 - 23 && tui_mouse_x <= tui_x_offset + 80 - 23 + 10) {
-                                return MAIN_SCREEN;
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 12 && tui_mouse_x <= tui_x_offset + 80 - 12 + 10) {
-                                tui_device_is_entering_dfu = true;
-                                redraw_screen();
-                                return tui_enter_dfu();
-                            }
-                        }
-                        tui_enter_dfu_nav_mouse_select = -1;
-                        break;
-                }
-                break;
-            }
-        }
-    }
-    return MAIN_SCREEN;
-}
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
+tui_screen_t tui_screen_enter_dfu() { return JAILBREAKING_SCREEN; }
@@ -1,4 +1,3 @@
-#ifdef TUI
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -9,201 +8,8 @@
 #include <locale.h>
 #include <unistd.h>
 #include <assert.h>
-#include <time.h>
-#include <poll.h>
+
 #include <palerain.h>
 #include <tui.h>

-int tui_enter_recovery_nav_selection = 1;
-bool tui_device_is_entering_recovery = false;
-bool tui_enter_recovery_mode_failed = false;
-
-static void tui_screen_enter_recovery_nav(void) {
-    MOVETOT(80 - 22, 23);
-    printf("%s[  Back  ]" COLOR(FG_WHITE, BG_BLACK) " %s[  Next  ]" COLOR(FG_WHITE, BG_BLACK),
-        tui_device_is_entering_recovery ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : tui_enter_recovery_nav_selection == 0 ? "\033[30;107m" : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 23 && tui_mouse_x <= tui_x_offset + 80 - 23 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ),
-        tui_device_is_entering_recovery ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : tui_enter_recovery_nav_selection == 1 ? "\033[30;107m" : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 12 && tui_mouse_x <= tui_x_offset + 80 - 12 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        )
-    );
-}
-
-static char enter_recovery_loading[9][8] = {
-    "........",
-    "|.......",
-    ".|......",
-    "..|.....",
-    "...|....",
-    "....|...",
-    ".....|..",
-    "......|.",
-    ".......|"
-};
-
-static char enter_recovery_loading_troll[9][8] = {
-    ".......",
-    "t......",
-    ".r.....",
-    "..o....",
-    "...l...",
-    "....l..",
-    ".....e.",
-    "......d",
-};
-
-static bool is_troll;
-static int tui_enter_recovery_loading_progress = 0;
-
-static void tui_screen_enter_recovery_loading(void) {
-    SETCOLOR(FG_YELLOW, BG_BLACK);
-    PRINTATT(3, 8, "Entering recovery mode ");
-    printf("%.8s", is_troll ? enter_recovery_loading_troll[tui_enter_recovery_loading_progress] : enter_recovery_loading[tui_enter_recovery_loading_progress]);
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    fflush(stdout);
-}
-
-void tui_screen_enter_recovery_redraw(void) {
-    PRINTATT(3, 3, "The device needs to be put into DFU mode to apply the jailbreak. This is a");
-    PRINTATT(3, 4, "manual process and we will guide you through it.");
-    PRINTATT(3, 5, "In order to prevent filesystem corruption through hard reset, the device");
-    PRINTATT(3, 6, "will be put into recovery mode first. Click Next when you are ready.");
-    
-    if (tui_enter_recovery_mode_failed) {
-        SETCOLOR(FG_YELLOW, BG_BLACK);
-        PRINTATT(3, 8, "Hmm... device did not enter recovery mode!? Click Next to try again...");
-        SETCOLOR(FG_WHITE, BG_BLACK);
-    }
-
-    tui_screen_enter_recovery_nav();
-    if (tui_device_is_entering_recovery) {
-        tui_screen_enter_recovery_loading();
-    }
-
-    fflush(stdout);
-}
-
-static int recovery_time = 0;
-
-static tui_screen_t tui_enter_recovery(void) {
-    enter_recovery_cmd(tui_connected_devices->udid);
-    is_troll = false;
-    if (rand() % 1000 == 0) {
-        is_troll = true;
-    }
-    int i = 0;
-    recovery_time = 0;
-    while(1) {
-        redraw_screen();
-        tui_enter_recovery_loading_progress++;
-        tui_enter_recovery_loading_progress %= 9;
-        // 100ms sleep
-        struct timespec ts;
-        ts.tv_sec = 0;
-        ts.tv_nsec = 100000000;
-        nanosleep(&ts, NULL);
-        
-        int event = tui_try_get_event();
-        if (event == TUI_EVENT_CONNECTED_DEVICES_CHANGED) {
-            if (tui_connected_devices && !tui_connected_devices->next && tui_connected_devices->mode == TUI_DEVICE_MODE_RECOVERY) {
-                SETCOLOR(FG_YELLOW, BG_BLACK);
-                PRINTATT(3, 8, "Device is now in recovery mode.");
-                SETCOLOR(FG_WHITE, BG_BLACK);
-                fflush(stdout);
-
-                sleep(3);
-                
-                return ENTER_DFU_SCREEN;
-            }
-        }
-        if (i > 60 * 10) {
-            tui_enter_recovery_mode_failed = true;
-            return ENTER_RECOVERY_SCREEN;
-        }
-    }
-}
-
-static int tui_enter_recovery_nav_mouse_select = -1;
-
-tui_screen_t tui_screen_enter_recovery(void) {
-    tui_device_is_entering_recovery = false;
-    tui_enter_recovery_loading_progress = 0;
-    tui_enter_recovery_nav_selection = 1;
-    redraw_screen();
-    
-    while(1) {
-        int event = tui_get_event();
-        switch (event) {
-            case TUI_EVENT_CONNECTED_DEVICES_CHANGED:
-                tui_enter_recovery_mode_failed = false;
-                return MAIN_SCREEN;
-            case TUI_EVENT_INPUT: {
-                int input = tui_last_input;
-                if (input == TUI_INPUT_NONE) continue;
-                if (tui_device_is_entering_recovery) continue;
-
-                switch (input) {
-                    case TUI_INPUT_LEFT:
-                    case TUI_INPUT_RIGHT:
-                        tui_enter_recovery_nav_selection = !tui_enter_recovery_nav_selection;
-                        redraw_screen();
-                        break;
-                    case TUI_INPUT_SELECT:
-                        switch(tui_enter_recovery_nav_selection) {
-                        case 0:
-                            tui_enter_recovery_mode_failed = false;
-                            return MAIN_SCREEN;
-                        case 1:
-                            tui_device_is_entering_recovery = true;
-                            redraw_screen();
-                            return tui_enter_recovery();
-                        }
-                        break;
-                    case TUI_INPUT_MOUSE_MOVE:
-                        tui_screen_enter_recovery_nav();
-                        fflush(stdout);
-                        break;
-                    case TUI_INPUT_MOUSE_DOWN:
-                        if (tui_mouse_y == tui_y_offset + 22) {
-                            if (tui_mouse_x >= tui_x_offset + 80 - 23 && tui_mouse_x <= tui_x_offset + 80 - 23 + 10) {
-                                tui_enter_recovery_nav_selection = 0;
-                                tui_enter_recovery_nav_mouse_select = 0;
-                                tui_screen_enter_recovery_nav();
-                                fflush(stdout);
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 12 && tui_mouse_x <= tui_x_offset + 80 - 12 + 10) {
-                                tui_enter_recovery_nav_selection = 1;
-                                tui_enter_recovery_nav_mouse_select = 1;
-                                tui_screen_enter_recovery_nav();
-                                fflush(stdout);
-                            }
-                        }
-                        break;
-                    case TUI_INPUT_MOUSE_UP:
-                        if (tui_mouse_y == tui_y_offset + 22) {
-                            if (tui_mouse_x >= tui_x_offset + 80 - 23 && tui_mouse_x <= tui_x_offset + 80 - 23 + 10) {
-                                return MAIN_SCREEN;
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 12 && tui_mouse_x <= tui_x_offset + 80 - 12 + 10) {
-                                tui_device_is_entering_recovery = true;
-                                redraw_screen();
-                                return tui_enter_recovery();
-                            }
-                        }
-                        tui_enter_recovery_nav_mouse_select = -1;
-                        break;
-                }
-                break;
-            }
-        }
-    }
-    tui_enter_recovery_mode_failed = false;
-    return MAIN_SCREEN;
-}
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
+tui_screen_t tui_screen_enter_recovery() { return ENTER_DFU_SCREEN; }
@@ -1,4 +1,3 @@
-#ifdef TUI
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -13,164 +12,4 @@
 #include <palerain.h>
 #include <tui.h>

-bool tui_is_jailbreaking = false;
-
-static void tui_screen_jailbreak_nav(void) {
-    if (tui_is_jailbreaking) {
-        if (supports_bright_colors) {
-            SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-        } else {
-            SETCOLOR(FG_BLUE, BG_BLACK);
-        }
-    } else {
-        SETCOLOR(FG_BLACK, BG_BRIGHT_WHITE);
-    }
-    PRINTATT(80 - 11, 23, "[  Done  ]");
-    SETCOLOR(FG_WHITE, BG_BLACK);
-}
-
-static pthread_t tui_jailbreak_thread_id;
-
-int tui_jailbreak_stage = 0;
-char *tui_jailbreak_status = NULL;
-
-void tui_jailbreak_status_changed(void) {
-    tui_last_event = TUI_EVENT_JAILBREAK_STATUS_CHANGED;
-    sem_post(tui_event_semaphore);
-}
-
-static void *tui_jailbreak_thread(void *arg) {
-    tui_jailbreak_stage = 1;
-    tui_jailbreak_status = "About to execute checkra1n";
-
-    tui_jailbreak_status_changed();
-
-    if (!tui_connected_devices || tui_connected_devices->next || tui_connected_devices->mode != TUI_DEVICE_MODE_DFU) {
-        tui_jailbreak_status = "ERROR: No single device in DFU mode found";
-        tui_jailbreak_status_changed();
-        pthread_exit(NULL);
-        return NULL;
-    }
-
-    tui_jailbreak_stage = 2;
-    tui_jailbreak_status = "Running exploit";
-    tui_jailbreak_status_changed();
-
-    if (exec_checkra1n() != 0) {
-        tui_jailbreak_status = "ERROR: Failed to run exploit";
-        tui_jailbreak_status_changed();
-        pthread_exit(NULL);
-        return NULL;
-    }
-
-    tui_jailbreak_stage = 3;
-    tui_jailbreak_status = "Waiting for PongoOS";
-    tui_jailbreak_status_changed();
-
-    sleep(2);
-    pthread_create(&pongo_thread, NULL, pongo_helper, NULL);
-
-    // pongo helper will take care of the rest
-
-    pthread_exit(NULL);
-}
-
-void tui_jailbreak(void) {
-    tui_is_jailbreaking = true;
-    if (tui_options_verbose_boot) {
-        palerain_flags |= palerain_option_verbose_boot;
-    } else {
-        palerain_flags &= ~palerain_option_verbose_boot;
-    }
-
-    if (tui_options_safe_mode) {
-        palerain_flags |= palerain_option_safemode;
-    } else {
-        palerain_flags &= ~palerain_option_safemode;
-    }
-
-    if (tui_options_force_revert) {
-        palerain_flags |= palerain_option_force_revert;
-    } else {
-        palerain_flags &= ~palerain_option_force_revert;
-    }
-
-    snprintf(palerain_flags_cmd, 0x30, "palera1n_flags 0x%" PRIx64, palerain_flags);
-    snprintf(xargs_cmd, sizeof(xargs_cmd), "xargs %s", tui_options_boot_args);
-
-    pthread_create(&tui_jailbreak_thread_id, NULL, tui_jailbreak_thread, NULL);
-}
-
-void tui_screen_jailbreak_redraw(void) {
-    PRINTATT(3, 3, "Installing jailbreak, this will take a moment. If the device asks for a");
-    PRINTATT(3, 4, "passcode please enter it. Do not disconnect the device until finished.");
-
-    if (tui_jailbreak_status) {
-        SETCOLOR(FG_YELLOW, BG_BLACK);
-        PRINTATT(3, 6, tui_jailbreak_status);
-        SETCOLOR(FG_WHITE, BG_BLACK);
-    }
-
-    tui_draw_rectangle(5, 9, 80 - 6, 9 + 2);
-    MOVETOT(6 + 1, 10 + 1);
-    SETCOLOR(FG_BLACK, BG_WHITE);
-    for (int i = 0; i < ((80 - 12) * ((float)tui_jailbreak_stage / 9)); i++) {
-        putchar(' ');
-    }
-    SETCOLOR(FG_WHITE, BG_BLACK);
-
-    tui_screen_jailbreak_nav();
-}
-
-static int tui_jailbreak_nav_mouse_select = -1;
-
-tui_screen_t tui_screen_jailbreak(void) {
-    redraw_screen();
-
-    while(1) {
-        int event = tui_get_event();
-        switch (event) {
-        case TUI_EVENT_INPUT: {
-            int input = tui_last_input;
-            if (input == TUI_INPUT_NONE) continue;
-
-            switch (input) {
-            case TUI_INPUT_SELECT:
-                if (!tui_is_jailbreaking) {
-                    tui_is_restarting = true;
-                    tui_terminate(0);
-                }
-                break;
-            case TUI_INPUT_MOUSE_DOWN:
-                if (tui_mouse_y == tui_y_offset + 24 - 2 &&
-                    tui_mouse_x >= tui_x_offset + 80 - 12 &&
-                    tui_mouse_x <= tui_x_offset + 80 - 12 + 10) {
-                    tui_jailbreak_nav_mouse_select = 0;
-                    redraw_screen();
-                }
-                break;
-            case TUI_INPUT_MOUSE_UP:
-                if (tui_jailbreak_nav_mouse_select == 0) {
-                    tui_jailbreak_nav_mouse_select = -1;
-                    if (!tui_is_jailbreaking) {
-                        tui_is_restarting = true;
-                        tui_terminate(0);
-                    }
-                }
-                break;
-            }
-            break;
-        }
-        case TUI_EVENT_JAILBREAK_STATUS_CHANGED:
-            redraw_screen();
-            break;
-        }
-    }
-
-    return EXIT_SCREEN;
-}
-
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
+tui_screen_t tui_screen_jailbreak() { return EXIT_SCREEN; }
@@ -1,4 +1,3 @@
-#ifdef TUI
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -13,368 +12,36 @@
 #include <palerain.h>
 #include <tui.h>

-static int tui_compare_versions(const char *firstVersion, const char *secondVersion);
-
-static bool showing_ecid = false;
-
-static char palera1n_logo[17][16] = {
-"       ++       ",
-"      #@@#      ",
-"     +@@@@+     ",
-"    :@@@@@@:    ",
-"    #@@@@@@#    ",
-"   +@@@@@@@@+   ",
-"  :#*@@@@@@*#:  ",
-"  %###@@@@###%  ",
-" .####%@@%####. ",
-" @############@ ",
-"=@@*########*@@=",
-"+@@@@%####%@@@@+",
-":@@@@%%**%%@@@@:",
-" +@@%%*@@*%%@@+ ",        
-"   ++%@@@@%++   ",
-"      :++:      "
-};
-
-static char random_quotes[][150] = {
-    "panic(cpu 1 caller 0xfffffff0232bd958): SEP Panic",
-    "Now with Apple TV support!",
-    "checkra1n will open source in 2020",
-    "Try running palera1n on a Intel 80486!",
-    "\"iOS 15 with SSV is unhackable\", but here we are.",
-    "initproc exited -- exit reason namespace 1 subcode0x7 description: none",
-    "totally not checkra1n",
-    "Because the command line wasn't easy enough",
-    "Checkra1n wrapper?",
-    ""
-};
-
-#define PALERA1N_URL "https://palera.in"
-
-static int tui_main_nav_selection = 1;
-static bool quick_mode_enabled = false;
-static bool tui_can_start = false;
-static int random_quote;
-
-bool easter_egg = false;
-
-void tui_screen_main_nav(void) {
-    MOVETOT(80 - 52, 23);
-    printf("[%c] %sQuick Mode " COLOR(FG_WHITE, BG_BLACK) " %s[ Options ]" COLOR(FG_WHITE, BG_BLACK) " %s[  Start  ]" COLOR(FG_WHITE, BG_BLACK) " %s[  Quit   ]" COLOR(FG_WHITE, BG_BLACK), quick_mode_enabled ? 'x' : ' ',
-        tui_main_nav_selection == 0 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 49 && tui_mouse_x <= tui_x_offset + 80 - 49 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ),
-        tui_main_nav_selection == 1 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 37 && tui_mouse_x <= tui_x_offset + 80 - 37 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ),
-        tui_main_nav_selection == 2 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : !tui_can_start ? (supports_bright_colors ? COLOR(FG_BRIGHT_BLACK, BG_BLACK) : COLOR(FG_BLUE, BG_BLACK)) : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 25 && tui_mouse_x <= tui_x_offset + 80 - 25 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ),
-        tui_main_nav_selection == 3 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 13 && tui_mouse_x <= tui_x_offset + 80 - 13 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        )
-    );
+tui_screen_t tui_screen_main() {
+    int ret = MAIN_SCREEN;
+    bool can_start = false;
+    newtCenteredWindow(WIDTH, HEIGHT, NULL);
+    newtComponent optionsButton = newtCompactButton(46, 18, "Options");
+    newtComponent startButton = newtCompactButton(57, 18, "Start");
+    newtComponent exitButton = newtCompactButton(66, 18, "Exit");
+    newtComponent welcome = newtLabel(1, 0, "Welcome to palera1n!");
+    newtComponent deviceMsg = newtTextbox(1, 2, 40, 3, NEWT_FLAG_WRAP);
+    set_tui_log(deviceMsg);
+    LOG(LOG_INFO, "Connect your iPhone, iPad or iPod Touch to begin.");
+    newtTextboxSetColors(deviceMsg, PI_LOG_COLOR, PI_LOG_COLOR);
+    set_tui_log(deviceMsg);
+    newtComponent form = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(form, optionsButton, startButton, exitButton, welcome,
+    deviceMsg, NULL);
+    newtRunForm(form);
+    newtRefresh();
+    newtComponent buttonPressed = newtFormGetCurrent(form);
+    if (buttonPressed == optionsButton) {
+        ret = OPTIONS_SCREEN;
+    } else if (buttonPressed == startButton) {
+        if (can_start)
+            ret = ENTER_RECOVERY_SCREEN;
+        else
+            ret = MAIN_SCREEN;
+    } else if (buttonPressed == exitButton) {
+        ret = EXIT_SCREEN;
+    }
+    set_tui_log(NULL);
+    newtFormDestroy(form);
+    return ret;
 }
-
-void tui_screen_main_redraw(void) {
-    PRINTATT(3, 2, "Welcome to palera1n!");
-
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    PRINTATT(3, 9, "Made by: Nick Chan, Ploosh, Khcrysalis, Mineek");
-    PRINTATT(3, 10, "staturnz, kok3shidoll, ");
-    if ((tui_mouse_y == tui_y_offset + 9 && tui_mouse_x >= tui_x_offset + 25 && tui_mouse_x <= tui_x_offset + 25 + 8) || easter_egg) {
-        SETCOLORA(FG_BRIGHT_WHITE, BG_BLACK, BOLD);
-    }
-    printf("HAHALOSAH");
-    RESETFONT;
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    PRINTATT(3, 12, "Thanks to: llsc12, nebula,");
-    PRINTATT(3, 13, "nikias (libimobiledevice), checkra1n");
-    PRINTATT(3, 14, "(Siguza, axi0mx, littlelailo et al.), Procursus");
-    PRINTATT(3, 15, "Team (Hayden Seay, Cameron Katri, Keto et.al),");
-    PRINTATT(80 - (int)sizeof(PALERA1N_URL), 21, PALERA1N_URL);
-    PRINTATT(80 - (int)sizeof("@palera1n"), 20, "@palera1n");
-    PRINTATT(3, 20, "With <3 from HAHALOSAH");
-    PRINTATT(3, 21, "Note: Backup your stuff. Use at your own risk.");
-    DRAWLINET(2, 22, 78);
-    DRAWLINET(2, 3, 50);
-
-    if (supports_bright_colors) {
-        SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-    } else {
-        SETCOLOR(FG_BLUE, BG_BLACK);
-    }
-    DRAWLINET(2, 11, 50);
-    DRAWLINET(2, 16, 50);
-
-    for (int y = 0; y < 16; y++) {
-        PRINTATLENT(80 - 22, y + 4, palera1n_logo[y], 16);
-    }
-
-    SETCOLOR(FG_YELLOW, BG_BLACK);
-    if (tui_connected_devices == NULL) {
-        PRINTATT(3, 5, "Connect your iPhone, iPad, iPod Touch, or Apple");
-        PRINTATT(3, 6, "TV to begin.");
-        tui_can_start = false;
-    } else if (tui_connected_devices->next != NULL) {
-        PRINTATT(3, 5, "Please attach only one device.");
-        tui_can_start = false;
-    } else {
-        if (strlen(tui_connected_devices->display_name) == 0) {
-            PRINTATT(3, 5, "ERROR: Failed to open device in recovery/DFU mode");
-            PRINTATT(3, 6, "Please reopen palera1n and try again.");
-        } else if (tui_connected_devices->mode == TUI_DEVICE_MODE_NORMAL) {
-            MOVETOT(3, 5);
-            int ecid_y;
-            if (!tui_connected_devices->arm64) {
-                printf("Sorry, %s (iOS %s) is not supported.", tui_connected_devices->display_name, tui_connected_devices->version);
-                ecid_y = 6;
-                tui_can_start = false;
-            } else if (tui_compare_versions(tui_connected_devices->version, "15.0") < 0) {
-                printf("Sorry, %s is supported, but iOS", tui_connected_devices->display_name);
-                MOVETOT(3, 6);
-                printf("%s is not.", tui_connected_devices->version);
-                PRINTATT(3, 7, "Supported versions are 15.0+");
-                ecid_y = 8;
-                tui_can_start = false;
-             } else if (tui_connected_devices->requires_passcode_disabled) {
-                printf("Sorry, this devices passcode must be disabled on %s.", tui_connected_devices->version);
-                MOVETOT(3, 6);
-                printf("On 16.0+, you must reset the phone to factory settings");
-                MOVETOT(3, 7);
-                printf("and not have a passcode enabled ever since last restore.");
-                ecid_y = 8;
-                tui_can_start = false;
-            } else {
-                printf("%s (%s) connected in Normal mode.", tui_connected_devices->display_name, tui_connected_devices->version);
-                ecid_y = 6;
-                tui_can_start = true;
-            }
-            if (showing_ecid) {
-                MOVETOT(3, ecid_y);
-                printf("ECID: 0x%" PRIx64 " ", tui_connected_devices->ecid);
-            } else {
-                PRINTATT(3, ecid_y, "Press (E) to show ECID.");
-            }
-        } else if (tui_connected_devices->mode == TUI_DEVICE_MODE_RECOVERY) {
-            MOVETOT(3, 5);
-            printf("%s connected in Recovery mode.", tui_connected_devices->display_name);
-            if (showing_ecid) {
-                MOVETOT(3, 6);
-                printf("ECID: 0x%" PRIx64 " ", tui_connected_devices->ecid);
-            } else {
-                PRINTATT(3, 6, "Press (E) to show ECID.");
-            }
-            PRINTATT(3, 7, "NOTE: Ensure installed iOS is in range 15.0+");
-            tui_can_start = true;
-        } else if (tui_connected_devices->mode == TUI_DEVICE_MODE_DFU) {
-            MOVETOT(3, 5);
-            printf("%s connected in DFU mode.", tui_connected_devices->display_name);
-            if (showing_ecid) {
-                MOVETOT(3, 6);
-                printf("ECID: 0x%" PRIx64 " ", tui_connected_devices->ecid);
-            } else {
-                PRINTATT(3, 6, "Press (E) to show ECID.");
-            }
-#ifdef DEV_BUILD
-            tui_can_start = true;
-#else
-            PRINTATT(3, 7, "Please connect device in Normal/Recovery mode");
-            PRINTATT(3, 8, "or run palera1n in CLI mode");
-            tui_can_start = false;
-#endif
-        }
-    }
-
-    if (!tui_can_start && tui_main_nav_selection == 2) {
-        tui_main_nav_selection = 1;
-    }
-
-    SETCOLOR(FG_WHITE, BG_BLACK);
-
-    for (int y = 0; y < 3; y++) {
-        PRINTATLEN(tui_x_offset + 3, tui_y_offset + 17 + y, random_quotes[random_quote] + y * 50, 50);
-    }
-
-    tui_screen_main_nav();
-    fflush(stdout);
-}
-
-static int tui_main_nav_mouse_select = -1;
-
-tui_screen_t tui_screen_main(void) {
-    random_quote = ((unsigned int)((rand()+rand())/2)) % 8;
-    redraw_screen();
-
-    while(1) {
-        int event = tui_get_event();
-        switch (event) {
-            case TUI_EVENT_CONNECTED_DEVICES_CHANGED:
-                redraw_screen();
-                break;
-            case TUI_EVENT_INPUT: {
-                int input = tui_last_input;
-
-                switch (input) {
-                    case TUI_INPUT_NONE:
-                        if (tui_last_key == 'E' || tui_last_key == 'e') {
-                            showing_ecid = !showing_ecid;
-                            tui_screen_main_redraw();
-                        }
-                        break;
-                    case TUI_INPUT_LEFT:
-                    case TUI_INPUT_TAB_BACK:
-                        if (--tui_main_nav_selection == -1) tui_main_nav_selection = 3;
-                        if (tui_main_nav_selection == 2 && !tui_can_start) tui_main_nav_selection = 1;
-                        tui_screen_main_nav();
-                        fflush(stdout);
-                        break;
-                    case TUI_INPUT_RIGHT:
-                    case TUI_INPUT_TAB:
-                        if (++tui_main_nav_selection == 4) tui_main_nav_selection = 0;
-                        if (tui_main_nav_selection == 2 && !tui_can_start) tui_main_nav_selection = 3;
-                        tui_screen_main_nav();
-                        fflush(stdout);
-                        break;
-                    case TUI_INPUT_SELECT:
-                        switch(tui_main_nav_selection) {
-                        case 0:
-                            quick_mode_enabled = !quick_mode_enabled;
-                            tui_screen_main_nav();
-                            fflush(stdout);
-                            break;
-                        case 1:
-                            return OPTIONS_SCREEN;
-                        case 2:
-                            if (tui_can_start) {
-                                if (tui_connected_devices->mode == TUI_DEVICE_MODE_NORMAL) {
-                                    return ENTER_RECOVERY_SCREEN;
-                                } else if (tui_connected_devices->mode == TUI_DEVICE_MODE_RECOVERY) {
-                                    return ENTER_DFU_SCREEN;
-                                } else if (tui_connected_devices->mode == TUI_DEVICE_MODE_DFU) {
-                                    tui_jailbreak();
-                                    return JAILBREAK_SCREEN;
-                                }
-                            }
-                            break;
-                        case 3:
-                            return EXIT_SCREEN;
-                        }
-                        break;
-                    case TUI_INPUT_MOUSE_MOVE:
-                        tui_screen_main_redraw();
-                        break;
-                    case TUI_INPUT_MOUSE_DOWN:
-                        if ((tui_mouse_y == tui_y_offset + 9 && tui_mouse_x >= tui_x_offset + 25 && tui_mouse_x <= tui_x_offset + 25 + 8)) {
-                            easter_egg = true;
-                            break;
-                        }
-                        if (tui_mouse_y == tui_y_offset + 22) {
-                            if (tui_mouse_x >= tui_x_offset + 80 - 49 && tui_mouse_x <= tui_x_offset + 80 - 49 + 10) {
-                                tui_main_nav_selection = 0;
-                                tui_main_nav_mouse_select = 0;
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 37 && tui_mouse_x <= tui_x_offset + 80 - 37 + 10) {
-                                tui_main_nav_selection = 1;
-                                tui_main_nav_mouse_select = 1;
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 25 && tui_mouse_x <= tui_x_offset + 80 - 25 + 10) {
-                                if (tui_can_start) {
-                                    tui_main_nav_selection = 2;
-                                    tui_main_nav_mouse_select = 2;
-                                }
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 13 && tui_mouse_x <= tui_x_offset + 80 - 13 + 10) {
-                                tui_main_nav_selection = 3;
-                                tui_main_nav_mouse_select = 3;
-                            }
-                            tui_screen_main_nav();
-                            fflush(stdout);
-                        }
-                        break;
-                    case TUI_INPUT_MOUSE_UP:
-                        if (tui_mouse_y == tui_y_offset + 22) {
-                            if (tui_mouse_x >= tui_x_offset + 80 - 49 && tui_mouse_x <= tui_x_offset + 80 - 49 + 10 && tui_main_nav_mouse_select == 0) {
-                                quick_mode_enabled = !quick_mode_enabled;
-                                redraw_screen();
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 37 && tui_mouse_x <= tui_x_offset + 80 - 37 + 10 && tui_main_nav_mouse_select == 1) {
-                                return OPTIONS_SCREEN;
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 25 && tui_mouse_x <= tui_x_offset + 80 - 25 + 10 && tui_main_nav_mouse_select == 2) {
-                                if (tui_can_start) {
-                                    if (tui_connected_devices->mode == TUI_DEVICE_MODE_NORMAL) {
-                                        return ENTER_RECOVERY_SCREEN;
-                                    } else if (tui_connected_devices->mode == TUI_DEVICE_MODE_RECOVERY) {
-                                        return ENTER_DFU_SCREEN;
-                                    } else if (tui_connected_devices->mode == TUI_DEVICE_MODE_DFU) {
-                                        tui_jailbreak();
-                                        return JAILBREAK_SCREEN;
-                                    }
-                                }
-                            } else if (tui_mouse_x >= tui_x_offset + 80 - 13 && tui_mouse_x <= tui_x_offset + 80 - 13 + 10 && tui_main_nav_mouse_select == 3) {
-                                return EXIT_SCREEN;
-                            }
-                        }
-                        tui_main_nav_mouse_select = -1;
-                        break;
-                }
-                break;
-            }
-        }
-        
-    }
-
-    return MAIN_SCREEN;
-}
-
-static int tui_version_extract_component(const char *version, int index) {
-    int component = 0;
-    int componentIndex = 0;
-    for (int i = 0; version[i] != '\0'; i++) {
-        if (version[i] == '.') {
-            componentIndex++;
-            if (componentIndex > index) {
-                break;
-            }
-            continue;
-        }
-        if (componentIndex == index) {
-            component *= 10;
-            component += version[i] - '0';
-        }
-    }
-    return component;
-}
-
-static int tui_compare_versions(const char *firstVersion, const char *secondVersion) {
-    if (strcmp(firstVersion, secondVersion) == 0) {
-        return 0;
-    }
-
-    int firstVersionMajor = tui_version_extract_component(firstVersion, 0);
-    int firstVersionMinor = tui_version_extract_component(firstVersion, 1);
-    int firstVersionPatch = tui_version_extract_component(firstVersion, 2);
-    
-    int secondVersionMajor = tui_version_extract_component(secondVersion, 0);
-    int secondVersionMinor = tui_version_extract_component(secondVersion, 1);
-    int secondVersionPatch = tui_version_extract_component(secondVersion, 2);
-    
-    if (firstVersionMajor != secondVersionMajor) {
-        return firstVersionMajor - secondVersionMajor;
-    }
-    
-    if (firstVersionMinor != secondVersionMinor) {
-        return firstVersionMinor - secondVersionMinor;
-    }
-    
-    return firstVersionPatch - secondVersionPatch;
-}
-
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
@@ -1,4 +1,3 @@
-#ifdef TUI
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -13,329 +12,66 @@
 #include <palerain.h>
 #include <tui.h>

-static int tui_options_nav_selection = 0;
-static int tui_options_nav_mouse_select = 0;
-
-static bool tui_options_allow_untested = false;
-bool tui_options_safe_mode = false;
-bool tui_options_verbose_boot = false;
-bool tui_options_force_revert = false;
-bool tui_options_flower_chain = true;
-
-bool tui_options_is_editing_boot_args = false;
-
-char tui_options_boot_args[0x1e0 + 1] = {0};
-
-int tui_options_boot_args_cursor = 0;
-int tui_options_boot_args_offset = 0;
-
-void tui_screen_options_nav(void) {
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    MOVETOT(80 - 11, 23);
-    printf("%s[  Back  ]" COLOR(FG_WHITE, BG_BLACK),
-        tui_options_nav_selection == 0 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 80 - 12 && tui_mouse_x <= tui_x_offset + 80 - 12 + 10
-            ) && (tui_mouse_y == tui_y_offset + 22) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        )
-    );
-#ifdef DEV_BUILD
-    PRINTATT(3, 23, "DEV_BUILD");
-#endif
+void bitfield_check_cb(newtComponent box, void* data) {
+    if (newtCheckboxGetValue(box) == ' ') {
+        *((tui_bit_info_t*)data)->flags_p = *((tui_bit_info_t*)data)->flags_p &~ ((tui_bit_info_t*)data)->opt;
+    } else if (newtCheckboxGetValue(box) == '*') {
+        *((tui_bit_info_t*)data)->flags_p |= ((tui_bit_info_t*)data)->opt;
+    } else assert(0);
 }

-extern bool easter_egg;

-void tui_screen_options_options(void) {
-    SETCOLOR( FG_BRIGHT_BLACK, BG_BLACK);
-    MOVETOT(3, 8);
-    printf("[%c] %sAllow untested iOS/iPadOS versions" COLOR(FG_WHITE, BG_BLACK),
-        tui_options_allow_untested ? ' ' : ' ',
-        COLOR(FG_BLACK, FG_BRIGHT_BLACK));
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    MOVETOT(3, 9);
-    printf("[%c] %sSafe Mode                         " COLOR(FG_WHITE, BG_BLACK),
-        tui_options_safe_mode ? 'x' : ' ',
-        tui_options_nav_selection == 1 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
-            ) && (tui_mouse_y == tui_y_offset + 8) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ));
-    MOVETOT(3, 10);
-    printf("[%c] %sVerbose Boot                      " COLOR(FG_WHITE, BG_BLACK),
-        tui_options_verbose_boot ? 'x' : ' ',
-        tui_options_nav_selection == 2 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
-            ) && (tui_mouse_y == tui_y_offset + 9) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ));
-    MOVETOT(3, 11);
-    printf("[%c] %sForce Revert                      " COLOR(FG_WHITE, BG_BLACK),
-        tui_options_force_revert ? 'x' : ' ',
-        tui_options_nav_selection == 3 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
-            ) && (tui_mouse_y == tui_y_offset + 10) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ));
-    if (supports_bright_colors) {
-        SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-    } else {
-        SETCOLOR(FG_BLUE, BG_BLACK);
-    }
-    DRAWLINET(3, 13, 76);
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    MOVETOT(7, 15);
-    printf("%sBoot Arguments:                   " COLOR(FG_WHITE, BG_BLACK),
-        tui_options_nav_selection == 4 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
-            ) && (
-                tui_mouse_y == tui_y_offset + 14 || tui_mouse_y == tui_y_offset + 15
-            ) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ));
-    const char* boot_args_hint = tui_options_is_editing_boot_args ? "(press ENTER when done)" : "  (press ENTER to edit)";
-    MOVETOT((int)(80 - 5 - strlen(boot_args_hint)), 15);
-    printf("%s", boot_args_hint);
-    MOVETOT(3, 17);
-    printf("[%c] %s%s                      " COLOR(FG_WHITE, BG_BLACK),
-        tui_options_flower_chain ? 'x' : ' ',
-        tui_options_nav_selection == 5 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-            (
-                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
-            ) && (tui_mouse_y == tui_y_offset + 16) ? COLOR(FG_BLACK, BG_WHITE) : ""
-        ), easter_egg ? "Neko Chain  " : "Flower Chain");
+tui_screen_t tui_screen_options() {
+    tui_bit_info_t verbose_info = { &kpf_flags, checkrain_option_verbose_boot };
+    tui_bit_info_t rootful_info = { &palerain_flags, palerain_option_rootful };
+    tui_bit_info_t setup_rootful_info = { &palerain_flags, palerain_option_setup_rootful };
+    tui_bit_info_t force_revert_info = { &checkrain_flags, checkrain_option_force_revert };
+    tui_bit_info_t safemode_info = { &checkrain_flags, checkrain_option_safemode };

-    MOVETOT(7, 16);
-    if (supports_bright_colors) {
-        SETCOLOR(tui_options_is_editing_boot_args ? FG_YELLOW : FG_WHITE, BG_BRIGHT_BLACK);
-    } else {
-        SETCOLOR(tui_options_is_editing_boot_args ? FG_YELLOW : FG_WHITE, BG_BLUE);
-    }
-    int boot_args_len = strlen(tui_options_boot_args);
+    static checkrain_option_t flower_flags = 0, flower_option_flower_chain = (1 << 0);
+    tui_bit_info_t flower_chain_info = { &flower_flags, flower_option_flower_chain };
+    
+    const char* bootargs_entered = NULL;
+    int ret = MAIN_SCREEN;

-    if ((tui_options_boot_args_cursor - tui_options_boot_args_offset) > (68 - 1)) {
-        tui_options_boot_args_offset += (tui_options_boot_args_cursor - tui_options_boot_args_offset) - (68 - 1);
-    }
-    if ((tui_options_boot_args_cursor - tui_options_boot_args_offset) < 0) {
-        tui_options_boot_args_offset = tui_options_boot_args_cursor;
-    }
-    if ((tui_options_boot_args_offset + 68 - 1) > boot_args_len && boot_args_len >= 68 - 1) {
-        tui_options_boot_args_offset = boot_args_len - 68 + 1;
-    }
+    newtCenteredWindow(WIDTH, HEIGHT, NULL);
+    newtComponent backButton = newtCompactButton(66, 18, "Back");

-    for (int i = 0; i < 68; i++) {
-        putchar(((i + tui_options_boot_args_offset) < boot_args_len) ? tui_options_boot_args[i + tui_options_boot_args_offset] : ' ');
-    }
+    newtComponent optionsNotice = newtTextbox(1, 0, WIDTH - 2, 3, NEWT_FLAG_WRAP);
+    newtTextboxSetText(optionsNotice, "You may set the following options. If you don't know what they mean you'll probably have no reason to set them.");
+    // newtTextboxSetColors(optionsNotice, NEWT_COLORSET_LABEL, NEWT_COLORSET_LABEL);

-    if (tui_options_is_editing_boot_args) {
-        MOVETOT((int)(7 + tui_options_boot_args_cursor - tui_options_boot_args_offset), 16);
-        if (supports_bright_colors) {
-            SETCOLOR(FG_BRIGHT_BLACK, BG_YELLOW);
-        } else {
-            SETCOLOR(FG_BLUE, BG_YELLOW);
-        }
-        putchar(tui_options_boot_args_cursor < boot_args_len ? tui_options_boot_args[tui_options_boot_args_cursor] : ' ');
-    }
+    newtComponent verboseBootBox = newtCheckbox(1, 3, "Verbose boot", CHECKBOX_STATE(kpf_flags, checkrain_option_verbose_boot), NULL, NULL);
+    newtComponent rootfulBox = newtCheckbox(1, 4, "Rootful", CHECKBOX_STATE(palerain_flags, palerain_option_rootful), NULL, NULL);
+    newtComponent rootfulSetupBox = newtCheckbox(1, 5, "Setup fakefs", CHECKBOX_STATE(palerain_flags, palerain_option_setup_rootful), NULL, NULL);
+    newtComponent forceRevertBox = newtCheckbox(1, 6, "Restore system", CHECKBOX_STATE(checkrain_flags, checkrain_option_force_revert), NULL, NULL);
+    newtComponent safeModeBox = newtCheckbox(1, 7, "Safe mode", CHECKBOX_STATE(checkrain_flags, checkrain_option_safemode), NULL, NULL);

-    SETCOLOR(FG_WHITE, BG_BLACK);
-    MOVETOT(5, 16);
-    printf(tui_options_boot_args_offset > 0 ? "<<" : "  ");
-    MOVETOT(75, 16);
-    printf((strlen(tui_options_boot_args) - tui_options_boot_args_offset) > 68 ? ">>" : "  ");
+    newtComponentAddCallback(verboseBootBox, bitfield_check_cb, &verbose_info);
+    newtComponentAddCallback(rootfulBox, bitfield_check_cb, &rootful_info);
+    newtComponentAddCallback(rootfulSetupBox, bitfield_check_cb, &setup_rootful_info);
+    newtComponentAddCallback(forceRevertBox, bitfield_check_cb, &force_revert_info);
+    newtComponentAddCallback(safeModeBox, bitfield_check_cb, &safemode_info);
+
+    newtComponent bootCmdlineLabel = newtLabel(1, 8, "Kernel command line:");
+    newtComponent bootCmdlineEntry = newtEntry(1, 9, &xargs_cmd[6], WIDTH - 2, &bootargs_entered, NEWT_ENTRY_SCROLL);
+
+    newtComponent flowerChainBox = newtCheckbox(1, 10, "Flower chain", CHECKBOX_STATE(flower_flags, flower_option_flower_chain), NULL, NULL);
+    newtComponentAddCallback(flowerChainBox, bitfield_check_cb, &flower_chain_info);
+
+
+    newtComponent form = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(form, backButton, verboseBootBox, rootfulBox,
+     rootfulSetupBox, forceRevertBox, safeModeBox, bootCmdlineLabel, 
+     bootCmdlineEntry, flowerChainBox, optionsNotice,
+     NULL);
+    newtRunForm(form);
+    newtRefresh();
+    snprintf(xargs_cmd, 0x270, "xargs %s", bootargs_entered);
+    newtComponent buttonPressed = newtFormGetCurrent(form);
+    if (buttonPressed == backButton) {
+        ret = MAIN_SCREEN;
+    } else ret = MAIN_SCREEN;
+    newtFormDestroy(form);
+    return ret;
 }
-
-void tui_screen_options_redraw(void) {
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    PRINTATT(3, 3, "You may set the following options. If you don't know what they mean you'll");
-    PRINTATT(3, 4, "probably have no reason to set them.");
-    if (supports_bright_colors) {
-        SETCOLOR(FG_BRIGHT_BLACK, BG_BLACK);
-    } else {
-        SETCOLOR(FG_BLUE, BG_BLACK);
-    }
-    DRAWLINET(3, 6, 76);
-    tui_screen_options_nav();
-    tui_screen_options_options();
-    fflush(stdout);
-}
-
-tui_screen_t tui_screen_options(void) {
-    redraw_screen();
-
-    while(1) {
-        int event = tui_get_event();
-        if (event != TUI_EVENT_INPUT) continue;
-        int input = tui_last_input;
-
-        switch (input) {
-            case TUI_INPUT_DOWN:
-            case TUI_INPUT_TAB:
-                if (tui_options_is_editing_boot_args) break;
-                if (++tui_options_nav_selection > 5) tui_options_nav_selection = 0;
-                tui_screen_options_nav();
-                tui_screen_options_options();
-                fflush(stdout);
-                break;
-            case TUI_INPUT_UP:
-            case TUI_INPUT_TAB_BACK:
-                if (tui_options_is_editing_boot_args) break;
-                if (--tui_options_nav_selection < 0) tui_options_nav_selection = 5;
-                tui_screen_options_nav();
-                tui_screen_options_options();
-                fflush(stdout);
-                break;
-            case TUI_INPUT_SELECT:
-                if (tui_options_is_editing_boot_args && tui_last_key == ' ' && tui_options_boot_args[strlen(tui_options_boot_args)] == '\x00') {
-                    int len = strlen(tui_options_boot_args);
-                    tui_options_boot_args[len] = ' ';
-                    tui_options_boot_args[len + 1] = '\x00';
-                    tui_options_boot_args_cursor++;
-                    tui_screen_options_options();
-                    fflush(stdout);
-                    break;
-                }
-                switch(tui_options_nav_selection) {
-                case 0:
-                    return MAIN_SCREEN;
-                // case 1:
-                //     tui_options_allow_untested = !tui_options_allow_untested;
-                //     break;
-                case 1:
-                    tui_options_safe_mode = !tui_options_safe_mode;
-                    break;
-                case 2:
-                    tui_options_verbose_boot = !tui_options_verbose_boot;
-                    break;
-                case 3:
-                    tui_options_force_revert = !tui_options_force_revert;
-                    break;
-                case 4:
-                    tui_options_is_editing_boot_args = !tui_options_is_editing_boot_args;
-                    tui_options_boot_args_cursor = tui_options_is_editing_boot_args ? strlen(tui_options_boot_args) : 0;
-                    break;
-                case 5:
-                    tui_options_flower_chain = !tui_options_flower_chain;
-                    break;
-                }
-                tui_screen_options_nav();
-                tui_screen_options_options();
-                fflush(stdout);
-                break;
-            case TUI_INPUT_MOUSE_MOVE:
-                tui_screen_options_nav();
-                tui_screen_options_options();
-                fflush(stdout);
-                break;
-            case TUI_INPUT_MOUSE_DOWN:
-                if (tui_mouse_y == tui_y_offset + 24 - 2 &&
-                    tui_mouse_x >= tui_x_offset + 80 - 12 &&
-                    tui_mouse_x <= tui_x_offset + 80 - 12 + 10) {
-                    tui_options_nav_selection = 0;
-                    tui_options_nav_mouse_select = 0;
-                    redraw_screen();
-                }
-
-#define MOUSEDOWN_HANDLER(y, val)                               \
-                if (tui_mouse_y == tui_y_offset + y &&          \
-                    tui_mouse_x >= tui_x_offset + 5 - 4 &&      \
-                    tui_mouse_x <= tui_x_offset + 5 + 34) {     \
-                    tui_options_nav_selection = val;            \
-                    tui_options_nav_mouse_select = val;         \
-                    tui_screen_options_nav();                   \
-                    tui_screen_options_options();               \
-                    fflush(stdout);                             \
-                }
-
-                if (!tui_options_is_editing_boot_args) {
-                    MOUSEDOWN_HANDLER(8, 1);
-                    MOUSEDOWN_HANDLER(9, 2);
-                    MOUSEDOWN_HANDLER(10, 3);
-                    MOUSEDOWN_HANDLER(16, 5);
-                }
-                
-                MOUSEDOWN_HANDLER(14, 4);
-                MOUSEDOWN_HANDLER(15, 4);
-
-#undef MOUSEDOWN_HANDLER
-                break;
-            case TUI_INPUT_MOUSE_UP:
-                if (tui_mouse_y == tui_y_offset + 24 - 2 &&
-                    tui_mouse_x >= tui_x_offset + 80 - 12 &&
-                    tui_mouse_x <= tui_x_offset + 80 - 12 + 10 &&
-                    tui_options_nav_mouse_select == 0) {
-                    return MAIN_SCREEN;
-                }
-
-#define MOUSEUP_HANDLER(y, val, option, e)                          \
-                if (tui_mouse_y == tui_y_offset + y &&              \
-                    tui_mouse_x >= tui_x_offset + 5 - 4 &&          \
-                    tui_mouse_x <= tui_x_offset + 5 + 34 &&         \
-                    tui_options_nav_mouse_select == val) {          \
-                    tui_options_##option = !tui_options_##option;   \
-                    e                                               \
-                    tui_screen_options_nav();                       \
-                    tui_screen_options_options();                   \
-                    fflush(stdout);                                 \
-                }
-
-                if (!tui_options_is_editing_boot_args) {
-                    MOUSEUP_HANDLER(8, 1, safe_mode, );
-                    MOUSEUP_HANDLER(9, 2, verbose_boot, );
-                    MOUSEUP_HANDLER(10, 3, force_revert, );
-                    MOUSEUP_HANDLER(16, 5, flower_chain, );
-                }
-
-                #define BOOTARGS_HANDLER                                                                                \
-                tui_options_boot_args_cursor = tui_options_is_editing_boot_args ? strlen(tui_options_boot_args) : 0;
-
-                MOUSEUP_HANDLER(14, 4, is_editing_boot_args, BOOTARGS_HANDLER);
-                MOUSEUP_HANDLER(15, 4, is_editing_boot_args, BOOTARGS_HANDLER);
-#undef MOUSEUP_HANDLER
-                tui_options_nav_mouse_select = -1;
-                break;
-            case TUI_INPUT_BACKSPACE:
-                if (tui_options_is_editing_boot_args && tui_options_boot_args_cursor > 0) {
-                    memmove(tui_options_boot_args + tui_options_boot_args_cursor - 1, tui_options_boot_args + tui_options_boot_args_cursor, strlen(tui_options_boot_args) - tui_options_boot_args_cursor);
-                    tui_options_boot_args[strlen(tui_options_boot_args) - 1] = '\x00';
-                    tui_options_boot_args_cursor--;
-                    tui_screen_options_options();
-                    fflush(stdout);
-                }
-                break;
-            case TUI_INPUT_NONE:
-                if (tui_options_is_editing_boot_args && tui_options_boot_args[strlen(tui_options_boot_args)] == '\x00') {
-                    int len = strlen(tui_options_boot_args);
-                    memmove(tui_options_boot_args + tui_options_boot_args_cursor + 1, tui_options_boot_args + tui_options_boot_args_cursor, strlen(tui_options_boot_args) - tui_options_boot_args_cursor);
-                    tui_options_boot_args[tui_options_boot_args_cursor] = tui_last_key;
-                    tui_options_boot_args[len + 1] = '\x00';
-                    tui_options_boot_args_cursor++;
-                    tui_screen_options_options();
-                    fflush(stdout);
-                }
-                break;
-            case TUI_INPUT_LEFT:
-                if (tui_options_is_editing_boot_args) {
-                    if (tui_options_boot_args_cursor > 0) {
-                        tui_options_boot_args_cursor--;
-                        tui_screen_options_options();
-                        fflush(stdout);
-                    }
-                }
-                break;
-            case TUI_INPUT_RIGHT:
-                if (tui_options_is_editing_boot_args) {
-                    if (tui_options_boot_args_cursor < (int)strlen(tui_options_boot_args)) {
-                        tui_options_boot_args_cursor++;
-                        tui_screen_options_options();
-                        fflush(stdout);
-                    }
-                }
-                break;
-        }
-    }
-}
-
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
@@ -5,6 +5,8 @@
 	<true/>
 	<key>com.apple.private.security.no-container</key>
 	<true/>
+	<key>com.apple.private.skip-library-validation</key>
+	<true/>
 	<key>com.apple.security.iokit-user-client-class</key>
 	<array>
 		<string>IOUserClient</string>
@@ -24,7 +24,6 @@
 * SOFTWARE.
 *
 */
-#ifndef USE_LIBUSB
 #include <errno.h>
 #include <fcntl.h>              // open
 #include <pthread.h>
@@ -208,7 +207,7 @@ static const int pongo_usb_product = PONGO_USB_PRODUCT;

 int wait_for_pongo(void) {
    kern_return_t ret;
-    stuff_t stuff = {0};
+    stuff_t stuff;
    io_iterator_t found, lost;

    void* cfdict_keys[3];
@@ -251,7 +250,3 @@ int wait_for_pongo(void) {
    CFRelease(cfdict);
    return 0;
 }
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
-#endif
@@ -180,7 +180,8 @@ static int LostDevice(libusb_context *ctx, libusb_device *dev, libusb_hotplug_ev

 int wait_for_pongo(void)
 {
-    stuff_t stuff = {0};
+    stuff_t stuff;
+    stuff.handle = NULL;
    libusb_hotplug_callback_handle hp[2];
    libusb_context* ctx = NULL;

@@ -263,7 +264,4 @@ int wait_for_pongo(void)
        libusb_exit(ctx);
        return 0;
 }
-#else
-/* ISO C forbids an empty translation unit */
-extern char** environ;
 #endif
Author	SHA1	Message	Date
staturnz	fe6a3a8c13	chore: dry-run only for now	2023-06-04 18:25:35 -05:00
staturnz	1a3e99640b	Merge branch 'main' into gui	2023-06-04 18:23:06 -05:00
staturnz	e5a618682f	headers and packaging stuff	2023-04-07 09:59:14 -05:00
staturnz	cee71af2a6	main ui code main ui code, moving over from old repo	2023-04-06 15:45:00 -05:00
staturnz	0278d19df8	gui build stuff	2023-04-05 22:19:57 -05:00