diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2780b521..6d98ae4e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,9 +211,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ninja-build
           sudo apt-get remove -y cmake
-          git -C libultraship remote add nx https://github.com/Net64DD/libultraship.git
+          git -C libultraship remote add nx https://github.com/sonicdcer/libultraship.git
           git -C libultraship fetch nx
-          git -C libultraship checkout nx/main-nx
+          git -C libultraship checkout nx/main-nx_backup
           wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
           sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
           cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
index 07126f8d..3d83c850 100644
--- a/.github/workflows/switch.yml
+++ b/.github/workflows/switch.yml
@@ -18,9 +18,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ninja-build
           sudo apt-get remove -y cmake
-          git -C libultraship remote add nx https://github.com/Net64DD/libultraship.git
+          git -C libultraship remote add nx https://github.com/sonicdcer/libultraship.git
           git -C libultraship fetch nx
-          git -C libultraship checkout 09dfab5fb2a9a047a6e268dc9db2daad9b2ce5f0
+          git -C libultraship checkout nx/main-nx_backup
           wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
           sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
           cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
diff --git a/include/endianness.h b/include/endianness.h
deleted file mode 100644
index 3b17a8b9..00000000
--- a/include/endianness.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-namespace Ship {
-enum class Endianness {
-    Little = 0,
-    Big = 1,
-
-#if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) || defined(__BIG_ENDIAN__)
-    Native = Big,
-#else
-    Native = Little,
-#endif
-};
-} // namespace Ship
-#endif
-
-#ifdef _MSC_VER
-#include <stdlib.h>
-
-#define BSWAP16 _byteswap_ushort
-#define BSWAP32 _byteswap_ulong
-#define BSWAP64 _byteswap_uint64
-
-#define BOMSWAP16 _byteswap_ushort
-#define BOMSWAP32 _byteswap_ulong
-#define BOMSWAP64 _byteswap_uint64
-
-#define BOMSWAP16_CONST(x) ((((x) >> 8) & 0x00FF) | (((x) << 8) & 0xFF00))
-#define BOMSWAP32_CONST(x) \
-    ((((x) >> 24) & 0x000000FF) | (((x) >> 8) & 0x0000FF00) | (((x) << 8) & 0x00FF0000) | (((x) << 24) & 0xFF000000))
-#define BOMSWAP64_CONST(x)                                                                                          \
-    ((((x) >> 56) & 0x00000000000000FF) | (((x) >> 40) & 0x000000000000FF00) | (((x) >> 24) & 0x0000000000FF0000) | \
-     (((x) >> 8) & 0x00000000FF000000) | (((x) << 8) & 0x000000FF00000000) | (((x) << 24) & 0x0000FF0000000000) |   \
-     (((x) << 40) & 0x00FF000000000000) | (((x) << 56) & 0xFF00000000000000))
-#else
-
-#define BSWAP16 __builtin_bswap16
-#define BSWAP32 __builtin_bswap32
-#define BSWAP64 __builtin_bswap64
-
-#define BOMSWAP16 __builtin_bswap16
-#define BOMSWAP32 __builtin_bswap32
-#define BOMSWAP64 __builtin_bswap64
-
-#define BOMSWAP16_CONST __builtin_bswap16
-#define BOMSWAP32_CONST __builtin_bswap32
-#define BOMSWAP64_CONST __builtin_bswap64
-#endif
-
-#if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) || defined(__BIG_ENDIAN__)
-#ifndef IS_BIGENDIAN
-#define IS_BIGENDIAN
-#endif
-#endif
-
-#ifdef IS_BIGENDIAN
-#define BE16SWAP(x) (x)
-#define BE32SWAP(x) (x)
-#define BE64SWAP(x) (x)
-#define LE16SWAP(x) BOMSWAP16(x)
-#define LE32SWAP(x) BOMSWAP32(x)
-#define LE64SWAP(x) BOMSWAP64(x)
-
-#define BE16SWAP_CONST(x) (x)
-#define BE32SWAP_CONST(x) (x)
-#define BE64SWAP_CONST(x) (x)
-#define LE16SWAP_CONST(x) BOMSWAP16_CONST(x)
-#define LE32SWAP_CONST(x) BOMSWAP32_CONST(x)
-#define LE64SWAP_CONST(x) BOMSWAP64_CONST(x)
-#else
-#define BE16SWAP(x) BOMSWAP16(x)
-#define BE32SWAP(x) BOMSWAP32(x)
-#define BE64SWAP(x) BOMSWAP64(x)
-#define LE16SWAP(x) (x)
-#define LE32SWAP(x) (x)
-#define LE64SWAP(x) (x)
-
-#define BE16SWAP_CONST(x) BOMSWAP16_CONST(x)
-#define BE32SWAP_CONST(x) BOMSWAP32_CONST(x)
-#define BE64SWAP_CONST(x) BOMSWAP64_CONST(x)
-#define LE16SWAP_CONST(x) (x)
-#define LE32SWAP_CONST(x) (x)
-#define LE64SWAP_CONST(x) (x)
-#endif