diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b9bcd698a2..923fd37947 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -15,71 +15,83 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ env.HAXE_VERSION }}
-      - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v4.2.3
-        with:
-          # not caching the bin folder to prevent asset duplication and stuff like that
-          key: cache-build-linux
-          path: |
-            .haxelib/
-            export/release/linux/haxe/
-            export/release/linux/obj/
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-linux
+      #     path: |
+      #       .haxelib/
+      #       export/release/linux/obj/
+      - name: Installing Packages for Building Lime (TEMPORARY)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -qq \
+          libegl1-mesa-dev libgl1-mesa-dev libibus-1.0-dev libdbus-1-dev libdecor-0-dev libudev-dev libgbm-dev libdrm-dev \
+          libpng-dev libturbojpeg-dev libvorbis-dev libopenal-dev libsdl2-dev libglu1-mesa-dev libmbedtls-dev libuv1-dev libsqlite3-dev \
+          libx11-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbcommon-dev libxcursor-dev libxrandr-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxxf86vm-dev \
+          libpulse-dev libasound2-dev libpipewire-0.3-dev \
+          zlib1g-dev
       - name: Installing LibVLC
         run: |
           sudo apt-get install libvlc-dev libvlccore-dev
       - name: Installing/Updating libraries
         run: |
+          haxelib --global update haxelib
           haxe -cp commandline -D analyzer-optimize --run Main setup -si
       - name: Building the game
         run: |
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild linux -nocolor -release
           haxelib run lime build linux -DCOMPILE_EXPERIMENTAL
       # - name: Tar files
       #   run: tar -zcvf CodenameEngine.tar.gz -C export/release/linux/bin .
       - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Codename Engine (Executable Only)
           path: export/release/linux/bin/CodenameEngine
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Codename Engine
           path: export/release/linux/bin/
-      - name: Clearing already existing cache
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            for (const cache of caches.data.actions_caches) {
-              if (cache.key == "cache-build-linux") {
-                console.log('Clearing ' + cache.key + '...')
-                await github.rest.actions.deleteActionsCacheById({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  cache_id: cache.id,
-                })
-                console.log("Cache cleared.")
-              }
-            }
-      - name: Uploading new cache
-        uses: actions/cache@v4.2.3
-        with:
-          # caching again since for some reason it doesnt work with the first post cache shit
-          key: cache-build-linux
-          path: |
-            .haxelib/
-            export/release/linux/haxe/
-            export/release/linux/obj/
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-linux") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-linux
+      #     path: |
+      #       .haxelib/
+      #       export/release/linux/obj/
 
 # didnt compile debug in the same job or github would have said that job wasn't completed until debug was done too (debug uploads are not essential)
   debug_build:
@@ -89,61 +101,73 @@ jobs:
     needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ env.HAXE_VERSION }}
-      - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v4.2.3
-        with:
-          # not caching the bin folder to prevent asset duplication and stuff like that
-          key: cache-build-linux-debug
-          path: |
-            .haxelib/
-            export/debug/linux/haxe/
-            export/debug/linux/obj/
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-linux-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/linux/obj/
+      - name: Installing Packages for Building Lime (TEMPORARY)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -qq \
+          libegl1-mesa-dev libgl1-mesa-dev libibus-1.0-dev libdbus-1-dev libdecor-0-dev libudev-dev libgbm-dev libdrm-dev \
+          libpng-dev libturbojpeg-dev libvorbis-dev libopenal-dev libsdl2-dev libglu1-mesa-dev libmbedtls-dev libuv1-dev libsqlite3-dev \
+          libx11-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbcommon-dev libxcursor-dev libxrandr-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxxf86vm-dev \
+          libpulse-dev libasound2-dev libpipewire-0.3-dev \
+          zlib1g-dev
       - name: Installing LibVLC
         run: |
           sudo apt-get install libvlc-dev libvlccore-dev
       - name: Installing/Updating libraries
         run: |
+          haxelib --global update haxelib
           haxe -cp commandline -D analyzer-optimize --run Main setup -si
       - name: Building the game
         run: |
-          haxelib run lime build linux -debug
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild linux -nocolor -release
+          haxelib run lime build linux -debug -DCOMPILE_EXPERIMENTAL
       # - name: Tar files
       #   run: tar -zcvf CodenameEngine.tar.gz -C export/debug/linux/bin .
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Codename Engine Debug
           path: export/debug/linux/bin/
-      - name: Clearing already existing cache
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            for (const cache of caches.data.actions_caches) {
-              if (cache.key == "cache-build-linux-debug") {
-                console.log('Clearing ' + cache.key + '...')
-                await github.rest.actions.deleteActionsCacheById({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  cache_id: cache.id,
-                })
-                console.log("Cache cleared.")
-              }
-            }
-      - name: Uploading new cache
-        uses: actions/cache@v4.2.3
-        with:
-          # caching again since for some reason it doesnt work with the first post cache shit
-          key: cache-build-linux-debug
-          path: |
-            .haxelib/
-            export/debug/linux/haxe/
-            export/debug/linux/obj/
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-linux-debug") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-linux-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/linux/obj/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ecac5f1aba..9b4ae37a30 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -9,135 +9,367 @@ env:
   HXCPP_COMPILE_CACHE: ${{ github.workspace }}/.hxcpp_cache
 
 jobs:
-  build:
-    name: Mac OS Build
+  intel_build:
+    name: Mac OS x64 Build
     permissions: write-all
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ env.HAXE_VERSION }}
-      - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v4.2.3
-        with:
-          # not caching the bin folder to prevent asset duplication and stuff like that
-          key: cache-build-mac
-          path: |
-            .haxelib/
-            export/release/macos/haxe/
-            export/release/macos/obj/
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-mac
+      #     path: |
+      #       .haxelib/
+      #       export/release/macos/obj/
       - name: Installing/Updating libraries
         run: |
+          brew trust aws/tap
+          arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+          arch -x86_64 /usr/local/bin/brew install zlib
+          haxelib --global update haxelib
           haxe -cp commandline -D analyzer-optimize --run Main setup -si
       - name: Building the game
         run: |
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild mac -64 -nocolor -release
           arch -x86_64 haxelib run lime build mac -DCOMPILE_EXPERIMENTAL
       - name: Tar files
         run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
-      - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v4
+      - name: Uploading artifact (entire build)
+        uses: actions/upload-artifact@v7
         with:
-          name: Codename Engine (Executable Only)
-          path: export/release/macos/bin/CodenameEngine.app/Contents/MacOS/CodenameEngine
+          name: Codename Engine-x64
+          path: CodenameEngine.tar.gz
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-mac") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-mac
+      #     path: |
+      #       .haxelib/
+      #       export/release/macos/obj/
+
+  arm_build:
+    name: Mac OS ARM64 Build
+    permissions: write-all
+    runs-on: macos-26
+    steps:
+      - name: Pulling the new commit
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Setting up Haxe
+        uses: krdlab/setup-haxe@v2
+        with:
+          haxe-version: ${{ env.HAXE_VERSION }}
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-mac
+      #     path: |
+      #       .haxelib/
+      #       export/release/macos/obj/
+      - name: Installing/Updating libraries
+        run: |
+          brew trust aws/tap
+          brew install zlib
+          haxelib --global update haxelib
+          haxe -cp commandline -D analyzer-optimize --run Main setup -si
+      - name: Building the game
+        run: |
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild mac -nocolor -release
+          haxelib run lime build mac -DCOMPILE_EXPERIMENTAL
+      - name: Tar files
+        run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: Codename Engine
+          name: Codename Engine-ARM64
           path: CodenameEngine.tar.gz
-      - name: Clearing already existing cache
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            for (const cache of caches.data.actions_caches) {
-              if (cache.key == "cache-build-mac") {
-                console.log('Clearing ' + cache.key + '...')
-                await github.rest.actions.deleteActionsCacheById({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  cache_id: cache.id,
-                })
-                console.log("Cache cleared.")
-              }
-            }
-      - name: Uploading new cache
-        uses: actions/cache@v4.2.3
-        with:
-          # caching again since for some reason it doesnt work with the first post cache shit
-          key: cache-build-mac
-          path: |
-            .haxelib/
-            export/release/macos/haxe/
-            export/release/macos/obj/
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-mac") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-mac
+      #     path: |
+      #       .haxelib/
+      #       export/release/macos/obj/
+
+  universal_build:
+    name: Mac OS Universal Build
+    permissions: write-all
+    runs-on: macos-26
+    needs: 
+      - intel_build
+      - arm_build
+    steps:
+      - name: Download Mac OS x64 Full Build
+        uses: actions/download-artifact@v8
+        with:
+          name: Codename Engine-x64
+          path: intel
+      - name: Download Mac OS ARM64 Full Build
+        uses: actions/download-artifact@v8
+        with:
+          name: Codename Engine-ARM64
+          path: arm
+      - name: Tar files (x64)
+        run: tar -xvf intel/CodenameEngine.tar.gz -C intel
+      - name: Tar files (ARM64)
+        run: tar -xvf arm/CodenameEngine.tar.gz -C arm
+      - name: Removing ARM64 and x64 artifacts
+        uses: geekyeggo/delete-artifact@v6
+        with:
+          name: Codename Engine-*
+      - name: Creating Universal App Bundle
+        shell: bash
+        run: |
+          BIN="CodenameEngine.app/Contents/MacOS"
+          INTEL="intel/CodenameEngine.app/Contents/MacOS"
+          ARM="arm/CodenameEngine.app/Contents/MacOS"
+          cp -R intel/CodenameEngine.app CodenameEngine.app
+          lipo -create "$INTEL/CodenameEngine" "$ARM/CodenameEngine" -output "$BIN/CodenameEngine"
+          lipo -create "$INTEL/lime.ndll" "$ARM/lime.ndll" -output "$BIN/lime.ndll"
+      - name: Uploading Universal Mac OS bundle (executable)
+        uses: actions/upload-artifact@v7
+        with:
+          name: Codename Engine (Executable Only)
+          path: CodenameEngine.app/Contents/MacOS/CodenameEngine
+      - name: Uploading Universal Mac OS bundle
+        uses: actions/upload-artifact@v7
+        with:
+          name: Codename Engine
+          path: CodenameEngine.app
 
 # didnt compile debug in the same job or github would have said that job wasn't completed until debug was done too (debug uploads are not essential)
-  debug_build:
-    name: Mac OS Debug Build
+  intel_debug_build:
+    name: Mac OS x64 Debug Build
     permissions: write-all
-    runs-on: macos-15
-    needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
+    runs-on: macos-26
+    needs: universal_build # since its low priority, it'll run after, so actions will concentrate first on normal builds
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ env.HAXE_VERSION }}
-      - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v4.2.3
-        with:
-          # not caching the bin folder to prevent asset duplication and stuff like that
-          key: cache-build-mac-debug
-          path: |
-            .haxelib/
-            export/debug/macos/haxe/
-            export/debug/macos/obj/
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-mac-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/macos/obj/
       - name: Installing/Updating libraries
         run: |
+          brew trust aws/tap
+          arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+          arch -x86_64 /usr/local/bin/brew install zlib
+          haxelib --global update haxelib
           haxe -cp commandline -D analyzer-optimize --run Main setup -si
       - name: Building the game
         run: |
-          arch -x86_64 haxelib run lime build mac -debug
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild mac -64 -nocolor -release
+          arch -x86_64 haxelib run lime build mac -debug -DCOMPILE_EXPERIMENTAL
       - name: Tar files
         run: tar -zcvf CodenameEngine.tar.gz -C export/debug/macos/bin .
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: Codename Engine Debug
+          name: Codename Engine-x64 Debug
+          path: CodenameEngine.tar.gz
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-mac-debug") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-mac-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/macos/obj/
+
+  arm_debug_build:
+    name: Mac OS ARM64 Debug Build
+    permissions: write-all
+    runs-on: macos-26
+    needs: universal_build # since its low priority, it'll run after, so actions will concentrate first on normal builds
+    steps:
+      - name: Pulling the new commit
+        uses: actions/checkout@v6
+      - name: Setting up Haxe
+        uses: krdlab/setup-haxe@v2
+        with:
+          haxe-version: ${{ env.HAXE_VERSION }}
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-mac-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/macos/obj/
+      - name: Installing/Updating libraries
+        run: |
+          brew trust aws/tap
+          brew install zlib
+          haxelib --global update haxelib
+          haxe -cp commandline -D analyzer-optimize --run Main setup -si
+      - name: Building the game
+        run: |
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild mac -nocolor -release
+          haxelib run lime build mac -debug -DCOMPILE_EXPERIMENTAL
+      - name: Tar files
+        run: tar -zcvf CodenameEngine.tar.gz -C export/debug/macos/bin .
+      - name: Uploading artifact (entire build)
+        uses: actions/upload-artifact@v7
+        with:
+          name: Codename Engine-ARM64 Debug
           path: CodenameEngine.tar.gz
-      - name: Clearing already existing cache
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            for (const cache of caches.data.actions_caches) {
-              if (cache.key == "cache-build-mac-debug") {
-                console.log('Clearing ' + cache.key + '...')
-                await github.rest.actions.deleteActionsCacheById({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  cache_id: cache.id,
-                })
-                console.log("Cache cleared.")
-              }
-            }
-      - name: Uploading new cache
-        uses: actions/cache@v4.2.3
-        with:
-          # caching again since for some reason it doesnt work with the first post cache shit
-          key: cache-build-mac-debug
-          path: |
-            .haxelib/
-            export/debug/macos/haxe/
-            export/debug/macos/obj/
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-mac-debug") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-mac-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/macos/obj/
+
+  universal_debug_build:
+    name: Mac OS Universal Debug Build
+    permissions: write-all
+    runs-on: macos-26
+    needs: 
+      - intel_debug_build
+      - arm_debug_build
+    steps:
+      - name: Download Mac OS x64 Full Build
+        uses: actions/download-artifact@v8
+        with:
+          name: Codename Engine-x64 Debug
+          path: intel
+      - name: Download Mac OS ARM64 Full Build
+        uses: actions/download-artifact@v8
+        with:
+          name: Codename Engine-ARM64 Debug
+          path: arm
+      - name: Tar files (x64)
+        run: tar -xvf intel/CodenameEngine.tar.gz -C intel
+      - name: Tar files (ARM64)
+        run: tar -xvf arm/CodenameEngine.tar.gz -C arm
+      - name: Removing ARM64 and x64 artifacts
+        uses: geekyeggo/delete-artifact@v6
+        with:
+          name: Codename Engine-*
+      - name: Creating Universal App Bundle
+        shell: bash
+        run: |
+          BIN="CodenameEngine.app/Contents/MacOS"
+          INTEL="intel/CodenameEngine.app/Contents/MacOS"
+          ARM="arm/CodenameEngine.app/Contents/MacOS"
+          cp -R intel/CodenameEngine.app CodenameEngine.app
+          lipo -create "$INTEL/CodenameEngine" "$ARM/CodenameEngine" -output "$BIN/CodenameEngine"
+          lipo -create "$INTEL/lime.ndll" "$ARM/lime.ndll" -output "$BIN/lime.ndll"
+      - name: Uploading Universal Mac OS bundle
+        uses: actions/upload-artifact@v7
+        with:
+          name: Codename Engine Debug
+          path: CodenameEngine.app
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1d44b18914..3e78c83f20 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Download Windows Full Build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v8
         with:
           workflow: windows.yml
           name: Codename Engine
@@ -34,7 +34,7 @@ jobs:
           allow_forks: false
 
       - name: Download Windows Executable
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v8
         with:
           workflow: windows.yml
           name: Codename Engine (Executable Only)
@@ -42,7 +42,7 @@ jobs:
           allow_forks: false
 
       - name: Download Mac OS Full Build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v8
         with:
           workflow: macos.yml
           name: Codename Engine
@@ -50,7 +50,7 @@ jobs:
           allow_forks: false
 
       - name: Download Mac OS Executable
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v8
         with:
           workflow: macos.yml
           name: Codename Engine (Executable Only)
@@ -58,7 +58,7 @@ jobs:
           allow_forks: false
 
       - name: Download Linux Full Build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v8
         with:
           workflow: linux.yml
           name: Codename Engine
@@ -66,7 +66,7 @@ jobs:
           allow_forks: false
 
       - name: Download Linux Executable
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v8
         with:
           workflow: linux.yml
           name: Codename Engine (Executable Only)
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2f1584327d..3c2850f027 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,66 +15,71 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ env.HAXE_VERSION }}
-      - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v4.2.3
-        with:
-          # not caching the bin folder to prevent asset duplication and stuff like that
-          key: cache-build-windows
-          path: |
-            .haxelib/
-            export/release/windows/haxe/
-            export/release/windows/obj/
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-windows
+      #     path: |
+      #       .haxelib/
+      #       export/release/windows/obj/
       - name: Installing/Updating libraries
         run: |
+          haxelib --global update haxelib
           haxe -cp commandline -D analyzer-optimize --run Main setup -si --no-vscheck
       - name: Building the game
         run: |
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild windows -nocolor -release
           haxelib run lime build windows -DCOMPILE_EXPERIMENTAL
       - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Codename Engine (Executable Only)
-          path: export/release/windows/bin/CodenameEngine.exe
+          path: |
+            export/release/windows/bin/CodenameEngine.exe
+            export/release/windows/bin/lime.ndll
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Codename Engine
           path: export/release/windows/bin
-      - name: Clearing already existing cache
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            for (const cache of caches.data.actions_caches) {
-              if (cache.key == "cache-build-windows") {
-                console.log('Clearing ' + cache.key + '...')
-                await github.rest.actions.deleteActionsCacheById({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  cache_id: cache.id,
-                })
-                console.log("Cache cleared.")
-              }
-            }
-      - name: Uploading new cache
-        uses: actions/cache@v4.2.3
-        with:
-          # caching again since for some reason it doesnt work with the first post cache shit
-          key: cache-build-windows
-          path: |
-            .haxelib/
-            export/release/windows/haxe/
-            export/release/windows/obj/
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-windows") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-windows
+      #     path: |
+      #       .haxelib/
+      #       export/release/windows/obj/
 
 # didnt compile debug in the same job or github would have said that job wasn't completed until debug was done too (debug uploads are not essential)
   debug_build:
@@ -84,56 +89,60 @@ jobs:
     needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ env.HAXE_VERSION }}
-      - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v4.2.3
-        with:
-          # not caching the bin folder to prevent asset duplication and stuff like that
-          key: cache-build-windows-debug
-          path: |
-            .haxelib/
-            export/debug/windows/haxe/
-            export/debug/windows/obj/
+      # - name: Restore existing build cache for faster compilation
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # not caching the bin folder to prevent asset duplication and stuff like that
+      #     key: cache-build-windows-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/windows/haxe/
+      #       export/debug/windows/obj/
       - name: Installing/Updating libraries
         run: |
+          haxelib --global update haxelib
           haxe -cp commandline -D analyzer-optimize --run Main setup -si --no-vscheck
       - name: Building the game
         run: |
+          haxelib run lime setup -alias -y -nocffi
+          haxelib run lime rebuild hxcpp
+          haxelib run lime rebuild tools
+          haxelib run lime rebuild windows -nocolor -release
           haxelib run lime build windows -debug
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Codename Engine Debug
           path: export/debug/windows/bin
-      - name: Clearing already existing cache
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            for (const cache of caches.data.actions_caches) {
-              if (cache.key == "cache-build-windows-debug") {
-                console.log('Clearing ' + cache.key + '...')
-                await github.rest.actions.deleteActionsCacheById({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  cache_id: cache.id,
-                })
-                console.log("Cache cleared.")
-              }
-            }
-      - name: Uploading new cache
-        uses: actions/cache@v4.2.3
-        with:
-          # caching again since for some reason it doesnt work with the first post cache shit
-          key: cache-build-windows-debug
-          path: |
-            .haxelib/
-            export/debug/windows/haxe/
-            export/debug/windows/obj/
+      # - name: Clearing already existing cache
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const caches = await github.rest.actions.getActionsCacheList({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #       })
+      #       for (const cache of caches.data.actions_caches) {
+      #         if (cache.key == "cache-build-windows-debug") {
+      #           console.log('Clearing ' + cache.key + '...')
+      #           await github.rest.actions.deleteActionsCacheById({
+      #             owner: context.repo.owner,
+      #             repo: context.repo.repo,
+      #             cache_id: cache.id,
+      #           })
+      #           console.log("Cache cleared.")
+      #         }
+      #       }
+      # - name: Uploading new cache
+      #   uses: actions/cache@v4.2.3
+      #   with:
+      #     # caching again since for some reason it doesnt work with the first post cache shit
+      #     key: cache-build-windows-debug
+      #     path: |
+      #       .haxelib/
+      #       export/debug/windows/obj/
diff --git a/README.md b/README.md
index 02f9929bac..c9ffb7bfcd 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ The engine uses [HaxeFlixel](https://haxeflixel.com/) and it mainly features:
 ---
 
 > [!NOTE]
-> Codename Engine as for now supports **Windows x64**, **Mac OS x64** and **Linux x64**.<br>
+> Codename Engine as for now supports **Windows x64**, **Mac OS Universal** and **Linux x64**.<br>
 > More platforms will soon come, stay tuned!<br>
 > - [ ] **Web (HTML5) Support**
 > - [ ] **Mobile Support**
diff --git a/assets/data/editors/layouts/stage/characterEditScreen.xml b/assets/data/editors/layouts/stage/characterEditScreen.xml
index 414973c3ba..fe1bf3ba65 100644
--- a/assets/data/editors/layouts/stage/characterEditScreen.xml
+++ b/assets/data/editors/layouts/stage/characterEditScreen.xml
@@ -95,7 +95,7 @@
 			import funkin.game.Character;
 
 			var curCharBox = new UIAutoCompleteTextBox(col(2), charTypeY, char.curCharacter, 145, 32);
-			curCharBox.suggestItems = Character.getList(false);
+			curCharBox.suggestItems = Character.getList(false, false, null, true);
 			self.add(curCharBox);
 		 </exec>
 	</section>
diff --git a/assets/data/editors/layouts/stage/spriteEditScreen.xml b/assets/data/editors/layouts/stage/spriteEditScreen.xml
index 1e3bded91f..16f53219be 100644
--- a/assets/data/editors/layouts/stage/spriteEditScreen.xml
+++ b/assets/data/editors/layouts/stage/spriteEditScreen.xml
@@ -32,14 +32,29 @@
 		<textbox name="spriteTextBox" value="getEx('imageFile')" x="last.x + last.bWidth + XOFFSET" y="curY" width="200" height="32" />
 		<stepper name="alphaStepper" label="Alpha" value="sprite.alpha" x="last.x + last.bWidth + XOFFSET" y="curY" precision="2" step="0.01" width="100" />
 		<dropdown name="blendMode" label="${translate('blendMode')}" value="sprite.blend" x="last.x + last.bWidth + XOFFSET - 20" y="curY" width="150" height="32">
-			<!-- add all remaining blend modes once they are available pls -->
-			<!-- also why do i have to wrap them in 2 strings -->
 			<item label="${translate('blendMode.none')}" value="null" />
 			<item label="${translate('blendMode.add')}" value="'add'" />
+			<item label="${translate('blendMode.alpha')}" value="'alpha'" />
+			<item label="${translate('blendMode.color')}" value="'color'" />
+			<item label="${translate('blendMode.colordodge')}" value="'colordodge'" />
+			<item label="${translate('blendMode.colorburn')}" value="'colorburn'" />
+			<item label="${translate('blendMode.darken')}" value="'darken'" />
+			<item label="${translate('blendMode.difference')}" value="'difference'" />
+			<item label="${translate('blendMode.exclusion')}" value="'exclusion'" />
+			<item label="${translate('blendMode.erase')}" value="'erase'" />
+			<item label="${translate('blendMode.hardlight')}" value="'hardlight'" />
+			<item label="${translate('blendMode.hue')}" value="'hue'" />
+			<item label="${translate('blendMode.invert')}" value="'invert'" />
+			<item label="${translate('blendMode.layer')}" value="'layer'" />
 			<item label="${translate('blendMode.lighten')}" value="'lighten'" />
+			<item label="${translate('blendMode.luminosity')}" value="'luminosity'" />
 			<item label="${translate('blendMode.multiply')}" value="'multiply'" />
+			<item label="${translate('blendMode.overlay')}" value="'overlay'" />
 			<item label="${translate('blendMode.screen')}" value="'screen'" />
+			<item label="${translate('blendMode.shader')}" value="'shader'" />
+			<item label="${translate('blendMode.softlight')}" value="'softlight'" />
 			<item label="${translate('blendMode.subtract')}" value="'subtract'" />
+			<item label="${translate('blendMode.saturation')}" value="'saturation'" />
 		</dropdown>
 		<label name="imageFile" text="${translate('imageFile', [stage.spritesParentFolder])}" x="spriteTextBox.x" y="spriteTextBox.y - 14" size="15" />
 	</section>
diff --git a/assets/images/editors/folder.png b/assets/images/editors/folder.png
new file mode 100644
index 0000000000..cb607f5c18
Binary files /dev/null and b/assets/images/editors/folder.png differ
diff --git a/assets/languages/en/Editors.xml b/assets/languages/en/Editors.xml
index 447b0549a6..87138fcaec 100644
--- a/assets/languages/en/Editors.xml
+++ b/assets/languages/en/Editors.xml
@@ -44,6 +44,8 @@
 	<group name="ChartEditor">
 		<group name="CharterSelection" prefix="charterSelection.">
 			<str id="desc">Select a song to modify the charts from.</str>
+			<str id="acceptFolder">Press ACCEPT to edit this folder.</str>
+			<str id="desc-folder">Select a song to modify the charts from in {0}</str>
 			<str id="acceptSong">Press ACCEPT to choose a difficulty to edit.</str>
 			<str id="acceptVariation">Press ACCEPT to choose a song variation to edit.</str>
 			<str id="acceptDifficulty">Press ACCEPT to edit the chart for the selected difficulty.</str>
@@ -470,6 +472,8 @@
 			<str id="newTypeface">New Typeface</str>
 			<str id="newTypefaceDesc">Press ACCEPT to create a new typeface.</str>
 			<str id="desc">Select a typeface to edit</str>
+			<str id="desc-folder">Select a typeface to edit in {0}</str>
+			<str id="acceptFolder">Press ACCEPT to edit this folder.</str>
 
 			<group name="Warnings" prefix="warnings.">
 				<str id="notImplemented-title">New Typeface: Feature Not Implemented!</str>
@@ -530,6 +534,8 @@
 			<str id="acceptStage">Press ACCEPT to edit this stage.</str>
 			<str id="newStage">New Stage</str>
 			<str id="acceptNewStage">Press ACCEPT to create a new stage.</str>
+			<str id="acceptFolder">Press ACCEPT to edit this folder.</str>
+			<str id="desc-folder">Select a stage to edit in {0}</str>
 		</group>
 
 		<group name="StageEditor" prefix="stageEditor.">
diff --git a/assets/languages/en/Options.xml b/assets/languages/en/Options.xml
index edf59dc7d4..0227aeb67a 100644
--- a/assets/languages/en/Options.xml
+++ b/assets/languages/en/Options.xml
@@ -61,6 +61,7 @@
 			<str id="devMenus">Developer Menus</str>
 			<str id="openConsole">Open Console</str>
 			<str id="reloadState">Reload State</str>
+			<str id="openInspector">Open Inspector</str>
 		</group>
 	</group>
 
@@ -233,6 +234,9 @@
 
 		<str id="legacyMemoryCounter-name">Legacy Memory Counter</str>
 		<str id="legacyMemoryCounter-desc">If checked, the memory counter will show the Haxe GC memory usage and its peak (the original behavior) instead of the working set memory seen in Task Manager.</str>
+
+		<str id="imguiMultiViewport-name">ImGui Multi Viewport</str>
+		<str id="imguiMultiViewport-desc">If checked, ImGui windows can be dragged out of the main viewport, disabled by default on Linux due to common bugs and issues.</str>
 	</group>
 
 </language>
\ No newline at end of file
diff --git a/assets/shaders/engine/editorWaveforms.frag b/assets/shaders/engine/editorWaveforms.frag
index c65452dc7f..e3b3d21260 100644
--- a/assets/shaders/engine/editorWaveforms.frag
+++ b/assets/shaders/engine/editorWaveforms.frag
@@ -1,6 +1,9 @@
-#pragma header
+// this causes issues apparently?? need to check GLSLSourceAssembler
+// but it could just be unnecessary too anyway
+// if not, put this also in editorWaveformsRainbow.frag
+//#version 120
 
-// Used in charter by waveforms
+#pragma header
 
 const vec3 gradient1 = vec3(114.0/255.0, 81.0/255.0, 135.0/255.0);
 const vec3 gradient2 = vec3(144.0/255.0, 80.0/255.0, 186.0/255.0);
@@ -18,6 +21,21 @@ uniform vec2 waveformSize;
 
 uniform bool lowDetail;
 
+float catmullRom(
+	float p0, float p1, float p2, float p3,
+	float t
+) {
+	float t2 = t * t;
+	float t3 = t2 * t;
+
+	return 0.5 * (
+		(2.0 * p1) +
+		(-p0 + p2) * t +
+		(2.0*p0 - 5.0*p1 + 4.0*p2 - p3) * t2 +
+		(-p0 + 3.0*p1 - 3.0*p2 + p3) * t3
+	);
+}
+
 float getAmplitude(vec2 pixel) {
 	float pixelID = floor((pixel.y+pixelOffset)/3.0);
 
diff --git a/building/alsoft.txt b/building/alsoft.txt
deleted file mode 100644
index 58d8c74cc1..0000000000
--- a/building/alsoft.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-[General]
-sample-type=float32
-stereo-mode=speakers
-hrtf=false
-cf_level=0
-output-limiter=false
-front-stabilizer=false
-volume-adjust=0
-period_size=441
-sources=512
-sends=64
-dither=false
-
-[decoder]
-hq-mode=true
-distance-comp=true
-nfc=false
\ No newline at end of file
diff --git a/building/libs.xml b/building/libs.xml
index 8888214090..993d4a89d8 100644
--- a/building/libs.xml
+++ b/building/libs.xml
@@ -3,36 +3,34 @@
 	<if cond="update || all">
 		<print pretty="true">Preparing installation...</print>
 
-		<!-- OpenFL & Lime (Required for Flixel) -->
-		<git name="openfl" url="https://github.com/CodenameCrew/cne-openfl" ref="old" />
-		<lib name="lime" version="8.1.2" />
+		<!-- Hxcpp & OpenFL & Lime (Required for Flixel) -->
+		<git name="hxcpp" url="https://github.com/CodenameCrew/cne-hxcpp"/>
+		<git name="openfl" url="https://github.com/CodenameCrew/cne-openfl" ref="cne" skipDeps="true"/>
+		<git name="lime" url="https://github.com/CodenameCrew/cne-lime" ref="cne" skipDeps="true"/>
 
 		<!-- Flixel -->
-		<git name="flixel" url="https://github.com/CodenameCrew/cne-flixel" ref="old" />
-		<git name="flixel-addons" url="https://github.com/CodenameCrew/cne-flixel-addons" ref="old" />
+		<git name="flixel" url="https://github.com/CodenameCrew/cne-flixel" ref="cne" skipDeps="true"/>
+		<git name="flixel-addons" url="https://github.com/CodenameCrew/cne-flixel-addons" ref="dev" skipDeps="true"/>
 
-		<!-- Other Libraries -->
-		<git name="hscript-improved" url="https://github.com/CodenameCrew/hscript-improved" ref="codename-dev" />
-		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" ref="old" skipDeps="true" />
-		<lib name="funkin-modchart" url="https://github.com/CodenameCrew/FunkinModchart" skipDeps="true" />
-		<lib name="hxvlc" version="1.9.3" skipDeps="true" />
-		<lib name="hxWebSockets" />
-
-		<!-- Documentation and other features -->
-		<git name="away3d" url="https://github.com/CodenameCrew/away3d" />
-		<!-- <lib name="dox" /> -->
-		<lib name="markdown" />
-		<lib name="hxcpp-debug-server" />
+		<!-- CNE Core Libraries -->
+		<git name="flixel-animate" url="https://github.com/CodenameCrew/cne-flixel-animate" skipDeps="true"/>
+		<git name="hscript-improved" url="https://github.com/CodenameCrew/hscript-improved" ref="codename-dev"/>
+		<lib name="hxWebSockets"/>
 
-		<lib name="nape-haxe4" />
+		<!-- Other Libraries -->
+		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" ref="old" skipDeps="true"/>
+		<git name="hxvlc" url="https://github.com/CodenameCrew/cne-hxvlc" skipDeps="true"/>
+		<git name="funkin-modchart" url="https://github.com/CodenameCrew/FunkinModchart" skipDeps="true"/>
+		<git name="foxlite" url="https://github.com/dwdvIl/foxlite" skipDeps="true"/>
+		<lib name="hxcpp-debug-server"/>
+		<lib name="format"/>
+		<lib name="markdown"/>
+		<lib name="nape-haxe4"/>
 
 		<!-- For building lime -->
-		<lib global="true" name="hxp" /> <lib name="hxp" />
-		<lib global="true" name="format" /> <lib name="format" />
-
-		<git name="hxcpp" url="https://github.com/CodenameCrew/cne-hxcpp" ref="old" />
-
-		<git name="flixel-animate" url="https://github.com/CodenameCrew/cne-flixel-animate/" ref="old" skipDeps="true"/>
+		<lib global="true" name="hxp"/> <lib name="hxp"/>
+		<lib global="true" name="format"/> <lib name="format"/>
+		<lib global="true" name="svg"/> <lib name="svg"/>
 	</if>
 
 	<!-- Hxcpp Building -->
@@ -41,15 +39,16 @@
 
 		<!-- Build hxcpp -->
 		<cmd inLib="hxcpp" dir="tools/hxcpp" cmd="haxe compile.hxml" />
+		<cmd inLib="lime" cmd="haxelib run lime rebuild hxcpp"/>
 	</if>
 
 	<!-- Lime Building -->
-	<!-- <if cond="build-lime || all">
+	<if cond="build-lime">
 		<print pretty="true">Rebuilding Lime...</print>
 
-		<!- - Build lime - ->
-		<cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -release -clean" />
-		<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" />
-	</if> -->
+		<!-- Build lime -->
+		<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml"/>
+		<cmd inLib="lime" cmd="haxelib run lime rebuild $PLATFORM -nocolor -nocffi -release"/>
+	</if>
 
 </libraries>
diff --git a/project.xml b/project.xml
index 3bcdd92c26..585f8b1a6a 100644
--- a/project.xml
+++ b/project.xml
@@ -1,84 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project>
-	<!-- _________________________ Application Settings _________________________ -->
-	<app
-		title="Friday Night Funkin' - Codename Engine" main="funkin.backend.system.Main"
-		file="CodenameEngine" packageName="com.yoshman29.codenameengine"
-		package="com.yoshman29.codenameengine"
-		version="1.0.1" company="Yoshman29" />
+<project xmlns="http://lime.software/project/1.0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://lime.software/project/1.0.4 http://lime.software/xsd/project-1.0.4.xsd">
+	<!-- ____________________________ Window Settings ___________________________ -->
 
-	<!--
-		CHANGE THE SAVE PATH & NAME FOR YOUR MOD HERE!
-	-->
+	<!-- CHANGE THE SAVE PATH & NAME FOR YOUR MOD HERE! -->
 	<haxedef name="SAVE_PATH" value="CodenameEngine"/>
 	<haxedef name="SAVE_NAME" value="save-default"/>
 
 	<haxedef name="SAVE_OPTIONS_PATH" value="CodenameEngine"/>
 	<haxedef name="SAVE_OPTIONS_NAME" value="options"/>
 
-	<!--Switch Export with Unique ApplicationID and Icon-->
-	<set name="APP_ID" value="0x0100f6c013bbc000" />
-
-	<!-- DO NOT REMOVE!! ALLOWS ME TO DO REGIONS LIKE IN C# AND KEEP CODE ORGANIZED. REMOVING IT WOULD BREAK THE ENGINE -->
-	<haxedef name="REGION" />
-
-	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
-		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
-	<app preloader="flixel.system.FlxPreloader" />
-
-	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
-	<set name="SWF_VERSION" value="11.8" />
-
-	<!-- ____________________________ Window Settings ___________________________ -->
-
-	<!--These window settings apply to all targets-->
-	<window width="1280" height="720" background="#000000" hardware="true" vsync="false" />
-
-	<!--HTML5-specific-->
-	<window if="html5" resizable="true" />
-
-	<!--Desktop-specific-->
-	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false"/>
-	<window if="mac" allow-high-dpi="true" />
-
-	<!--Mobile-specific-->
-	<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" resizable="false"/>
+	<!--
+		May be used by the libraries of the engine to check
+		for CNE-specific things. DO NOT comment this out
+	-->
+	<haxedef name="cne"/>
 
-	<!--Switch-specific-->
-	<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
+	<!-- Comment this out to disable commit number on FPS -->
+	<define name="SHOW_BUILD_ON_FPS"/>
 
-	<!-- _________________________________ Engine Settings _______________________________ -->
+	<!-- Comment this out to disable dark mode windows -->
+	<define name="DARK_MODE_WINDOW"/>
 
-	<!-- Comment this out to disable updates !-->
-	<define name="UPDATE_CHECKING" unless="web || hl || neko || debug"/>
+	<!-- Should it checks for updates? -->
+	<define name="UPDATE_CHECKING" if="desktop" unless="hl || debug || COMPILE_EXPERIMENTAL || TEST_BUILD"/>
 
-	<!-- Comment this out to disable Discord RPC !-->
 	<section if="cpp">
+		<!-- Compile With Discord Rich Presence -->
+		<!-- TODO: Update Discord RPC Library & Rewrite DiscordUtil -->
+		<!-- NOTE before v1.1.0 release: PLEASE DO THIS ABOVE -->
 		<define name="DISCORD_RPC" if="desktop"/>
+
+		<!-- Compile with video support (hxvlc) -->
+		<define name="VIDEO_CUTSCENES" if="desktop || mobile"/>
+	</section>
+
+	<!-- Compile with tracy, use to catch memory leaks, generally, don't use this, inflates memory usages by 16gb~ -->
+	<section if="TRACY">
+		<haxedef name="HXCPP_TELEMETRY"/>
+		<haxedef name="HXCPP_TRACY"/>
+		<haxedef name="HXCPP_TRACY_MEMORY"/>
+		<haxedef name="HXCPP_TRACY_ON_DEMAND"/>
+		<haxedef name="HXCPP_TRACY_INCLUDE_CALLSTACKS"/>
 	</section>
 
 	<!-- Uncomment this to achive faster compile times, will strip extraneous and commonly unused features. -->
 	<!-- <define name="STRIPPED_COMPILE" unless="debug"/> -->
 
-	<!-- Comment this out to disable modcharting features -->
-	<define name="MODCHARTING_FEATURES" unless="STRIPPED_COMPILE" />
+	<!-- Compile with _theo0p's modcharting tools -->
+	<define name="MODCHARTING_FEATURES" unless="STRIPPED_COMPILE"/>
 
 	<!-- Comment this out to disable GitHub API integration !-->
 	<define name="GITHUB_API" unless="web || hl"/>
 
 	<!-- Comment this out to prevent unused classes from being compiled.
 		 Reduces compilation time at the cost of limited HScript flexibility. !-->
-	<define name="COMPILE_ALL_CLASSES" unless="STRIPPED_COMPILE" />
+	<define name="COMPILE_ALL_CLASSES" unless="STRIPPED_COMPILE"/>
 
 	<!-- Comment this out to prevent extending classes in hscript.
 		 Reduces compilation time at the cost of limited HScript flexibility. !-->
-	<define name="CUSTOM_CLASSES" unless="STRIPPED_COMPILE" />
+	<define name="CUSTOM_CLASSES" unless="STRIPPED_COMPILE"/>
 
 	<!-- Comment this out to disable abstract support in hscript. !-->
 	<haxedef name="HSCRIPT_ABSTRACT_SUPPORT" unless="STRIPPED_COMPILE" />
 
 	<!-- Comment this out to disable multithreading !-->
-	<haxedef name="ALLOW_MULTITHREADING" unless="web || flash" />
+	<haxedef name="ALLOW_MULTITHREADING" if="cpp"/>
 
 	<!-- Comment this out to disable mods folder !-->
 	<haxedef name="MOD_SUPPORT" unless="web"/>
@@ -87,36 +73,60 @@
 	<haxedef name="TRANSLATIONS_SUPPORT"/>
 
 	<!-- Comment this out to disable global scripts !-->
-	<haxedef name="GLOBAL_SCRIPT" />
+	<haxedef name="GLOBAL_SCRIPT"/>
 
 	<!-- Comment this out to disable softcoded states and state scripting !-->
-	<haxedef name="SOFTCODED_STATES" />
+	<haxedef name="SOFTCODED_STATES"/>
 
 	<!-- Comment this out to disable support for custom ndlls. !-->
-	<haxedef name="NDLLS_SUPPORTED" unless="web || iphonesim || hl" />
+	<haxedef name="NDLLS_SUPPORTED" unless="web || iphonesim || hl"/>
 
 	<!-- Comment this out to use the default OpenFL assets system for the assets/ folder. !-->
-	<define name="USE_ADAPTED_ASSETS" unless="web" />
+	<define name="USE_ADAPTED_ASSETS" unless="web"/>
 
-	<!-- Comment this out to disable support for Away3D Flixel Integration (reduces compile times) !-->
-	<define name="THREE_D_SUPPORT" unless="STRIPPED_COMPILE" />
+	<!-- Comment this out to disable support for 3D rendering (reduces compile times) !-->
+	<define name="THREE_D_SUPPORT" unless="STRIPPED_COMPILE"/>
 
 	<!-- Comment this out to disable support for Nape integration (flixel.addons.nape) (reduces compile times) !-->
-	<define name="NAPE_ENABLED" unless="STRIPPED_COMPILE" />
+	<define name="NAPE_ENABLED" unless="STRIPPED_COMPILE"/>
 
-	<!-- Comment this out to disable video cutscene support, in case of compilation errors. !-->
-	<section if="cpp">
-		<define name="VIDEO_CUTSCENES" if="desktop || android" />
-	</section>
+	<!-- Disable a optimization, to allow reflection to use more functions -->
+	<define name="FLX_NO_GENERIC"/>
 
-	<!-- Comment this out to disable commit number on FPS -->
-	<define name="SHOW_BUILD_ON_FPS" />
+	<!-- _________________________ Application Settings _________________________ -->
+	<app
+		title="Friday Night Funkin' - Codename Engine"
+		file="CodenameEngine" packageName="com.yoshman29.codenameengine"
+		package="com.yoshman29.codenameengine"
+		version="1.1.0" company="Yoshman29"/>
 
-	<!-- Comment this out to disable dark mode windows -->
-	<define name="DARK_MODE_WINDOW"/>
+	<!--Switch Export with Unique ApplicationID and Icon-->
+	<set name="APP_ID" value="0x0100f6c013bbc000"/>
 
-	<!-- Disable a optimization, to allow reflection to use more functions -->
-	<define name="FLX_NO_GENERIC" />
+	<!--<set name="SWF_VERSION" value="11.8"/>-->
+
+	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
+	<icon path="art/icon16.png" size='16'/>
+	<icon path="art/icon32.png" size='24'/>
+	<icon path="art/icon32.png" size='32'/>
+	<icon path="art/icon64.png" size='40'/>
+	<icon path="art/icon64.png" size='48'/>
+	<icon path="art/icon64.png" size='64'/>
+	<icon path="art/iconOG.png" size='96'/>
+	<icon path="art/iconOG.png" size='128'/>
+	<icon path="art/iconOG.png" size='196'/>
+	<icon path="art/iconOG.png" size='256'/>
+	<icon path="art/iconOG.png" size='512'/>
+	<icon path="art/iconOG.png" size='768'/>
+	<icon path="art/iconOG.png" size='1024'/>
+
+	<!-- ____________________________ Window Settings ___________________________ -->
+
+	<window hardware="true" colorDepth="32" background="" fps="0" orientation="landscape"/>
+	<window unless="desktop" width="0" height="0" vsync="true" fullscreen="true"/>
+	<window if="desktop" type="opengl" width="1280" height="720" fullscreen="false" resizable="true" vsync="false" allowHighDPI="true"/>
+	<window if="mobile" resizable="false"/>
+	<window if="html5 || switch" resizable="true"/>
 
 	<!-- _______________________________ Libraries ______________________________ -->
 
@@ -124,34 +134,49 @@
 	<define name="disable-version-check"/>
 	<haxedef name="disable-version-check"/>
 
-	<haxedef name="no-deprecation-warnings"/>
-	<haxedef name="DISCORD_DISABLE_IO_THREAD" if="DISCORD_RPC"/>
+	<haxelib name="flixel"/>
 
-	<haxelib name="flixel" />
-	<haxelib name="flixel-addons" />
+	<haxelib name="flixel-addons"/>
+	<haxelib name="flixel-animate"/>
 
-	<haxelib name="hxWebSockets" />
+	<haxelib name="hscript-improved"/>
+	<haxelib name="hxWebSockets"/>
 
-	<haxelib name="hxvlc" if="VIDEO_CUTSCENES" />
-	<haxelib name="away3d" if="THREE_D_SUPPORT" />
-	<haxelib name="format" />
-	<haxelib name="flixel-animate" />
-	<haxelib name="nape-haxe4" if="NAPE_ENABLED"/>
+	<haxelib name="format" unless="STRIPPED_COMPILE"/>
+	<haxelib name="markdown" unless="STRIPPED_COMPILE"/>
 
-	<haxelib name="hscript-improved" />
+	<haxelib name="hxvlc" if="VIDEO_CUTSCENES"/>
 	<haxelib name="hxdiscord_rpc" if="DISCORD_RPC"/>
-	<haxelib name="markdown" />
-	<haxelib name="hxcpp-debug-server" if="TEST_BUILD debug" />
+	<!--<haxelib name="away3d" if="THREE_D_SUPPORT"/>-->
+	<haxelib name="foxlite" if="THREE_D_SUPPORT"/>
+	<haxelib name="nape-haxe4" if="NAPE_ENABLED"/>
+
+	<haxelib name="hxcpp-debug-server" if="debug"/>
+
+	<!-- ____________________________ Source Settings ___________________________ -->
+
+	<!-- DO NO REMOVE THIS -->
+	<haxedef name="REGION"/>
+
+	<set name="BUILD_DIR" value="export/debug" if="debug"/>
+	<set name="BUILD_DIR" value="export/release" unless="debug"/>
+	<set name="BUILD_DIR" value="export/debug-32bit" if="debug 32bit"/>
+	<set name="BUILD_DIR" value="export/release-32bit" if="32bit" unless="debug"/>
+	<set name="BUILD_DIR" value="export/tracy" if="TRACY"/>
+	<set name="BUILD_DIR" value="latest/" if="beta"/>
 
-	<!-- _____________________________ Path Settings ____________________________ -->
+	<app main="funkin.backend.system.Main" preloader="flixel.system.FlxPreloader"/>
+	<source name="source"/>
 
-	<set name="BUILD_DIR" value="export/debug" if="debug" />
-	<set name="BUILD_DIR" value="export/release" unless="debug" />
-	<set name="BUILD_DIR" value="export/debug-32bit" if="debug 32bit" />
-	<set name="BUILD_DIR" value="export/release-32bit" if="32bit" unless="debug" />
-	<set name="BUILD_DIR" value="latest/" if="beta" />
+	<section if="MODCHARTING_FEATURES">
+		<haxedef name="FM_ENGINE" value="CODENAME"/>
+		<haxedef name="FM_ENGINE_VERSION" value="1.0"/>
 
-	<source name="source" />
+		<haxelib name="funkin-modchart" />
+		<haxeflag name="--macro" value="modchart.backend.macros.Macro.includeFiles()"/>
+	</section>
+
+	<!-- ____________________________ Assets Settings ___________________________ -->
 
 	<define name="PRELOAD_ALL" unless="web" />
 	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
@@ -167,81 +192,70 @@
 		<assets path='mods' rename='mods' embed='false' />
 	</section>
 
-	<assets path='art/readme.txt' rename='do NOT readme.txt' />
-
-	<!-- OpenAL config -->
-	<section if="desktop">
-		<assets path="building/alsoft.txt" rename="plugins/alsoft.ini" type="text" if="windows"/>
-		<assets path="building/alsoft.txt" rename="plugins/alsoft.conf" type="text" unless="windows"/>
-	</section>
+	<!-- <assets path='art/readme.txt' rename='do NOT readme.txt' /> -->
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
-	<haxeflag name="--macro" value="funkin.backend.system.macros.BuildInfo.printBuildInfo()" />
-
-	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
-
-	<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
-	<haxedef name="FLX_NO_DEBUG" unless="debug" />
+	<haxeflag name="--macro" value="funkin.backend.system.macros.Macros.initMacros()"/>
 
-	<haxedef name="analyzer-optimize" unless="debug" />
+	<haxedef name="VIDEO_CUTSCENES" if="VIDEO_CUTSCENES"/>
+	<haxedef name="UPDATE_CHECKING" if="UPDATE_CHECKING"/>
+	<haxedef name="DISCORD_RPC" if="DISCORD_RPC"/>
+	<haxedef name="SHOW_BUILD_ON_FPS" if="SHOW_BUILD_ON_FPS"/>
+	<haxedef name="SOFTCODED_CLASSES" if="SOFTCODED_CLASSES"/>
+	<haxedef name="USE_ADAPTED_ASSETS" if="USE_ADAPTED_ASSETS"/>
 
-	<haxedef name="VIDEO_CUTSCENES" if="VIDEO_CUTSCENES" />
-	<haxedef name="UPDATE_CHECKING" if="UPDATE_CHECKING" />
-	<haxedef name="DISCORD_RPC" if="DISCORD_RPC" />
-	<haxedef name="SHOW_BUILD_ON_FPS" if="SHOW_BUILD_ON_FPS" />
-	<haxedef name="SOFTCODED_CLASSES" if="SOFTCODED_CLASSES" />
-	<haxedef name="USE_ADAPTED_ASSETS" if="USE_ADAPTED_ASSETS" />
-	<haxedef name="openfl_dpi_aware" if="openfl_dpi_aware" />
+	<!-- Backward Compatibilities -->
+	<haxedef name="FLX_HEALTH" />
 
-	<!-- Disable it for more concise compilation errors. -->
-	<haxedef name="message.reporting" value="pretty" />
+	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN"/>
+	<haxedef name="FLX_NO_DEBUG" unless="debug"/>
 
-	<!-- _________________________________ Custom _______________________________ -->
+	<haxedef name="DISCORD_DISABLE_IO_THREAD" if="DISCORD_RPC"/>
 
-	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
-	<icon path="art/icon16.png" size='16'/>
-	<icon path="art/icon32.png" size='24'/>
-	<icon path="art/icon32.png" size='32'/>
-	<icon path="art/icon64.png" size='40'/>
-	<icon path="art/icon64.png" size='48'/>
-	<icon path="art/icon64.png" size='64'/>
-	<icon path="art/iconOG.png" size='96' />
-	<icon path="art/iconOG.png" size='128' />
-	<icon path="art/iconOG.png" size='196' />
-	<icon path="art/iconOG.png" size='256' />
-	<icon path="art/iconOG.png" size='512' />
-	<icon path="art/iconOG.png" size='768' />
-	<icon path="art/iconOG.png" size='1024' />
+	<!-- <haxedef name="no-deprecation-warnings"/> -->
 
-	<!-- _________________________________ Additional stuff _______________________________ -->
+	<!-- Fix compiling issues -->
+	<setenv name="HAXEPATH" value="./"/>
 
-	<section if="MODCHARTING_FEATURES">
-		<haxedef name="FM_ENGINE" value="CODENAME"/>
-		<haxedef name="FM_ENGINE_VERSION" value="1.0"/>
+	<!-- Haxe 4.3.0+: Enable pretty syntax errors and stuff. -->
+	<haxedef name="message.reporting" value="pretty"/>
 
-		<haxelib name="funkin-modchart" />
-		<haxeflag name="--macro" value="modchart.backend.macros.Macro.includeFiles()"/>
-	</section>
+	<!-- for logging -->
+	<haxedef name="hscriptPos"/>
 
 	<section if="COMPILE_ALL_CLASSES">
-		<haxeflag name="-dce" value="no" />
-		<haxeflag name="--macro" value="funkin.backend.system.macros.Macros.addAdditionalClasses()" />
+		<haxeflag name="-dce" value="no"/>
+		<haxeflag name="--macro" value="funkin.backend.system.macros.Macros.addAdditionalClasses()"/>
 	</section>
 
-	<haxeflag name="--macro" value="funkin.backend.system.macros.Macros.initMacros()" />
-
-	<!-- Fix compiling issues -->
-	<setenv name="HAXEPATH" value="./"/>
-
-	<haxedef name="HXCPP_M32" if="32bit" />
-	<haxedef name="HXCPP_DEBUG_LINK" if="debug" />
-	<haxedef name="HXCPP_CHECK_POINTER" />
-	<haxedef name="HXCPP_STACK_LINE" />
-	<haxedef name="HXCPP_CATCH_SEGV" />
-
-	<haxedef name="hscriptPos" /> <!-- for logging -->
+	<haxeflag name="--macro" value="funkin.backend.system.macros.BuildInfo.printBuildInfo()"/>
 
 	<!-- EXPERMENTAL FEATURES -->
 	<haxedef name="EXPERIMENTAL_FLXGRAPHIC_DESTROY_FIX" />
+	<haxedef name="openfl_dpi_aware"/>
+	<haxedef name="openfl_pool_events"/>
+	<haxedef name="openfl-enable-handle-error"/>
+	<haxedef name="openfl_no_custom_render_event"/>
+	<haxedef name="IMGUI_ENABLED" if="lime-imgui" />
+
+	<haxedef name="HXCPP_M32" if="32bit"/>
+	<haxedef name="HXCPP_DEBUG_LINK" if="debug"/>
+	<!--C++20 seems doesn't seem to do anything but causes compile warnings-->
+	<!--<haxedef name="HXCPP_CPP20"/>-->
+	<!--<haxedef name="HXCPP_CLANG"/>-->
+	<!--<haxedef name="HXCPP_MSVC"/>-->
+	<!-- This seems to causes more harm, but to be fair, its mostly because of text rendering -->
+	<!-- This is really important to fix honestly, try to get cairo text rendering not memory leak in the future -->
+	<!--<haxedef name="HXCPP_GC_BIG_BLOCKS"/>-->
+	<!--<haxedef name="HXCPP_GC_GENERATIONAL"/>-->
+	<!--<haxedef name="HXCPP_GC_DYNAMIC_SIZE"/>-->
+	<haxedef name="HXCPP_CHECK_POINTER"/>
+	<haxedef name="HXCPP_STACK_LINE"/>
+	<haxedef name="HXCPP_STACK_TRACE"/>
+	<!--<haxedef name="HXCPP_CATCH_SEGV"/>-->
+	<haxedef name="HXCPP_FAST_LINK" unless="debug"/>
+	<!--<haxedef name="HXCPP_ALIGN_ALLOC"/>--> <!--hxcpp.h(71): warning C4005: 'HXCPP_ALIGN_ALLOC': macro redefinition-->
+
+	<haxedef name="analyzer-optimize" unless="debug"/>
 </project>
diff --git a/source/flixel/sound/FlxSound.hx b/source/flixel/sound/FlxSound.hx
deleted file mode 100644
index 9891bc934a..0000000000
--- a/source/flixel/sound/FlxSound.hx
+++ /dev/null
@@ -1,960 +0,0 @@
-package flixel.sound;
-
-import lime.media.AudioBuffer;
-import lime.media.AudioSource;
-import lime.media.AudioManager;
-
-import openfl.Assets;
-import openfl.events.IEventDispatcher;
-import openfl.events.Event;
-import openfl.media.Sound;
-import openfl.media.SoundChannel;
-import openfl.media.SoundTransform;
-import openfl.media.SoundMixer;
-import openfl.net.URLRequest;
-import openfl.utils.AssetType;
-#if flash11
-import openfl.utils.ByteArray;
-#end
-
-import flixel.math.FlxMath;
-import flixel.math.FlxPoint;
-import flixel.system.FlxAssets.FlxSoundAsset;
-import flixel.tweens.FlxTween;
-import flixel.util.FlxDestroyUtil;
-import flixel.util.FlxSignal;
-import flixel.util.FlxStringUtil;
-import flixel.FlxBasic;
-import flixel.FlxObject;
-import flixel.FlxG;
-
-@:access(flixel.FlxGame)
-class FlxSound extends FlxBasic {
-	/**
-	 * The x position of this sound in world coordinates.
-	 * Only really matters if you are doing proximity/panning stuff.
-	 */
-	public var x:Float;
-
-	/**
-	 * The y position of this sound in world coordinates.
-	 * Only really matters if you are doing proximity/panning stuff.
-	 */
-	public var y:Float;
-
-	/**
-	 * Whether or not this sound should be automatically destroyed when you switch states.
-	 */
-	public var persist:Bool;
-
-	/**
-	 * Whether or not the sound is currently playing.
-	 */
-	public var playing(get, never):Bool;
-
-	/**
-	 * Set volume to a value between 0 and 1* to change how this sound is.
-	 */
-	public var volume(get, set):Float;
-
-	/**
-	 * Whether to make this sound muted or not.
-	 */
-	public var muted(default, set):Bool;
-
-	#if FLX_PITCH
-	/**
-	 * Set pitch, which also alters the playback speed. Default is 1.
-	 * @since 5.0.0
-	 */
-	public var pitch(get, set):Float;
-
-	/**
-	 * Alters the pitch of the sound depends on the current FlxG.timeScale. Default is true.
-	 * @since raltyMod
-	 */
-	public var timeScaleBased:Bool;
-	#end
-
-	/**
-	 * Pan amount. -1 = full left, 1 = full right. Proximity based panning overrides this.
-	 */
-	public var pan(get, set):Float;
-
-	/**
-	 * The position in runtime of the music playback in milliseconds.
-	 * If set while paused, changes only come into effect after a `resume()` call.
-	 */
-	public var time(get, set):Float;
-
-	/**
-	 * The offset for this FlxSound.
-	 * Useful for just generally offsetting this sound without affecting time.
-	 * @since raltyMod
-	 */
-	public var offset(get, set):Float;
-
-	/**
-	 * The length of the sound in milliseconds.
-	 * @since 4.2.0
-	 */
-	public var length(get, never):Float;
-
-	/**
-	 * The latency of the sound in milliseconds.
-	 * @since raltyMod
-	 */
-	//public var latency(get, never):Float;
-
-	/**
-	 * Whether or not this sound should loop.
-	 */
-	public var looped(default, set):Bool;
-
-	/**
-	 * In case of looping, the point (in milliseconds) from where to restart the sound when it loops back
-	 * @since 4.1.0
-	 */
-	public var loopTime(default, set):Float;
-
-	/**
-	 * At which point to stop playing the sound, in milliseconds.
-	 * If not set / `null`, the sound completes normally.
-	 * @since 4.2.0
-	 */
-	public var endTime(default, set):Null<Float>;
-
-	/**
-	 * The sound's "target" (for proximity and panning).
-	 * @since raltyMod
-	 */
-	public var target:Null<FlxObject>;
-
-	/**
-	 * The maximum effective radius of this sound (for proximity and panning).
-	 * @since raltyMod
-	 */
-	public var radius:Float;
-
-	/**
-	 * Whether the proximity alters the pan or not.
-	 * @since raltyMod
-	 */
-	public var proximityPan:Bool;
-
-	/**
-	 * Controls how much this object is affected by camera scrolling. `0` = no movement (e.g. a static sound),
-	 * This is only useful if used with proximity (Initialized once proximity is used).
-	 * @since raltyMod
-	 */
-	public var scrollFactor(default, null):FlxPoint;
-
-	/**
-	 * Stores for how much channels are in the loaded sound.
-	 * @since raltyMod
-	 */
-	public var channels(get, never):Int;
-
-	/**
-	 * Whether or not this sound is stereo instead of mono.
-	 * @since raltyMod
-	 */
-	public var stereo(get, never):Bool;
-
-	/**
-	 * Whether or not this sound is loaded yet.
-	 * @since raltyMod
-	 */
-	public var loaded(get, never):Bool;
-
-	/**
-	 * Whether or not this sound is streamed, only vorbis though.
-	 * @since raltyMod
-	 */
-	public var streamed(get, never):Bool;
-
-	/**
-	 * Stores the average wave amplitude of both stereo channels.
-	 * @since raltyMod
-	 */
-	public var amplitude(get, never):Float;
-
-	/**
-	 * Just the amplitude of the left stereo channel
-	 * @since raltyMod
-	 */
-	public var amplitudeLeft(get, never):Float;
-
-	/**
-	 * Just the amplitude of the right stereo channel
-	 * @since raltyMod
-	 */
-	public var amplitudeRight(get, never):Float;
-
-	/**
-	 * The ID3 song name. Defaults to null. Currently only works for MP3 streamed sounds.
-	 */
-	public var name(default, null):String;
-
-	/**
-	 * The ID3 artist name. Defaults to null. Currently only works for MP3 streamed sounds.
-	 */
-	public var artist(default, null):String;
-
-	/**
-	 * Whether to call `destroy()` when the sound has finished playing.
-	 */
-	public var autoDestroy:Bool;
-
-	/**
-	 * Signal that is dispatched on sound complete.
-	 * Seperates the looping from onComplete.
-	 */
-	public final onFinish:FlxSignal;
-
-	/**
-	 * Tracker for sound complete callback. If assigned, will be called
-	 * each time when sound reaches its end.
-	 */
-	//@:deprecated("`FlxSound.onComplete` is deprecated! Use `FlxSound.onFinish` instead.")
-	public var onComplete:Void->Void;
-
-	/**
-	 * The sound group this sound belongs to
-	 */
-	public var group(default, set):FlxSoundGroup;
-
-	/**
-	 * Stores the sound lime AudioBuffer if exists.
-	 * @since raltyMod
-	 */
-	public var buffer(get, never):AudioBuffer;
-
-	/**
-	 * The tween used to fade this sound's volume in and out (set via `fadeIn()` and `fadeOut()`)
-	 * @since 4.1.0
-	 */
-	public var fadeTween:FlxTween;
-
-	@:allow(flixel.system.frontEnds.SoundFrontEnd.load) var _sound:Sound;
-	var _transform:SoundTransform;
-	var _channel:SoundChannel;
-	var _source:AudioSource;
-	var _paused:Bool;
-	var _volume:Float;
-	var _volumeAdjust:Float;
-	var _pan:Float;
-	var _panAdjust:Float;
-	var _time:Float;
-	var _offset:Float;
-	var _timeInterpolation:Float;
-	var _lastTime:Null<Float>; // FlxG.game.getTicks(), in MS
-	var _length:Float;
-	#if FLX_PITCH
-	var _pitch:Float;
-	var _timeScaleAdjust:Float;
-	var _realPitch:Float;
-	#end
-	var _amplitudeLeft:Float;
-	var _amplitudeRight:Float;
-	var _amplitudeUpdate:Bool;
-	var _alreadyPaused:Null<Bool>;
-
-	public function new() {
-		super();
-		onFinish = new FlxSignal();
-		revive();
-	}
-
-	/**
-	 * Resets this FlxSound properties.
-	 *
-	 * @param	clean	Whether if this FlxSound also needs to be cleaned up too.
-	 */
-	public function reset():Void {
-		if (_source != null) stop();
-		onFinish.removeAll();
-
-		x = y = 0;
-		@:bypassAccessor muted = false;
-		@:bypassAccessor looped = false;
-		@:bypassAccessor loopTime = 0;
-		@:bypassAccessor endTime = null;
-		autoDestroy = false;
-		visible = false;
-		target = null;
-		radius = 0;
-		proximityPan = true;
-		onComplete = null;
-		timeScaleBased = true;
-
-		_alreadyPaused = null;
-		_cameras = null;
-		_lastTime = null;
-		_paused = false;
-		_offset = _length = _time = 0;
-		_volume = _volumeAdjust = 1;
-		_amplitudeLeft = _amplitudeRight = 0;
-		_amplitudeUpdate = true;
-		#if FLX_PITCH _pitch = _realPitch = _timeScaleAdjust = 1; #end
-
-		if (_transform == null) _transform = new SoundTransform();
-	}
-
-	/**
-	 * Internal cleanup function for cleaning up this FlxSound.
-	 * @since raltyMod
-	 */
-	function cleanup(destroySound:Bool, resetPosition:Bool = true) @:privateAccess {
-		active = false;
-		_lastTime = null;
-
-		if (destroySound) {
-			scrollFactor = FlxDestroyUtil.put(scrollFactor);
-
-			if (group != null) group.remove(this);
-
-			if (_channel != null) {
-				_channel.stop();
-				_channel = null;
-			}
-			if (_source != null) {
-				_source.onComplete.remove(stopped);
-				_source.onLoop.remove(source_looped);
-				_source.dispose();
-			}
-			_source = null;
-			_sound = null;
-
-			if (autoDestroy) persist = false;
-			reset();
-		}
-		else if (_channel != null && _channel.__isValid) {
-			if (resetPosition) {
-				_source.stop();
-
-				_time = 0;
-				_paused = false;
-			}
-			else if (!_paused) {
-				get_time();
-				_source.pause();
-			}
-		}
-	}
-
-	/**
-	 * Handles fade out, fade in, panning, proximity, and amplitude operations each frame.
-	 */
-	override function update(elapsed:Float):Void {
-		if (!playing) return;
-
-		var timeScaleTarget = timeScaleBased ? FlxG.timeScale : 1.0;
-		if (_timeScaleAdjust != timeScaleTarget) {
-			_timeScaleAdjust = timeScaleTarget;
-			pitch = _pitch;
-			if (_channel == null) return;
-		}
-
-		_amplitudeUpdate = true;
-
-		// Distance-based volume control
-		if (target != null) {
-			var targetPosition = target.getPosition(), position = getPosition();
-			var camera = camera;
-			if (camera != null) {
-				targetPosition.subtract(camera.scroll.x * target.scrollFactor.x, camera.scroll.y * target.scrollFactor.y);
-				if (scrollFactor != null) position.subtract(camera.scroll.x * scrollFactor.x, camera.scroll.y * scrollFactor.y);
-				else position.subtract(camera.scroll.x, camera.scroll.y);
-			}
-
-			var radialMultiplier = targetPosition.distanceTo(position) / radius;
-
-			// Make it so it affects the 3d position of the source and not just the panning?
-			_volumeAdjust = 1 - FlxMath.bound(radialMultiplier, 0, 1);
-			if (proximityPan) _panAdjust = (position.x - targetPosition.x) / radius;
-
-			targetPosition.put();
-			position.put();
-		}
-		else
-			_volumeAdjust = 1.0;
-
-		updateTransform();
-	}
-
-	override function revive() {
-		reset();
-		super.revive();
-	}
-
-	override function kill() {
-		super.kill();
-		reset();
-	}
-
-	override function destroy() {
-		super.destroy();
-		cleanup(true);
-	}
-
-	/**
-	 * One of the main setup functions for sounds, this function loads a sound from an embedded MP3.
-	 *
-	 * @param	embeddedSound	An embedded Class object representing an MP3 file.
-	 * @param	looped			Whether or not this sound should loop endlessly.
-	 * @param	autoDestroy		Whether or not this FlxSound instance should be destroyed when the sound finishes playing.
-	 * 							Default value is false, but `FlxG.sound.play()` and `FlxG.sound.stream()` will set it to true by default.
-	 * @param	onComplete		Called when the sound finished playing
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function loadEmbedded(embeddedSound:FlxSoundAsset, looped = false, autoDestroy = false, ?onComplete:Void->Void):FlxSound {
-		if (!exists || embeddedSound == null) return this;
-		cleanup(true);
-
-		if ((embeddedSound is Sound)) _sound = embeddedSound;
-		else if ((embeddedSound is Class)) _sound = Type.createInstance(embeddedSound, []);
-		else if ((embeddedSound is String)) {
-			if (Assets.exists(embeddedSound, AssetType.MUSIC) && this == FlxG.sound.music)
-				_sound = Assets.getMusic(embeddedSound);
-			else if (Assets.exists(embeddedSound, AssetType.SOUND))
-				_sound = Assets.getSound(embeddedSound);
-			else
-				FlxG.log.error('Could not find a Sound asset with an ID of \'$embeddedSound\'.');
-		}
-
-		return init(looped, autoDestroy, onComplete);
-	}
-
-	/**
-	 * One of the main setup functions for sounds, this function loads a sound from a URL.
-	 *
-	 * @param	soundURL		A string representing the URL of the MP3 file you want to play.
-	 * @param	looped			Whether or not this sound should loop endlessly.
-	 * @param	autoDestroy		Whether or not this FlxSound instance should be destroyed when the sound finishes playing.
-	 * 							Default value is false, but `FlxG.sound.play()` and `FlxG.sound.stream()` will set it to true by default.
-	 * @param	onComplete		Called when the sound finished playing
-	 * @param	onLoad			Called when the sound finished loading.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function loadStream(soundURL:String, looped = false, autoDestroy = false, ?onComplete:Void->Void, ?onLoad:Void->Void):FlxSound {
-		if (!exists) return this;
-		cleanup(true);
-
-		_sound = new Sound();
-		_sound.addEventListener(Event.ID3, gotID3);
-		var loadCallback:Event->Void = null;
-		loadCallback = function(e:Event)
-		{
-			(e.target : IEventDispatcher).removeEventListener(e.type, loadCallback);
-			// Check if the sound was destroyed before calling. Weak ref doesn't guarantee GC.
-			if (_sound == e.target)
-			{
-				_length = _sound.length;
-				if (onLoad != null)
-					onLoad();
-			}
-		}
-		// Use a weak reference so this can be garbage collected if destroyed before loading.
-		_sound.addEventListener(Event.COMPLETE, loadCallback, false, 0, true);
-		_sound.load(new URLRequest(soundURL));
-
-		return init(looped, autoDestroy, onComplete);
-	}
-
-	#if flash11
-	/**
-	 * One of the main setup functions for sounds, this function loads a sound from a ByteArray.
-	 *
-	 * @param	bytes 			A ByteArray object.
-	 * @param	looped			Whether or not this sound should loop endlessly.
-	 * @param	autoDestroy		Whether or not this FlxSound instance should be destroyed when the sound finishes playing.
-	 * 							Default value is false, but `FlxG.sound.play()` and `FlxG.sound.stream()` will set it to true by default.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function loadByteArray(bytes:ByteArray, looped = false, autoDestroy = false, ?onComplete:Void->Void):FlxSound {
-		if (!exists) return this;
-		cleanup(true);
-
-		_sound = new Sound();
-		_sound.addEventListener(Event.ID3, gotID3);
-		_sound.loadCompressedDataFromByteArray(bytes, bytes.length);
-
-		return init(looped, autoDestroy, onComplete);
-	}
-	#end
-
-	function init(?looped:Null<Bool>, ?autoDestroy:Null<Bool>, ?onComplete:Null<Void->Void>):FlxSound {
-		if (looped != null) this.looped = looped;
-		if (autoDestroy != null) this.autoDestroy = autoDestroy;
-		if (onComplete != null) this.onComplete = onComplete;
-
-		if (_sound != null) makeChannel();
-		else _length = 0;
-
-		endTime = null;
-
-		return this;
-	}
-
-	/**
-	 * Call inbetween init function if a sound asset does exists.
-	 * @since raltyMod
-	 */
-	function makeChannel() @:privateAccess {
-		if (_sound.__buffer == null) return;
-		if (_source != null) _source.dispose();
-
-		if (_channel == null) (_source = (_channel = new SoundChannel(null)).__source = new AudioSource(_sound.__buffer)).gain = 0;
-		else {
-			(_source = new AudioSource(_sound.__buffer)).gain = 0;
-			_channel.__dispose();
-			_channel.__source = _source;
-			SoundMixer.__registerSoundChannel(_channel);
-		}
-		_length = _source.length;
-
-		_source.onComplete.add(stopped);
-		_source.onLoop.add(source_looped);
-		_channel.__soundTransform = _transform;
-		_channel.__isValid = true;
-	}
-
-	/**
-	 * Call after adjusting the volume to update the sound channel's settings.
-	 */
-	@:allow(flixel.sound.FlxSoundGroup)
-	function updateTransform() {
-		_transform.volume = calcTransformVolume();
-		_transform.pan = _pan + _panAdjust;
-		if (_channel != null) _channel.soundTransform = _transform;
-	}
-
-	public function calcTransformVolume():Float {
-		if (muted) return 0.0;
-
-		#if FLX_SOUND_SYSTEM
-		if (FlxG.sound.muted) return 0.0;
-
-		// TODO: when flixel-cne is updated, enable this
-		//return FlxG.sound.applySoundCurve(FlxG.sound.volume * volume);
-		return FlxG.sound.volume * getActualVolume();
-		#else
-		return getActualVolume();
-		#end
-	}
-
-	/**
-	 * Call this function if you want this sound's volume to change
-	 * based on distance from a particular FlxObject.
-	 *
-	 * @param	X			The X position of the sound.
-	 * @param	Y			The Y position of the sound.
-	 * @param	TargetObject		The object you want to track.
-	 * @param	Radius			The maximum distance this sound can travel.
-	 * @param	Pan			Whether panning should be used in addition to the volume changes.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function proximity(x = 0.0, y = 0.0, ?targetObject:FlxObject, ?radius:Float, pan = true, ?scrollFactor:FlxPoint):FlxSound {
-		setPosition(x, y);
-		if (targetObject != null) this.target = targetObject;
-		if (radius != null) this.radius = radius;
-		proximityPan = pan;
-
-		if (this.scrollFactor == null) this.scrollFactor = FlxPoint.get(1, 1);
-		if (scrollFactor != null) this.scrollFactor.copyFrom(scrollFactor);
-
-		return this;
-	}
-
-	/**
-	 * Helper function to set the coordinates of this object.
-	 * Sound positioning is used in conjunction with proximity/panning.
-	 *
-	 * @param  x  The new x position
-	 * @param  y  The new y position
-	 */
-	public function setPosition(x = 0.0, y = 0.0):Void {
-		this.x = x;
-		this.y = y;
-	}
-
-	/**
-	 * Returns the world position of this object.
-	 * 
-	 * @param   result  Optional arg for the returning point.
-	 * @return  The world position of this object.
-	 * @since   raltyMod
-	 */
-	public function getPosition(?result:FlxPoint):FlxPoint {
-		if (result == null)
-			result = FlxPoint.get();
-
-		return result.set(x, y);
-	}
-
-	/**
-	 * Call this function to play the sound - also works on paused sounds.
-	 *
-	 * @param   forceRestart   Whether to start the sound over or not.
-	 *                         Default value is false, meaning if the sound is already playing or was
-	 *                         paused when you call play(), it will continue playing from its current
-	 *                         position, NOT start again from the beginning.
-	 * @param   startTime      At which point to start playing the sound, in milliseconds.
-	 * @param   endTime        At which point to stop playing the sound, in milliseconds.
-	 *                         If not set / `null`, the sound completes normally.
-	 */
-	public function play(forceRestart = false, startTime = 0.0, ?endTime:Null<Float>):FlxSound {
-		if (!exists) return this;
-
-		if (forceRestart) cleanup(false, true);
-		else if (playing) return this;
-
-		if (endTime != null) this.endTime = endTime;
-		if (_paused) resume();
-		else startSound(startTime);
-
-		return this;
-	}
-
-	/**
-	 * Unpause a sound. Only works on sounds that have been paused.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function resume():FlxSound {
-		if (_paused) startSound(_time);
-		return this;
-	}
-
-	/**
-	 * Call this function to pause this sound.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function pause():FlxSound {
-		if (!playing) return this;
-
-		cleanup(false, false);
-		_paused = true;
-		return this;
-	}
-
-	/**
-	 * Call this function to stop this sound.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function stop():FlxSound {
-		cleanup(autoDestroy, true);
-		return this;
-	}
-
-	/**
-	 * Helper function that tweens this sound's volume.
-	 *
-	 * @param	duration	The amount of time the fade-out operation should take.
-	 * @param	to			The volume to tween to, 0 by default.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function fadeOut(duration = 1.0, to = 0.0, ?onComplete:FlxTween->Void):FlxSound {
-		if (fadeTween != null) fadeTween.cancel();
-		fadeTween = FlxTween.num(volume, to, duration, {onComplete: onComplete}, volumeTween);
-
-		return this;
-	}
-
-	/**
-	 * Helper function that tweens this sound's volume.
-	 * If the sound wasn't playing at all, it'll play before the tween starts.
-	 *
-	 * @param	duration	The amount of time the fade-in operation should take.
-	 * @param	from		The volume to tween from, 0 by default.
-	 * @param	to			The volume to tween to, 1 by default.
-	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
-	 */
-	public function fadeIn(duration = 1.0, from = 0.0, to = 1.0, ?onComplete:FlxTween->Void):FlxSound {
-		if (!playing) play();
-		if (fadeTween != null) fadeTween.cancel();
-		fadeTween = FlxTween.num(from, to, duration, {onComplete: onComplete}, volumeTween);
-
-		return this;
-	}
-
-	function volumeTween(f:Float) volume = f;
-
-	/**
-	 * Returns the currently selected "real" volume of the sound (takes fades and proximity into account).
-	 *
-	 * @return	The adjusted volume of the sound.
-	 */
-	public inline function getActualVolume():Float
-		return (group != null ? group.getVolume() : 1.0) * _volume * _volumeAdjust;
-
-	#if FLX_PITCH
-	/**
-	 * Returns the currently selected "real" pitch of the sound.
-	 *
-	 * @return	The adjusted pitch of the sound.
-	 */
-	public inline function getActualPitch():Float
-		return _realPitch;
-	#end
-
-	/**
-	 * Returns the actual time coming from the internal, can be used for detecting sync error.
-	 * 
-	 * @return The actual time of the sound.
-	 */
-	public inline function getActualTime():Float {
-		get_time();
-		return _time;
-	}
-
-	/**
-	 * An internal helper function used to attempt to start playing
-	 * the sound and populate the _channel variable.
-	 */
-	function startSound(startTime:Float) @:privateAccess {
-		if (_sound == null) return;
-
-		_paused = false;
-		_time = startTime;
-		_lastTime = FlxG.game.getTicks();
-		if (_channel == null || !_channel.__isValid || _source == null #if lime_cffi || _source.__backend.disposed #end)
-			makeChannel();
-
-		if (_channel != null) {
-			#if FLX_PITCH
-			_timeScaleAdjust = timeScaleBased ? FlxG.timeScale : 1.0;
-			pitch = _pitch;
-			#end
-
-			updateTransform();
-			_channel.__lastPeakTime = -10;
-			_channel.__leftPeak = 0;
-			_channel.__rightPeak = 0;
-
-			#if lime_cffi _source.__backend.playing = true; #end
-			_source.offset = 0;
-			_source.currentTime = startTime + _offset;
-			#if !lime_cffi _source.play(); #end
-
-			looped = looped;
-			loopTime = loopTime;
-			endTime = endTime;
-
-			active = true;
-		}
-		else {
-			exists = false;
-			active = false;
-		}
-	}
-
-	function stopped() {
-		onFinish.dispatch();
-
-		if (onComplete != null) onComplete();
-
-		if (looped) {
-			cleanup(false);
-			play(false, loopTime, endTime);
-		}
-		else cleanup(autoDestroy);
-	}
-
-	function source_looped() {
-		if (onComplete != null) onComplete();
-
-		if (!looped) {
-			cleanup(autoDestroy);
-			_lastTime = FlxG.game.getTicks();
-			_time = loopTime;
-		}
-		else if (_source != null)
-			_source.loops = 999;
-	}
-
-	/**
-	 * Internal event handler for ID3 info (i.e. fetching the song name).
-	 */
-	function gotID3(_) {
-		name = _sound.id3.songName;
-		artist = _sound.id3.artist;
-		_sound.removeEventListener(Event.ID3, gotID3);
-	}
-
-	#if FLX_SOUND_SYSTEM
-	@:allow(flixel.system.frontEnds.SoundFrontEnd)
-	function onFocus() if (!_alreadyPaused) {
-		resume();
-		_alreadyPaused = null;
-	}
-
-	@:allow(flixel.system.frontEnds.SoundFrontEnd)
-	function onFocusLost() if (_alreadyPaused == null && !(_alreadyPaused = _paused)) pause();
-	#end
-
-	function set_group(value:FlxSoundGroup):FlxSoundGroup {
-		if (value != null) value.add(this);
-		else group.remove(this);
-		return group;
-	}
-
-	inline function get_playing():Bool @:privateAccess
-		return _source != null && _source.playing;
-
-	inline function get_volume():Float
-		return _volume;
-
-	inline function set_volume(v:Float):Float {
-		_volume = FlxMath.bound(v, 0, 10);
-		updateTransform();
-		return _volume;
-	}
-
-	inline function set_muted(v:Bool):Bool {
-		muted = v;
-		updateTransform();
-		return muted;
-	}
-
-	inline function get_pan():Float return _pan;
-	inline function set_pan(v:Float):Float {
-		_pan = FlxMath.bound(v, -1, 1);
-		updateTransform();
-		return _pan;
-	}
-
-	inline function get_loaded():Bool
-		return buffer != null;
-
-	inline function get_streamed():Bool
-		@:privateAccess return #if lime_vorbis _sound != null && _sound.__buffer.__srcVorbisFile != null #else false #end;
-
-	inline function get_buffer():AudioBuffer
-		@:privateAccess return _sound != null ? _sound.__buffer : null;
-
-	inline function update_amplitude():Void @:privateAccess {
-		if (_channel != null && _channel.__updatePeaks(get_time()) && _amplitudeUpdate) {
-			_amplitudeUpdate = false;
-			_amplitudeLeft = _channel.__leftPeak;
-			_amplitudeRight = _channel.__rightPeak;
-		}
-	}
-
-	inline function get_amplitudeLeft():Float {
-		update_amplitude();
-		return _amplitudeLeft;
-	}
-
-	inline function get_amplitudeRight():Float {
-		update_amplitude();
-		return _amplitudeRight;
-	}
-
-	inline function get_amplitude():Float {
-		update_amplitude();
-		return Math.max(_amplitudeLeft, _amplitudeRight);//if (stereo) (_amplitudeLeft + _amplitudeRight) * 0.5; else _amplitudeLeft;
-	}
-
-	inline function get_channels():Int
-		@:privateAccess return (buffer != null) ? buffer.channels : 0;
-
-	inline function get_stereo():Bool
-		return channels > 1;
-
-	#if FLX_PITCH
-	inline function get_pitch():Float
-		return _pitch;
-
-	inline function set_pitch(v:Float):Float {
-		_realPitch = (_pitch = v) * _timeScaleAdjust;
-		if (_source != null) _source.pitch = _realPitch;
-		return _pitch;
-	}
-	#end
-
-	function set_looped(v:Bool):Bool {
-		if (playing) _source.loops = v ? 999 : 0;
-		return looped = v;
-	}
-
-	function set_loopTime(v:Float):Float {
-		if (playing) _source.loopTime = v;
-		return loopTime = v;
-	}
-
-	function set_endTime(v:Null<Float>):Null<Float> {
-		if (playing) {
-			if (v != null && v > 0 && v < _length) _source.length = v;
-			else _source.length = null;
-		}
-		return endTime = v;
-	}
-
-	inline function getFakeTime():Float {
-		if (_source.playing && _realPitch > 0 && _lastTime != null)
-			return _time + (FlxG.game.getTicks() - _lastTime) * _realPitch * _timeInterpolation;
-		else
-			return _time;
-	}
-	function get_time():Float {
-		if (_source == null || /*AudioManager.context == null*/funkin.backend.system.Main.audioDisconnected) return _time;
-
-		final sourceTime = _source.currentTime - _source.offset - _offset;
-		if (!_source.playing || _realPitch <= 0) {
-			_lastTime = null;
-			return _time = sourceTime;
-		}
-
-		final fakeTime = getFakeTime();
-		if (sourceTime != _time) {
-			_lastTime = FlxG.game.getTicks();
-			if ((_timeInterpolation = 1 - Math.min(fakeTime - sourceTime, 1000) * 0.001) < 1 && _timeInterpolation > .9)
-				return _time = fakeTime;
-			else {
-				_timeInterpolation = 1;
-				return _time = sourceTime;
-			}
-		}
-		else
-			return fakeTime;
-	}
-
-	function set_time(time:Float):Float @:privateAccess {
-		time = FlxMath.bound(time, _offset, length - 1);
-		if (_channel != null && _realPitch > 0) {
-			if (!_channel.__isValid) {
-				cleanup(false, true);
-				startSound(time);
-			}
-			else {
-				_source.offset = 0;
-				_source.currentTime = time + _offset;
-			}
-		}
-
-		_lastTime = null;
-		return _time = time;
-	}
-
-	function get_offset():Float return _offset;
-	function set_offset(offset:Float):Float {
-		if (_offset == (_offset = offset)) return offset;
-		//time = time + _offset;
-		return offset;
-	}
-
-	function get_length():Float return _length - _offset;
-
-	//function get_latency():Float return _source != null ? _source.latency : 0;
-
-	override function toString():String {
-		return FlxStringUtil.getDebugString([
-			LabelValuePair.weak("playing", playing),
-			LabelValuePair.weak("time", time),
-			LabelValuePair.weak("length", length),
-			LabelValuePair.weak("volume", volume),
-			LabelValuePair.weak("pitch", pitch)
-		]);
-	}
-}
\ No newline at end of file
diff --git a/source/flixel/sound/FlxSoundGroup.hx b/source/flixel/sound/FlxSoundGroup.hx
deleted file mode 100644
index 9c2fcc1cbd..0000000000
--- a/source/flixel/sound/FlxSoundGroup.hx
+++ /dev/null
@@ -1,120 +0,0 @@
-package flixel.sound;
-
-/**
- * A way of grouping sounds for things such as collective volume control
- */
-class FlxSoundGroup
-{
-	/**
-	 * The sounds in this group
-	 */
-	public var sounds:Array<FlxSound> = [];
-
-	/**
-	 * The volume of this group
-	 */
-	public var volume(default, set):Float;
-
-	/**
-	 * Whether or not this group is muted
-	 */
-	public var muted(default, set):Bool;
-
-	/**
-	 * Create a new sound group
-	 * @param	volume  The initial volume of this group
-	 */
-	public function new(volume:Float = 1)
-	{
-		this.volume = volume;
-	}
-
-	/**
-	 * Add a sound to this group, will remove the sound from any group it is currently in
-	 * @param	sound The sound to add to this group
-	 * @return True if sound was successfully added, false otherwise
-	 */
-	public function add(sound:FlxSound):Bool
-	{
-		if (!sounds.contains(sound))
-		{
-			// remove from prev group
-			if (sound.group != null)
-				sound.group.sounds.remove(sound);
-			
-			sounds.push(sound);
-			@:bypassAccessor
-			sound.group = this;
-			sound.updateTransform();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove a sound from this group
-	 * @param	sound The sound to remove
-	 * @return True if sound was successfully removed, false otherwise
-	 */
-	public function remove(sound:FlxSound):Bool
-	{
-		if (sounds.contains(sound))
-		{
-			@:bypassAccessor
-			sound.group = null;
-			sounds.remove(sound);
-			sound.updateTransform();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Call this function to pause all sounds in this group.
-	 * @since 4.3.0
-	 */
-	public function pause():Void
-	{
-		for (sound in sounds)
-			sound.pause();
-	}
-
-	/**
-	 * Unpauses all sounds in this group. Only works on sounds that have been paused.
-	 * @since 4.3.0
-	 */
-	public function resume():Void
-	{
-		for (sound in sounds)
-			sound.resume();
-	}
-
-	/**
-	 * Returns the volume of this group, taking `muted` in account.
-	 * @return The volume of the group or 0 if the group is muted.
-	 */
-	public function getVolume():Float
-	{
-		return muted ? 0.0 : volume;
-	}
-
-	function set_volume(volume:Float):Float
-	{
-		this.volume = volume;
-		for (sound in sounds)
-		{
-			sound.updateTransform();
-		}
-		return volume;
-	}
-
-	function set_muted(value:Bool):Bool
-	{
-		muted = value;
-		for (sound in sounds)
-		{
-			sound.updateTransform();
-		}
-		return muted;
-	}
-}
diff --git a/source/flx3d/Flx3DCamera.hx b/source/flx3d/Flx3DCamera.hx
deleted file mode 100644
index 48089857b7..0000000000
--- a/source/flx3d/Flx3DCamera.hx
+++ /dev/null
@@ -1,188 +0,0 @@
-package flx3d;
-
-#if THREE_D_SUPPORT
-import away3d.cameras.Camera3D;
-import away3d.containers.ObjectContainer3D;
-import away3d.containers.View3D;
-import away3d.entities.Mesh;
-import away3d.entities.SegmentSet;
-import away3d.entities.TextureProjector;
-import away3d.events.Asset3DEvent;
-import away3d.events.LoaderEvent;
-import away3d.library.Asset3DLibrary;
-import away3d.library.Asset3DLibraryBundle;
-import away3d.library.assets.Asset3DType;
-import away3d.lights.LightBase;
-import away3d.loaders.misc.AssetLoaderContext;
-import away3d.loaders.misc.AssetLoaderToken;
-import away3d.loaders.parsers.*;
-import away3d.materials.TextureMaterial;
-import away3d.primitives.SkyBox;
-import away3d.utils.Cast;
-import away3d.utils.Utils.expect;
-import flixel.FlxG;
-import flx3d.Flx3DUtil;
-import haxe.io.Path;
-import openfl.Assets;
-#end
-import flixel.FlxCamera;
-
-class Flx3DCamera extends FlxCamera
-{
-	#if THREE_D_SUPPORT
-	private static var __3DIDS:Int = 0;
-
-	public var view:View3D;
-
-	var meshes:Array<Mesh> = [];
-
-	public function new(X:Int = 0, Y:Int = 0, Width:Int = 0, Height:Int = 0, DefaultZoom:Float = 1)
-	{
-		if (!Flx3DUtil.is3DAvailable())
-			throw "[Flx3DCamera] 3D is not available on this platform. Stages in use: "
-				+ Flx3DUtil.getTotal3D()
-				+ ", Max stages allowed: "
-				+ FlxG.stage.stage3Ds.length
-				+ ".";
-		super(X, Y, Width, Height, DefaultZoom);
-		__cur3DStageID = __3DIDS++;
-
-		view = new View3D();
-		view.width = this.width;
-		view.height = this.height;
-		view.visible = true;
-
-		FlxG.stage.addChild(view);
-	}
-
-	public override function render()
-	{
-		super.render();
-
-		view.x = FlxG.game.x + FlxG.game.scaleX * (flashSprite.x + flashSprite.scaleX * (_scrollRect.x + _scrollRect.scaleX * (_scrollRect.scrollRect.x)));
-		view.x -= _scrollRect.scrollRect.width * ((zoom / initialZoom) - 1) / 2;
-		view.y = FlxG.game.y + FlxG.game.scaleY * (flashSprite.y + flashSprite.scaleY * (_scrollRect.y + _scrollRect.scaleY * (_scrollRect.scrollRect.y)));
-		view.y -= _scrollRect.scrollRect.height * ((zoom / initialZoom) - 1) / 2;
-
-		view.width = _scrollRect.scrollRect.width / initialZoom;
-		view.width += _scrollRect.scrollRect.width / initialZoom * ((zoom / initialZoom) - 1);
-		view.height = _scrollRect.scrollRect.height / initialZoom;
-		view.height += _scrollRect.scrollRect.height / initialZoom * ((zoom / initialZoom) - 1);
-
-		view.render();
-	}
-
-	public function addModel(assetPath:String, callback:Asset3DEvent->Void, ?texturePath:String, smoothTexture:Bool = true)
-	{
-		var model = Assets.getBytes(assetPath);
-		if (model == null)
-			throw 'Model at ${assetPath} was not found.';
-
-		var context = new AssetLoaderContext();
-		var noExt = Path.withoutExtension(assetPath);
-		trace(noExt);
-		context.mapUrlToData(Path.withoutDirectory(noExt) + '.mtl', noExt + '.mtl');
-
-		var material:TextureMaterial = null;
-		if (texturePath != null)
-			material = new TextureMaterial(Cast.bitmapTexture(Assets.getBitmapData(texturePath, true, false)), smoothTexture);
-
-		return loadData(model, context, switch (Path.extension(assetPath).toLowerCase())
-		{
-			case "dae": new DAEParser();
-			case "md2": new MD2Parser();
-			case "md5": new MD5MeshParser();
-			case "awd": new AWDParser();
-			default: new OBJParser();
-		}, (event:Asset3DEvent) ->
-			{
-				if (event.asset != null && event.asset.assetType == Asset3DType.MESH)
-				{
-					var mesh:Mesh = cast event.asset;
-					if (material != null)
-						mesh.material = material;
-					meshes.push(mesh);
-				}
-				callback(event);
-			});
-	}
-
-	private var __cur3DStageID:Int;
-	private var _loaders:Map<Asset3DLibraryBundle, AssetLoaderToken> = [];
-
-	private function loadData(data:Dynamic, context:AssetLoaderContext, parser:ParserBase, onAssetCallback:Asset3DEvent->Void):AssetLoaderToken
-	{
-		var token:AssetLoaderToken;
-
-		var lib:Asset3DLibraryBundle = Asset3DLibraryBundle.getInstance('Flx3DView-${__cur3DStageID}');
-		token = lib.loadData(data, context, null, parser);
-
-		token.addEventListener(Asset3DEvent.ASSET_COMPLETE, (event:Asset3DEvent) ->
-		{
-			// ! Taken from Loader3D https://github.com/openfl/away3d/blob/master/away3d/loaders/Loader3D.hx#L207-L232
-			if (event.type == Asset3DEvent.ASSET_COMPLETE)
-			{
-				var obj:ObjectContainer3D = switch (event.asset.assetType)
-				{
-					case Asset3DType.LIGHT: expect(event.asset, LightBase);
-					case Asset3DType.CONTAINER: expect(event.asset, ObjectContainer3D);
-					case Asset3DType.MESH: expect(event.asset, Mesh);
-					case Asset3DType.SKYBOX: expect(event.asset, SkyBox);
-					case Asset3DType.TEXTURE_PROJECTOR: expect(event.asset, TextureProjector);
-					case Asset3DType.CAMERA: expect(event.asset, Camera3D);
-					case Asset3DType.SEGMENT_SET: expect(event.asset, SegmentSet);
-					default: null;
-				}
-				if (obj != null && obj.parent == null)
-					view.scene.addChild(obj);
-			}
-
-			if (onAssetCallback != null)
-				onAssetCallback(event);
-		});
-
-		token.addEventListener(LoaderEvent.RESOURCE_COMPLETE, (_) ->
-		{
-			trace("Loader Finished...");
-		});
-
-		_loaders.set(lib, token);
-
-		return token;
-	}
-
-	override function destroy()
-	{
-		if (meshes != null)
-			for (mesh in meshes)
-				mesh.dispose();
-
-		var bundle = Asset3DLibraryBundle.getInstance('Flx3DView-${__cur3DStageID}');
-		bundle.stopAllLoadingSessions();
-		@:privateAccess {
-			if (bundle._loadingSessions != null)
-			{
-				for (load in bundle._loadingSessions)
-				{
-					load.dispose();
-				}
-			}
-			Asset3DLibrary._instances.remove('Flx3DView-${__cur3DStageID}');
-		}
-
-		FlxG.stage.removeChild(view);
-		try
-		{
-			view.dispose();
-		}
-		catch (e)
-		{
-		}
-
-		super.destroy();
-	}
-
-	public function addChild(c)
-		view.scene.addChild(c);
-	#end
-}
diff --git a/source/flx3d/Flx3DUtil.hx b/source/flx3d/Flx3DUtil.hx
deleted file mode 100644
index 71706e35fb..0000000000
--- a/source/flx3d/Flx3DUtil.hx
+++ /dev/null
@@ -1,63 +0,0 @@
-package flx3d;
-
-#if THREE_D_SUPPORT
-import away3d.core.managers.Stage3DManager;
-import away3d.library.assets.IAsset;
-import flixel.FlxG;
-#end
-
-/**
- * @author lunarcleint
- * @see https://twitter.com/lunarcleint
- *
- * Help from Ne_Eo
- * @see https://twitter.com/Ne_Eo_Twitch
- */
-@:access(away3d.core.managers.Stage3DManager)
-final class Flx3DUtil
-{
-	#if THREE_D_SUPPORT
-	/**
-	 * Returns the total amount of 3D stages (not excluding the ones in use)
-	 * @return Int
-	 */
-	public static inline function getTotal3D():Int
-	{
-		return FlxG.stage.stage3Ds.length;
-	}
-
-	/**
-	 * Returns the total amount of 3D stages that are in use
-	 * @return Int
-	 */
-	public static inline function getUsed3D():Int
-	{
-		return Stage3DManager._numStageProxies;
-	}
-
-	/**
-	 * Returns if a Stage3D is available
-	 * @return Bool
-	 */
-	public static inline function is3DAvailable():Bool
-	{
-		if (Stage3DManager._stageProxies == null)
-			return true;
-
-		return Stage3DManager._numStageProxies < Stage3DManager._stageProxies.length;
-	}
-
-	/**
-	 * Calls dispose() (destroy) on a Away3D asset
-	 * @param obj
-	 * @return null
-	 */
-	public static inline function dispose<T:IAsset>(obj:Null<T>):T
-	{
-		if (obj != null)
-			obj.dispose();
-
-		return null;
-	}
-	#end
-}
diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx
deleted file mode 100644
index 9004d27af8..0000000000
--- a/source/flx3d/Flx3DView.hx
+++ /dev/null
@@ -1,152 +0,0 @@
-package flx3d;
-
-#if THREE_D_SUPPORT
-import away3d.cameras.Camera3D;
-import away3d.containers.ObjectContainer3D;
-import away3d.entities.Mesh;
-import away3d.entities.SegmentSet;
-import away3d.entities.TextureProjector;
-import away3d.events.Asset3DEvent;
-import away3d.events.LoaderEvent;
-import away3d.library.Asset3DLibrary;
-import away3d.library.Asset3DLibraryBundle;
-import away3d.library.assets.Asset3DType;
-import away3d.lights.LightBase;
-import away3d.loaders.misc.AssetLoaderContext;
-import away3d.loaders.misc.AssetLoaderToken;
-import away3d.loaders.parsers.*;
-import away3d.materials.TextureMaterial;
-import away3d.primitives.SkyBox;
-import away3d.utils.Cast;
-import flx3d.Flx3DUtil;
-import haxe.io.Path;
-import openfl.Assets;
-import away3d.utils.Utils.expect;
-#end
-
-// FlxView3D with helpers for easier updating
-class Flx3DView extends FlxView3D
-{
-	#if THREE_D_SUPPORT
-	private static var __3DIDS:Int = 0;
-
-	var meshes:Array<Mesh> = [];
-
-	public function new(x:Float = 0, y:Float = 0, width:Int = -1, height:Int = -1)
-	{
-		if (!Flx3DUtil.is3DAvailable())
-			throw "[Flx3DView] 3D is not available on this platform. Stages in use: "
-				+ Flx3DUtil.getUsed3D()
-				+ ", Max stages allowed: "
-				+ Flx3DUtil.getTotal3D()
-				+ ".";
-		super(x, y, width, height);
-		__cur3DStageID = __3DIDS++;
-	}
-
-	public function addModel(assetPath:String, callback:Asset3DEvent->Void, ?texturePath:String, smoothTexture:Bool = true)
-	{
-		var model = Assets.getBytes(assetPath);
-		if (model == null)
-			throw 'Model at ${assetPath} was not found.';
-
-		var context = new AssetLoaderContext();
-		var noExt = Path.withoutExtension(assetPath);
-		trace(noExt);
-		context.mapUrlToData(Path.withoutDirectory(noExt) + '.mtl', noExt + '.mtl');
-
-		var material:TextureMaterial = null;
-		if (texturePath != null)
-			material = new TextureMaterial(Cast.bitmapTexture(Assets.getBitmapData(texturePath, true, false)), smoothTexture);
-
-		return loadData(model, context, switch (Path.extension(assetPath).toLowerCase())
-		{
-			case "dae": new DAEParser();
-			case "md2": new MD2Parser();
-			case "md5": new MD5MeshParser();
-			case "awd": new AWDParser();
-			default: new OBJParser();
-		}, (event:Asset3DEvent) ->
-			{
-				if (event.asset != null && event.asset.assetType == Asset3DType.MESH)
-				{
-					var mesh:Mesh = cast event.asset;
-					if (material != null)
-						mesh.material = material;
-					meshes.push(mesh);
-				}
-				callback(event);
-			});
-	}
-
-	private var __cur3DStageID:Int;
-	private var _loaders:Map<Asset3DLibraryBundle, AssetLoaderToken> = [];
-
-	private function loadData(data:Dynamic, context:AssetLoaderContext, parser:ParserBase, onAssetCallback:Asset3DEvent->Void):AssetLoaderToken
-	{
-		var token:AssetLoaderToken;
-
-		var lib:Asset3DLibraryBundle;
-		lib = Asset3DLibraryBundle.getInstance('Flx3DView-${__cur3DStageID}');
-		token = lib.loadData(data, context, null, parser);
-
-		token.addEventListener(Asset3DEvent.ASSET_COMPLETE, (event:Asset3DEvent) ->
-		{
-			// ! Taken from Loader3D https://github.com/openfl/away3d/blob/master/away3d/loaders/Loader3D.hx#L207-L232
-			if (event.type == Asset3DEvent.ASSET_COMPLETE)
-			{
-				var obj:ObjectContainer3D = switch (event.asset.assetType)
-				{
-					case Asset3DType.LIGHT: expect(event.asset, LightBase);
-					case Asset3DType.CONTAINER: expect(event.asset, ObjectContainer3D);
-					case Asset3DType.MESH: expect(event.asset, Mesh);
-					case Asset3DType.SKYBOX: expect(event.asset, SkyBox);
-					case Asset3DType.TEXTURE_PROJECTOR: expect(event.asset, TextureProjector);
-					case Asset3DType.CAMERA: expect(event.asset, Camera3D);
-					case Asset3DType.SEGMENT_SET: expect(event.asset, SegmentSet);
-					default: null;
-				}
-				if (obj != null && obj.parent == null)
-					view.scene.addChild(obj);
-			}
-
-			if (onAssetCallback != null)
-				onAssetCallback(event);
-		});
-
-		token.addEventListener(LoaderEvent.RESOURCE_COMPLETE, (_) ->
-		{
-			trace("Loader Finished...");
-		});
-
-		_loaders.set(lib, token);
-
-		return token;
-	}
-
-	override function destroy()
-	{
-		if (meshes != null)
-			for (mesh in meshes)
-				mesh.dispose();
-
-		var bundle = Asset3DLibraryBundle.getInstance('Flx3DView-${__cur3DStageID}');
-		bundle.stopAllLoadingSessions();
-		@:privateAccess {
-			if (bundle._loadingSessions != null)
-			{
-				for (load in bundle._loadingSessions)
-				{
-					load.dispose();
-				}
-			}
-			Asset3DLibrary._instances.remove('Flx3DView-${__cur3DStageID}');
-		}
-
-		super.destroy();
-	}
-
-	public function addChild(c)
-		view.scene.addChild(c);
-	#end
-}
diff --git a/source/flx3d/FlxView3D.hx b/source/flx3d/FlxView3D.hx
deleted file mode 100644
index b07b78e213..0000000000
--- a/source/flx3d/FlxView3D.hx
+++ /dev/null
@@ -1,178 +0,0 @@
-package flx3d;
-
-#if THREE_D_SUPPORT
-import flx3d._internal.TextureView3D;
-import away3d.containers.View3D;
-import away3d.library.assets.IAsset;
-import flixel.FlxG;
-import openfl.display.BitmapData;
-#end
-import flixel.FlxSprite;
-
-/**
- * @author Ne_Eo
- * @see https://twitter.com/Ne_Eo_Twitch
- *
- * @author lunarcleint
- * @see https://twitter.com/lunarcleint
- */
-class FlxView3D extends FlxSprite
-{
-	#if THREE_D_SUPPORT
-	@:noCompletion private var bmp:BitmapData = null;
-	private var _textureView:TextureView3D;
-	private var legacyRender:Bool = false;
-
-	// With new rendering, it seems to only work if 2 or more views are being rendered.
-	// This workaround creates a second instance if there is only one view.
-	// "There is nothing more permanent than a temporary solution"
-	// -idk who said this i just wanted to quote it
-	private static var workaroundInstance:FlxView3D;
-	private static var createdWorkaround:Bool = false;
-
-	private inline function createWorkaround()
-	{
-		if (!createdWorkaround && !legacyRender)
-		{
-			createdWorkaround = true;
-			workaroundInstance = new FlxView3D(0, 0, 1, 1);
-			FlxG.state.add(workaroundInstance);
-		}
-	}
-
-	private inline function destroyWorkaround()
-	{
-		if (workaroundInstance == this)
-		{
-			workaroundInstance = null;
-			createdWorkaround = false;
-		}
-	}
-
-	/**
-	 * The Away3D View
-	 */
-	public var view:View3D;
-
-	/**
-	 * Set this flag to true to force the View3D to update during the `draw()` call.
-	 */
-	public var dirty3D:Bool = true;
-
-	/**
-	 * Creates a new instance of a View3D from Away3D and renders it as a FlxSprite
-	 * ! Call Flx3DUtil.is3DAvailable(); to make sure a 3D stage is usable
-	 * @param x
-	 * @param y
-	 * @param width Leave as -1 for screen width
-	 * @param height Leave as -1 for screen height
-	 */
-	public function new(x:Float = 0, y:Float = 0, width:Int = -1, height:Int = -1)
-	{
-		legacyRender = false;
-
-		super(x, y);
-		if (legacyRender)
-		{
-			view = new View3D();
-		}
-		else
-		{
-			_textureView = new TextureView3D();
-			_textureView.onUpdateBitmap = function(bitmap)
-			{
-				bmp = bitmap;
-				loadGraphic(bmp);
-			}
-
-			view = _textureView;
-		}
-
-		view.visible = false;
-
-		this.width = width == -1 ? FlxG.width : width;
-		this.height = height == -1 ? FlxG.height : height;
-		if (legacyRender)
-		{
-			bmp = new BitmapData(Std.int(view.width), Std.int(view.height), true, 0x0);
-			loadGraphic(bmp);
-		}
-
-		view.backgroundAlpha = 0;
-		FlxG.stage.addChildAt(view, 0);
-
-		createWorkaround();
-	}
-
-	/**
-	 * Disposes (destroys) the asset and returns null
-	 * @param obj
-	 * @return T null
-	 */
-	public static function dispose<T:IAsset>(obj:Null<T>):T
-	{
-		return Flx3DUtil.dispose(obj);
-	}
-
-	/**
-	 * Disposes of all the Away3D assets associated with the FlxView3D
-	 */
-	override function destroy()
-	{
-		FlxG.stage.removeChild(view);
-		super.destroy();
-
-		if (bmp != null)
-		{
-			bmp.dispose();
-			bmp = null;
-		}
-
-		if (view != null)
-		{
-			view.dispose();
-			view = null;
-		}
-
-		destroyWorkaround();
-	}
-
-	@:noCompletion override function draw()
-	{
-		if (dirty3D)
-		{
-			if (legacyRender)
-			{
-				view.visible = false;
-				FlxG.stage.addChildAt(view, 0);
-
-				var old = FlxG.game.filters;
-				FlxG.game.filters = null;
-
-				view.renderer.queueSnapshot(bmp);
-				view.render();
-
-				FlxG.game.filters = old;
-				FlxG.stage.removeChild(view);
-			}
-			else
-			{
-				view.render();
-			}
-		}
-		super.draw();
-	}
-
-	@:noCompletion override function set_width(newWidth:Float):Float
-	{
-		super.set_width(newWidth);
-		return view != null ? view.width = width : width;
-	}
-
-	@:noCompletion override function set_height(newHeight:Float):Float
-	{
-		super.set_height(newHeight);
-		return view != null ? view.height = height : height;
-	}
-	#end
-}
diff --git a/source/flx3d/_internal/TextureView3D.hx b/source/flx3d/_internal/TextureView3D.hx
deleted file mode 100644
index efce9b9a4f..0000000000
--- a/source/flx3d/_internal/TextureView3D.hx
+++ /dev/null
@@ -1,177 +0,0 @@
-package flx3d._internal;
-
-import flixel.FlxG;
-import haxe.Exception;
-import away3d.containers.View3D;
-import away3d.containers.Scene3D;
-import away3d.cameras.Camera3D;
-import away3d.core.render.RendererBase;
-import away3d.core.managers.Stage3DManager;
-import away3d.core.managers.Stage3DProxy;
-import openfl.display3D.textures.TextureBase;
-import openfl.display3D.textures.RectangleTexture;
-import openfl.display3D.Context3D;
-import openfl.display.BitmapData;
-import openfl.events.Event;
-import openfl.geom.Point;
-
-class TextureView3D extends View3D
-{
-	public var bitmap:BitmapData;
-
-	private var _framebuffer:TextureBase = null;
-
-	public var onUpdateBitmap:(BitmapData) -> Void;
-
-	/**
-	 * Prevents the engine from disposing Flixel's Stage3D/Context3D instance
-	 */
-	public override function dispose() @:privateAccess {
-		_stage3DProxy = null;
-		super.dispose();
-	}
-
-	private override function set_height(value:Float):Float
-	{
-		if (_height == value)
-			return value;
-		super.set_height(value);
-		_createFramebuffer();
-		return value;
-	}
-
-	private override function set_width(value:Float):Float
-	{
-		if (_width == value)
-			return value;
-		super.set_width(value);
-		_createFramebuffer();
-		return value;
-	}
-
-	public function new(scene:Scene3D = null, camera:Camera3D = null, renderer:RendererBase = null, forceSoftware:Bool = false, profile:String = "baseline",
-			contextIndex:Int = -1)
-	{
-		super(scene, camera, renderer, forceSoftware, profile, contextIndex);
-
-		_stage3DProxy = Stage3DManager.getInstance(FlxG.stage).getStage3DProxy(0);
-		_createFramebuffer();
-	}
-
-	private function _createFramebuffer()
-	{
-		if (width == 0 || height == 0)
-			return;
-		if (_framebuffer != null)
-			_framebuffer.dispose();
-		_framebuffer = FlxG.stage.context3D.createRectangleTexture(Std.int(_width), Std.int(_height), BGRA, true);
-		bitmap = BitmapDataCrashFix.fromTextureCrashFix(_framebuffer);
-		onUpdateBitmap(bitmap);
-	}
-
-	/**
-	 * Renders the view.
-	 */
-	public override function render():Void
-	{
-		Stage3DProxy.drawTriangleCount = 0;
-
-		// if context3D has Disposed by the OS,don't render at this frame
-		if (stage3DProxy.context3D == null || !stage3DProxy.recoverFromDisposal())
-		{
-			_backBufferInvalid = true;
-			return;
-		}
-
-		// reset or update render settings
-		if (_backBufferInvalid)
-			updateBackBuffer();
-
-		if (_shareContext && _layeredView)
-			stage3DProxy.clearDepthBuffer();
-
-		if (!_parentIsStage)
-		{
-			var globalPos:Point = parent.localToGlobal(_localTLPos);
-			if (_globalPos.x != globalPos.x || _globalPos.y != globalPos.y)
-			{
-				_globalPos = globalPos;
-				_globalPosDirty = true;
-			}
-		}
-
-		if (_globalPosDirty)
-			updateGlobalPos();
-
-		updateTime();
-
-		updateViewSizeData();
-
-		_entityCollector.clear();
-
-		// collect stuff to render
-		_scene.traversePartitions(_entityCollector);
-
-		// update picking
-		_mouse3DManager.updateCollider(this);
-		_touch3DManager.updateCollider();
-
-		if (_requireDepthRender)
-			renderSceneDepthToTexture(_entityCollector);
-
-		// todo: perform depth prepass after light update and before final render
-		if (_depthPrepass)
-			renderDepthPrepass(_entityCollector);
-
-		@:privateAccess _renderer.clearOnRender = !_depthPrepass;
-
-		if (_filter3DRenderer != null && _stage3DProxy.context3D != null)
-		{
-			_renderer.render(_entityCollector, _filter3DRenderer.getMainInputTexture(_stage3DProxy), _rttBufferManager.renderToTextureRect);
-			_filter3DRenderer.render(_stage3DProxy, camera, _depthRender);
-		}
-		else
-		{
-			@:privateAccess _renderer.shareContext = _shareContext;
-			if (_shareContext)
-				_renderer.render(_entityCollector, _framebuffer, _scissorRect);
-			else
-				_renderer.render(_entityCollector, _framebuffer);
-		}
-
-		if (!_shareContext)
-		{
-			stage3DProxy.present();
-
-			// fire collected mouse events
-			_mouse3DManager.fireMouseEvents();
-			_touch3DManager.fireTouchEvents();
-		}
-
-		// clean up data for this render
-		_entityCollector.cleanUp();
-
-		// register that a view has been rendered
-		stage3DProxy.bufferClear = false;
-	}
-}
-
-class BitmapDataCrashFix extends BitmapData
-{
-	public static function fromTextureCrashFix(texture:TextureBase):BitmapDataCrashFix @:privateAccess {
-		if (texture == null)
-			return null;
-
-		var bitmapData = new BitmapDataCrashFix(texture.__width, texture.__height, true, 0);
-		bitmapData.readable = false;
-		bitmapData.__texture = texture;
-		bitmapData.__textureContext = texture.__textureContext;
-		bitmapData.image = null;
-		return bitmapData;
-	}
-
-	@:dox(hide) public override function getTexture(context:Context3D):TextureBase
-	{
-		return __texture;
-	}
-}
diff --git a/source/funkin/backend/FunkinSprite.hx b/source/funkin/backend/FunkinSprite.hx
index 2ac888aff9..5a4d54eacf 100644
--- a/source/funkin/backend/FunkinSprite.hx
+++ b/source/funkin/backend/FunkinSprite.hx
@@ -120,7 +120,7 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
 
 			if (casted != null) {
 				spr.skew.set(casted.skew.x, casted.skew.y);
-				spr.animOffsets = casted.animOffsets.copy();
+				for (i => p in casted.animOffsets) spr.addOffset(i, p.x, p.y);
 				spr.zoomFactor = casted.zoomFactor;
 				spr.angleFactor = casted.angleFactor;
 			}
@@ -147,7 +147,6 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
 
 	public function loadSprite(path:String, Unique:Bool = false, Key:String = null)
 	{
-		var noExt = Path.withoutExtension(path);
 		frames = Paths.getFrames(path, true, null, null, animateSettings);
 		return this;
 	}
diff --git a/source/funkin/backend/FunkinText.hx b/source/funkin/backend/FunkinText.hx
index 09bd9dca97..76da9f66c6 100644
--- a/source/funkin/backend/FunkinText.hx
+++ b/source/funkin/backend/FunkinText.hx
@@ -3,6 +3,7 @@ package funkin.backend;
 import animate.FlxAnimate;
 import flixel.FlxCamera;
 import flixel.FlxG;
+import flixel.math.FlxMath;
 import flixel.math.FlxAngle;
 import flixel.math.FlxMatrix;
 import flixel.math.FlxPoint;
@@ -70,7 +71,7 @@ class FunkinText extends FlxText
 	override function drawComplex(camera:FlxCamera):Void
 	{
 		_frame.prepareMatrix(_matrix, ANGLE_0, checkFlipX(), checkFlipY());
-		_matrix.translate(-origin.x, -origin.y);
+		_matrix.translate(-origin.x - _graphicOffset.x, -origin.y - _graphicOffset.y);
 
 		if (frameOffsetAngle != null && frameOffsetAngle != angle)
 		{
@@ -137,7 +138,7 @@ class FunkinText extends FlxText
 
 	override function getScreenBounds(?rect:FlxRect, ?camera:FlxCamera):FlxRect
 	{
-		if (camera == null) camera = FlxG.camera;
+		if (camera == null) camera = getDefaultCamera();
 		rect = super.getScreenBounds(rect, camera);
 
 		if (zoomFactorEnabled && zoomFactor != 1) {
diff --git a/source/funkin/backend/assets/MultiFramesCollection.hx b/source/funkin/backend/assets/MultiFramesCollection.hx
deleted file mode 100644
index 2a03c64cdd..0000000000
--- a/source/funkin/backend/assets/MultiFramesCollection.hx
+++ /dev/null
@@ -1,72 +0,0 @@
-package funkin.backend.assets;
-
-import flixel.FlxG;
-import flixel.graphics.FlxGraphic;
-import flixel.graphics.frames.FlxFrame.FlxFrameAngle;
-import flixel.graphics.frames.FlxFrame.FlxFrameType;
-import flixel.graphics.frames.FlxFramesCollection;
-import flixel.math.FlxMath;
-import flixel.math.FlxPoint;
-import flixel.math.FlxRect;
-import flixel.util.FlxDestroyUtil;
-import flixel.util.FlxStringUtil;
-
-/**
- * Base class for all frame collections.
- */
-class MultiFramesCollection extends FlxFramesCollection
-{
-	public var parentedFrames:Array<FlxFramesCollection> = [];
-
-	public function new(parent:FlxGraphic, ?border:FlxPoint)
-	{
-		super(parent, USER("MULTI"), border);
-	}
-
-	/**
-	 * Returns the `FlxAtlasFrame` of the specified `FlxGraphic` object.
-	 *
-	 * @param   graphic   `FlxGraphic` object to find the `FlxAtlasFrames` collection for.
-	 * @return  `FlxAtlasFrames` collection for the specified `FlxGraphic` object
-	 *          Could be `null` if `FlxGraphic` doesn't have it yet.
-	 */
-	public static function findFrame(graphic:FlxGraphic, ?border:FlxPoint):MultiFramesCollection
-	{
-		if (border == null)
-			border = FlxPoint.weak();
-
-		var atlasFrames:Array<MultiFramesCollection> = cast graphic.getFramesCollections(USER("MULTI"));
-
-		for (atlas in atlasFrames)
-			if (atlas.border.equals(border))
-				return atlas;
-
-		return null;
-	}
-
-	public function addFrames(collection:FlxFramesCollection) {
-		if (collection == null || collection.frames == null) return;
-
-		collection.parent.useCount++;
-		parentedFrames.push(collection);
-
-		for(f in collection.frames) {
-			if (f != null) {
-				pushFrame(f);
-				f.parent = collection.parent;
-			}
-		}
-	}
-
-	public override function destroy():Void
-	{
-		if(parentedFrames != null) {
-			for(collection in parentedFrames) {
-				if(collection != null)
-					collection.parent.useCount--;
-			}
-			parentedFrames = null;
-		}
-		super.destroy();
-	}
-}
\ No newline at end of file
diff --git a/source/funkin/backend/assets/Paths.hx b/source/funkin/backend/assets/Paths.hx
index 8b47a62e27..151873e850 100644
--- a/source/funkin/backend/assets/Paths.hx
+++ b/source/funkin/backend/assets/Paths.hx
@@ -94,8 +94,8 @@ class Paths
 		return '$p$file.${e[0]}';
 	}
 
-	public static inline function video(key:String, ?ext:String)
-		return getPath('videos/$key.${ext != null ? ext : Flags.VIDEO_EXT}');
+	public static inline function video(key:String, ?ext:OneOfTwo<String, Array<String>>)
+		return getPath('videos/$key', null, ext != null ? ext : Flags.VIDEO_EXTS);
 
 	public static inline function ndll(key:String)
 		return getPath('ndlls/$key.ndll');
@@ -127,38 +127,37 @@ class Paths
 	public static inline function ps1(key:String, ?library:String)
 		return getPath('data/$key.ps1', library);
 
-	static public function sound(key:String, ?library:String, ?ext:String)
-		return getPath('sounds/$key.${ext != null ? ext : Flags.SOUND_EXT}', library);
+	static public function sound(key:String, ?library:String, ?ext:OneOfTwo<String, Array<String>>)
+		return getPath('sounds/$key', library, ext != null ? ext : Flags.SOUND_EXTS);
 
 	public static inline function soundRandom(key:String, min:Int, max:Int, ?library:String)
 		return sound(key + FlxG.random.int(min, max), library);
 
-	inline static public function music(key:String, ?library:String, ?ext:String)
-		return getPath('music/$key.${ext != null ? ext : Flags.SOUND_EXT}', library);
+	inline static public function music(key:String, ?library:String, ?ext:OneOfTwo<String, Array<String>>)
+		return getPath('music/$key', library, ext != null ? ext : Flags.SOUND_EXTS);
 
-	inline static public function voices(song:String, ?difficulty:String, ?suffix:String = "", ?ext:String) {
+	inline static public function voices(song:String, ?difficulty:String, ?suffix:String = "", ?ext:OneOfTwo<String, Array<String>>) {
 		if (difficulty == null) difficulty = Flags.DEFAULT_DIFFICULTY;
-		if (ext == null) ext = Flags.SOUND_EXT;
-		var diff = getPath('songs/$song/song/Voices$suffix-${difficulty}.${ext}', null);
-		return Assets.exists(diff) ? diff : getPath('songs/$song/song/Voices$suffix.${ext}', null);
+		var diff = getPath('songs/$song/song/Voices$suffix-${difficulty}', null, ext != null ? ext : Flags.SOUND_EXTS);
+		return Assets.exists(diff) ? diff : getPath('songs/$song/song/Voices$suffix', null, ext != null ? ext : Flags.SOUND_EXTS);
 	}
 
-	inline static public function inst(song:String, ?difficulty:String, ?suffix:String = "", ?ext:String) {
+	inline static public function inst(song:String, ?difficulty:String, ?suffix:String = "", ?ext:OneOfTwo<String, Array<String>>) {
 		if (difficulty == null) difficulty = Flags.DEFAULT_DIFFICULTY;
-		if (ext == null) ext = Flags.SOUND_EXT;
-		var diff = getPath('songs/$song/song/Inst$suffix-${difficulty}.${ext}', null);
-		return Assets.exists(diff) ? diff : getPath('songs/$song/song/Inst$suffix.${ext}', null);
+		var diff = getPath('songs/$song/song/Inst$suffix-${difficulty}', null, ext != null ? ext : Flags.SOUND_EXTS);
+		return Assets.exists(diff) ? diff : getPath('songs/$song/song/Inst$suffix', null, ext != null ? ext : Flags.SOUND_EXTS);
 	}
 
-	static public function image(key:String, ?library:String, checkForAtlas:Bool = false, ?ext:String) {
-		if (ext == null) ext = Flags.IMAGE_EXT;
+	static public function image(key:String, ?library:String, checkForAtlas:Bool = true, ?ext:OneOfTwo<String, Array<String>>) {
+		final defaultPath = getPath('images/$key', library, ext != null ? ext : Flags.IMAGE_EXTS);
 		if (checkForAtlas) {
-			var atlasPath = getPath('images/$key/spritemap.$ext', library);
-			var multiplePath = getPath('images/$key/1.$ext', library);
-			if (atlasPath != null && Assets.exists(atlasPath)) return atlasPath.substr(0, atlasPath.length - 14);
-			if (multiplePath != null && Assets.exists(multiplePath)) return multiplePath.substr(0, multiplePath.length - 6);
+			final ogExt = Path.extension(defaultPath);
+			var atlasPath = getPath('images/$key/spritemap1', library, ext != null ? ext : Flags.IMAGE_EXTS);
+			var multiplePath = getPath('images/$key/1', library, ext != null ? ext : Flags.IMAGE_EXTS);
+			if (atlasPath != null && Assets.exists(atlasPath)) return atlasPath.substr(0, atlasPath.length - 15) + '.$ogExt';
+			if (multiplePath != null && Assets.exists(multiplePath)) return multiplePath.substr(0, multiplePath.length - 6) + '.$ogExt';
 		}
-		return getPath('images/$key.$ext', library);
+		return defaultPath;
 	}
 
 	public static inline function script(key:String, ?library:String, isAssetsPath:Bool = false) {
@@ -218,26 +217,26 @@ class Paths
 		return getPath('models/$key.awd');
 	}
 
-	inline static public function getSparrowAtlas(key:String, ?library:String, ?ext:String)
+	inline static public function getSparrowAtlas(key:String, ?library:String, ?ext:OneOfTwo<String, Array<String>>)
 		return FlxAtlasFrames.fromSparrow(image(key, library, ext), file('images/$key.xml', library));
 
 	inline static public function getAnimateAtlasAlt(key:String, ?settings:FlxAnimateSettings)
 		return FlxAnimateFrames.fromAnimate(key, null, null, null, false, settings);
 
-	inline static public function getSparrowAtlasAlt(key:String, ?ext:String)
-		return FlxAtlasFrames.fromSparrow('$key.${ext != null ? ext : Flags.IMAGE_EXT}', '$key.xml');
+	inline static public function getSparrowAtlasAlt(key:String, ?ext:OneOfTwo<String, Array<String>>)
+		return FlxAtlasFrames.fromSparrow('$key.${ext != null ? ext : Flags.IMAGE_EXTS}', '$key.xml');
 
-	inline static public function getPackerAtlas(key:String, ?library:String, ?ext:String)
+	inline static public function getPackerAtlas(key:String, ?library:String, ?ext:OneOfTwo<String, Array<String>>)
 		return FlxAtlasFrames.fromSpriteSheetPacker(image(key, library, ext), file('images/$key.txt', library));
 
-	inline static public function getPackerAtlasAlt(key:String, ?ext:String)
-		return FlxAtlasFrames.fromSpriteSheetPacker('$key.${ext != null ? ext : Flags.IMAGE_EXT}', '$key.txt');
+	inline static public function getPackerAtlasAlt(key:String, ?ext:OneOfTwo<String, Array<String>>)
+		return FlxAtlasFrames.fromSpriteSheetPacker('$key.${ext != null ? ext : Flags.IMAGE_EXTS}', '$key.txt');
 
-	inline static public function getAsepriteAtlas(key:String, ?library:String, ?ext:String)
+	inline static public function getAsepriteAtlas(key:String, ?library:String, ?ext:OneOfTwo<String, Array<String>>)
 		return FlxAtlasFrames.fromAseprite(image(key, library, ext), file('images/$key.json', library));
 
-	inline static public function getAsepriteAtlasAlt(key:String, ?ext:String)
-		return FlxAtlasFrames.fromAseprite('$key.${ext != null ? ext : Flags.IMAGE_EXT}', '$key.json');
+	inline static public function getAsepriteAtlasAlt(key:String, ?ext:OneOfTwo<String, Array<String>>)
+		return FlxAtlasFrames.fromAseprite('$key.${ext != null ? ext : Flags.IMAGE_EXTS}', '$key.json');
 
 	static public function getAssetsRoot():String {
 		return if (ModsFolder.currentModFolder != null) '${ModsFolder.modsPath}${ModsFolder.currentModFolder}';
@@ -247,17 +246,81 @@ class Paths
 	/**
 	 * Gets frames at specified path.
 	 * @param key Path to the frames
+	 * @param assetsPath (Additional) Whether's the key already a path to an asset.
 	 * @param library (Additional) library to load the frames from.
 	 */
-	public static function getFrames(key:String, assetsPath:Bool = false, ?library:String, ?ext:String = null, ?animateSettings:FlxAnimateSettings) {
+	public static function getFrames(key:String, assetsPath:Bool = false, ?library:String, ?ext:OneOfTwo<String, Array<String>> = null, ?animateSettings:FlxAnimateSettings) {
 		if (tempFramesCache.exists(key)) {
 			var frames = tempFramesCache[key];
-			if (frames != null && frames.parent != null && frames.parent.bitmap != null && frames.parent.bitmap.readable)
-				return frames;
-			else
-				tempFramesCache.remove(key);
+			if (frames != null && frames.parent != null && frames.parent.bitmap != null) return frames;
+			else tempFramesCache.remove(key);
 		}
-		return tempFramesCache[key] = loadFrames(assetsPath ? key : Paths.image(key, library, true, ext), false, null, false, ext, animateSettings);
+		return tempFramesCache[key] = loadFrames(assetsPath ? key : Paths.image(key, library, true, ext), false, null, false, animateSettings);
+	}
+
+	/**
+	 * Gets frames from multiple specified image with supporting all atlas types.
+	 * @param sheets An array of paths to the images
+	 * @param assetsPath (Additional) Whether's the key already a path to an asset.
+	 * @param unique (Additional) Whenever the images should be unique in the cache.
+	 * @param key (Additional) Key for the returned frames in the cache, although the frames are still cached normally.
+	 *  If, left undefined, the key will the be joint sheets argument that is passed
+	 * @param skipMulti (Additional) Whenever the multi spritesheet check should be skipped.
+	 * @param ext (Additional) Extension(s) of the images.
+	 * @return FlxFramesCollection Frames
+	**/
+	public static function getMultiFrames(sheets:Array<String>, assetsPath:Bool = false, ?unique:Bool = false, ?key:String = null,
+			?skipMulti:Bool = false, ?ext:OneOfTwo<String, Array<String>> = null, ?animateSettings:FlxAnimateSettings):FlxFramesCollection
+	{
+		final assetKey = key != null ? key : "combo/" + sheets.join(",");
+
+		var asset:FlxAtlasFrames = cast tempFramesCache.get(assetKey);
+
+		if (asset != null && asset.parent != null && asset.parent.bitmap != null) return asset;
+		else tempFramesCache.remove(assetKey);
+
+		if (!unique) {
+			final graphic = FlxG.bitmap.get(assetKey);
+			if (graphic != null && (asset = graphic.atlasFrames) != null) {
+				tempFramesCache.set(assetKey, asset);
+				return asset;
+			}
+		}
+
+		final frameCollections:Array<FlxFramesCollection> = [];
+
+		for (key in sheets) {
+			final path = assetsPath ? key : image(key, null, true, ext);
+
+			var frames:FlxFramesCollection;
+			if (tempFramesCache.exists(key)) {
+				if ((frames = tempFramesCache.get(key)) != null && frames.parent != null && frames.parent.bitmap != null) {
+					frameCollections.push(frames);
+					continue;
+				}
+				else
+					tempFramesCache.remove(key);
+			}
+
+			frames = loadFrames(path, unique, null, false, skipMulti, animateSettings);
+			if (frames == null) {
+				Logs.warn('There is no Bitmap asset for "$path". Skipping...');
+				continue;
+			}
+
+			frameCollections.push(frames);
+		}
+
+		if (frameCollections.length == 1 && !unique && (key == null || key == assetKey)) return frameCollections[0];
+
+		//asset = new FlxAnimateFrames(FlxGraphic.fromFrame(FlxG.bitmap.whitePixel, unique, assetKey));
+		//for (frames in frameCollections) asset.addAtlas(cast frames); // wont compile in hashlink because of mismatch type
+		
+		// see FlxAnimateFrames#L495
+		asset = FlxAnimateFrames.combineAtlas(cast /* how do you make this good */ frameCollections);
+
+		if (!unique) tempFramesCache.set(assetKey, asset);
+		return asset;
 	}
 
 	/**
@@ -270,52 +333,52 @@ class Paths
 	**/
 	public static function framesExists(key:String, checkAtlas:Bool = false, checkMulti:Bool = true, assetsPath:Bool = false, ?library:String) {
 		var path = assetsPath ? key : Paths.image(key, library, true);
+
 		var noExt = Path.withoutExtension(path);
-		if(checkAtlas && Assets.exists('$noExt/Animation.json'))
+		var ext = Path.extension(path);
+
+		if (checkAtlas && Assets.exists('$noExt/Animation.json'))
 			return true;
-		if(checkMulti && Assets.exists('$noExt/1.png'))
+		if (checkMulti && Assets.exists('$noExt/1.$ext'))
 			return true;
-		if(Assets.exists('$noExt.xml'))
+		if (Assets.exists('$noExt.xml'))
 			return true;
-		if(Assets.exists('$noExt.txt'))
+		if (Assets.exists('$noExt.txt'))
 			return true;
-		if(Assets.exists('$noExt.json'))
+		if (Assets.exists('$noExt.json'))
 			return true;
 		return false;
 	}
-
+	
 	/**
+	 * Unintended for future normal usage, use getMultiFrames or loadMultiFrames instead.
+	 * 
 	 * Loads frames from a specific image path. Supports Sparrow Atlases, Packer Atlases, and multiple spritesheets.
 	 * @param path Path to the image
 	 * @param Unique Whenever the image should be unique in the cache
 	 * @param Key Key to the image in the cache
 	 * @param SkipAtlasCheck Whenever the atlas check should be skipped.
 	 * @param SkipMultiCheck Whenever the multi spritesheet check should be skipped.
-	 * @param Ext Extension of the image.
 	 * @return FlxFramesCollection Frames
 	 */
-	static function loadFrames(path:String, Unique:Bool = false, Key:String = null, SkipAtlasCheck:Bool = false, SkipMultiCheck:Bool = false, ?Ext:String = null, ?animateSettings:FlxAnimateSettings):FlxFramesCollection {
+	static function loadFrames(path:String, Unique:Bool = false, Key:String = null, SkipAtlasCheck:Bool = false, SkipMultiCheck:Bool = false,
+			Ext:String = null, ?animateSettings:FlxAnimateSettings):FlxFramesCollection
+	{
 		var noExt = Path.withoutExtension(path);
-		var ext = Ext != null ? Ext : Flags.IMAGE_EXT;
-
-		if (!SkipMultiCheck && Assets.exists('$noExt/1.${ext}')) {
-			// MULTIPLE SPRITESHEETS!!
-
-			var graphic = FlxG.bitmap.add("flixel/images/logo/default.png", false, '$noExt/mult');
-			var frames = MultiFramesCollection.findFrame(graphic);
-			if (frames != null)
-				return frames;
-
-			trace("no frames yet for multiple atlases!!");
-			var cur = 1;
-			var finalFrames = new MultiFramesCollection(graphic);
-			while(Assets.exists('$noExt/$cur.${ext}')) {
-				var spr = loadFrames('$noExt/$cur.${ext}', false, null, false, true);
-				finalFrames.addFrames(spr);
+		var ext = Ext != null ? Ext : Path.extension(path);
+
+		if (!SkipMultiCheck && Assets.exists('$noExt/1.$ext')) {
+			var cur:Int = 1;
+			final finalFrames = [];
+			while (Assets.exists('$noExt/$cur.$ext')) {
+				finalFrames.push('$noExt/$cur.$ext');
 				cur++;
 			}
-			return finalFrames;
-		} else if (Assets.exists('$noExt/Animation.json')) {
+			return getMultiFrames(finalFrames, true, true,
+				'$noExt/mult', true, ext, animateSettings);
+		} else if (!SkipAtlasCheck && Assets.exists('$noExt/Animation.json')) {
+			// ???
+			if (noExt.endsWith('/')) noExt = noExt.substr(0, noExt.length - 1);
 			return Paths.getAnimateAtlasAlt(noExt, animateSettings);
 		} else if (Assets.exists('$noExt.xml')) {
 			return Paths.getSparrowAtlasAlt(noExt, ext);
diff --git a/source/funkin/backend/assets/ZipFolderLibrary.hx b/source/funkin/backend/assets/ZipFolderLibrary.hx
index d12afb456d..ad5225e048 100644
--- a/source/funkin/backend/assets/ZipFolderLibrary.hx
+++ b/source/funkin/backend/assets/ZipFolderLibrary.hx
@@ -55,7 +55,7 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 	}
 
 	public function precacheVideos() {
-		_videoExtensions = [Flags.VIDEO_EXT];
+		_videoExtensions = Flags.VIDEO_EXTS;
 		
 		videoCacheRemap = [];
 		for (entry in zip.entries) {
@@ -70,7 +70,7 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 	}
 
 	// Now we have supports for videos in ZIP!!
-	public var _videoExtensions:Array<String> = [Flags.VIDEO_EXT];
+	public var _videoExtensions:Array<String> = Flags.VIDEO_EXTS;
 	public var videoCacheRemap:Map<String, String> = [];
 	public function getVideoRemap(originalPath:String):String {
 		if (!_videoExtensions.contains(Path.extension(_parsedAsset))) return originalPath;
diff --git a/source/funkin/backend/chart/Chart.hx b/source/funkin/backend/chart/Chart.hx
index d2c01ec3aa..3660540fb3 100644
--- a/source/funkin/backend/chart/Chart.hx
+++ b/source/funkin/backend/chart/Chart.hx
@@ -85,7 +85,7 @@ class Chart {
 	}
 
 	inline public static function defaultChartMetaFields(data:ChartMetaData):ChartMetaData {
-		data.setFieldDefault("displayName", data.name);
+		data.setFieldDefault("displayName", ~/(.*[\/])/g.map(data.name, _->''));
 
 		data.setFieldDefault("bpm", Flags.DEFAULT_BPM);
 		data.setFieldDefault("beatsPerMeasure", Flags.DEFAULT_BEATS_PER_MEASURE);
diff --git a/source/funkin/backend/scripting/Script.hx b/source/funkin/backend/scripting/Script.hx
index a0dde86115..1df5063161 100644
--- a/source/funkin/backend/scripting/Script.hx
+++ b/source/funkin/backend/scripting/Script.hx
@@ -10,7 +10,8 @@ import lime.app.Application;
  * Class used for scripting.
  * Use `Script.create` to create a script.
  */
-class Script extends FlxBasic implements IFlxDestroyable {
+class Script extends FlxBasic implements IFlxDestroyable
+{
 	/**
 	 * Use "static var thing = true;" in hscript to use those!!
 	 * are reset every mod switch so once you're done with them make sure to make them null!!
@@ -20,7 +21,8 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	/**
 	 * Gets the default variables for a script.
 	 */
-	public static function getDefaultVariables(?script:Script):Map<String, Dynamic> {
+	public static function getDefaultVariables(?script:Script):Map<String, Dynamic>
+	{
 		var vars = _defaultVariablesTemplate != null ? _defaultVariablesTemplate : (_defaultVariablesTemplate = buildDefaultVariables());
 		var copy = vars.copy();
 		copy.set("state", flixel.FlxG.state); // `state` changes on state switch, so it can't be cached
@@ -34,94 +36,117 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 */
 	private static var _defaultVariablesTemplate:Map<String, Dynamic> = null;
 
-	private static function buildDefaultVariables():Map<String, Dynamic> {
+	private static function buildDefaultVariables():Map<String, Dynamic>
+	{
 		return [
 			// Haxe related stuff
-			"Std"				=> Std,
-			"Math"				=> Math,
-			"Reflect"			=> Reflect,
-			"StringTools"		=> StringTools,
-			"Json"				=> haxe.Json,
-			"Xml"				=> Xml,
-			"Type"				=> Type,
-			"Date"				=> Date,
-			"Lambda"			=> Lambda,
-			#if sys "Sys"		=> Sys, #end
+			"Std" => Std,
+			"Math" => Math,
+			"Reflect" => Reflect,
+			"StringTools" => StringTools,
+			"Json" => haxe.Json,
+			"Xml" => Xml,
+			"Type" => Type,
+			"Date" => Date,
+			"Lambda" => Lambda,
+			#if sys "Sys" => Sys, #end
 
 			// OpenFL & Lime related stuff
-			"BlendMode"			=> CoolUtil.getMacroAbstractClass("openfl.display.BlendMode"),
-			"Assets"			=> openfl.utils.Assets,
-			"Application"		=> lime.app.Application,
-			"Main"				=> funkin.backend.system.Main,
+			"BlendMode" => CoolUtil.getMacroAbstractClass("openfl.display.BlendMode"),
+			"Assets" => openfl.utils.Assets,
+			"Application" => lime.app.Application,
+			"Main" => funkin.backend.system.Main,
 
 			// Flixel related stuff
-			"FlxG"				=> flixel.FlxG,
-			"FlxSprite"			=> flixel.FlxSprite,
-			"FlxBasic"			=> flixel.FlxBasic,
-			"FlxCamera"			=> flixel.FlxCamera,
-			"FlxEase"			=> flixel.tweens.FlxEase,
-			"FlxTween"			=> flixel.tweens.FlxTween,
-			"FlxSound"			=> flixel.sound.FlxSound,
-			"FlxAssets"			=> flixel.system.FlxAssets,
-			"FlxMath"			=> flixel.math.FlxMath,
-			"FlxGroup"			=> flixel.group.FlxGroup,
-			"FlxTypedGroup"		=> flixel.group.FlxGroup.FlxTypedGroup,
-			"FlxSpriteGroup"	=> flixel.group.FlxSpriteGroup,
-			"FlxTypeText"		=> flixel.addons.text.FlxTypeText,
-			"FlxText"			=> flixel.text.FlxText,
-			"FlxTimer"			=> flixel.util.FlxTimer,
-			"FlxPoint"			=> CoolUtil.getMacroAbstractClass("flixel.math.FlxPoint"),
-			"FlxAxes"			=> CoolUtil.getMacroAbstractClass("flixel.util.FlxAxes"),
-			"FlxColor"			=> CoolUtil.getMacroAbstractClass("flixel.util.FlxColor"),
+			"FlxG" => flixel.FlxG,
+			"FlxSprite" => flixel.FlxSprite,
+			"FlxBasic" => flixel.FlxBasic,
+			"FlxCamera" => flixel.FlxCamera,
+			"FlxEase" => flixel.tweens.FlxEase,
+			"FlxTween" => flixel.tweens.FlxTween,
+			"FlxSound" => flixel.sound.FlxSound,
+			"FlxAssets" => flixel.system.FlxAssets,
+			"FlxMath" => flixel.math.FlxMath,
+			"FlxGroup" => flixel.group.FlxGroup,
+			"FlxTypedGroup" => flixel.group.FlxGroup.FlxTypedGroup,
+			"FlxSpriteGroup" => flixel.group.FlxSpriteGroup,
+			"FlxTypeText" => flixel.addons.text.FlxTypeText,
+			"FlxText" => flixel.text.FlxText,
+			"FlxTimer" => flixel.util.FlxTimer,
+			"FlxPoint" => CoolUtil.getMacroAbstractClass("flixel.math.FlxPoint"),
+			"FlxAxes" => CoolUtil.getMacroAbstractClass("flixel.util.FlxAxes"),
+			"FlxColor" => CoolUtil.getMacroAbstractClass("flixel.util.FlxColor"),
+
+			#if (THREE_D_SUPPORT && foxlite)
+			// Foxlite stuff
+			"FoxScene" => foxlite.FoxScene, "FoxCamera" => foxlite.FoxCamera, "FoxFPSCamera" => foxlite.extras.FoxFPSCamera, "FoxRenderer" =>
+			foxlite.renderer.FoxRenderer, "FoxLoaderUtil" => foxlite.loaders.FoxLoaderUtil, "FoxModel" => foxlite.FoxModel, "FoxQuadMesh" =>
+			foxlite.mesh.FoxQuadMesh, "FoxCubeMesh" => foxlite.mesh.FoxCubeMesh, "FoxMaterial" => foxlite.material.FoxMaterial, "FoxShader" =>
+			foxlite.FoxShader, "FoxTexture" => foxlite.texture.FoxTexture, "FoxCache" => foxlite.FoxCache, "FoxRenderMetrics" =>
+			foxlite.flixel.FoxRenderMetrics, "FoxFunkinSprite" => foxlite.funkin.FoxFunkinSprite, "FoxFlxSprite" => foxlite.flixel.FoxFlxSprite,
+			"FoxPanoramaSky" => foxlite.sky.FoxPanoramaSky, "FoxStencilAction" => foxlite.stencil.FoxStencilAction, "FoxOBJLoader" =>
+			foxlite.loaders.FoxOBJLoader, "FoxMTLLoader" => foxlite.loaders.FoxMTLLoader, "FoxDirectionalLight" => foxlite.lights.FoxDirectionalLight,
+			"FoxLayer" => CoolUtil.getMacroAbstractClass("foxlite.FoxLayer"), "FoxEaseType" => CoolUtil.getMacroAbstractClass("foxlite.animation.FoxEaseType"),
+			"FoxInstanceUpdateMode" => CoolUtil.getMacroAbstractClass("foxlite.instancing.FoxInstanceUpdateMode"), "FoxAreaLightShape" =>
+			CoolUtil.getMacroAbstractClass("foxlite.lights.FoxAreaLightShape"), "FoxLightType" =>
+			CoolUtil.getMacroAbstractClass("foxlite.lights.FoxLightType"), "FoxBlendMode" => CoolUtil.getMacroAbstractClass("foxlite.material.FoxBlendMode"),
+			"FoxDepthCompareMode" => CoolUtil.getMacroAbstractClass("foxlite.material.FoxDepthCompareMode"), "FoxStencilCompareMode" =>
+			CoolUtil.getMacroAbstractClass("foxlite.stencil.FoxStencilCompareMode"), "FoxTriangleFace" =>
+			CoolUtil.getMacroAbstractClass("foxlite.material.FoxTriangleFace"), "FoxMeshBufferType" =>
+			CoolUtil.getMacroAbstractClass("foxlite.mesh.FoxMeshBufferType"), "FoxQuadFace" => CoolUtil.getMacroAbstractClass("foxlite.mesh.FoxQuadFace"),
+			"FoxStencilActionType" => CoolUtil.getMacroAbstractClass("foxlite.stencil.FoxStencilActionType"), "FoxCubemapSide" =>
+			CoolUtil.getMacroAbstractClass("foxlite.texture.FoxCubemapSide"), "FoxMipFilter" => CoolUtil.getMacroAbstractClass("foxlite.texture.FoxMipFilter"),
+			"FoxTextureFilter" => CoolUtil.getMacroAbstractClass("foxlite.texture.FoxTextureFilter"), "FoxWrapMode" =>
+			CoolUtil.getMacroAbstractClass("foxlite.texture.FoxWrapMode"),
+			#end
 
 			// Engine related stuff
-			"engine"			=> {
+			"engine" => {
 				commit: Flags.COMMIT_NUMBER,
 				hash: Flags.COMMIT_HASH,
 				build: 2675, // 2675 being the last build num before it was removed
 				name: "Codename Engine"
 			},
-			"ModState"			=> funkin.backend.scripting.ModState,
-			"ModSubState"		=> funkin.backend.scripting.ModSubState,
-			"PlayState"			=> funkin.game.PlayState,
-			"GameOverSubstate"	=> funkin.game.GameOverSubstate,
-			"HealthIcon"		=> funkin.game.HealthIcon,
-			"HudCamera"			=> funkin.game.HudCamera,
-			"Note"				=> funkin.game.Note,
-			"Strum"				=> funkin.game.Strum,
-			"StrumLine"			=> funkin.game.StrumLine,
-			"Character"			=> funkin.game.Character,
-			"Boyfriend"			=> funkin.game.Character, // for compatibility
-			"PauseSubstate"		=> funkin.menus.PauseSubState,
-			"FreeplayState"		=> funkin.menus.FreeplayState,
-			"MainMenuState"		=> funkin.menus.MainMenuState,
-			"PauseSubState"		=> funkin.menus.PauseSubState,
-			"StoryMenuState"	=> funkin.menus.StoryMenuState,
-			"TitleState"		=> funkin.menus.TitleState,
-			"Options"			=> funkin.options.Options,
-			"Paths"				=> funkin.backend.assets.Paths,
-			"Conductor"			=> funkin.backend.system.Conductor,
-			"FunkinShader"		=> funkin.backend.shaders.FunkinShader,
-			"CustomShader"		=> funkin.backend.shaders.CustomShader,
-			"FunkinText"		=> funkin.backend.FunkinText,
-			"FlxAnimate"		=> animate.FlxAnimate,
-			"FunkinSprite"		=> funkin.backend.FunkinSprite,
-			"Alphabet"			=> funkin.menus.ui.Alphabet,
-			"Flags"				=> funkin.backend.system.Flags,
-
-			"CoolUtil"			=> funkin.backend.utils.CoolUtil,
-			"IniUtil"			=> funkin.backend.utils.IniUtil,
-			"XMLUtil"			=> funkin.backend.utils.XMLUtil,
-			#if sys "ZipUtil"	=> funkin.backend.utils.ZipUtil, #end
-			"MarkdownUtil"		=> funkin.backend.utils.MarkdownUtil,
-			"EngineUtil"		=> funkin.backend.utils.EngineUtil,
-			"ThreadUtil"		=> funkin.backend.utils.ThreadUtil,
-			"MemoryUtil"		=> funkin.backend.utils.MemoryUtil,
-			"BitmapUtil"		=> funkin.backend.utils.BitmapUtil,
+			"ModState" => funkin.backend.scripting.ModState,
+			"ModSubState" => funkin.backend.scripting.ModSubState,
+			"PlayState" => funkin.game.PlayState,
+			"GameOverSubstate" => funkin.game.GameOverSubstate,
+			"HealthIcon" => funkin.game.HealthIcon,
+			"HudCamera" => funkin.game.HudCamera,
+			"Note" => funkin.game.Note,
+			"Strum" => funkin.game.Strum,
+			"StrumLine" => funkin.game.StrumLine,
+			"Character" => funkin.game.Character,
+			"Boyfriend" => funkin.game.Character, // for compatibility
+			"PauseSubstate" => funkin.menus.PauseSubState,
+			"FreeplayState" => funkin.menus.FreeplayState,
+			"MainMenuState" => funkin.menus.MainMenuState,
+			"PauseSubState" => funkin.menus.PauseSubState,
+			"StoryMenuState" => funkin.menus.StoryMenuState,
+			"TitleState" => funkin.menus.TitleState,
+			"Options" => funkin.options.Options,
+			"Paths" => funkin.backend.assets.Paths,
+			"Conductor" => funkin.backend.system.Conductor,
+			"FunkinShader" => funkin.backend.shaders.FunkinShader,
+			"CustomShader" => funkin.backend.shaders.CustomShader, // deprecated
+			"FunkinText" => funkin.backend.FunkinText,
+			"FlxAnimate" => animate.FlxAnimate,
+			"FunkinSprite" => funkin.backend.FunkinSprite,
+			"Alphabet" => funkin.menus.ui.Alphabet,
+			"Flags" => funkin.backend.system.Flags,
+
+			"CoolUtil" => funkin.backend.utils.CoolUtil,
+			"IniUtil" => funkin.backend.utils.IniUtil,
+			"XMLUtil" => funkin.backend.utils.XMLUtil,
+			#if sys "ZipUtil" => funkin.backend.utils.ZipUtil, #end
+			"MarkdownUtil" => funkin.backend.utils.MarkdownUtil,
+			"EngineUtil" => funkin.backend.utils.EngineUtil,
+			"ThreadUtil" => funkin.backend.utils.ThreadUtil,
+			"MemoryUtil" => funkin.backend.utils.MemoryUtil,
+			"BitmapUtil" => funkin.backend.utils.BitmapUtil,
 
 			#if TRANSLATIONS_SUPPORT
-			"TranslationUtil"	=> funkin.backend.utils.TranslationUtil,
-			"translate"		=> funkin.backend.utils.TranslationUtil.get,
+			"TranslationUtil" => funkin.backend.utils.TranslationUtil, "translate" => funkin.backend.utils.TranslationUtil.get,
 			#end
 		];
 	}
@@ -131,43 +156,44 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * This gets set on `hscript.Interp.importRedirects`,
 	 * if you wanna modify it, please edit `hscript.Interp.importRedirects` directly.
 	**/
-	public static function getDefaultImportRedirects():Map<String, String> {
+	public static function getDefaultImportRedirects():Map<String, String>
+	{
 		var redirects:Map<String, String> = [];
 
 		// Events
 		final events = "funkin.backend.scripting.events.";
-		redirects[events + "CharacterNodeEvent"]			= events + "character.CharacterNodeEvent";
-		redirects[events + "CharacterXMLEvent"]				= events + "character.CharacterXMLEvent";
-		redirects[events + "DanceEvent"]					= events + "character.DanceEvent";
-		redirects[events + "DirectionAnimEvent"]			= events + "character.DirectionAnimEvent";
-		redirects[events + "DiscordPresenceUpdateEvent"]	= events + "discord.DiscordPresenceUpdateEvent";
-		redirects[events + "GameOverCreationEvent"]			= events + "gameover.GameOverCreationEvent";
-		redirects[events + "CamMoveEvent"]					= events + "gameplay.CamMoveEvent";
-		redirects[events + "CountdownEvent"]				= events + "gameplay.CountdownEvent";
-		redirects[events + "EventGameEvent"]				= events + "gameplay.EventGameEvent";
-		redirects[events + "GameOverEvent"]					= events + "gameplay.GameOverEvent";
-		redirects[events + "RatingUpdateEvent"]				= events + "gameplay.RatingUpdateEvent";
-		redirects[events + "HealthIconChangeEvent"]			= events + "healthicon.HealthIconChangeEvent";
-		redirects[events + "FreeplayAlphaUpdateEvent"]		= events + "menu.freeplay.FreeplayAlphaUpdateEvent";
-		redirects[events + "FreeplaySongSelectEvent"]		= events + "menu.freeplay.FreeplaySongSelectEvent";
-		redirects[events + "MenuChangeEvent"]				= events + "menu.MenuChangeEvent";
-		redirects[events + "PauseCreationEvent"]			= events + "menu.pause.PauseCreationEvent";
-		redirects[events + "WeekSelectEvent"]				= events + "menu.storymenu.WeekSelectEvent";
-		redirects[events + "InputSystemEvent"]				= events + "note.InputSystemEvent";
-		redirects[events + "NoteCreationEvent"]				= events + "note.NoteCreationEvent";
-		redirects[events + "NoteHitEvent"]					= events + "note.NoteHitEvent";
-		redirects[events + "NoteMissEvent"]					= events + "note.NoteMissEvent";
-		redirects[events + "NoteUpdateEvent"]				= events + "note.NoteUpdateEvent";
-		redirects[events + "SimpleNoteEvent"]				= events + "note.SimpleNoteEvent";
-		redirects[events + "StrumCreationEvent"]			= events + "note.StrumCreationEvent";
-		redirects[events + "SplashShowEvent"]				= events + "splash.SplashShowEvent";
-		redirects[events + "PlayAnimContext"]				= events + "sprite.PlayAnimContext";
-		redirects[events + "PlayAnimEvent"]					= events + "sprite.PlayAnimEvent";
-		redirects[events + "StageNodeEvent"]				= events + "stage.StageNodeEvent";
-		redirects[events + "StageXMLEvent"]					= events + "stage.StageXMLEvent";
+		redirects[events + "CharacterNodeEvent"] = events + "character.CharacterNodeEvent";
+		redirects[events + "CharacterXMLEvent"] = events + "character.CharacterXMLEvent";
+		redirects[events + "DanceEvent"] = events + "character.DanceEvent";
+		redirects[events + "DirectionAnimEvent"] = events + "character.DirectionAnimEvent";
+		redirects[events + "DiscordPresenceUpdateEvent"] = events + "discord.DiscordPresenceUpdateEvent";
+		redirects[events + "GameOverCreationEvent"] = events + "gameover.GameOverCreationEvent";
+		redirects[events + "CamMoveEvent"] = events + "gameplay.CamMoveEvent";
+		redirects[events + "CountdownEvent"] = events + "gameplay.CountdownEvent";
+		redirects[events + "EventGameEvent"] = events + "gameplay.EventGameEvent";
+		redirects[events + "GameOverEvent"] = events + "gameplay.GameOverEvent";
+		redirects[events + "RatingUpdateEvent"] = events + "gameplay.RatingUpdateEvent";
+		redirects[events + "HealthIconChangeEvent"] = events + "healthicon.HealthIconChangeEvent";
+		redirects[events + "FreeplayAlphaUpdateEvent"] = events + "menu.freeplay.FreeplayAlphaUpdateEvent";
+		redirects[events + "FreeplaySongSelectEvent"] = events + "menu.freeplay.FreeplaySongSelectEvent";
+		redirects[events + "MenuChangeEvent"] = events + "menu.MenuChangeEvent";
+		redirects[events + "PauseCreationEvent"] = events + "menu.pause.PauseCreationEvent";
+		redirects[events + "WeekSelectEvent"] = events + "menu.storymenu.WeekSelectEvent";
+		redirects[events + "InputSystemEvent"] = events + "note.InputSystemEvent";
+		redirects[events + "NoteCreationEvent"] = events + "note.NoteCreationEvent";
+		redirects[events + "NoteHitEvent"] = events + "note.NoteHitEvent";
+		redirects[events + "NoteMissEvent"] = events + "note.NoteMissEvent";
+		redirects[events + "NoteUpdateEvent"] = events + "note.NoteUpdateEvent";
+		redirects[events + "SimpleNoteEvent"] = events + "note.SimpleNoteEvent";
+		redirects[events + "StrumCreationEvent"] = events + "note.StrumCreationEvent";
+		redirects[events + "SplashShowEvent"] = events + "splash.SplashShowEvent";
+		redirects[events + "PlayAnimContext"] = events + "sprite.PlayAnimContext";
+		redirects[events + "PlayAnimEvent"] = events + "sprite.PlayAnimEvent";
+		redirects[events + "StageNodeEvent"] = events + "stage.StageNodeEvent";
+		redirects[events + "StageXMLEvent"] = events + "stage.StageXMLEvent";
 
 		// Old State Names
-		redirects["funkin.menus.BetaWarningState"] 			= "funkin.menus.WarningState";
+		redirects["funkin.menus.BetaWarningState"] = "funkin.menus.WarningState";
 
 		return redirects;
 	}
@@ -176,7 +202,8 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Gets the default defines for a script.
 	 * Includes all of the defines that the build was compiled with.
 	 */
-	public static function getDefaultPreprocessors():Map<String, Dynamic> {
+	public static function getDefaultPreprocessors():Map<String, Dynamic>
+	{
 		var defines = funkin.backend.system.macros.DefinesMacro.defines;
 		defines.set("CODENAME_ENGINE", true);
 		defines.set("CODENAME_VER", Flags.VERSION);
@@ -184,14 +211,17 @@ class Script extends FlxBasic implements IFlxDestroyable {
 		defines.set("CODENAME_COMMIT", Flags.COMMIT_NUMBER);
 		return defines;
 	}
+
 	/**
 	 * All available script extensions
 	 */
 	public static var scriptExtensions:Array<String> = [
-		"hx", "hscript", "hsc", "hxs",
+		"hx",
+		"hscript",
+		"hsc",
+		"hxs",
 		"pack", // combined file
-		"lua" /** ACTUALLY NOT SUPPORTED, ONLY FOR THE MESSAGE **/
-	];
+		"lua" /** ACTUALLY NOT SUPPORTED, ONLY FOR THE MESSAGE **/];
 
 	/**
 	 * Currently executing script.
@@ -232,9 +262,12 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Creates a script from the specified asset path. The language is automatically determined.
 	 * @param path Path in assets
 	 */
-	public static function create(path:String):Script {
-		if (Assets.exists(path)) {
-			return switch(Path.extension(path).toLowerCase()) {
+	public static function create(path:String):Script
+	{
+		if (Assets.exists(path))
+		{
+			return switch (Path.extension(path).toLowerCase())
+			{
 				case "hx" | "hscript" | "hsc" | "hxs":
 					new HScript(path);
 				case "pack":
@@ -255,8 +288,10 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * @param code code
 	 * @param path filename
 	 */
-	public static function fromString(code:String, path:String):Script {
-		return switch(Path.extension(path).toLowerCase()) {
+	public static function fromString(code:String, path:String):Script
+	{
+		return switch (Path.extension(path).toLowerCase())
+		{
 			case "hx" | "hscript" | "hsc" | "hxs":
 				new HScript(path).loadFromString(code);
 			case "lua":
@@ -271,7 +306,8 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Creates a new instance of the script class.
 	 * @param path
 	 */
-	public function new(path:String) {
+	public function new(path:String)
+	{
 		super();
 
 		rawPath = path;
@@ -281,21 +317,24 @@ class Script extends FlxBasic implements IFlxDestroyable {
 		extension = Path.extension(path);
 		this.path = path;
 		onCreate(path);
-		for(k=>e in getDefaultVariables(this)) {
+		for (k => e in getDefaultVariables(this))
+		{
 			set(k, e);
 		}
-		set("disableScript", () -> {
+		set("disableScript", () ->
+		{
 			active = false;
 		});
 		set("__script__", this);
 	}
 
-
 	/**
 	 * Loads the script
 	 */
-	public function load() {
-		if(didLoad) return;
+	public function load()
+	{
+		if (didLoad)
+			return;
 
 		var oldScript = curScript;
 		curScript = this;
@@ -309,38 +348,36 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * HSCRIPT ONLY FOR NOW
 	 * Sets the "public" variables map for ScriptPack
 	 */
-	public function setPublicMap(map:Map<String, Dynamic>) {
-
+	public function setPublicMap(map:Map<String, Dynamic>)
+	{
 	}
 
 	/**
 	 * Hot-reloads the script, if possible
 	 */
-	public function reload() {
-
+	public function reload()
+	{
 	}
 
 	/**
 	 * Traces something as this script.
 	 */
-	public function trace(v:Dynamic) {
+	public function trace(v:Dynamic)
+	{
 		var fileName = this.fileName;
-		if(remappedNames.exists(fileName))
+		if (remappedNames.exists(fileName))
 			fileName = remappedNames.get(fileName);
-		Logs.traceColored([
-			Logs.logText(fileName + ': ', GREEN),
-			Logs.logText(Std.string(v))
-		], TRACE);
+		Logs.traceColored([Logs.logText(fileName + ': ', GREEN), Logs.logText(Std.string(v))], TRACE);
 	}
 
-
 	/**
 	 * Calls the function `func` defined in the script.
 	 * @param func Name of the function
 	 * @param parameters (Optional) Parameters of the function.
 	 * @return Result (if void, then null)
 	 */
-	public function call(func:String, ?parameters:Array<Dynamic>):Dynamic {
+	public function call(func:String, ?parameters:Array<Dynamic>):Dynamic
+	{
 		var oldScript = curScript;
 		curScript = this;
 
@@ -354,7 +391,8 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Loads the code from a string, doesn't really work after the script has been loaded
 	 * @param code The code.
 	 */
-	public function loadFromString(code:String) {
+	public function loadFromString(code:String)
+	{
 		return this;
 	}
 
@@ -362,42 +400,45 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Sets a script's parent object so that its properties can be accessed easily. Ex: Passing `PlayState.instance` will allow `boyfriend` to be typed instead of `PlayState.instance.boyfriend`.
 	 * @param variable Parent variable.
 	 */
-	public function setParent(variable:Dynamic) {}
+	public function setParent(variable:Dynamic)
+	{
+	}
 
 	/**
 	 * Gets the variable `variable` from the script's variables.
 	 * @param variable Name of the variable.
 	 * @return Variable (or null if it doesn't exists)
 	 */
-	public function get(variable:String):Dynamic {return null;}
+	public function get(variable:String):Dynamic
+	{
+		return null;
+	}
 
 	/**
 	 * Sets the variable `variable` from the script's variables.
 	 * @param variable Name of the variable.
 	 * @return Variable (or null if it doesn't exists)
 	 */
-	public function set(variable:String, value:Dynamic):Void {}
+	public function set(variable:String, value:Dynamic):Void
+	{
+	}
 
 	/**
 	 * Shows an error from this script.
 	 * @param text Text of the error (ex: Null Object Reference).
 	 * @param additionalInfo Additional information you could provide.
 	 */
-	public function error(text:String, ?additionalInfo:Dynamic):Void {
+	public function error(text:String, ?additionalInfo:Dynamic):Void
+	{
 		var fileName = this.fileName;
-		if(remappedNames.exists(fileName))
+		if (remappedNames.exists(fileName))
 			fileName = remappedNames.get(fileName);
-		Logs.traceColored([
-			Logs.logText(fileName, RED),
-			Logs.logText(text)
-		], ERROR);
+		Logs.traceColored([Logs.logText(fileName, RED), Logs.logText(text)], ERROR);
 	}
 
-	override public function toString():String {
-		return FlxStringUtil.getDebugString(didLoad ? [
-			LabelValuePair.weak("path", path),
-			LabelValuePair.weak("active", active),
-		] : [
+	override public function toString():String
+	{
+		return FlxStringUtil.getDebugString(didLoad ? [LabelValuePair.weak("path", path), LabelValuePair.weak("active", active),] : [
 			LabelValuePair.weak("path", path),
 			LabelValuePair.weak("active", active),
 			LabelValuePair.weak("loaded", didLoad),
@@ -407,17 +448,23 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	/**
 	 * PRIVATE HANDLERS - DO NOT TOUCH
 	 */
-	private function onCall(func:String, parameters:Array<Dynamic>):Dynamic {
+	private function onCall(func:String, parameters:Array<Dynamic>):Dynamic
+	{
 		return null;
 	}
+
 	/**
 	 * Called when the script is created.
 	 * @param path Path to the script
 	 */
-	public function onCreate(path:String) {}
+	public function onCreate(path:String)
+	{
+	}
 
 	/**
 	 * Called when the script is loaded.
 	 */
-	public function onLoad() {}
+	public function onLoad()
+	{
+	}
 }
diff --git a/source/funkin/backend/shaders/BlendModeEffect.hx b/source/funkin/backend/shaders/BlendModeEffect.hx
deleted file mode 100644
index 2865829285..0000000000
--- a/source/funkin/backend/shaders/BlendModeEffect.hx
+++ /dev/null
@@ -1,36 +0,0 @@
-package funkin.backend.shaders;
-
-import flixel.util.FlxColor;
-import openfl.display.ShaderParameter;
-
-@:dox(hide)
-typedef BlendModeShader =
-{
-	var uBlendColor:ShaderParameter<Float>;
-}
-
-@:dox(hide)
-class BlendModeEffect
-{
-	public var shader(default, null):BlendModeShader;
-
-	@:isVar
-	public var color(default, set):FlxColor;
-
-	public function new(shader:BlendModeShader, color:FlxColor):Void
-	{
-		shader.uBlendColor.value = [];
-		this.shader = shader;
-		this.color = color;
-	}
-
-	function set_color(color:FlxColor):FlxColor
-	{
-		shader.uBlendColor.value[0] = color.redFloat;
-		shader.uBlendColor.value[1] = color.greenFloat;
-		shader.uBlendColor.value[2] = color.blueFloat;
-		shader.uBlendColor.value[3] = color.alphaFloat;
-
-		return this.color = color;
-	}
-}
diff --git a/source/funkin/backend/shaders/CustomShader.hx b/source/funkin/backend/shaders/CustomShader.hx
index 62308e69ee..61066575c2 100644
--- a/source/funkin/backend/shaders/CustomShader.hx
+++ b/source/funkin/backend/shaders/CustomShader.hx
@@ -2,39 +2,15 @@ package funkin.backend.shaders;
 
 import openfl.Assets;
 
-/**
- * Class for custom shaders.
- *
- * To create one, create a `shaders` folder in your assets/mod folder, then add a file named `my-shader.frag` or/and `my-shader.vert`.
- *
- * Non-existent shaders will only load the default one, and throw a warning in the console.
- *
- * To access the shader's uniform variables, use `shader.variable`
- */
+@:deprecated("Use funkin.backend.shaders.FunkinShader.fromFile instead.")
 class CustomShader extends FunkinShader {
-	public var path:String = "";
+	@:isVar
+	public var path(get, set):String;
+	inline function get_path():String return path != null ? path : _fragmentFilePath + _vertexFilePath;
+	inline function set_path(v:Null<String>):String return path = cast v;
 
-	/**
-	 * Creates a new custom shader
-	 * @param name Name of the frag and vert files.
-	 * @param glslVersion GLSL version to use. Defaults to `120`.
-	 */
-	public function new(name:String, glslVersion:String = null) {
-		if (glslVersion == null) glslVersion = Flags.DEFAULT_GLSL_VERSION;
-		var fragShaderPath = Paths.fragShader(name);
-		var vertShaderPath = Paths.vertShader(name);
-		var fragCode = Assets.exists(fragShaderPath) ? Assets.getText(fragShaderPath) : null;
-		var vertCode = Assets.exists(vertShaderPath) ? Assets.getText(vertShaderPath) : null;
-
-		fileName = name;
-		fragFileName = fragShaderPath;
-		vertFileName = vertShaderPath;
-
-		path = fragShaderPath+vertShaderPath;
-
-		if (fragCode == null && vertCode == null)
-			Logs.error('Shader "$name" couldn\'t be found.');
-
-		super(fragCode, vertCode, glslVersion);
+	public function new(name:String, ?glslVersion:String) {
+		super();
+		loadShaderFile(Paths.fragShader(name), Paths.vertShader(name), glslVersion);
 	}
 }
\ No newline at end of file
diff --git a/source/funkin/backend/shaders/FunkinShader.hx b/source/funkin/backend/shaders/FunkinShader.hx
index 281616b03b..58fa9a4b8f 100644
--- a/source/funkin/backend/shaders/FunkinShader.hx
+++ b/source/funkin/backend/shaders/FunkinShader.hx
@@ -1,533 +1,65 @@
 package funkin.backend.shaders;
 
-import flixel.graphics.FlxGraphic;
-import flixel.system.FlxAssets.FlxShader;
-import flixel.util.FlxSignal.FlxTypedSignal;
+import haxe.io.Path;
 import haxe.Exception;
+
 import hscript.IHScriptCustomBehaviour;
-import lime.utils.Float32Array;
+
 import openfl.display.BitmapData;
-import openfl.display.ShaderInput;
+import openfl.display.Shader;
 import openfl.display.ShaderParameter;
 import openfl.display.ShaderParameterType;
+import openfl.display.ShaderPrecision;
+import openfl.display.ShaderInput;
 import openfl.display3D._internal.GLProgram;
 import openfl.display3D._internal.GLShader;
+import openfl.display3D.Program3D;
 import openfl.utils._internal.Log;
+import openfl.utils.GLSLSourceAssembler;
+
+import flixel.addons.display.FlxRuntimeShader;
+import flixel.graphics.FlxGraphic;
+import flixel.util.FlxSignal.FlxTypedSignal;
+import flixel.util.FlxStringUtil;
 
-using StringTools;
 @:access(openfl.display3D.Context3D)
 @:access(openfl.display3D.Program3D)
 @:access(openfl.display.ShaderInput)
 @:access(openfl.display.ShaderParameter)
-class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
-	private static var __instanceFields = Type.getInstanceFields(FunkinShader);
-	private static var FRAGMENT_SHADER = 0;
-	private static var VERTEX_SHADER = 1;
-
+class FunkinShader extends FlxRuntimeShader implements IHScriptCustomBehaviour {
 	public var onGLUpdate:FlxTypedSignal<Void->Void> = new FlxTypedSignal<Void->Void>();
-	public var onProcessGLData:FlxTypedSignal<(String, String)->Void> = new FlxTypedSignal<(String, String)->Void>();
-
-	public var glslVer:String = Flags.DEFAULT_GLSL_VERSION;
-	public var fileName:String = "FunkinShader";
-	public var fragFileName:String = "FunkinShader";
-	public var vertFileName:String = "FunkinShader";
-
-	public var shaderPrefix:String = "";
-	public var fragmentPrefix:String = "";
-	public var vertexPrefix:String = "";
-
-	/**
-	 * Creates a new shader from the specified fragment and vertex source.
-	 * Accepts `#pragma header`.
-	 * @param frag Fragment source (pass `null` to use default)
-	 * @param vert Vertex source (pass `null` to use default)
-	 * @param glslVer Version of GLSL to use (defaults to 120)
-	 */
-	public override function new(frag:String, vert:String, glslVer:String = null) {
-		if (glslVer == null) glslVer = Flags.DEFAULT_GLSL_VERSION;
-		if (frag == null) frag = ShaderTemplates.defaultFragmentSource;
-		if (vert == null) vert = ShaderTemplates.defaultVertexSource;
-		this.glFragmentSource = frag;
-		this.glVertexSource = vert;
-
-		this.glslVer = glslVer;
-		super();
-	}
-
-	static var IMPORT_REGEX = ~/#import\s+<(.*)>/;
-
-	private function processImports(value:String, type:Int):String
-	{
-		while(IMPORT_REGEX.match(value))
-		{
-			var importPath = IMPORT_REGEX.matched(1);
-			var importSource = Assets.getText("assets/shaders/" + importPath);
-			if(importSource == null) {
-				var fileName = type == FRAGMENT_SHADER ? fragFileName : vertFileName;
-				Logs.traceColored([
-					Logs.logText('[Shader] ', RED),
-					Logs.logText('Failed to import shader ${importPath} in ${fileName}', RED),
-				]);
-			} else {
-				value = value.replace(IMPORT_REGEX.matched(0), importSource);
-			}
-		}
-		return value;
-	}
-
-	static var ERROR_POS_REGEX = ~/(\d+):(\d+): (.*)/g;
-	static var ERROR_REGEX = ~/ERROR: (\d+):(\d+): (.*)/g;
-	static var ERROR_REGEX_2 = ~/(\d+)\((\d+)\) : error ([^:]+): (.*)/g;
-	@:noCompletion private override function __createGLShader(source:String, type:Int):GLShader
-	{
-		var gl = __context.gl;
-
-		var shader = gl.createShader(type);
-		gl.shaderSource(shader, source);
-		gl.compileShader(shader);
-		var shaderInfoLog = gl.getShaderInfoLog(shader);
-		var hasInfoLog = shaderInfoLog != null && StringTools.trim(shaderInfoLog) != "";
-		var compileStatus = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
-
-		if (hasInfoLog || compileStatus == 0)
-		{
-			var isVertexShader = type == gl.VERTEX_SHADER;
-			var messageBuf = new StringBuf();
-			messageBuf.add((compileStatus == 0) ? "Error" : "Info");
-			if(isVertexShader) {
-				messageBuf.add(" compiling vertex shader");
-				if(vertFileName != null && vertFileName.length > 0) {
-					messageBuf.add(" (" + vertFileName + ")");
-				}
-			} else {
-				messageBuf.add(" compiling fragment shader");
-				if(fragFileName != null && fragFileName.length > 0) {
-					messageBuf.add(" (" + fragFileName + ")");
-				}
-			}
-			messageBuf.add("\n");
-			var errorPositions = [];
-			var regex = null;
-			var tmp = shaderInfoLog;
-			if(shaderInfoLog.contains(" : error ")) {
-				regex = ERROR_REGEX_2;
-
-				while(regex.match(tmp)) {
-					errorPositions.push(new ShaderErrorPosition(regex.matched(2), regex.matched(1), regex.matched(4)));
-					tmp = regex.matchedRight();
-				}
-			} else if(shaderInfoLog.contains("ERROR: ")) {
-				regex = ERROR_REGEX;
-
-				while(regex.match(tmp)) {
-					errorPositions.push(new ShaderErrorPosition(regex.matched(2), regex.matched(1), regex.matched(3)));
-					tmp = regex.matchedRight();
-				}
-			} else {
-				regex = ERROR_POS_REGEX;
-
-				while(regex.match(tmp)) {
-					errorPositions.push(new ShaderErrorPosition(regex.matched(2), regex.matched(1), regex.matched(3)));
-					tmp = regex.matchedRight();
-				}
-			}
-			var splitSource = source.split("\n");
-			for(error in errorPositions) {
-				messageBuf.add("ERROR: Line: " + error.line);
-				if(error.column > 0) {
-					messageBuf.add(", Column: " + error.column);
-				}
-				messageBuf.add(", " + error.message);
-				if(error.line < splitSource.length) {
-					messageBuf.add("\nLine: ");
-					messageBuf.add(splitSource[error.line-1].trim());
-				}
-				messageBuf.add("\n\n");
-			}
-			var hasErrorPosition = errorPositions.length > 0;
-			if(hasErrorPosition) {
-				messageBuf.add("Raw shader info log:\n");
-			}
-			messageBuf.add(shaderInfoLog);
-			messageBuf.add("\n");
-			messageBuf.add(source);
-
-			var message = messageBuf.toString();
-			if (compileStatus == 0) Log.error(message);
-			else if (hasInfoLog) Log.debug(message);
-		}
-
-		return shader;
-	}
-
-	@:noCompletion private override function __createGLProgram(vertexSource:String, fragmentSource:String):GLProgram
-	{
-		var program:GLProgram = null;
-		try
-		{
-			var gl = __context.gl;
-
-			var vertexShader = __createGLShader(vertexSource, gl.VERTEX_SHADER);
-			var fragmentShader = __createGLShader(fragmentSource, gl.FRAGMENT_SHADER);
-
-			program = gl.createProgram();
-
-			// Fix support for drivers that don't draw if attribute 0 is disabled
-			for (param in __paramFloat)
-			{
-				if (param.name.indexOf("Position") > -1 && StringTools.startsWith(param.name, "openfl_"))
-				{
-					gl.bindAttribLocation(program, 0, param.name);
-					break;
-				}
-			}
-
-			gl.attachShader(program, vertexShader);
-			gl.attachShader(program, fragmentShader);
-			gl.linkProgram(program);
-
-			if (gl.getProgramParameter(program, gl.LINK_STATUS) == 0)
-			{
-				var messageBuf = new StringBuf();
-				messageBuf.add("Unable to initialize the shader program");
-				messageBuf.add("\n");
-				messageBuf.add(gl.getProgramInfoLog(program));
-				var message = messageBuf.toString();
-				Log.error(message);
-			}
-		}
-		catch (error:Dynamic)
-		{
-			Logs.traceColored([
-				Logs.logText('[Shader] ', BLUE),
-				Logs.logText('Failed to compile shader ${fileName}: ', RED),
-				Logs.logText(Std.string(error))
-			], TRACE);
-		}
-		return program;
-
-		return program;
-	}
 
-	var glRawFragmentSource:String;
-	var glRawVertexSource:String;
-
-	@:noCompletion override private function set_glFragmentSource(value:String):String
-	{
-		if(value == null)
-			value = ShaderTemplates.defaultFragmentSource;
-		glRawFragmentSource = value;
-		value = processImports(value, FRAGMENT_SHADER);
-		value = value.replace("#pragma header", ShaderTemplates.fragHeader).replace("#pragma body", ShaderTemplates.fragBody);
-		if (value != __glFragmentSource)
-		{
-			__glSourceDirty = true;
-		}
-
-		return __glFragmentSource = value;
-	}
-
-	@:noCompletion override private function set_glVertexSource(value:String):String
-	{
-		if(value == null)
-			value = ShaderTemplates.defaultVertexSource;
-		glRawVertexSource = value;
-		value = processImports(value, VERTEX_SHADER);
-
-		var useBackCompat:Bool = true;
-		for (regex in ShaderTemplates.vertBackCompatVarList) if (!regex.match(value)) {
-			useBackCompat = false;
-			break;
-		}
-
-		var header = useBackCompat ? ShaderTemplates.vertHeaderBackCompat : ShaderTemplates.vertHeader;
-		var body = useBackCompat ? ShaderTemplates.vertBodyBackCompat : ShaderTemplates.vertBody;
-
-		value = value.replace("#pragma header", header).replace("#pragma body", body);
-
-		if (value != __glVertexSource)
-		{
-			__glSourceDirty = true;
-		}
-
-		return __glVertexSource = value;
-	}
-
-	override function __updateGL():Void {
-		onGLUpdate.dispatch();
-		super.__updateGL();
+	public function new(?fragmentSource:String, ?vertexSource:String, ?version:String) {
+		super(fragmentSource, vertexSource, version ?? (fragmentSource != null || vertexSource != null ? Flags.DEFAULT_GLSL_VERSION : null));
 	}
 
-	@:noCompletion private override function __initGL():Void
-	{
-		if (__glSourceDirty || __paramBool == null)
-		{
-			__glSourceDirty = false;
-			program = null;
-
-			__inputBitmapData = new Array();
-			__paramBool = new Array();
-			__paramFloat = new Array();
-			__paramInt = new Array();
-
-			__processGLData(glVertexSource, "attribute");
-			__processGLData(glVertexSource, "uniform");
-			__processGLData(glFragmentSource, "uniform");
-		}
-
-		if (__context != null && program == null)
-		{
-			var prefixBuf = new StringBuf();
-			prefixBuf.add('#version ${glslVer}\n');
-			prefixBuf.add(shaderPrefix);
-
-			var gl = __context.gl;
-
-			prefixBuf.add("#ifdef GL_ES\n");
-			if (precisionHint == FULL) {
-				prefixBuf.add("#ifdef GL_FRAGMENT_PRECISION_HIGH\n");
-				prefixBuf.add("precision highp float;\n");
-				prefixBuf.add("#else\n");
-				prefixBuf.add("precision mediump float;\n");
-				prefixBuf.add("#endif\n");
-			} else {
-				prefixBuf.add("precision lowp float;\n");
-			}
-			prefixBuf.add("#endif\n");
-
-			var prefix = prefixBuf.toString();
-
-			var vertex = prefix + vertexPrefix + glVertexSource;
-			var fragment = prefix + fragmentPrefix + glFragmentSource;
-
-			var id = vertex + fragment;
-
-			if (__context.__programs.exists(id))
-			{
-				program = __context.__programs.get(id);
-			}
-			else
-			{
-				program = __context.createProgram(GLSL);
-				program.__glProgram = __createGLProgram(vertex, fragment);
-				__context.__programs.set(id, program);
-			}
-
-			if (program != null)
-			{
-				glProgram = program.__glProgram;
-
-				for (input in __inputBitmapData) {
-
-					if (input.__isUniform) {
-						input.index = gl.getUniformLocation(glProgram, input.name);
-					} else {
-						input.index = gl.getAttribLocation(glProgram, input.name);
-					}
-				}
-
-				for (parameter in __paramBool) {
-					if (parameter.__isUniform) {
-						parameter.index = gl.getUniformLocation(glProgram, parameter.name);
-					} else {
-						parameter.index = gl.getAttribLocation(glProgram, parameter.name);
-					}
-				}
-
-				for (parameter in __paramFloat) {
-					if (parameter.__isUniform) {
-						parameter.index = gl.getUniformLocation(glProgram, parameter.name);
-					} else {
-						parameter.index = gl.getAttribLocation(glProgram, parameter.name);
-					}
-				}
-
-				for (parameter in __paramInt) {
-					if (parameter.__isUniform) {
-						parameter.index = gl.getUniformLocation(glProgram, parameter.name);
-					} else {
-						parameter.index = gl.getAttribLocation(glProgram, parameter.name);
-					}
-				}
-			}
-			// initInstance(vertex, fragment); // btw make sure to disable the prefixes for ._isInstance
-		}
+	public static function fromFile(fragmentPath:String, ?vertexPath:String, ?version:String):FunkinShader {
+		return new FunkinShader().loadShaderFile(fragmentPath, vertexPath, version);
 	}
 
-	var __cancelNextProcessGLData:Bool = false;
-	@:noCompletion private override function __processGLData(source:String, storageType:String):Void
-	{
-		onProcessGLData.dispatch(source, storageType);
-		if (__cancelNextProcessGLData != (__cancelNextProcessGLData = false))
-			return;
-		var lastMatch = 0, position, regex, name, type;
-
-		if (storageType == "uniform")
-		{
-			regex = ~/uniform ([A-Za-z0-9]+) ([A-Za-z0-9_]+)/;
-		}
-		else
-		{
-			regex = ~/attribute ([A-Za-z0-9]+) ([A-Za-z0-9_]+)/;
+	public function loadShaderFile(fragmentPath:String, ?vertexPath:String, ?version:String):FunkinShader {
+		if (vertexPath == null) {
+			final idx = fragmentPath.lastIndexOf(".");
+			if (idx == -1) vertexPath = fragmentPath;
+			else vertexPath = fragmentPath.substr(0, idx);
 		}
 
-		while (regex.matchSub(source, lastMatch))
-		{
-			type = regex.matched(1);
-			name = regex.matched(2);
-
-			if (StringTools.startsWith(name, "gl_"))
-			{
-				continue;
-			}
+		fragmentPath = FlxRuntimeShader._getPath(fragmentPath, false);
+		vertexPath = FlxRuntimeShader._getPath(vertexPath, true);
+		_fromFile(fragmentPath, vertexPath, version ?? (fragmentPath != null || vertexPath != null ? Flags.DEFAULT_GLSL_VERSION : null));
 
-			var isUniform = (storageType == "uniform");
-			registerParameter(name, type, isUniform);
-
-			position = regex.matchedPos();
-			lastMatch = position.pos + position.len;
-		}
+		return this;
 	}
 
-	function registerParameter(name:String, type:String, isUniform:Bool):Void
-	{
-		if (StringTools.startsWith(type, "sampler"))
-		{
-			var input = new ShaderInput<BitmapData>();
-			input.name = name;
-			input.__isUniform = isUniform;
-			__inputBitmapData.push(input);
-
-			switch (name)
-			{
-				case "openfl_Texture":
-					__texture = input;
-				case "bitmap":
-					__bitmap = input;
-				default:
-			}
-
-			Reflect.setField(__data, name, input);
-			try{Reflect.setField(this, name, input);} catch(e) {}
-		}
-		else if (!Reflect.hasField(__data, name) || Reflect.field(__data, name) == null)
-		{
-			var parameterType:ShaderParameterType = switch (type)
-			{
-				case "bool": BOOL;
-				case "double", "float": FLOAT;
-				case "int", "uint": INT;
-				case "bvec2": BOOL2;
-				case "bvec3": BOOL3;
-				case "bvec4": BOOL4;
-				case "ivec2", "uvec2": INT2;
-				case "ivec3", "uvec3": INT3;
-				case "ivec4", "uvec4": INT4;
-				case "vec2", "dvec2": FLOAT2;
-				case "vec3", "dvec3": FLOAT3;
-				case "vec4", "dvec4": FLOAT4;
-				case "mat2", "mat2x2": MATRIX2X2;
-				case "mat2x3": MATRIX2X3;
-				case "mat2x4": MATRIX2X4;
-				case "mat3x2": MATRIX3X2;
-				case "mat3", "mat3x3": MATRIX3X3;
-				case "mat3x4": MATRIX3X4;
-				case "mat4x2": MATRIX4X2;
-				case "mat4x3": MATRIX4X3;
-				case "mat4", "mat4x4": MATRIX4X4;
-				default: null;
-			}
+	#if REGION /* IHScriptCustomBehaviour */
+	public function hget(name:String):Dynamic {
+		if (__glSourceDirty) __init();
 
-			var length = switch (parameterType)
-			{
-				case BOOL2, INT2, FLOAT2: 2;
-				case BOOL3, INT3, FLOAT3: 3;
-				case BOOL4, INT4, FLOAT4, MATRIX2X2: 4;
-				case MATRIX3X3: 9;
-				case MATRIX4X4: 16;
-				default: 1;
-			}
+		if (__thisHasField(name) || __thisHasField('get_${name}')) return Reflect.getProperty(this, name);
+		else if (!Reflect.hasField(__data, name)) return null;
 
-			var arrayLength = switch (parameterType)
-			{
-				case MATRIX2X2: 2;
-				case MATRIX3X3: 3;
-				case MATRIX4X4: 4;
-				default: 1;
-			}
+		final field:Dynamic = Reflect.field(__data, name);
 
-			switch (parameterType)
-			{
-				case BOOL, BOOL2, BOOL3, BOOL4:
-					var parameter = new ShaderParameter<Bool>();
-					parameter.name = name;
-					parameter.type = parameterType;
-					parameter.__arrayLength = arrayLength;
-					parameter.__isBool = true;
-					parameter.__isUniform = isUniform;
-					parameter.__length = length;
-					__paramBool.push(parameter);
-
-					if (name == "openfl_HasColorTransform")
-					{
-						__hasColorTransform = parameter;
-					}
-
-					Reflect.setField(__data, name, parameter);
-					try{Reflect.setField(this, name, parameter);} catch(e) {}
-
-				case INT, INT2, INT3, INT4:
-					var parameter = new ShaderParameter<Int>();
-					parameter.name = name;
-					parameter.type = parameterType;
-					parameter.__arrayLength = arrayLength;
-					parameter.__isInt = true;
-					parameter.__isUniform = isUniform;
-					parameter.__length = length;
-					__paramInt.push(parameter);
-					Reflect.setField(__data, name, parameter);
-					try{Reflect.setField(this, name, parameter);} catch(e) {}
-
-				default:
-					var parameter = new ShaderParameter<Float>();
-					parameter.name = name;
-					parameter.type = parameterType;
-					parameter.__arrayLength = arrayLength;
-					#if lime
-					if (arrayLength > 0) parameter.__uniformMatrix = new Float32Array(arrayLength * arrayLength);
-					#end
-					parameter.__isFloat = true;
-					parameter.__isUniform = isUniform;
-					parameter.__length = length;
-					__paramFloat.push(parameter);
-
-					if (StringTools.startsWith(name, "openfl_"))
-					{
-						switch (name)
-						{
-							case "openfl_Alpha": __alpha = parameter;
-							case "openfl_ColorMultiplier": __colorMultiplier = parameter;
-							case "openfl_ColorOffset": __colorOffset = parameter;
-							case "openfl_Matrix": __matrix = parameter;
-							case "openfl_Position": __position = parameter;
-							case "openfl_TextureCoord": __textureCoord = parameter;
-							case "openfl_TextureSize": __textureSize = parameter;
-							default:
-						}
-					}
-
-					Reflect.setField(__data, name, parameter);
-					try{Reflect.setField(this, name, parameter);} catch(e) {}
-			}
-		}
-	}
-
-	public function hget(name:String):Dynamic {
-		if (__instanceFields.contains(name) || __instanceFields.contains('get_${name}'))
-			return Reflect.getProperty(this, name);
-		if (!Reflect.hasField(data, name))
-			return null;
-		var field:Dynamic = Reflect.field(data, name);
 		var cl:String = Type.getClassName(Type.getClass(field));
 
 		// little problem we are facing boys...
@@ -546,17 +78,19 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
 	}
 
 	public function hset(name:String, val:Dynamic):Dynamic {
-		if (__instanceFields.contains(name) || __instanceFields.contains('set_${name}')) {
+		if (__glSourceDirty) __init();
+
+		if (__thisHasField(name) || __thisHasField('set_${name}')) {
 			Reflect.setProperty(this, name, val);
 			return val;
 		}
-
-		if (!Reflect.hasField(data, name)) {
-			Reflect.setField(data, name, val);
+		else if (!Reflect.hasField(__data, name)) {
+			// ??? huh
+			Reflect.setField(__data, name, val);
 			return val;
 		}
 
-		var field = Reflect.field(data, name);
+		var field = Reflect.field(__data, name);
 		var cl = Type.getClassName(Type.getClass(field));
 		var isNotNull = val != null;
 		// cant do "field is ShaderInput" for some reason
@@ -598,67 +132,142 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
 
 		return val;
 	}
-}
+	#end
 
-class ShaderTemplates {
-	public static final fragHeader:String = "varying float openfl_Alphav;
-varying vec4 openfl_ColorMultiplierv;
-varying vec4 openfl_ColorOffsetv;
-varying vec2 openfl_TextureCoordv;
+	override function __updateGL():Void {
+		onGLUpdate.dispatch();
+		super.__updateGL();
+	}
 
-uniform bool openfl_HasColorTransform;
-uniform vec2 openfl_TextureSize;
-uniform sampler2D bitmap;
+	override function __createAssembler():Void {
+		__glSourceAssembler = new FunkinShaderSourceAssembler(this);
+	}
 
-uniform bool hasTransform;
-uniform bool hasColorTransform;
+	override function toString():String {
+		return __cacheProgramId != null ? 'FunkinShader(${__cacheProgramId})' : 'FunkinShader';
+	}
+
+	#if REGION /* Deprecated */
+	public var shaderPrefix:String = "";
+	public var fragmentPrefix:String = "";
+	public var vertexPrefix:String = "";
+	#end
+
+	#if REGION /* Backward Compatibility */
+	private static var __instanceFields = Type.getInstanceFields(FunkinShader);
+	private static var FRAGMENT_SHADER = 0;
+	private static var VERTEX_SHADER = 1;
+
+	public var fileName(get, set):String;
+	inline function get_fileName():String return _fragmentFilePath ?? _vertexFilePath ?? "FunkinShader";
+	inline function set_fileName(v:String):String return _fragmentFilePath = _vertexFilePath = v;
+
+	public var fragFileName(get, set):String;
+	inline function get_fragFileName():String return _fragmentFilePath ?? "FunkinShader";
+	inline function set_fragFileName(v:String):String return _fragmentFilePath = v;
 
-vec4 applyFlixelEffects(vec4 color) {
-	if(!hasTransform) {
-		return color;
+	public var vertFileName(get, set):String;
+	inline function get_vertFileName():String return _vertexFilePath ?? "FunkinShader";
+	inline function set_vertFileName(v:String):String return _vertexFilePath = v;
+
+	public var glslVer(get, set):String;
+	inline function get_glslVer():String return glVersion;
+	inline function set_glslVer(v:String):String return glVersion = v;
+
+	public var glRawFragmentSource(get, set):String;
+	inline function get_glRawFragmentSource():String return __glFragmentSourceRaw;
+	inline function set_glRawFragmentSource(v:String):String return __glFragmentSourceRaw = v;
+
+	public var glRawVertexSource(get, set):String;
+	inline function get_glRawVertexSource():String return __glVertexSourceRaw;
+	inline function set_glRawVertexSource(v:String):String return __glVertexSourceRaw = v;
+
+	function thisHasField(v:String):Bool return __thisHasField(v);
+
+	function registerParameter(name:String, type:String, isUniform:Bool) {
+		__registerParameter(name, Shader.getParameterTypeFromGLSL(type, false), StringTools.startsWith(type, "sampler"), 1, null, isUniform, null);
 	}
 
-	if(color.a == 0.0) {
-		return vec4(0.0, 0.0, 0.0, 0.0);
+	// Unused... cne-openfl uses a different system
+	var __cancelNextProcessGLData:Bool = false;
+	public var onProcessGLData:FlxTypedSignal<(String, String)->Void> = new FlxTypedSignal<(String, String)->Void>();
+	#end
+}
+
+class FunkinShaderSourceAssembler extends FlxRuntimeShader.FlxShaderSourceAssembler {
+	final funkinParent:FunkinShader;
+
+	public function new(parent:FunkinShader) {
+		super(funkinParent = parent);
 	}
 
-	if(!hasColorTransform) {
-		return color * openfl_Alphav;
+	override function __appendIncludes(source:String, isVertex:Bool, ?includedKeys:Map<String, Bool>):String
+	{
+		if (includedKeys == null) includedKeys = [];
+
+		source = GLSLSourceAssembler.__getIncludeFinder().map(source, (regex:EReg) ->
+		{
+			var key = regex.matched(1);
+			if (includedKeys.get(key)) return '/*Recursive include $key*/\n';
+
+			var include = __getIncludeSource(key, isVertex);
+			if (include == null) return '/*Unknown include $key*/\n';
+
+			includedKeys.set(key, true);
+			return '/*include $key*/\n' + __appendIncludes(include, isVertex, includedKeys);
+		});
+
+		return __getImportCompatibilityFinder().map(source, (regex:EReg) ->
+		{
+			var key = regex.matched(1);
+			if (includedKeys.get(key)) return '/*Recursive import $key*/\n';
+
+			var include = __getIncludeSource(key, isVertex);
+			if (include == null) return '/*Unknown import $key*/\n';
+
+			includedKeys.set(key, true);
+			return '/*import $key*/\n' + __appendIncludes(include, isVertex, includedKeys);
+		});
 	}
 
-	color.rgb = color.rgb / color.a;
-	color = clamp(openfl_ColorOffsetv + (color * openfl_ColorMultiplierv), 0.0, 1.0);
+	override function __getIncludeSource(include:String, fromVertex:Bool):Null<String> {
+		final path = Paths.getPath('shaders/' + include);
+		if (Assets.exists(path)) return Assets.getText(path);
 
-	if(color.a > 0.0) {
-		return vec4(color.rgb * color.a * openfl_Alphav, color.a * openfl_Alphav);
+		final fallback = __getIncludeSource(include, fromVertex);
+		if (fallback != null) return fallback;
+
+		Logs.traceColored([
+			Logs.logText('[Shader] ', RED),
+			Logs.logText('Failed to import shader $include', RED),
+		]);
+		return null;
 	}
-	return vec4(0.0, 0.0, 0.0, 0.0);
-}
 
-vec4 flixel_texture2D(sampler2D bitmap, vec2 coord) {
-	vec4 color = texture2D(bitmap, coord);
-	return applyFlixelEffects(color);
-}
+	override function __appendPrefix(source:String, versionNumber:Int, versionProfile:String, extensions:Map<String, String>, isVertex:Bool,
+			precisionHint:Null<ShaderPrecision>):String
+	{
+		var result = super.__appendPrefix(null, versionNumber, versionProfile, extensions, isVertex, precisionHint) + "\n";
 
-uniform vec4 _camSize;
+		result += funkinParent.shaderPrefix + "\n" + (isVertex ? funkinParent.vertexPrefix : funkinParent.fragmentPrefix) + "\n";
 
-float map(float value, float min1, float max1, float min2, float max2) {
-	return min2 + (value - min1) * (max2 - min2) / (max1 - min1);
-}
+		if (source != null) {
+			if (!isVertex && versionNumber >= 300 && versionProfile != "compatibility" && !StringTools.contains(source, "out vec4")) {
+				result += "out vec4 openfl_FragColor;\n";
+			}
+			result += source;
+		}
 
-vec2 getCamPos(vec2 pos) {
-	vec4 size = _camSize / vec4(openfl_TextureSize, openfl_TextureSize);
-	return vec2(map(pos.x, size.x, size.x + size.z, 0.0, 1.0), map(pos.y, size.y, size.y + size.w, 0.0, 1.0));
-}
-vec2 camToOg(vec2 pos) {
-	vec4 size = _camSize / vec4(openfl_TextureSize, openfl_TextureSize);
-	return vec2(map(pos.x, 0.0, 1.0, size.x, size.x + size.z), map(pos.y, 0.0, 1.0, size.y, size.y + size.w));
+		return result;
+	}
+
+	private static inline function __getImportCompatibilityFinder():EReg {
+		return ~/#import\s+(?|"([^"]+)"|'([^']+)'|<(.*)>|([^\s]+))/g;
+	}
 }
-vec4 textureCam(sampler2D bitmap, vec2 pos) {
-	return flixel_texture2D(bitmap, camToOg(pos));
-}";
 
-	public static final fragBody:String = "gl_FragColor = flixel_texture2D(bitmap, openfl_TextureCoordv);";
+#if REGION /* Backward Compatibility */
+class ShaderTemplates {
 	public static final vertHeader:String = "attribute float openfl_Alpha;
 attribute vec4 openfl_ColorMultiplier;
 attribute vec4 openfl_ColorOffset;
@@ -679,32 +288,97 @@ attribute vec4 colorMultiplier;
 attribute vec4 colorOffset;
 uniform bool hasColorTransform;";
 
-	public static final vertBody:String = "openfl_Alphav = openfl_Alpha;
-openfl_TextureCoordv = openfl_TextureCoord;
+	public static final vertBody:String = "openfl_TextureCoordv = openfl_TextureCoord;
 
-if(openfl_HasColorTransform) {
-	openfl_ColorMultiplierv = openfl_ColorMultiplier;
-	openfl_ColorOffsetv = openfl_ColorOffset / 255.0;
+if (hasColorTransform)
+{
+	openfl_Alphav = openfl_Alpha * colorMultiplier.a;
+	if (openfl_HasColorTransform)
+	{
+		openfl_ColorOffsetv = (openfl_ColorOffset / 255.0 * colorMultiplier) + (colorOffset / 255.0);
+		openfl_ColorMultiplierv = openfl_ColorMultiplier * vec4(colorMultiplier.rgb, 1.0);
+	}
+	else
+	{
+		openfl_ColorOffsetv = colorOffset / 255.0;
+		openfl_ColorMultiplierv = vec4(colorMultiplier.rgb, 1.0);
+	}
 }
+else
+{
+	openfl_Alphav = openfl_Alpha * alpha;
+	if (openfl_HasColorTransform)
+	{
+		openfl_ColorOffsetv = (openfl_ColorOffset + colorOffset) / 255.0;
+		openfl_ColorMultiplierv = openfl_ColorMultiplier;
+	}
+	else
+	{
+		openfl_ColorOffsetv = colorOffset / 255.0;
+		openfl_ColorMultiplierv = vec4(1.0);
+	}
+}";
+
+	public static final fragHeader:String = "varying float openfl_Alphav;
+varying vec4 openfl_ColorMultiplierv;
+varying vec4 openfl_ColorOffsetv;
+varying vec2 openfl_TextureCoordv;
+
+uniform bool openfl_HasColorTransform;
+uniform vec2 openfl_TextureSize;
+uniform sampler2D bitmap;
+uniform bool hasTransform;
+uniform bool hasColorTransform;
+uniform bool premultiplyAlpha;
 
-openfl_Alphav = openfl_Alpha * alpha;
+vec4 apply_flixel_transform(vec4 color)
+{
+	if (!hasTransform) return color;
+	else if (color.a <= 0.0 || openfl_Alphav == 0.0) return vec4(0.0);
 
-if(hasColorTransform) {
-	openfl_ColorOffsetv = colorOffset / 255.0;
-	openfl_ColorMultiplierv = colorMultiplier;
+	// this is just solely for ASTC compressed textures.
+	// ...also in flixel_texture2D, it also converts to linear alpha anyway.
+	if (!premultiplyAlpha) color.rgb /= color.a;
+
+	color = clamp(openfl_ColorOffsetv + (color * openfl_ColorMultiplierv), 0.0, 1.0);
+	return vec4(color.rgb * color.a * openfl_Alphav, color.a * openfl_Alphav);
 }
+#define applyFlixelEffects(color) apply_flixel_transform(color)
 
-gl_Position = openfl_Matrix * openfl_Position;";
+vec4 flixel_texture2D(sampler2D bitmap, vec2 coord)
+{
+	return apply_flixel_transform(texture2D(bitmap, coord));
+}
 
-// TODO: make this ignore comments
-public static final vertBackCompatVarList:Array<EReg> = [
-	~/attribute float alpha/,
-	~/attribute vec4 colorMultiplier/,
-	~/attribute vec4 colorOffset/,
-	~/uniform bool hasColorTransform/
-];
+uniform vec4 _camSize;
+
+float map(float value, float min1, float max1, float min2, float max2) {
+	return min2 + (value - min1) * (max2 - min2) / (max1 - min1);
+}
 
-public static final vertHeaderBackCompat:String = "attribute float openfl_Alpha;
+vec2 getCamPos(vec2 pos) {
+	vec4 size = _camSize / vec4(openfl_TextureSize, openfl_TextureSize);
+	return vec2(map(pos.x, size.x, size.x + size.z, 0.0, 1.0), map(pos.y, size.y, size.y + size.w, 0.0, 1.0));
+}
+vec2 camToOg(vec2 pos) {
+	vec4 size = _camSize / vec4(openfl_TextureSize, openfl_TextureSize);
+	return vec2(map(pos.x, 0.0, 1.0, size.x, size.x + size.z), map(pos.y, 0.0, 1.0, size.y, size.y + size.w));
+}
+vec4 textureCam(sampler2D bitmap, vec2 pos) {
+	return flixel_texture2D(bitmap, camToOg(pos));
+}";
+
+	public static final fragBody:String = "gl_FragColor = flixel_texture2D(bitmap, openfl_TextureCoordv);
+if (gl_FragColor.a == 0.0) discard;";
+
+	public static final vertBackCompatVarList:Array<EReg> = [
+		~/attribute float alpha/,
+		~/attribute vec4 colorMultiplier/,
+		~/attribute vec4 colorOffset/,
+		~/uniform bool hasColorTransform/
+	];
+
+	public static final vertHeaderBackCompat:String = "attribute float openfl_Alpha;
 attribute vec4 openfl_ColorMultiplier;
 attribute vec4 openfl_ColorOffset;
 attribute vec4 openfl_Position;
@@ -719,7 +393,7 @@ uniform mat4 openfl_Matrix;
 uniform bool openfl_HasColorTransform;
 uniform vec2 openfl_TextureSize;";
 
-public static final vertBodyBackCompat:String = "openfl_Alphav = openfl_Alpha;
+	public static final vertBodyBackCompat:String = "openfl_Alphav = openfl_Alpha;
 openfl_TextureCoordv = openfl_TextureCoord;
 
 if(openfl_HasColorTransform) {
@@ -728,19 +402,8 @@ if(openfl_HasColorTransform) {
 }
 
 gl_Position = openfl_Matrix * openfl_Position;";
-
-	public static final defaultVertexSource:String = "#pragma header
-
-void main(void) {
-	#pragma body
-}";
-
-	public static final defaultFragmentSource:String = "#pragma header
-
-void main(void) {
-	#pragma body
-}";
 }
+#end
 
 class ShaderTypeException extends Exception {
 	var has:Class<Dynamic>;
@@ -753,16 +416,4 @@ class ShaderTypeException extends Exception {
 		this.name = name;
 		super('ShaderTypeException - Tried to set the shader uniform "${name}" as a ${Type.getClassName(has)}, but the shader uniform is a ${Std.string(want)}.');
 	}
-}
-
-class ShaderErrorPosition {
-	public var column:Int;
-	public var line:Int;
-	public var message:String;
-
-	public function new(line:String, column:String, message:String) {
-		this.line = Std.parseInt(line);
-		this.column = Std.parseInt(column);
-		this.message = message;
-	}
 }
\ No newline at end of file
diff --git a/source/funkin/backend/shaders/FunkinShaderOLD._hx b/source/funkin/backend/shaders/FunkinShaderOLD._hx
new file mode 100644
index 0000000000..1853813dde
--- /dev/null
+++ b/source/funkin/backend/shaders/FunkinShaderOLD._hx
@@ -0,0 +1,471 @@
+package funkin.backend.shaders;
+
+import haxe.Exception;
+import haxe.io.Path;
+import flixel.graphics.FlxGraphic;
+import flixel.system.FlxAssets.FlxShader;
+import flixel.util.FlxSignal.FlxTypedSignal;
+import flixel.util.FlxStringUtil;
+import hscript.IHScriptCustomBehaviour;
+import openfl.display.BitmapData;
+import openfl.display.ShaderInput;
+import openfl.display.ShaderParameter;
+import openfl.display.ShaderParameterType;
+import openfl.display.Shader;
+import openfl.display3D._internal.GLProgram;
+import openfl.display3D._internal.GLShader;
+import openfl.display3D.Program3D;
+import openfl.utils._internal.Log;
+
+using StringTools;
+@:access(openfl.display3D.Context3D)
+@:access(openfl.display3D.Program3D)
+@:access(openfl.display.ShaderInput)
+@:access(openfl.display.ShaderParameter)
+class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
+	#if REGION /* Backward Compatibility */
+	private static var __instanceFields = Type.getInstanceFields(FunkinShader);
+	private static var FRAGMENT_SHADER = 0;
+	private static var VERTEX_SHADER = 1;
+
+	public var glslVer(get, set):String;
+	inline function get_glslVer():String return glVersion;
+	inline function set_glslVer(v:String):String return glVersion = v;
+
+	public var glRawFragmentSource(get, set):String;
+	inline function get_glRawFragmentSource():String return __glFragmentSourceRaw;
+	inline function set_glRawFragmentSource(v:String):String return __glFragmentSourceRaw = v;
+
+	public var glRawVertexSource(get, set):String;
+	inline function get_glRawVertexSource():String return __glVertexSourceRaw;
+	inline function set_glRawVertexSource(v:String):String return __glVertexSourceRaw = v;
+
+	// Unused... cne-openfl uses a different system
+	var __cancelNextProcessGLData:Bool = false;
+	public var onProcessGLData:FlxTypedSignal<(String, String)->Void> = new FlxTypedSignal<(String, String)->Void>();
+	#end
+
+	public static function getShaderCode(key:String, isFragment = true):Null<String> {
+		var path = "shaders/" + key;
+		key = Path.withoutExtension(key);
+
+		final ext = Path.extension(path);
+		if (ext == "") path = path + (isFragment ? ".frag" : ".vert");
+		else isFragment = ext != "vert";
+
+		path = Paths.getPath(path);
+		return Assets.exists(path) ? Assets.getText(path) : null;
+	}
+
+	private static function processGLSLText(source:String, glVersion:String, isFragment:Bool, ?pragmas:Map<String, String>):String
+		return Shader.processGLSLText(_processGLSLText(source, glVersion, isFragment, pragmas), glVersion, isFragment);
+
+	private static function _processGLSLText(source:String, glVersion:String, isFragment:Bool, ?pragmas:Map<String, String>):String {
+		if (pragmas != null) {
+			final pragmaKeyword = ~/#pragma\s+(\w+)/g;
+			source = pragmaKeyword.map(source, (_) -> {
+				var name = pragmaKeyword.matched(1), pragma:String;
+				if (pragmas.exists(name)) pragma = pragmas.get(name);
+				else {
+					if (name != "header" && name != "body") return '#pragma $name';
+					pragma = "";
+				}
+				return _processGLSLText(pragma, glVersion, isFragment, pragmas);
+			});
+		}
+
+		inline function tryGetShaderCode(key:String) {
+			final s = getShaderCode(key, isFragment);
+			if (s == null) {
+				Logs.traceColored([
+					Logs.logText('[Shader] ', RED),
+					Logs.logText('Failed to import shader $key', RED),
+				]);
+				return "";
+			}
+			return s;
+		}
+
+		final includeKeyword = ~/#include ['"](.+)['"]/g;
+		final importKeyword = ~/#import\s+<(.*)>/g;
+		source = importKeyword.map(source, (_) ->
+			return _processGLSLText(tryGetShaderCode(importKeyword.matched(1)), glVersion, isFragment, pragmas) ?? "");
+
+		return source = includeKeyword.map(source, (_) ->
+			return _processGLSLText(tryGetShaderCode(includeKeyword.matched(1)), glVersion, isFragment, pragmas) ?? "");
+	}
+
+	private static var __defaultsAvailable:Bool;
+	private static var __glFragmentSourceDefault:String;
+	private static var __glVertexSourceDefault:String;
+	private static var __glFragmentPragmasDefault:Map<String, String>;
+	private static var __glVertexPragmasDefault:Map<String, String>;
+	private static var __glFragmentExtensionsDefault:Array<ShaderExtension>;
+	private static var __glVertexExtensionsDefault:Array<ShaderExtension>;
+
+	public var onGLUpdate:FlxTypedSignal<Void->Void> = new FlxTypedSignal<Void->Void>();
+
+	public var fileName:String = "FunkinShader";
+	public var fragFileName:String = "FunkinShader";
+	public var vertFileName:String = "FunkinShader";
+
+	public var shaderPrefix:String = "";
+	public var fragmentPrefix:String = "";
+	public var vertexPrefix:String = "";
+
+	private var __immediate:Bool;
+
+	public function new(?fragmentSource:String, ?vertexSource:String, ?version:String,
+		?fragmentExtensions:Array<ShaderExtension>, ?vertexExtensions:Array<ShaderExtension>, immediate = false
+	) {
+		if (!__defaultsAvailable) {
+			__glFragmentSourceDefault = __glFragmentSourceRaw;
+			__glVertexSourceDefault = __glVertexSourceRaw;
+			__glFragmentPragmasDefault = __glFragmentPragmas.copy();
+			__glVertexPragmasDefault = __glVertexPragmas.copy();
+			__glFragmentExtensionsDefault = __glFragmentExtensions ?? [];
+			__glVertexExtensionsDefault = __glVertexExtensions ?? [];
+			__defaultsAvailable = true;
+		}
+
+		__immediate = immediate;
+
+		if (version != null) glVersion = version;
+		if (vertexExtensions != null) glVertexExtensions = vertexExtensions;
+		if (fragmentExtensions != null) glFragmentExtensions = fragmentExtensions;
+		if (vertexSource != null) glVertexSource = vertexSource;
+		if (fragmentSource != null) glFragmentSource = fragmentSource;
+
+		super();
+
+		if (!__isGenerated) {
+			__isGenerated = true;
+			__init();
+		}
+	}
+
+	public function loadShader(name:String, ?version:String, immediate = false):FunkinShader {
+		final fragment = getShaderCode(name, true), vertex = getShaderCode(name, false);
+
+		glVersion = version;
+		glVertexSource = vertex ?? __glVertexSourceDefault;
+		glFragmentSource = fragment ?? __glFragmentSourceDefault;
+
+		if (immediate) __init();
+		return this;
+	}
+
+	override function __initGL():Void {
+		if (__immediate) {
+			__context = FlxG.stage.context3D;
+			__enable();
+		}
+		super.__initGL();
+	}
+
+	override function __updateGL():Void {
+		onGLUpdate.dispatch();
+		super.__updateGL();
+	}
+
+	public function hget(name:String):Dynamic {
+		if (__glSourceDirty || __data == null) __init();
+
+		if (thisHasField(name) || thisHasField('get_${name}')) return Reflect.getProperty(this, name);
+		else if (!Reflect.hasField(__data, name)) return null;
+
+		final field:Dynamic = Reflect.field(__data, name);
+
+		var cl:String = Type.getClassName(Type.getClass(field));
+
+		// little problem we are facing boys...
+
+		// cant do "field is ShaderInput" because ShaderInput has the @:generic metadata
+		// aka instead of ShaderInput<Float> it gets built as ShaderInput_Float
+		// this should be fine tho because we check the class, and the fields don't vary based on the type
+
+		// thanks for looking in the code cne fans :D!! -lunar
+
+		if (cl.startsWith("openfl.display.ShaderParameter"))
+			return (field.__length > 1) ? field.value : field.value[0];
+		else if (cl.startsWith("openfl.display.ShaderInput"))
+			return field.input;
+		return field;
+	}
+
+	public function hset(name:String, val:Dynamic):Dynamic {
+		if (__glSourceDirty || __data == null) __init();
+
+		if (thisHasField(name) || thisHasField('set_${name}')) {
+			Reflect.setProperty(this, name, val);
+			return val;
+		}
+		else if (!Reflect.hasField(__data, name)) {
+			// ??? huh
+			Reflect.setField(__data, name, val);
+			return val;
+		}
+
+		var field = Reflect.field(__data, name);
+		var cl = Type.getClassName(Type.getClass(field));
+		var isNotNull = val != null;
+		// cant do "field is ShaderInput" for some reason
+		if (cl.startsWith("openfl.display.ShaderParameter")) {
+			if (field.__length <= 1) {
+				// that means we wait for a single number, instead of an array
+				if (field.__isInt && isNotNull && !(val is Int)) {
+					throw new ShaderTypeException(name, Type.getClass(val), 'Int');
+					return null;
+				} else
+				if (field.__isBool && isNotNull && !(val is Bool)) {
+					throw new ShaderTypeException(name, Type.getClass(val), 'Bool');
+					return null;
+				} else
+				if (field.__isFloat && isNotNull && !(val is Float)) {
+					throw new ShaderTypeException(name, Type.getClass(val), 'Float');
+					return null;
+				}
+				return field.value = isNotNull ? [val] : null;
+			} else {
+				if (isNotNull && !(val is Array)) {
+					throw new ShaderTypeException(name, Type.getClass(val), Array);
+					return null;
+				}
+				return field.value = val;
+			}
+		} else if (cl.startsWith("openfl.display.ShaderInput")) {
+			// shader input!!
+			var bitmap:BitmapData;
+			if (!isNotNull) bitmap = null;
+			else if (val is BitmapData) bitmap = val;
+			else if (val is FlxGraphic) bitmap = val.bitmap;
+			else {
+				throw new ShaderTypeException(name, Type.getClass(val), BitmapData);
+				return null;
+			}
+			field.input = bitmap;
+		}
+
+		return val;
+	}
+
+	override function __buildSourcePrefix(isFragment:Bool):String {
+		var result = super.__buildSourcePrefix(isFragment) + '\n$shaderPrefix';
+		return isFragment ? result + '\n$fragmentPrefix' : result + '\n$vertexPrefix';
+	}
+
+	override function set_glFragmentExtensions(value:Array<ShaderExtension>):Array<ShaderExtension> {
+		if (value == null) value = __glFragmentExtensionsDefault;
+		if (value != __glFragmentExtensions) __glSourceDirty = true;
+		return __glFragmentExtensions = value;
+	}
+
+	override function set_glVertexExtensions(value:Array<ShaderExtension>):Array<ShaderExtension> {
+		if (value == null) value = __glVertexExtensionsDefault;
+		if (value != __glVertexExtensions) __glSourceDirty = true;
+		return __glVertexExtensions = value;
+	}
+
+	override function set_glVersion(value:Null<String>):String {
+		if (value == null || value == "") value = Flags.DEFAULT_GLSL_VERSION;
+		if ((__glVersionRaw = value) != __glVersion) {
+			__glSourceDirty = true;
+			if (__glVertexSourceRaw != null) __glVertexSource = processGLSLText(__glVertexSourceRaw, value, false, __glVertexPragmas);
+			if (__glFragmentSourceRaw != null) __glFragmentSource = processGLSLText(__glFragmentSourceRaw, value, true, __glFragmentPragmas);
+		}
+
+		return __glVersion = value;
+	}
+
+	override function set_glFragmentSource(value:String):String {
+		if (value == null || value == "") value = __glFragmentSourceDefault;
+		if ((__glFragmentSourceRaw = value) != null) {
+			if (__glVersion != (__glVersion = Shader.getGLSLTextVersion(value, __glVersionRaw)))
+				__glSourceDirty = true;
+
+			value = processGLSLText(value, __glVersion, true, __glFragmentPragmas);
+		}
+
+		if (value != __glFragmentSource) __glSourceDirty = true;
+		return __glFragmentSource = value;
+	}
+
+	override function set_glVertexSource(value:String):String {
+		if (value == null || value == "") value = __glVertexSourceDefault;
+		if ((__glVertexSourceRaw = value) != null) {
+			if (__glVersion != (__glVersion = Shader.getGLSLTextVersion(value, __glVersionRaw)))
+				__glSourceDirty = true;
+
+			value = processGLSLText(value, __glVersion, false, __glVertexPragmas);
+		}
+
+		if (value != __glVertexSource) __glSourceDirty = true;
+		return __glVertexSource = value;
+	}
+
+	override function set_glFragmentPragmas(value:Map<String, String>):Map<String, String> {
+		if (value == null) value = __glFragmentPragmasDefault;
+		if (value != __glFragmentPragmas)
+			__glSourceDirty = true;
+
+		return __glFragmentPragmas = value;
+	}
+
+	override function set_glVertexPragmas(value:Map<String, String>):Map<String, String> {
+		if (value == null) value = __glVertexPragmasDefault;
+		if (value != __glVertexPragmas)
+			__glSourceDirty = true;
+
+		return __glVertexPragmas = value;
+	}
+
+	function registerParameter(name:String, type:String, isUniform:Bool):Void {
+		__registerParameter(name, Program3D.getParameterTypeFromGLString(type, 1), 1, -1, isUniform, false, null);
+	}
+
+	public function toString():String
+		return FlxStringUtil.getDebugString([for (field in Reflect.fields(data)) LabelValuePair.weak(field, Reflect.field(data, field))]);
+}
+
+class ShaderTemplates {
+	#if REGION /* Backward Compatibility */
+	public static final vertHeader:String = "attribute float openfl_Alpha;
+attribute vec4 openfl_ColorMultiplier;
+attribute vec4 openfl_ColorOffset;
+attribute vec4 openfl_Position;
+attribute vec2 openfl_TextureCoord;
+
+varying float openfl_Alphav;
+varying vec4 openfl_ColorMultiplierv;
+varying vec4 openfl_ColorOffsetv;
+varying vec2 openfl_TextureCoordv;
+
+uniform mat4 openfl_Matrix;
+uniform bool openfl_HasColorTransform;
+uniform vec2 openfl_TextureSize;
+
+attribute float alpha;
+attribute vec4 colorMultiplier;
+attribute vec4 colorOffset;
+
+uniform bool hasColorTransform;";
+
+	public static final vertBody:String = "openfl_TextureCoordv = openfl_TextureCoord;
+
+if (hasColorTransform) {
+	openfl_Alphav = openfl_Alpha * colorMultiplier.a;
+	if (openfl_HasColorTransform) {
+		openfl_ColorOffsetv = (openfl_ColorOffset / 255.0 * colorMultiplier) + (colorOffset / 255.0);
+		openfl_ColorMultiplierv = openfl_ColorMultiplier * vec4(colorMultiplier.rgb, 1.0);
+	}
+	else {
+		openfl_ColorOffsetv = colorOffset / 255.0;
+		openfl_ColorMultiplierv = vec4(colorMultiplier.rgb, 1.0);
+	}
+}
+else {
+	openfl_Alphav = openfl_Alpha * alpha;
+	if (openfl_HasColorTransform) {
+		openfl_ColorOffsetv = (openfl_ColorOffset + colorOffset) / 255.0;
+		openfl_ColorMultiplierv = openfl_ColorMultiplier;
+	}
+	else {
+		openfl_ColorOffsetv = colorOffset / 255.0;
+		openfl_ColorMultiplierv = vec4(1.0);
+	}
+}";
+
+	public static final fragHeader:String = "varying float openfl_Alphav;
+varying vec4 openfl_ColorMultiplierv;
+varying vec4 openfl_ColorOffsetv;
+varying vec2 openfl_TextureCoordv;
+
+uniform bool openfl_HasColorTransform;
+uniform vec2 openfl_TextureSize;
+uniform sampler2D bitmap;
+
+uniform bool hasTransform;
+uniform bool hasColorTransform;
+
+vec4 apply_flixel_transform(vec4 color) {
+	if (!hasTransform) return color;
+	else if (color.a <= 0.0 || openfl_Alphav == 0.0) return vec4(0.0);
+
+	color.rgb /= color.a;
+	color = clamp(openfl_ColorOffsetv + (color * openfl_ColorMultiplierv), 0.0, 1.0);
+	return vec4(color.rgb * color.a * openfl_Alphav, color.a * openfl_Alphav);
+}
+
+#define applyFlixelEffects(color) apply_flixel_transform(color)
+
+vec4 flixel_texture2D(sampler2D bitmap, vec2 coord) {
+	return apply_flixel_transform(texture2D(bitmap, coord));
+}
+
+uniform vec4 _camSize;
+
+float map(float value, float min1, float max1, float min2, float max2) {
+	return min2 + (value - min1) * (max2 - min2) / (max1 - min1);
+}
+
+vec2 getCamPos(vec2 pos) {
+	vec4 size = _camSize / vec4(openfl_TextureSize, openfl_TextureSize);
+	return vec2(map(pos.x, size.x, size.x + size.z, 0.0, 1.0), map(pos.y, size.y, size.y + size.w, 0.0, 1.0));
+}
+vec2 camToOg(vec2 pos) {
+	vec4 size = _camSize / vec4(openfl_TextureSize, openfl_TextureSize);
+	return vec2(map(pos.x, 0.0, 1.0, size.x, size.x + size.z), map(pos.y, 0.0, 1.0, size.y, size.y + size.w));
+}
+vec4 textureCam(sampler2D bitmap, vec2 pos) {
+	return flixel_texture2D(bitmap, camToOg(pos));
+}";
+
+	public static final fragBody:String = "gl_FragColor = flixel_texture2D(bitmap, openfl_TextureCoordv);
+if (gl_FragColor.a == 0.0) discard;";
+
+	public static final vertBackCompatVarList:Array<EReg> = [
+		~/attribute float alpha/,
+		~/attribute vec4 colorMultiplier/,
+		~/attribute vec4 colorOffset/,
+		~/uniform bool hasColorTransform/
+	];
+
+	public static final vertHeaderBackCompat:String = "attribute float openfl_Alpha;
+attribute vec4 openfl_ColorMultiplier;
+attribute vec4 openfl_ColorOffset;
+attribute vec4 openfl_Position;
+attribute vec2 openfl_TextureCoord;
+
+varying float openfl_Alphav;
+varying vec4 openfl_ColorMultiplierv;
+varying vec4 openfl_ColorOffsetv;
+varying vec2 openfl_TextureCoordv;
+
+uniform mat4 openfl_Matrix;
+uniform bool openfl_HasColorTransform;
+uniform vec2 openfl_TextureSize;";
+
+	public static final vertBodyBackCompat:String = "openfl_Alphav = openfl_Alpha;
+openfl_TextureCoordv = openfl_TextureCoord;
+
+if(openfl_HasColorTransform) {
+	openfl_ColorMultiplierv = openfl_ColorMultiplier;
+	openfl_ColorOffsetv = openfl_ColorOffset / 255.0;
+}
+
+gl_Position = openfl_Matrix * openfl_Position;";
+	#end
+}
+
+class ShaderTypeException extends Exception {
+	var has:Class<Dynamic>;
+	var want:Class<Dynamic>;
+	var name:String;
+
+	public function new(name:String, has:Class<Dynamic>, want:Dynamic) {
+		this.has = has;
+		this.want = want;
+		this.name = name;
+		super('ShaderTypeException - Tried to set the shader uniform "${name}" as a ${Type.getClassName(has)}, but the shader uniform is a ${Std.string(want)}.');
+	}
+}
\ No newline at end of file
diff --git a/source/funkin/backend/system/Controls.hx b/source/funkin/backend/system/Controls.hx
index c4c80d5308..14a9518263 100644
--- a/source/funkin/backend/system/Controls.hx
+++ b/source/funkin/backend/system/Controls.hx
@@ -31,6 +31,7 @@ enum Control
 	DEV_ACCESS;
 	DEV_CONSOLE;
 	DEV_RELOAD;
+	DEV_INSPECTOR;
 }
 
 enum KeyboardScheme
@@ -185,6 +186,12 @@ class Controls extends FlxActionSet
 	@:pressed("dev-reload") public var DEV_RELOAD_HOLD(get, set): Bool;
 	@:justReleased("dev-reload") public var DEV_RELOAD_R(get, set): Bool;
 
+	@:devModeOnly
+	@:gamepad([])
+	@:justPressed("dev-inspector") public var DEV_INSPECTOR(get, set): Bool;
+	@:pressed("dev-inspector") public var DEV_INSPECTOR_HOLD(get, set): Bool;
+	@:justReleased("dev-inspector") public var DEV_INSPECTOR_R(get, set): Bool;
+
 	@:allow(funkin.backend.utils.ControlsUtil)
 	var byName:Map<String, FlxActionDigital> = [];
 
diff --git a/source/funkin/backend/system/FakeCamera.hx b/source/funkin/backend/system/FakeCamera.hx
index 99d0eb1b88..114af05544 100644
--- a/source/funkin/backend/system/FakeCamera.hx
+++ b/source/funkin/backend/system/FakeCamera.hx
@@ -11,9 +11,14 @@ import openfl.display.BlendMode;
 import openfl.geom.ColorTransform;
 import openfl.geom.Point;
 import openfl.geom.Rectangle;
+import openfl.display.TriangleCulling;
+import openfl.display3D.Context3DWrapMode;
+import openfl.display3D.Context3DCompareMode;
+import openfl.filters.BitmapFilter;
+import openfl.filters.ShaderFilter;
 
 class FakeCamera extends FlxCamera {
-	public static final instance = new FakeCamera();
+	public static var instance:FakeCamera;
 
 	public function new() {
 		super();
@@ -21,14 +26,14 @@ class FakeCamera extends FlxCamera {
 		visible = false;
 	}
 
-	override function startTrianglesBatch(graphic:FlxGraphic, smoothing:Bool = false, isColored:Bool = false, ?blend:BlendMode, ?hasColorOffsets:Bool, ?shader:FlxShader) { return null;}
-	override function startQuadBatch(graphic:FlxGraphic, colored:Bool, hasColorOffsets:Bool = false, ?blend:BlendMode, smooth:Bool = false, ?shader:FlxShader) { return null;}
+	override function startTrianglesBatch(graphic:FlxGraphic, smoothing:Bool = false, isColored:Bool = false, ?blend:BlendMode, ?hasColorOffsets:Bool, ?shader:FlxShader, ?wrapMode:Context3DWrapMode, ?depthCompareMode:Context3DCompareMode, ?culling:TriangleCulling) { return null;}
+	override function startQuadBatch(graphic:FlxGraphic, colored:Bool, hasColorOffsets:Bool = false, ?blend:BlendMode, smooth:Bool = false, ?shader:FlxShader, ?wrapMode:Context3DWrapMode, ?depthCompareMode:Context3DCompareMode) { return null;}
 	override function clearDrawStack() {}
 	override function render() {}
 
-	public override function drawPixels(?frame:FlxFrame, ?pixels:BitmapData, matrix:FlxMatrix, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader) {}
-	public override function copyPixels(?frame:FlxFrame, ?pixels:BitmapData, ?sourceRect:Rectangle, destPoint:Point, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader) {}
-	public override function drawTriangles(graphic:FlxGraphic, vertices:DrawData<Float>, indices:DrawData<Int>, uvtData:DrawData<Float>, ?colors:DrawData<Int>, ?position:FlxPoint, ?blend:BlendMode, repeat:Bool = false, smoothing:Bool = false, ?transform:ColorTransform, ?shader:FlxShader):Void {}
+	public override function drawPixels(?frame:FlxFrame, ?pixels:BitmapData, matrix:FlxMatrix, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader, ?wrapMode:Context3DWrapMode, ?depthCompareMode:Context3DCompareMode) {}
+	public override function copyPixels(?frame:FlxFrame, ?pixels:BitmapData, ?sourceRect:Rectangle, destPoint:Point, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader, ?wrapMode:Context3DWrapMode, ?depthCompareMode:Context3DCompareMode) {}
+	public override function drawTriangles(graphic:FlxGraphic, vertices:DrawData<Float>, indices:DrawData<Int>, uvtData:DrawData<Float>, ?colors:DrawData<Int>, ?position:FlxPoint, ?blend:BlendMode, repeat:Bool = false, smoothing:Bool = false, ?transform:ColorTransform, ?shader:FlxShader, ?wrapMode:Context3DWrapMode, ?depthCompareMode:Context3DCompareMode, ?culling:TriangleCulling):Void {}
 
 	public override function update(elapsed:Float) {}
 
@@ -38,13 +43,13 @@ class FakeCamera extends FlxCamera {
 }
 
 class FakeCallCamera extends FakeCamera {
-	public static final instance = new FakeCallCamera();
+	public static var instance:FakeCallCamera;
 	public var ignoreDraws:Bool = false;
 
-	public dynamic function onDraw(?frame:FlxFrame, ?pixels:BitmapData, matrix:FlxMatrix, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader) {
+	public dynamic function onDraw(?frame:FlxFrame, ?pixels:BitmapData, matrix:FlxMatrix, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader, ?wrapMode:Context3DWrapMode, ?depthCompareMode:Context3DCompareMode) {
 	}
 
-	override function drawPixels(?frame:FlxFrame, ?pixels:BitmapData, matrix:FlxMatrix, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader) {
-		if (!ignoreDraws) onDraw(frame, pixels, matrix, transform, blend, smoothing, shader);
+	override function drawPixels(?frame:FlxFrame, ?pixels:BitmapData, matrix:FlxMatrix, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader, ?wrapMode:Context3DWrapMode, ?depthCompareMode:Context3DCompareMode) {
+		if (!ignoreDraws) onDraw(frame, pixels, matrix, transform, blend, smoothing, shader, wrapMode, depthCompareMode);
 	}
 }
\ No newline at end of file
diff --git a/source/funkin/backend/system/Flags.hx b/source/funkin/backend/system/Flags.hx
index 83448e61e2..d04aa7e7f1 100644
--- a/source/funkin/backend/system/Flags.hx
+++ b/source/funkin/backend/system/Flags.hx
@@ -66,12 +66,16 @@ class Flags {
 	public static var PATHS_UNIX_FIX:Bool = true;
 
 	/**
-	 * Preferred sound extension for the game's audio files.
-	 * Currently is set to `mp3` for web targets, and `ogg` for other targets.
+	 * Preferred file extensions for the game's audio files.
 	 */
-	public static var SOUND_EXT:String = #if web "mp3" #else "ogg" #end; // we also support wav
-	public static var VIDEO_EXT:String = "mp4";
-	public static var IMAGE_EXT:String = "png"; // we also support jpg
+	public static var SOUND_EXTS:Array<String> = [#if web "mp3", "ogg", #else "ogg", "mp3", #end "flac", "opus", "wav"];
+	public static var VIDEO_EXTS:Array<String> = ["mp4", "webm", "mkv", "mov"]; // is there any more? // yes frakits
+	public static var IMAGE_EXTS:Array<String> = ["png", "jpg", "jpeg"]; // TODO: Add more after another lime rebases for SDLImage
+
+	// DEPRECATED
+	@:lazy public static var SOUND_EXT:Null<String> = null;
+	@:lazy public static var VIDEO_EXT:Null<String> = null;
+	@:lazy public static var IMAGE_EXT:Null<String> = null;
 
 	public static var DEFAULT_DISCORD_LOGO_KEY:String = "icon";
 	public static var DEFAULT_DISCORD_CLIENT_ID:String = "1383853614589673472";
@@ -111,6 +115,11 @@ class Flags {
 	public static var DEFAULT_STEPS_PER_BEAT:Int = 4;
 	public static var DEFAULT_LOOP_TIME:Float = 0.0;
 	public static var ICONS_AUTOPOSITION:Bool = true;
+
+	@:lazy public static var DEFAULT_SOUND_TIME_SCALED_PITCH:Null<Bool> = null;
+	@:lazy public static var USE_SOUND_VOLUME_CURVE:Null<Bool> = null;
+	@:lazy public static var USE_FLXTRAIL_FRAMES:Null<Bool> = null;
+
 	public static var SUPPORTED_CHART_RUNTIME_FORMATS:Array<String> = ["Legacy", "Psych Engine"];
 	public static var SUPPORTED_CHART_FORMATS:Array<String> = ["BaseGame"];
 
@@ -289,7 +298,7 @@ class Flags {
 	public static var DEFAULT_CHARACTER_GHOSTDISABLE_SOUND:String = "editors/character/ghostDisable";
 	public static var DEFAULT_CHARACTER_GHOSTENABLE_SOUND:String = "editors/character/ghostEnable";
 
-	public static var DEFAULT_GLSL_VERSION:String = "120";
+	@:lazy public static var DEFAULT_GLSL_VERSION:String = null;
 	@:also(funkin.backend.utils.HttpUtil.userAgent)
 	public static var USER_AGENT:String = 'request';
 	// -- End of Codename's Default Flags --
@@ -323,8 +332,28 @@ class Flags {
 		if (WINDOW_TITLE_USE_MOD_NAME == null) WINDOW_TITLE_USE_MOD_NAME = !overridenFlags.exists('TITLE') && overridenFlags.exists('MOD_NAME');
 		if (USE_LEGACY_TIMING == null) USE_LEGACY_TIMING = MOD_API_VERSION < 2;
 		if (SUSTAINS_AS_ONE_NOTE == null) SUSTAINS_AS_ONE_NOTE = MOD_API_VERSION >= 2;
+		if (DEFAULT_GLSL_VERSION == null) {
+			if (MOD_API_VERSION < 2) {
+				DEFAULT_GLSL_VERSION = #if (android || mac || web) "100" #else "120" #end;
+				Logs.warn("Blend Mode Extensions won't work in MOD_API_VERSION below than 2");
+			}
+			else {
+				DEFAULT_GLSL_VERSION = openfl.utils.GLSLSourceAssembler.getDefaultVersion();
+			}
+		}
+		if (DEFAULT_SOUND_TIME_SCALED_PITCH == null) DEFAULT_SOUND_TIME_SCALED_PITCH = MOD_API_VERSION >= 2;
+		if (USE_SOUND_VOLUME_CURVE == null) USE_SOUND_VOLUME_CURVE = MOD_API_VERSION >= 2;
+		if (USE_FLXTRAIL_FRAMES == null) USE_FLXTRAIL_FRAMES = MOD_API_VERSION < 2;
+
+		flixel.sound.FlxSound.defaultTimeScaledPitch = cast DEFAULT_SOUND_TIME_SCALED_PITCH;
+		flixel.addons.effects.FlxTrail.defaultDelayBackwardCompatibility = cast USE_FLXTRAIL_FRAMES;
+
 		if (USE_LEGACY_CENTER_CAM == null) USE_LEGACY_CENTER_CAM = MOD_API_VERSION < 3;
 		if (USE_LEGACY_FLXANIMATE_STAGE_MATRIX == null) USE_LEGACY_FLXANIMATE_STAGE_MATRIX = MOD_API_VERSION < 3;
+
+		if (SOUND_EXT == null) SOUND_EXT = SOUND_EXTS[0]; else SOUND_EXTS = [SOUND_EXT];
+		if (VIDEO_EXT == null) VIDEO_EXT = VIDEO_EXTS[0]; else VIDEO_EXTS = [VIDEO_EXT];
+		if (IMAGE_EXT == null) IMAGE_EXT = IMAGE_EXTS[0]; else IMAGE_EXTS = [IMAGE_EXT];
 	}
 
 	public static function loadFromDatas(datas:Array<String>):Map<String, String> {
diff --git a/source/funkin/backend/system/FunkinGame.hx b/source/funkin/backend/system/FunkinGame.hx
index b754c8d41d..44122aee39 100644
--- a/source/funkin/backend/system/FunkinGame.hx
+++ b/source/funkin/backend/system/FunkinGame.hx
@@ -3,9 +3,11 @@ package funkin.backend.system;
 import flixel.FlxGame;
 import flixel.FlxG;
 import openfl.events.KeyboardEvent;
+import openfl.events.Event;
 
 class FunkinGame extends FlxGame {
 	var skipNextTickUpdate:Bool = false;
+	var manualPause:Bool = false; //fake autopause
 
 	#if desktop
 	var fullscreenListener:KeyboardEvent->Void;
@@ -28,12 +30,45 @@ class FunkinGame extends FlxGame {
 		super.switchState();
 		// draw once to put all images in gpu then put the last update time to now to prevent lag spikes or whatever
 		draw();
-		_total = ticks = getTicks();
+		ticks = getTicks();
 		skipNextTickUpdate = true;
 	}
 
-	public override function onEnterFrame(t) {
-		if (skipNextTickUpdate != (skipNextTickUpdate = false)) _total = ticks = getTicks();
-		super.onEnterFrame(t);
+	override function __enterFrame(deltaTime:Float) {
+		if (skipNextTickUpdate != (skipNextTickUpdate = false)) ticks = getTicks();
+		if (manualPause) {
+			var prevAutoPause = FlxG.autoPause;
+			FlxG.autoPause = true;
+			super.__enterFrame(deltaTime);
+			FlxG.autoPause = prevAutoPause;
+			draw();
+			return;
+		}
+		super.__enterFrame(deltaTime);
+	}
+
+
+	override public function onFocus(_):Void {
+		if (manualPause) return;
+		super.onFocus(_);
+	}
+
+	override public function onFocusLost(event:Event):Void {
+		if (manualPause) return;
+		super.onFocusLost(event);
+	}
+
+	public function toggleManualPause() {
+		var prevAutoPause = FlxG.autoPause;
+		FlxG.autoPause = true;
+
+		if (!manualPause) {
+			onFocusLost(null);
+			manualPause = true;
+		} else {
+			manualPause = false;
+			onFocus(null);
+		}
+		FlxG.autoPause = prevAutoPause;
 	}
 }
diff --git a/source/funkin/backend/system/GraphicCacheSprite.hx b/source/funkin/backend/system/GraphicCacheSprite.hx
index 6ff61905b3..cba41b61bd 100644
--- a/source/funkin/backend/system/GraphicCacheSprite.hx
+++ b/source/funkin/backend/system/GraphicCacheSprite.hx
@@ -36,7 +36,7 @@ class GraphicCacheSprite extends FlxSprite {
 		if (graphic == null) return;
 
 		// make their useCount one time higher to prevent them from auto being cleared from cache
-		graphic.useCount++;
+		graphic.incrementUseCount();
 		graphic.destroyOnNoUse = false;
 		cachedGraphics.push(graphic);
 		nonRenderedCachedGraphics.push(graphic);
@@ -45,7 +45,7 @@ class GraphicCacheSprite extends FlxSprite {
 	public override function destroy() {
 		for(g in cachedGraphics) {
 			g.destroyOnNoUse = true;
-			g.useCount--;
+			g.decrementUseCount();
 		}
 		graphic = null;
 		super.destroy();
diff --git a/source/funkin/backend/system/Logs.hx b/source/funkin/backend/system/Logs.hx
index 1913e4abc6..fe5bc386b3 100644
--- a/source/funkin/backend/system/Logs.hx
+++ b/source/funkin/backend/system/Logs.hx
@@ -2,6 +2,7 @@ package funkin.backend.system;
 
 import flixel.system.debug.log.LogStyle;
 import flixel.system.frontEnds.LogFrontEnd;
+import funkin.backend.system.console.ConsoleUI;
 import funkin.backend.utils.NativeAPI.ConsoleColor;
 import funkin.backend.utils.NativeAPI;
 import haxe.Log;
@@ -9,18 +10,26 @@ import haxe.Log;
 final class Logs {
 	private static var __showing:Bool = false;
 
+	public static final LOG_WARNING_TEXT =     '   WARNING   ';
+	public static final LOG_ERROR_TEXT =       '    ERROR    ';
+	public static final LOG_TRACE_TEXT =       '    TRACE    ';
+	public static final LOG_VERBOSE_TEXT =     '   VERBOSE   ';
+	public static final LOG_SUCCESS_TEXT =     '   SUCCESS   ';
+	public static final LOG_FAILURE_TEXT =     '   FAILURE   ';
+	public static final LOG_INFORMATION_TEXT = ' INFORMATION ';
+
 	public static var nativeTrace = Log.trace;
 	public static function init() {
 		Log.trace = function(v:Dynamic, ?infos:Null<haxe.PosInfos>) {
 			var data = [
-				logText('${infos.fileName}:${infos.lineNumber}: ', CYAN),
-				logText(Std.string(v))
+				logText('${infos.fileName}:${infos.lineNumber}: ', CYAN, TRACE),
+				logText(Std.string(v), LIGHTGRAY, TRACE)
 			];
 
 			if (infos.customParams != null) {
 				for (i in infos.customParams) {
 					data.push(
-						logText("," + Std.string(i))
+						logText("," + Std.string(i), LIGHTGRAY, TRACE)
 					);
 				}
 			}
@@ -77,30 +86,31 @@ final class Logs {
 	public static function prepareColoredTrace(text:Array<LogText>, level:Level = INFO) {
 		var time = Date.now();
 		var superCoolText = [
-			logText('[  '),
-			logText('${Std.string(time.getHours()).addZeros(2)}:${Std.string(time.getMinutes()).addZeros(2)}:${Std.string(time.getSeconds()).addZeros(2)}', DARKMAGENTA),
-			logText('  |'),
+			logText('[  ', LIGHTGRAY, level),
+			logText('${Std.string(time.getHours()).addZeros(2)}:${Std.string(time.getMinutes()).addZeros(2)}:${Std.string(time.getSeconds()).addZeros(2)}', DARKMAGENTA, level),
+			logText('  |', LIGHTGRAY, level),
 			switch (level)
 			{
-				case WARNING:	logText('   WARNING   ', DARKYELLOW);
-				case ERROR:		logText('    ERROR    ', DARKRED);
-				case TRACE:		logText('    TRACE    ', GRAY);
-				case VERBOSE:	logText('   VERBOSE   ', DARKMAGENTA);
-				case SUCCESS:	logText('   SUCCESS   ', GREEN);
-				case FAILURE:	logText('   FAILURE   ', RED);
-				default:		logText(' INFORMATION ', CYAN);
+				case WARNING:	logText(LOG_WARNING_TEXT, DARKYELLOW, level);
+				case ERROR:		logText(LOG_ERROR_TEXT, DARKRED, level);
+				case TRACE:		logText(LOG_TRACE_TEXT, GRAY, level);
+				case VERBOSE:	logText(LOG_VERBOSE_TEXT, DARKMAGENTA, level);
+				case SUCCESS:	logText(LOG_SUCCESS_TEXT, GREEN, level);
+				case FAILURE:	logText(LOG_FAILURE_TEXT, RED, level);
+				default:		logText(LOG_INFORMATION_TEXT, CYAN, level);
 			},
-			logText('] ')
+			logText('] ', LIGHTGRAY, level)
 		];
 		for(k=>e in superCoolText)
 			text.insert(k, e);
 		return text;
 	}
 
-	public static function logText(text:String, color:ConsoleColor = LIGHTGRAY):LogText {
+	public static function logText(text:String, color:ConsoleColor = LIGHTGRAY, level:Level = INFO):LogText {
 		return {
 			text: text,
-			color: color
+			color: color,
+			level: level
 		};
 	}
 
@@ -115,7 +125,7 @@ final class Logs {
 			Sys.print(t.text);
 		}
 		NativeAPI.setConsoleColors();
-		Sys.print("\r\n");
+		Sys.println("\r");
 		__showing = false;
 		#elseif mobile
 		while(__showing) {
@@ -129,19 +139,24 @@ final class Logs {
 		@:privateAccess
 		nativeTrace([for(t in text) t.text].join(""));
 		#end
+
+		#if IMGUI_ENABLED
+		@:privateAccess
+		ConsoleUI.instance.addToConsole(text);
+		#end
 	}
 
 	public inline static function traceColored(text:Array<LogText>, level:Level = INFO)
 		__showInConsole(prepareColoredTrace(text, level));
 
 	public static function trace(text:String, level:Level = INFO, color:ConsoleColor = LIGHTGRAY, ?prefix:String) {
-		var text = [logText(text, color)];
-		if(prefix != null) text.insert(0, getPrefix(prefix));
+		var text = [logText(text, color, level)];
+		if(prefix != null) text.insert(0, getPrefix(prefix, level));
 		traceColored(text, level);
 	}
 
-	public inline static function getPrefix(prefix:String)
-		return logText('[${prefix}] ', BLUE);
+	public inline static function getPrefix(prefix:String, level:Level = INFO)
+		return logText('[${prefix}] ', BLUE, level);
 
 	public inline static function infos(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String)
 		Logs.trace(text, INFO, color, prefix);
@@ -169,4 +184,5 @@ enum abstract Level(Int) {
 typedef LogText = {
 	var text:String;
 	var color:ConsoleColor;
+	var level:Level;
 }
diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx
index 60e25798b5..40d4a84802 100644
--- a/source/funkin/backend/system/Main.hx
+++ b/source/funkin/backend/system/Main.hx
@@ -6,10 +6,13 @@ import flixel.addons.transition.TransitionData;
 import flixel.graphics.FlxGraphic;
 import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
+import funkin.backend.system.FakeCamera;
+import funkin.backend.system.FakeCamera.FakeCallCamera;
 import flixel.system.ui.FlxSoundTray;
 import funkin.backend.assets.AssetSource;
 import funkin.backend.assets.AssetsLibraryList;
 import funkin.backend.assets.ModsFolder;
+import funkin.backend.system.console.ConsoleUI;
 import funkin.backend.system.framerate.Framerate;
 import funkin.backend.system.framerate.SystemInfo;
 import funkin.backend.system.modules.*;
@@ -24,8 +27,13 @@ import openfl.utils.AssetLibrary;
 import sys.FileSystem;
 import sys.io.File;
 #if android
-import android.content.Context;
-import android.os.Build;
+import extension.androidtools.content.Context;
+import extension.androidtools.os.Build;
+#end
+
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
 #end
 
 class Main extends Sprite
@@ -33,7 +41,7 @@ class Main extends Sprite
 	public static var instance:Main;
 
 	public static var modToLoad:String = null;
-	public static var forceGPUOnlyBitmapsOff:Bool = #if desktop false #else true #end;
+	public static var forceGPUOnlyBitmapsOff:Bool = false;
 	public static var noTerminalColor:Bool = false;
 	public static var verbose:Bool = false;
 	public static var goToSong:String = null;
@@ -62,9 +70,11 @@ class Main extends Sprite
 	// You can pretty much ignore everything from here on - your code should go in your states.
 
 	public static function preInit() {
+		#if sys
 		funkin.backend.utils.NativeAPI.registerAsDPICompatible();
 		funkin.backend.system.CommandLineHandler.parseCommandLine(Sys.args());
 		funkin.backend.system.Main.fixWorkingDirectory();
+		#end
 	}
 
 	public function new()
@@ -73,7 +83,16 @@ class Main extends Sprite
 
 		instance = this;
 
+		#if IMGUI_ENABLED
+		initImGui();
+		addChild(ImGuiHandler.instance);
+		#end
 		CrashHandler.init();
+		ConsoleUI.init();
+
+		// i hate you hxcpp
+		FakeCamera.instance = new FakeCamera();
+		FakeCallCamera.instance = new FakeCallCamera();
 
 		addChild(game = new FunkinGame(gameWidth, gameHeight, MainState, Options.framerate, Options.framerate, skipSplash, startFullscreen));
 
@@ -99,16 +118,10 @@ class Main extends Sprite
 	// DEPRECATED
 	@:dox(hide) public static function execAsync(func:Void->Void) ThreadUtil.execAsync(func);
 
-	private static function getTimer():Int {
-		return time = Lib.getTimer();
-	}
-
 	public static function loadGameSettings() {
 		WindowUtils.init();
 		SaveWarning.init();
 		MemoryUtil.init();
-		@:privateAccess
-		FlxG.game.getTimer = getTimer;
 		FunkinCache.init();
 		Paths.assetsTree = new AssetsLibraryList();
 
@@ -133,12 +146,13 @@ class Main extends Sprite
 		funkin.options.PlayerSettings.init();
 		Options.load();
 
+		game.focusLostFramerate = 30;
 		FlxG.fixedTimestep = false;
-
 		FlxG.scaleMode = scaleMode = new FunkinRatioScaleMode();
+		FlxG.sound.applySoundCurve = applySoundCurve;
+		FlxG.sound.reverseSoundCurve = reverseSoundCurve;
 
 		Conductor.init();
-		AudioSwitchFix.init();
 		EventManager.init();
 		FlxG.signals.focusGained.add(onFocus);
 		FlxG.signals.preStateSwitch.add(onStateSwitch);
@@ -161,6 +175,16 @@ class Main extends Sprite
 		initTransition();
 	}
 
+	public static function applySoundCurve(volume:Float) {
+		return Flags.USE_SOUND_VOLUME_CURVE ? Math.pow(volume, 1.75) : volume;
+	}
+
+	public static function reverseSoundCurve(curvedVolume:Float) {
+		return Flags.USE_SOUND_VOLUME_CURVE ? Math.pow(curvedVolume, 0.5714285714285714) : curvedVolume;
+	}
+
+	static var persistShaderKeys:Map<String, Bool>;
+
 	public static function refreshAssets() @:privateAccess {
 		FunkinCache.instance.clearSecondLayer();
 
@@ -177,6 +201,18 @@ class Main extends Sprite
 		}
 
 		game.addChildAt(game.soundTray = daSndTray, index);
+
+		if (persistShaderKeys == null) {
+			persistShaderKeys = [for (k in @:privateAccess Lib.current.stage.context3D.__programs.keys()) k => true];
+		}
+		else {
+			for (key => program in @:privateAccess Lib.current.stage.context3D.__programs) {
+				if (persistShaderKeys.get(key) || Type.resolveClass(key) != null) continue;
+
+				program.dispose();
+				@:privateAccess Lib.current.stage.context3D.__programs.remove(key);
+			}
+		}
 	}
 
 	public static function initTransition() {
@@ -197,10 +233,11 @@ class Main extends Sprite
 	private static function onStateSwitch() {
 		scaleMode.resetSize();
 	}
-
 	public static function onUpdate() {
+		#if !IMGUI_ENABLED
 		if (PlayerSettings.solo.controls.DEV_CONSOLE)
 			NativeAPI.allocConsole();
+		#end
 
 		if (PlayerSettings.solo.controls.FPS_COUNTER && Options.fpsCounter)
 			Framerate.debugMode = (Framerate.debugMode + 1) % 3;
@@ -210,16 +247,6 @@ class Main extends Sprite
 		// manual asset clearing since base openfl one does'nt clear lime one
 		// does'nt clear bitmaps since flixel fork does it auto
 
-		@:privateAccess {
-			// clear uint8 pools
-			for(length=>pool in openfl.display3D.utils.UInt8Buff._pools) {
-				for(b in pool.clear())
-					b.destroy();
-			}
-
-			openfl.display3D.utils.UInt8Buff._pools.clear();
-		}
-
 		MemoryUtil.clearMajor();
 	}
 
@@ -240,4 +267,75 @@ class Main extends Sprite
 	public static function get_timeSinceFocus():Float {
 		return (FlxG.game.ticks - _tickFocused) / 1000;
 	}
+
+	#if IMGUI_ENABLED
+	private static var imGuiActiveLastFrame:Bool = true;
+	#end
+	private static function initImGui() {
+		#if IMGUI_ENABLED
+		//codename styled
+		var vcrFont = ImGuiIO.fonts.addFontFromFileTTF("assets/fonts/vcr.ttf");
+		ImGuiIO.fontDefault = vcrFont;
+		var style = ImGui.getStyle();
+		style.windowBorderSize = 2;
+		style.childBorderSize = 2;
+		style.popupBorderSize = 2;
+		style.frameBorderSize = 2;
+		style.windowRounding = 6;
+		style.childRounding = 6;
+		style.popupRounding = 6;
+		style.frameRounding = 6;
+		style.scrollbarRounding = 6;
+		style.grabRounding = 6;
+		style.setColor(ImGuiCol.WindowBg,               new ImVec4(0.11, 0.00, 0.16, 0.8));
+		style.setColor(ImGuiCol.Border,                 new ImVec4(0.59, 0.59, 0.59, 0.50));
+		style.setColor(ImGuiCol.FrameBg,                new ImVec4(0.13, 0.00, 0.19, 0.54));
+		style.setColor(ImGuiCol.FrameBgHovered,         new ImVec4(0.33, 0.15, 0.42, 0.40));
+		style.setColor(ImGuiCol.FrameBgActive,          new ImVec4(0.33, 0.15, 0.42, 0.67));
+		style.setColor(ImGuiCol.TitleBg,                new ImVec4(0.38, 0.36, 0.40, 0.32));
+		style.setColor(ImGuiCol.TitleBgActive,          new ImVec4(0.38, 0.36, 0.40, 0.72));
+		style.setColor(ImGuiCol.CheckMark,              new ImVec4(0.80, 0.60, 1.00, 1.00));
+		style.setColor(ImGuiCol.SliderGrab,             new ImVec4(0.33, 0.30, 0.35, 1.00));
+		style.setColor(ImGuiCol.SliderGrabActive,       new ImVec4(0.80, 0.60, 1.00, 1.00));
+		style.setColor(ImGuiCol.Button,                 new ImVec4(0.14, 0.13, 0.13, 0.99));
+		style.setColor(ImGuiCol.ButtonHovered,          new ImVec4(0.39, 0.00, 0.59, 1.00));
+		style.setColor(ImGuiCol.ButtonActive,           new ImVec4(0.76, 0.00, 1.00, 1.00));
+		style.setColor(ImGuiCol.Header,                 new ImVec4(0.15, 0.13, 0.13, 0.8));
+		style.setColor(ImGuiCol.HeaderHovered,          new ImVec4(0.39, 0.00, 0.59, 0.80));
+		style.setColor(ImGuiCol.HeaderActive,           new ImVec4(0.76, 0.00, 1.00, 1.00));
+		style.setColor(ImGuiCol.SeparatorHovered,       new ImVec4(0.39, 0.00, 0.59, 0.78));
+		style.setColor(ImGuiCol.SeparatorActive,        new ImVec4(0.76, 0.00, 1.00, 1.00));
+		style.setColor(ImGuiCol.ResizeGrip,             new ImVec4(0.15, 0.13, 0.13, 0.20));
+		style.setColor(ImGuiCol.ResizeGripHovered,      new ImVec4(0.39, 0.00, 0.59, 0.67));
+		style.setColor(ImGuiCol.ResizeGripActive,       new ImVec4(0.76, 0.00, 1.00, 0.95));
+		style.setColor(ImGuiCol.InputTextCursor,        new ImVec4(0.68, 0.13, 0.96, 1.00));
+		style.setColor(ImGuiCol.TabHovered,             new ImVec4(0.39, 0.00, 0.59, 0.80));
+		style.setColor(ImGuiCol.Tab,                    new ImVec4(0.21, 0.19, 0.19, 0.86));
+		style.setColor(ImGuiCol.TabSelected,            new ImVec4(0.76, 0.00, 1.00, 1.00));
+		style.setColor(ImGuiCol.TabSelectedOverline,    new ImVec4(0.76, 0.00, 1.00, 1.00));
+		style.setColor(ImGuiCol.TabDimmed,              new ImVec4(0.36, 0.18, 0.41, 1.00));
+		style.setColor(ImGuiCol.TabDimmedSelected,      new ImVec4(0.46, 0.21, 0.54, 1.00));
+		style.setColor(ImGuiCol.DockingPreview,         new ImVec4(0.56, 0.11, 0.71, 1.00));
+
+		ImGuiHandler.instance.addCallback(function() {
+			if ((ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0)
+			{
+				if (ImGuiIO.metricsRenderWindows > 2) { //debug window + dockspace
+					if (!imGuiActiveLastFrame) {
+						imGuiActiveLastFrame = true;
+						FlxG.autoPause = false;
+						FlxG.game.focusLostFramerate = FlxG.drawFramerate;
+					}
+				} else {
+					if (imGuiActiveLastFrame) {
+						imGuiActiveLastFrame = false;
+						FlxG.autoPause = Options.autoPause;
+						//FlxG.game.focusLostFramerate = 30; //just keep as draw fps, some timing issues with window focusing that keep it from working correctly
+					}
+				}
+			}
+			ImGui.dockSpaceOverViewport(0, null, ImGuiDockNodeFlags.PassthruCentralNode);
+		});
+		#end
+	}
 }
diff --git a/source/funkin/backend/system/MainState.hx b/source/funkin/backend/system/MainState.hx
index 03c260209e..97e812c485 100644
--- a/source/funkin/backend/system/MainState.hx
+++ b/source/funkin/backend/system/MainState.hx
@@ -1,5 +1,6 @@
 package funkin.backend.system;
 
+import funkin.backend.system.console.ConsoleCommandManager;
 #if MOD_SUPPORT
 import sys.FileSystem;
 #end
@@ -36,8 +37,10 @@ class MainState extends FlxState {
 		Options.save();
 
 		ControlsUtil.resetCustomControls();
+		ConsoleCommandManager.unregisterModdedCommands();
 		FlxG.bitmap.reset();
 		FlxG.sound.destroy(true);
+		FlxG.sound.resetCache();
 
 		Paths.assetsTree.reset();
 
@@ -169,7 +172,7 @@ class MainState extends FlxState {
 		}
 		initiated = true;
 
-		if (@:privateAccess FlxG.game._requestedState == null || @:privateAccess FlxG.game._requestedState == this) {
+		if (@:privateAccess FlxG.game._nextState == null) {
 			var startState:Class<FlxState> = Flags.DISABLE_WARNING_SCREEN ? TitleState : funkin.menus.WarningState;
 			var outdatedAPI:Bool = (Flags.MOD_API_VERSION ?? Flags.CURRENT_API_VERSION) < Flags.CURRENT_API_VERSION;
 			// In this case if the mod we just loaded a compressed modpack, we can't edit or modify files without decompressing it.
diff --git a/source/funkin/backend/system/OptimizedBitmapData.hx b/source/funkin/backend/system/OptimizedBitmapData.hx
index f6cf1117a9..510ebf14e2 100644
--- a/source/funkin/backend/system/OptimizedBitmapData.hx
+++ b/source/funkin/backend/system/OptimizedBitmapData.hx
@@ -1,62 +1,14 @@
 package funkin.backend.system;
 
 import lime.graphics.Image;
-import lime.graphics.cairo.CairoImageSurface;
 import openfl.display.BitmapData;
-import openfl.geom.Rectangle;
 
+@:deprecated("Use openfl.display.BitmapData.toHardware instead.")
 class OptimizedBitmapData extends BitmapData {
 	@SuppressWarnings("checkstyle:Dynamic")
 	@:noCompletion private override function __fromImage(image:#if lime Image #else Dynamic #end):Void
 	{
-		#if lime
-		if (image != null && image.buffer != null)
-		{
-			this.image = image;
-
-			width = image.width;
-			height = image.height;
-			rect = new Rectangle(0, 0, image.width, image.height);
-
-			__textureWidth = width;
-			__textureHeight = height;
-
-			#if sys
-			image.format = BGRA32;
-			image.premultiplied = true;
-			#end
-
-			__isValid = true;
-			readable = true;
-
-			if(FlxG.stage.context3D != null) {
-				lock();
-				getTexture(FlxG.stage.context3D);
-				getSurface();
-
-				readable = true;
-				this.image = null;
-
-				// @:privateAccess
-				// if (FlxG.bitmap.__doNotDelete)
-				// 	MemoryUtil.clearMinor();
-			}
-		}
-		#end
-	}
-
-	@SuppressWarnings("checkstyle:Dynamic")
-	@:dox(hide) public override function getSurface():#if lime CairoImageSurface #else Dynamic #end
-	{
-		#if lime
-		if (__surface == null)
-		{
-			__surface = CairoImageSurface.fromImage(image);
-		}
-
-		return __surface;
-		#else
-		return null;
-		#end
+		super.__fromImage(image);
+		toHardware();
 	}
 }
\ No newline at end of file
diff --git a/source/funkin/backend/system/RotatingSpriteGroup.hx b/source/funkin/backend/system/RotatingSpriteGroup.hx
index ad3eea575e..520e77417f 100644
--- a/source/funkin/backend/system/RotatingSpriteGroup.hx
+++ b/source/funkin/backend/system/RotatingSpriteGroup.hx
@@ -8,7 +8,12 @@ class RotatingSpriteGroup extends FlxSpriteGroup {
 			if (maxSize <= 0)
 				return super.recycle(ObjectClass, ObjectFactory, Force, Revive);
 			if (group.members.length < maxSize)
-				return group.recycleCreateObject(ObjectClass, ObjectFactory);
+			{
+				if (ObjectFactory != null) return add(ObjectFactory());
+				if (ObjectClass != null) return add(Type.createInstance(ObjectClass, []));
+
+				return null;
+			}
 			var spr = group.members.shift();
 			group.members.push(spr);
 			if (Revive)
diff --git a/source/funkin/backend/system/console/BuiltInCommands.hx b/source/funkin/backend/system/console/BuiltInCommands.hx
new file mode 100644
index 0000000000..63e9f2030b
--- /dev/null
+++ b/source/funkin/backend/system/console/BuiltInCommands.hx
@@ -0,0 +1,178 @@
+package funkin.backend.system.console;
+import funkin.backend.scripting.ModState;
+import funkin.menus.credits.CreditsMain;
+import funkin.editors.stage.StageEditor;
+import funkin.game.Stage;
+import funkin.game.Character;
+import funkin.editors.character.CharacterEditor;
+import funkin.options.OptionsMenu;
+import funkin.editors.charter.Charter;
+import funkin.backend.chart.Chart;
+import funkin.menus.TitleState;
+import funkin.menus.MainMenuState;
+import funkin.menus.FreeplayState;
+import funkin.menus.StoryMenuState;
+import funkin.backend.system.console.ConsoleCommand;
+
+
+class BuiltInCommands {
+	static var help = new FuncCommand("help", "[object]", "(Shows full list of commands or list of fields on an object or class)", function(args) {
+		if (args.length == 0) {
+			var strBuf:StringBuf = new StringBuf();
+			strBuf.add("\nCommands:");
+			for (cmdName in ConsoleCommandManager.commandsStringList) { //use list to go in order
+				var cmd = ConsoleCommandManager.getCommand(cmdName);
+				strBuf.add("\n\t");
+				strBuf.add(cmd.name);
+				strBuf.add(" ");
+				strBuf.add(cmd.argsDesc);
+				strBuf.add("\n\t\t");
+				strBuf.add(cmd.desc);
+			}
+			Logs.infos(strBuf.toString());
+		} else {
+			@:privateAccess
+			var fields = ConsoleUI.instance.consoleHscript.tryGetFields(args[0]);
+			if (fields.length == 0) {
+				Logs.infos("Failed to find fields for: " + args[0]);
+				return;
+			}
+			var strBuf:StringBuf = new StringBuf();
+			strBuf.add("\n");
+			strBuf.add(args[0]);
+			strBuf.add(":");
+			for (f in fields) {
+				strBuf.add("\n\t");
+				strBuf.add(f.name);
+				strBuf.add(":");
+				strBuf.add(f.type);
+				if (f.value != "") {
+					strBuf.add(" = ");
+					strBuf.add(f.value);
+				}
+			}
+			Logs.infos(strBuf.toString());
+		}
+	});
+	static var clear = new FuncCommand("clear", "", "(Clears the console log)", function(args) { @:privateAccess ConsoleUI.instance.clearConsole(); });
+	static var pause = new FuncCommand("pause", "", "(Toggles pause on game)", function(args) { 
+		var game:FunkinGame = cast FlxG.game;
+		game.toggleManualPause();
+	});
+	static var loadSong = new FuncCommand("loadSong", "[song] [diff] [variation] [opponentMode] [coopMode]", "(Loads a new song and switches to PlayState)", function(args) {
+		if (args.length == 0) {
+			Logs.error("Can't load a song with no name!");
+			return;
+		}
+
+		var name:String = args[0];
+		var diff:String = args[1];
+		var variation:String = args[2] != null ? (args[2] == "default" ? null : args[2]) : null;
+
+		var chartPath:String = Paths.chart(name, diff, variation);
+		if (Assets.exists(chartPath)) {
+			PlayState.loadSong(name, diff, variation, args[3] != null ? args[3] == "true" : false, args[4] != null ? args[4] == "true" : false);
+			FlxG.switchState(new PlayState());
+		} else {
+			Logs.error('Chart for song $name at "$chartPath" was not found.');
+		}
+	});
+	static var endSong = new FuncCommand("endSong", "", "(Ends the current song if in PlayState)", function(args) {
+		if (PlayState.instance != null) {
+			PlayState.instance.endSong();
+		}
+	});
+	static var loadWeek = new FuncCommand("loadWeek", "[name] [diff]", "(Loads a new week and switches to PlayState)", function(args) {
+		if (args.length == 0) return;
+		var weeklist = StoryWeeklist.get(true, false);
+		for (w in weeklist.weeks) {
+			if (args[0] == w.id) {
+				var diff = args[1] != null ? args[1] : w.difficulties[w.difficulties.length-1];
+				if (w.difficulties.contains(diff)) {
+					PlayState.loadWeek(w, diff);
+					FlxG.switchState(new PlayState());
+					return;
+				}
+				Logs.error('Difficulty $diff for week ${w.id} was not found.');
+				return;
+			}
+		}
+		Logs.error('Week with id ${args[0]} was not found.');
+	});
+	static var switchMod = new FuncCommand("switchMod", "[name]", "(Switches to another mod, inputting nothing will disable mod)", function(args) { funkin.backend.assets.ModsFolder.switchMod(args[0]); });
+	static var reloadMod = new FuncCommand("reloadMod", "", "(Reload current mod)", function(args) { funkin.backend.assets.ModsFolder.reloadMods(); });
+
+	static var reloadState = new FuncCommand("reloadState", "", "(Reload current state)", function(args) { FlxG.resetState(); });
+	static var goToPlayState = new FuncCommand("goToPlayState", "", "(switches state to PlayState, only works if a song is already loaded)", function(args) { if (PlayState.SONG != null) FlxG.switchState(new PlayState()); });
+	static var goToMainMenu = new FuncCommand("goToMainMenu", "", "(switches state to MainMenuState)", function(args) { FlxG.switchState(new MainMenuState()); });
+	static var goToStoryMode = new FuncCommand("goToStoryMode", "", "(switches state to StoryMenuState)", function(args) { FlxG.switchState(new StoryMenuState()); });
+	static var goToFreeplay = new FuncCommand("goToFreeplay", "", "(switches state to FreeplayState)", function(args) { FlxG.switchState(new FreeplayState()); });
+	static var goToOptions = new FuncCommand("goToOptions", "", "(switches state to OptionsMenu)", function(args) { FlxG.switchState(new OptionsMenu()); });
+	static var goToCredits = new FuncCommand("goToCredits", "", "(switches state to CreditsMain)", function(args) { FlxG.switchState(new CreditsMain()); });
+	static var goToTitle = new FuncCommand("goToTitle", "[reset]", "(switches state to TitleState)", function(args) {
+		@:privateAccess
+		if (args[0] != null && args[0] == "true") TitleState.initialized = false;
+		FlxG.switchState(new TitleState());
+	});
+	static var goToModState = new FuncCommand("goToModState", "[name]", "(switches state to a custom ModState)", function(args) {
+		FlxG.switchState(new ModState(args[0]));
+	});
+
+	static var goToCharter = new FuncCommand("goToCharter", "[song] [diff] [variation]", "(opens chart editor, inputting nothing will load existing song)", function(args) {
+		if (args.length == 0) {
+			if (PlayState.SONG == null) {
+				Logs.error("Charter doesn't have any song data loaded!");
+			} else {
+				@:privateAccess
+				if (Charter.__song == null || (PlayState.SONG != null && PlayState.SONG.meta != null && PlayState.SONG.meta.name != Charter.__song) || PlayState.difficulty != Charter.__diff || PlayState.variation != Charter.__variant) {
+					FlxG.switchState(new Charter(PlayState.SONG.meta.name, PlayState.difficulty, PlayState.variation)); //load fresh charter, can't load previous because PlayState.SONG probably changed
+				} else {
+					@:privateAccess
+					FlxG.switchState(new Charter(Charter.__song, Charter.__diff, Charter.__variant, false));
+				}
+			}
+			return;
+		}
+
+		var name:String = args[0];
+		var diff:String = args[1];
+		var variation:String = args[2] != null ? (args[2] == "default" ? null : args[2]) : null;
+
+		var chartPath:String = Paths.chart(name, diff, variation);
+		if (Assets.exists(chartPath)) {
+			FlxG.switchState(new Charter(name, diff, variation));
+		} else {
+			Logs.error('Chart for song $name at "$chartPath" was not found.');
+		}
+	});
+
+	static var goToCharacterEditor = new FuncCommand("goToCharacterEditor", "[name]", "(opens character editor)", function(args) {
+		if (args.length == 0) {
+			Logs.error("Can't load a character with no name!");
+			return;
+		}
+		var name:String = args[0];
+		var list = Character.getList(false, false, null, true);
+		if (!list.contains(name)) {
+			Logs.error('Character $name was not found.');
+			return;
+		}
+
+		FlxG.switchState(new CharacterEditor(name));
+	});
+
+	static var goToStageEditor = new FuncCommand("goToStageEditor", "[name]", "(opens stage editor)", function(args) {
+		if (args.length == 0) {
+			Logs.error("Can't load a stage with no name!");
+			return;
+		}
+		var name:String = args[0];
+		var list = Stage.getList(false, true);
+		if (!list.contains(name)) {
+			Logs.error('stage $name was not found.');
+			return;
+		}
+
+		FlxG.switchState(new StageEditor(name));
+	});
+}
\ No newline at end of file
diff --git a/source/funkin/backend/system/console/ConsoleCommand.hx b/source/funkin/backend/system/console/ConsoleCommand.hx
new file mode 100644
index 0000000000..0455c1d375
--- /dev/null
+++ b/source/funkin/backend/system/console/ConsoleCommand.hx
@@ -0,0 +1,76 @@
+package funkin.backend.system.console;
+import funkin.backend.system.console.ConsoleCommandManager;
+
+class BaseCommand {
+	public var name:String;
+	public var argsDesc:String;
+	public var desc:String;
+
+	@:allow(funkin.backend.system.console.ConsoleCommandManager)
+	private var _nameLower:String;
+
+	public function new(name:String, argsDesc:String, desc:String, autoRegister:Bool = true) {
+		this.name = name;
+		this.argsDesc = argsDesc;
+		this.desc = desc;
+		_nameLower = name.toLowerCase();
+		if (autoRegister) ConsoleCommandManager.registerCommand(this);
+	}
+	public function onRegister() {};
+	public function onUnregister() {};
+	public function execute(raw:String) {};
+
+	public static function parseArgs(raw:String) {
+		var args:Array<String> = [];
+		if (raw == "") return args;
+
+		var i:Int = 0;
+		var curStr = "";
+		var parseState = 0;
+		while(true) {
+			var char = raw.charAt(i);
+			if (parseState == 0 && char == " ") {
+				if (curStr != "") args.push(curStr);
+				curStr = "";
+			} else if (parseState == 0 && char == "\"") {
+				parseState = 1;
+			} else if (parseState == 1 && char == "\"") {
+				parseState = 0;
+			} else if (parseState == 0 && char == "'") {
+				parseState = 2;
+			} else if (parseState == 2 && char == "'") {
+				parseState = 0;
+			} else {
+				curStr += char;
+			}
+			
+			i++;
+			if (i > raw.length-1) {
+				if (curStr != "") args.push(curStr);
+				break;
+			}
+		}
+		return args;
+	}
+}
+
+class FuncCommand extends BaseCommand {
+	public var func:Array<String>->Void;
+	override public function new (name:String, argsDesc:String, desc:String, func:Array<String>->Void, autoRegister:Bool = true) {
+		super(name, argsDesc, desc, autoRegister);
+		this.func = func;
+	}
+	override public function execute(raw:String) {
+		func(BaseCommand.parseArgs(raw));
+	}
+}
+
+//auto removed on mod switch, intended for mod global scripts
+class ModFuncCommand extends FuncCommand {
+	override public function onRegister() {
+		Logs.infos("Registered modded command: " + name, LIGHTGRAY, "Console");
+	}
+	override public function onUnregister() {
+		Logs.infos("Unregistered modded command: " + name, LIGHTGRAY, "Console");
+	}
+}
diff --git a/source/funkin/backend/system/console/ConsoleCommandManager.hx b/source/funkin/backend/system/console/ConsoleCommandManager.hx
new file mode 100644
index 0000000000..302ec27d96
--- /dev/null
+++ b/source/funkin/backend/system/console/ConsoleCommandManager.hx
@@ -0,0 +1,63 @@
+package funkin.backend.system.console;
+import funkin.backend.system.Logs;
+import funkin.backend.system.console.ConsoleCommand;
+
+class ConsoleCommandManager {
+	
+	public static var commands:Map<String, BaseCommand> = [];
+	public static var commandsStringList:Array<String> = [];
+
+	public static function registerCommand(cmd:BaseCommand) {
+		if (commands.exists(cmd._nameLower)) {
+			Logs.warn("Trying to register console command that already exists! (" + cmd.name + ")");
+			return;
+		}
+		cmd.onRegister();
+		commands.set(cmd._nameLower, cmd);
+		commandsStringList.push(cmd._nameLower);
+	}
+
+	public static function unregisterCommand(cmd:BaseCommand) {
+		if (!commands.exists(cmd._nameLower)) {
+			Logs.warn("Trying to unregister console command that isn't registered! (" + cmd.name + ")");
+			return;
+		}
+		cmd.onUnregister();
+		commandsStringList.remove(cmd._nameLower);
+		commands.remove(cmd._nameLower);
+	}
+
+	public static function getCommand(name:String) {
+		if (commands.exists(name.toLowerCase())) {
+			return commands.get(name.toLowerCase());
+		}
+		return null;
+	}
+
+	public static function tryExecute(str:String) {
+		var strLower = str.toLowerCase();
+		var targetCmd = strLower;
+		var rawArgs = "";
+		if (strLower.indexOf(" ") != -1) {
+			targetCmd = strLower.substring(0, strLower.indexOf(" "));
+			rawArgs = str.substring(str.indexOf(" ")+1, str.length);
+		}
+		
+		if (ConsoleCommandManager.commands.exists(targetCmd)) {
+			Logs.infos("Executing command: " + str, LIGHTGRAY, "Console");
+			ConsoleCommandManager.commands.get(targetCmd).execute(rawArgs);
+			return true;
+		}
+		return false;
+	}
+
+	public static function unregisterModdedCommands() {
+		var commandsToRemove:Array<BaseCommand> = [];
+		for (name => cmd in commands) {
+			if (cmd is ModFuncCommand) {
+				unregisterCommand(cmd);
+			}
+		}
+	}
+}
+
diff --git a/source/funkin/backend/system/console/ConsoleHscript.hx b/source/funkin/backend/system/console/ConsoleHscript.hx
new file mode 100644
index 0000000000..d96823b4c3
--- /dev/null
+++ b/source/funkin/backend/system/console/ConsoleHscript.hx
@@ -0,0 +1,281 @@
+package funkin.backend.system.console;
+import haxe.io.Path;
+import funkin.backend.scripting.HScript;
+import funkin.backend.scripting.ScriptPack;
+import funkin.backend.scripting.Script;
+
+import hscript.*;
+import hscript.Expr.Error;
+import hscript.Parser;
+import hscript.CustomClass;
+
+typedef ConsoleHscriptField = {
+	var name:String;
+	var type:String;
+	var isStatic:Bool;
+	var isScriptVar:Bool;
+	var value:String;
+	var ?autoComplete:String;
+	var ?extraDesc:String;
+};
+
+class ConsoleHscript {
+	//mods can add their own imports if needed
+	public static var extraImports:Map<String, Dynamic> = [
+		"Script" => Script
+	];
+
+	private static final scriptVariableBlackList:Array<String> = ["__script__", "importScript", "true", "false", "null", "disableScript", "trace"];
+	private static final customClassVariableBlacklist:Array<String> = ["hset", "hget"];
+
+	public var interp:Interp;
+	public var parser:Parser;
+	public var expr:Expr;
+	public var variableFields:Array<ConsoleHscriptField> = [];
+
+	public function new() {
+		parser = new Parser();
+		parser.allowJSON = parser.allowMetadata = parser.allowTypes = true;
+		
+		interp = new Interp();
+		interp.importEnabled = false;
+
+		resetVariables();
+		FlxG.signals.postStateSwitch.add(function() {
+			resetVariables();
+		});
+	}
+
+	private function resetVariables() {
+		@:privateAccess
+		interp.resetVariables();
+		variableFields = [];
+		var defaults = Script.getDefaultVariables(null);
+		for(k=>e in defaults) {
+			set(k, e);
+		}
+		for (k=>e in extraImports) {
+			set(k, e);
+		}
+
+		var scriptPacks:Array<ScriptPack> = [];
+		var scriptPackPaths:Array<String> = [];
+		if (FlxG.state is MusicBeatState) {
+			var state:MusicBeatState = cast FlxG.state;
+			scriptPacks.push(state.stateScripts);
+			scriptPackPaths.push("stateScripts");
+			set("stateScripts", state.stateScripts);
+			if (PlayState.instance != null) {
+				scriptPacks.push(PlayState.instance.scripts);
+				scriptPackPaths.push("scripts");
+				set("scripts", PlayState.instance.scripts);
+			}
+		}
+
+		for (k=>e in Script.staticVariables) {
+			variableFields.push({
+				name: k,
+				type: getFieldTypeName(e),
+				isStatic: false,
+				isScriptVar: true,
+				value: getFieldTypeValue(e),
+				autoComplete: "Script.staticVariables[\"" + k + "\"]",
+				extraDesc: "Static"
+			});
+		}
+
+		for (i => s in scriptPacks) {
+			for (k=>e in s.publicVariables) {
+				variableFields.push({
+					name: k,
+					type: getFieldTypeName(e),
+					isStatic: false,
+					isScriptVar: true,
+					value: getFieldTypeValue(e),
+					autoComplete: scriptPackPaths[i] + ".publicVariables[\"" + k + "\"]",
+					extraDesc: "Public, " + scriptPackPaths[i]
+				});
+			}
+
+			for (scriptIndex => script in s.scripts) {
+				if (script is HScript) {
+					var hscript:HScript = cast script;
+					var name = "_"+Path.withoutExtension(script.fileName);
+					while(interp.varExists(name)) name += "0"; //hopefully prevent duplicates
+					name = name.replace(" ", "_");
+					name = name.replace(".", "_");
+					set(name, hscript.interp.variables);
+					for (k=>e in hscript.interp.variables) {
+						if (!defaults.exists(k) && !(e is Class) && !scriptVariableBlackList.contains(k)) {
+							variableFields.push({
+								name: k,
+								type: getFieldTypeName(e),
+								isStatic: false,
+								isScriptVar: true,
+								value: getFieldTypeValue(e),
+								autoComplete: name + "[\"" + k + "\"]",
+								extraDesc: "Local, " + script.fileName
+							});
+						}
+					}
+				}
+				
+			}
+		}
+	}
+
+	public function set(val:String, value:Dynamic) {
+		interp.variables.set(val, value);
+		variableFields.push({
+			name: val,
+			type: value is Class ? Type.getClassName(value) : getFieldTypeName(value),
+			isStatic: (value is Class),
+			isScriptVar: false,
+			value: ""
+		});
+	}
+
+	public function prepareString(str:String) {
+		if (str.endsWith(";")) str = str.substr(0, -1);
+		return str;
+	}
+	public function getObj(str:String) {
+		var obj:Dynamic = null;
+		try {
+			obj = interp.expr(parser.parseString(str, "console"));
+		} catch(e:Error) {
+			//ignore errors while getting fields
+		} catch(e) {
+			
+		}
+		return obj;
+	}
+
+	public function getFieldTypeName(obj:Dynamic) {
+		switch(Type.typeof(obj)) {
+			case TBool:
+				return "Bool";
+			case TInt:
+				return "Int";
+			case TFloat:
+				return "Float";
+			case TFunction:
+				return "Function";
+			case TObject:
+				return "Dynamic";
+			case TEnum(c):
+				return Type.getEnumName(c);
+			case TClass(c):
+				return Type.getClassName(c);
+			default:
+				return Type.getClassName(Type.getClass(obj));
+		}
+		return "Unknown";
+	}
+
+	public function getFieldTypeValue(obj:Dynamic) {
+		switch(Type.typeof(obj)) {
+			case TBool:
+				return Std.string(obj);
+			case TInt:
+				return Std.string(obj);
+			case TFloat:
+				return Std.string(obj);
+			case TFunction:
+				return "";
+			case TObject:
+				return "";
+			case TEnum(c):
+				return Std.string(obj);
+			case TClass(c):
+				if (getFieldTypeName(obj) == "Array" && obj != null) {
+					return "Length: " + obj.length + (obj.length > 0 ? ", " + getFieldTypeName(obj[0]) : ""); //guess the type based on first element
+				} else if (getFieldTypeName(obj) == "String") {
+					return "\"" + Std.string(obj) + "\"";
+				} else if (Reflect.hasField(obj, "toString")) {
+					return Std.string(obj);
+				}
+			default:
+				return "";
+		}
+		return "";
+	}
+
+	public function tryGetFields(str:String) {
+		var obj:Dynamic = getObj(prepareString(str));
+		if (obj == null) return [];
+
+		var returnFields:Array<ConsoleHscriptField> = [];
+		var fields:Array<String> = [];
+		var isStatic = (obj is Class);
+		var isEnum = (obj is Enum);
+		var isObject = Reflect.isObject(obj);
+		var hasClass = Type.getClass(obj) != null;
+
+		if (isStatic) {
+			fields = Type.getClassFields(obj);
+		} else if (isEnum) {
+			fields = Type.getEnumConstructs(obj);
+		} else if (obj is CustomClass) {
+			var customClass:CustomClass = cast obj;
+			@:privateAccess
+			for (f in customClass.getSuperFields()) {
+				if (!f.startsWith("_HX_SUPER__") && !customClassVariableBlacklist.contains(f)) {
+					fields.push(f);
+				}
+			}
+		} else if (hasClass) {
+			fields = Type.getInstanceFields(Type.getClass(obj));
+		} else if (isObject) { //usually for dynamic structs
+			fields = Reflect.fields(obj);
+		}
+
+		var filteredFields:Array<String> = [];
+		for (field in fields) {
+			if (field.startsWith("get_") || field.startsWith("set_")) {
+				var name = field.substr(4);
+				if (!fields.contains(name) && !filteredFields.contains(name))
+					filteredFields.push(name);
+			}
+			else {
+				filteredFields.push(field);
+			}
+		}
+
+		for (field in filteredFields) {
+			var fieldObj = getObj(prepareString(str) + "." + field);
+			if (fieldObj != null) {
+				returnFields.push({
+					name: field,
+					type: getFieldTypeName(fieldObj),
+					isStatic: isStatic,
+					isScriptVar: false,
+					value: getFieldTypeValue(fieldObj)
+				});
+			} else {
+				returnFields.push({
+					name: field,
+					type: "Unknown",
+					isStatic: isStatic,
+					isScriptVar: false,
+					value: ""
+				});
+			}
+		}
+		return returnFields;
+	}
+
+	public function tryExecute(cmd:String) {
+		cmd = cmd.trim();
+		if (!cmd.endsWith(";")) cmd += ";";
+		var ret = null;
+		try {
+			ret = interp.execute(parser.parseString(cmd, "console"));
+		} catch(e:Error) {
+			ret = e.toString();
+		} catch(e) {
+			ret = e.toString();
+		}
+		return ret;
+	}
+}
\ No newline at end of file
diff --git a/source/funkin/backend/system/console/ConsoleUI.hx b/source/funkin/backend/system/console/ConsoleUI.hx
new file mode 100644
index 0000000000..abae22c11e
--- /dev/null
+++ b/source/funkin/backend/system/console/ConsoleUI.hx
@@ -0,0 +1,699 @@
+package funkin.backend.system.console;
+
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGui;
+import lime.tools.imgui.ImGuiIO;
+import lime.tools.imgui.ImGuiStyle;
+import lime.tools.imgui.ImGuiHandler;
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
+import lime.tools.imgui.ImGuiPtr;
+import lime.tools.imgui.ImGuiInputTextCallbackData;
+#end
+import openfl.Lib;
+import funkin.backend.system.Logs;
+import funkin.backend.utils.NativeAPI.ConsoleColor;
+import funkin.backend.system.console.inspector.ConsoleInspector;
+
+using funkin.backend.utils.ImGuiUtil;
+
+typedef ConsoleSearchData = {
+	var name:String;
+	var desc:String;
+	var ?argsDesc:String;
+	var searchIndex:Int;
+	var isCommand:Bool;
+	var ?autoComplete:String;
+}
+
+typedef ConsoleLogData = {
+	var log:Array<LogText>;
+	var times:Int;
+}
+
+class ConsoleUI {
+
+	static final CONSOLE_BG_COLOR = 0xFF380051;
+	static final SEARCH_HIGHLIGHT_COLOR = 0xFF00FF00;
+	static final SEARCH_SELECTED_COLOR = 0xFFE2D302;
+	static final SEARCH_DESC_COLOR = 0xFF636363;
+	static final SEARCH_ARGS_COLOR = 0xFF58804F;
+
+	static final CONSOLE_MAX_OUPUT = 100;
+	static final SEARCH_MAX_OUTPUT = 25;
+
+	public static var instance(default, null):ConsoleUI;
+
+	private var active:Bool = false;
+	private var inspectorActive:Bool = false;
+	#if IMGUI_ENABLED
+	private var style:ImGuiStyle;
+	#end
+	private var consoleHscript:ConsoleHscript;
+	private var consoleInspector:ConsoleInspector;
+
+	var commandSearch:Array<ConsoleSearchData> = [];
+	var prevCommands:Array<String> = [];
+	var forceFocusTextInput = false;
+	var cyclingCommands = false;
+	var cyclingPrevCommands = false;
+	var cycleIndex = 0;
+
+	#if IMGUI_ENABLED
+	var consoleInputString:ImGuiStringPtr = new ImGuiStringPtr("");
+	var consoleInputTextCallback:ImGuiInputTextCallback;
+	#end
+	var consoleOutput:Array<ConsoleLogData> = [];
+	var consoleOutputCurrentIndex:Int = 0;
+	var wrapConsoleOutput = false;
+	var autoScrollNextFrame = false;
+
+
+	#if IMGUI_ENABLED
+	var settingsOpen:ImGuiBoolPtr = new ImGuiBoolPtr(false);
+
+	var timeFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var typeFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+
+	var infoFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var warningFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var errorFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var traceFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var verboseFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+
+	var commandsFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var hscriptClassFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var hscriptFunctionFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var hscriptBasicTypesFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var hscriptObjectsFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+	var hscriptScriptsFilter:ImGuiBoolPtr = new ImGuiBoolPtr(true);
+
+	var countDuplicatedOutput:ImGuiBoolPtr = new ImGuiBoolPtr(false);
+
+	function saveSettings() {
+		Options.consoleTimeFilter = timeFilter.value;
+		Options.consoleTypeFilter = typeFilter.value;
+		Options.consoleInfoFilter = infoFilter.value;
+		Options.consoleWarningFilter = warningFilter.value;
+		Options.consoleErrorFilter = errorFilter.value;
+		Options.consoleTraceFilter = traceFilter.value;
+		Options.consoleVerboseFilter = verboseFilter.value;
+		Options.consoleCommandsFilter = commandsFilter.value;
+		Options.consoleClassFilter = hscriptClassFilter.value;
+		Options.consoleFunctionFilter = hscriptFunctionFilter.value;
+		Options.consoleBasicTypesFilter = hscriptBasicTypesFilter.value;
+		Options.consoleObjectsFilter = hscriptObjectsFilter.value;
+		Options.consoleScriptsFilter = hscriptScriptsFilter.value;
+		Options.consoleCountDuplicatedOutput = countDuplicatedOutput.value;
+	}
+	function loadSettings() {
+		//console is created before options are loaded
+		timeFilter.value = Options.consoleTimeFilter;
+		typeFilter.value = Options.consoleTypeFilter;
+		infoFilter.value = Options.consoleInfoFilter;
+		warningFilter.value = Options.consoleWarningFilter;
+		errorFilter.value = Options.consoleErrorFilter;
+		traceFilter.value = Options.consoleTraceFilter;
+		verboseFilter.value = Options.consoleVerboseFilter;
+		commandsFilter.value = Options.consoleCommandsFilter;
+		hscriptClassFilter.value = Options.consoleClassFilter;
+		hscriptFunctionFilter.value = Options.consoleFunctionFilter;
+		hscriptBasicTypesFilter.value = Options.consoleBasicTypesFilter;
+		hscriptObjectsFilter.value = Options.consoleObjectsFilter;
+		hscriptScriptsFilter.value = Options.consoleScriptsFilter;
+		countDuplicatedOutput.value = false; //Options.consoleCountDuplicatedOutput; //temp disable
+	}
+	#end
+
+	public static function init() {
+		ConsoleUI.instance = new ConsoleUI();
+		#if IMGUI_ENABLED
+		ImGuiHandler.instance.addCallback(ConsoleUI.instance.displayUI);
+		#end
+	}
+
+	public function new() {
+		#if IMGUI_ENABLED
+		style = ImGui.getStyle();
+		consoleInputTextCallback = new ImGuiInputTextCallback(onInputTextCallback);
+		#end
+
+		for (i in 0...CONSOLE_MAX_OUPUT) {
+			consoleOutput.push({log: [], times: 0});
+		}
+	};
+
+	private function addToConsole(text:Array<LogText>) {
+		#if IMGUI_ENABLED
+		//check for repeats
+		var min = consoleOutputCurrentIndex-10;
+		if (min < 0) min = 0;
+		if (countDuplicatedOutput.value) //currently disabled
+		{
+			for (i in min...consoleOutputCurrentIndex) {
+				var matching = true;
+				if (text.length > 4 && text.length == consoleOutput[i].log.length) {
+					for (textIndex in 3...consoleOutput[i].log.length) {
+						if (text[textIndex].text != consoleOutput[i].log[textIndex].text) matching = false;
+					}
+				} else {
+					matching = false;
+				}
+				if (matching) {
+					consoleOutput[i].log = text;
+					consoleOutput[i].times++;
+					if (i != consoleOutputCurrentIndex-1) { //TODO: this should push to bottom instead of swapping since it doesnt always work
+						var temp = consoleOutput[consoleOutputCurrentIndex-1];
+						consoleOutput[consoleOutputCurrentIndex-1] = consoleOutput[i];
+						consoleOutput[i] = temp;
+					}
+					return;
+				}
+			}
+		}
+		addToConsoleOutput(text);
+		autoScrollNextFrame = true;
+		#end
+	}
+
+	private inline function addToConsoleOutput(text:Array<LogText>) {
+		consoleOutput[consoleOutputCurrentIndex] = {log: text, times: 1};
+		consoleOutputCurrentIndex++;
+
+		if (consoleOutputCurrentIndex >= CONSOLE_MAX_OUPUT) { //wrap around like a ring buffer
+			consoleOutputCurrentIndex = 0;
+			wrapConsoleOutput = true;
+		}
+	}
+
+	public function toggleUI() {
+		#if IMGUI_ENABLED
+		active = !active;
+
+		if (active) {
+			loadSettings();
+			forceFocusTextInput = true;
+			if (consoleHscript == null) consoleHscript = new ConsoleHscript();
+		} else {
+			ImGui.setKeyboardFocusHere(0);
+		}
+		#end
+	}
+
+	public function toggleInspector() {
+		#if IMGUI_ENABLED
+		inspectorActive = !inspectorActive;
+		if (inspectorActive) {
+			if (consoleHscript == null) consoleHscript = new ConsoleHscript();
+			if (consoleInspector == null) consoleInspector = new ConsoleInspector(consoleHscript);
+		}
+		#end
+	}
+
+	public function displayUI() {
+		#if IMGUI_ENABLED
+		if (!Options.devMode) {
+			if (active) toggleUI();
+			if (inspectorActive) toggleInspector();
+			return;
+		}
+		
+		var toggled:Bool = false;
+		for (key in Options.SOLO_DEV_CONSOLE) {
+			if (ImGui.isKeyPressed(key.toImGuiKey(), false)) toggled = true;
+		}
+		if (toggled) toggleUI();
+
+		var toggledInspector:Bool = false;
+		for (key in Options.SOLO_DEV_INSPECTOR) {
+			if (ImGui.isKeyPressed(key.toImGuiKey(), false)) toggledInspector = true;
+		}
+		if (toggledInspector) toggleInspector();
+		if (inspectorActive) consoleInspector.displayUI();
+
+		if (!active) return;
+
+		if (settingsOpen.value) {
+			ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX() + Lib.application.window.width - 240, ImGuiUtil.getWindowSpaceY(), ImGuiCond.FirstUseEver);
+			ImGui.setNextWindowSize(240, 405, ImGuiCond.FirstUseEver);
+			if (ImGui.begin("Console Settings", settingsOpen, 0)) {
+				//ImGui.checkbox("Count duplicated output##Console Settings", countDuplicatedOutput); ImGui.setItemTooltip("Toggles if duplicated logs add a counter instead of displaying again");
+				ImGui.separatorText("Log Filter:");
+				ImGui.checkbox("Time##Console Settings", timeFilter); ImGui.setItemTooltip("Toggles if timestamp shows in each log");
+				ImGui.checkbox("Type##Console Settings", typeFilter); ImGui.setItemTooltip("Toggles if the type shows in each log");
+				ImGui.separator();
+				ImGui.checkbox("Info##Console Settings", infoFilter); ImGui.setItemTooltip("Toggles if info logs show");
+				ImGui.checkbox("Warning##Console Settings", warningFilter); ImGui.setItemTooltip("Toggles if warning logs show");
+				ImGui.checkbox("Error##Console Settings", errorFilter); ImGui.setItemTooltip("Toggles if error logs show");
+				ImGui.checkbox("Trace##Console Settings", traceFilter); ImGui.setItemTooltip("Toggles if trace logs show");
+				ImGui.checkbox("Verbose##Console Settings", verboseFilter); ImGui.setItemTooltip("Toggles if verbose logs show");
+				ImGui.separatorText("Search Filter:");
+				ImGui.checkbox("Commands##Console Settings", commandsFilter); ImGui.setItemTooltip("Toggles if commands show in the autofill");
+				ImGui.checkbox("Classes##Console Settings", hscriptClassFilter); ImGui.setItemTooltip("Toggles if classes show in the autofill");
+				ImGui.checkbox("Functions##Console Settings", hscriptFunctionFilter); ImGui.setItemTooltip("Toggles if functions show in the autofill");
+				ImGui.checkbox("Basic Types##Console Settings", hscriptBasicTypesFilter); ImGui.setItemTooltip("Toggles if basic types (Int, Float, String) show in the autofill");
+				ImGui.checkbox("Objects##Console Settings", hscriptObjectsFilter); ImGui.setItemTooltip("Toggles if objects show in the autofill");
+				ImGui.checkbox("Script Variables##Console Settings", hscriptScriptsFilter); ImGui.setItemTooltip("Toggles if script variables show in the autofill");
+			}
+			ImGui.end();
+			saveSettings();
+		}
+
+		ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX(), ImGuiUtil.getWindowSpaceY() + (Lib.application.window.height-250), ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowSize(Lib.application.window.width, 250, ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowDockID(0, ImGuiCond.FirstUseEver);
+		if (ImGui.begin("Console", null, ImGuiWindowFlags.NoScrollbar)) {
+			displayOutput();
+			ImGui.separator();
+			displayInput();
+		}
+		ImGui.end();
+		#end
+	}
+
+	#if IMGUI_ENABLED
+	private function displayOutput() {
+		var windowWidth = ImGui.getWindowWidth();
+		var windowHeight = ImGui.getWindowHeight();
+		var outputHeight = windowHeight - (40 * style.fontScaleDpi); //I think scaling the dpi should be good enough?	//TODO: should probably look at this again
+		//var outputHeight = windowHeight - (ImGui.getFrameHeightWithSpacing()*2);
+		//if (ImGui.isWindowDocked()) windowHeight -= ImGui.getFrameHeightWithSpacing();
+		if (outputHeight > 0) {
+			ImGui.pushTextWrapPos();
+			if (ImGui.beginChild("Console output", windowWidth, outputHeight)) {
+				if (wrapConsoleOutput) {
+					outputLog(consoleOutputCurrentIndex, CONSOLE_MAX_OUPUT);
+				}
+				outputLog(0, consoleOutputCurrentIndex);
+			}
+			if (autoScrollNextFrame) {
+				ImGui.setScrollHereY(1.0);
+				autoScrollNextFrame = false;
+			}
+			ImGui.endChild();
+			ImGui.popTextWrapPos();
+		}
+	}
+
+	private inline function outputLog(start:Int, end:Int) {
+		var indicesToIgnore:Array<Int> = [];
+		if (!timeFilter.value && !typeFilter.value) indicesToIgnore = [0, 1, 2, 3, 4];
+		else if (!timeFilter.value) indicesToIgnore = [1, 2];
+		else if (!typeFilter.value) indicesToIgnore = [2, 3];
+
+		var i = start;
+		while (i < end) {
+			if (consoleOutput[i].log.length > 0) {
+				var type = consoleOutput[i].log[0].level;
+				switch(type) {
+					case INFO:
+						if (!infoFilter.value) { i++; continue; }
+					case WARNING:
+						if (!warningFilter.value) { i++; continue; }
+					case ERROR:
+						if (!errorFilter.value) { i++; continue; }
+					case TRACE:
+						if (!traceFilter.value) { i++; continue; }
+					case VERBOSE:
+						if (!verboseFilter.value) { i++; continue; }
+					default:
+
+				}
+			}
+
+			for (textIndex => t in consoleOutput[i].log) {
+				if (indicesToIgnore.contains(textIndex)) continue;
+				if (!timeFilter.value && textIndex == 0) { //fix padding
+					ImGui.sameLine(0, 0);
+					ImGui.pushStyleColor(ImGuiCol.Text, consoleColorToImColor(t.color));
+					ImGui.textUnformatted("[");
+					ImGui.popStyleColor();
+					continue;
+				} else if (!typeFilter.value && textIndex == 4) {
+					ImGui.sameLine(0, 0);
+					ImGui.pushStyleColor(ImGuiCol.Text, consoleColorToImColor(t.color));
+					ImGui.textUnformatted("  ] ");
+					ImGui.popStyleColor();
+					continue;
+				}
+
+				ImGui.sameLine(0, 0);
+				ImGui.pushStyleColor(ImGuiCol.Text, consoleColorToImColor(t.color));
+				var lines = t.text.split("\n");
+				for (i => l in lines) {
+					ImGui.textUnformatted(l);
+				}
+				ImGui.popStyleColor();
+			}
+
+			if (countDuplicatedOutput.value && consoleOutput[i].times > 1) {
+				ImGui.sameLine(0, 0);
+				ImGui.textUnformatted("  ("+consoleOutput[i].times +"x)");
+			}
+
+			ImGui.newLine();
+			i++;
+		}
+	}
+
+	private function displayInput() {
+		var inputTextCursorPos = ImGui.getCursorScreenPos();
+		var currentInputString = consoleInputString.value;
+		final flags = ImGuiInputTextFlags.EnterReturnsTrue | ImGuiInputTextFlags.CallbackCompletion | ImGuiInputTextFlags.CallbackHistory | ImGuiInputTextFlags.CallbackEdit | ImGuiInputTextFlags.CallbackAlways;
+		if (ImGui.inputText("Input##Console", consoleInputString, flags | (forceFocusTextInput ? ImGuiInputTextFlags.ReadOnly : 0), consoleInputTextCallback)) {
+			if (consoleInputString.value != "") {
+				tryExecuteCommand(consoleInputString.value);
+				if (prevCommands[0] != consoleInputString.value) prevCommands.insert(0, consoleInputString.value);
+				consoleInputString.value = "";
+				ImGui.setKeyboardFocusHere(-1);
+				autoScrollNextFrame = true;
+				cyclingCommands = false;
+				cyclingPrevCommands = false;
+				commandSearch = [];
+			}
+		}
+		if (forceFocusTextInput) {
+			ImGui.setKeyboardFocusHere(-1);
+			forceFocusTextInput = false;
+		}
+		
+		if (consoleInputString.value != currentInputString) {
+			if ((cyclingCommands && getConsoleInputStringForSearch(commandSearch[cycleIndex]) == getCommandSearchAutoComplete(commandSearch[cycleIndex])) || (cyclingPrevCommands && consoleInputString.value == prevCommands[cycleIndex])) {
+				
+			} else {
+				searchCommands(consoleInputString.value, consoleInputString.value.length < currentInputString.length || currentInputString.length == 0);
+			}
+		}
+		ImGui.setScrollHereY(1.0);
+
+		ImGui.sameLine();
+		var settingButtonWidth = ImGui.calcTextSize("Settings").x + style.framePaddingX * 2;
+		var pos = ImGui.getCursorPos();
+		ImGui.setCursorPos(pos.x + ImGui.getContentRegionAvail().x - settingButtonWidth, pos.y);
+		if (ImGui.button("Settings")) {
+			settingsOpen.value = !settingsOpen.value;
+		}
+
+		if (commandSearch.length > 0) {
+			var targetIndex = cyclingCommands ? cycleIndex : commandSearch.length;
+			var start = targetIndex - (SEARCH_MAX_OUTPUT-1);
+			var end = targetIndex+1;
+			if (start < 0) start = 0;
+			if (end < SEARCH_MAX_OUTPUT) end = SEARCH_MAX_OUTPUT;
+			if (end > commandSearch.length) end = commandSearch.length;
+
+			ImGui.pushStyleColor(ImGuiCol.WindowBg, CONSOLE_BG_COLOR);
+			ImGui.setNextWindowPos(inputTextCursorPos.x, inputTextCursorPos.y - (ImGui.getTextLineHeightWithSpacing() * (end-start))-12);
+			if (ImGui.begin("Command Search window", null, ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoFocusOnAppearing)) {
+				for (i in start...end) {
+					var cmd = commandSearch[i];
+					if (!cyclingCommands) {
+						var cmdName:String = cmd.name;
+						var inputName:String = getConsoleInputStringForSearch(cmd);
+						var before:String = cmdName.substring(0, cmd.searchIndex);
+						var after:String = cmdName.substring(cmd.searchIndex+inputName.length, cmdName.length);
+
+						if (before != "") {
+							if (i == commandSearch.length-1) ImGui.pushStyleColor(ImGuiCol.Text, SEARCH_SELECTED_COLOR);
+							ImGui.textUnformatted(before);
+							ImGui.sameLine(0, 0);
+							if (i == commandSearch.length-1) ImGui.popStyleColor();
+						}
+						ImGui.pushStyleColor(ImGuiCol.Text, SEARCH_HIGHLIGHT_COLOR);
+						ImGui.textUnformatted(cmdName.substring(cmd.searchIndex, cmd.searchIndex+inputName.length));
+						ImGui.popStyleColor();
+						if (after != "") {
+							if (i == commandSearch.length-1) ImGui.pushStyleColor(ImGuiCol.Text, SEARCH_SELECTED_COLOR);
+							ImGui.sameLine(0, 0);
+							ImGui.textUnformatted(after);
+							if (i == commandSearch.length-1) ImGui.popStyleColor();
+						}
+
+						if (inputName.length == cmd.name.length && cmd.autoComplete != null) {
+							ImGui.sameLine();
+							ImGui.textUnformatted("(TAB to Autocomplete)");
+						}
+					} else {
+						if (i == cycleIndex) ImGui.pushStyleColor(ImGuiCol.Text, SEARCH_SELECTED_COLOR);
+						ImGui.textUnformatted(cmd.name);
+						if (i == cycleIndex) ImGui.popStyleColor();
+					}
+
+					if (cmd.argsDesc != null && cmd.argsDesc != "") {
+						ImGui.sameLine();
+						ImGui.pushStyleColor(ImGuiCol.Text, SEARCH_ARGS_COLOR);
+						ImGui.textUnformatted(cmd.argsDesc);
+						ImGui.popStyleColor();
+					}
+					if (cmd.desc != "") {
+						ImGui.sameLine();
+						ImGui.pushStyleColor(ImGuiCol.Text, SEARCH_DESC_COLOR);
+						ImGui.textUnformatted(cmd.desc);
+						ImGui.popStyleColor();
+					}
+				}
+			}
+			ImGui.popStyleColor();
+			ImGui.end();
+		}
+	}
+
+	var thingsThatMeanTheresANewThing = " +-*/=|();,"; //TODO: name this something better
+	var currentCursorPos = 0;
+	var currentHscriptVarStart = 0;
+	var currentHscriptVarEnd = 0;
+
+	private function searchCommands(str:String, fullSearch:Bool) {
+		cyclingCommands = false;
+		cyclingPrevCommands = false;
+		if (fullSearch) commandSearch = [];
+		if (str == "") return;
+
+		//for commands only, allow any case
+		var strLower = str.toLowerCase();
+		if (strLower.indexOf(" ") != -1) {
+			strLower = strLower.substring(0, strLower.indexOf(" "));
+		}
+		
+		//figure out the current hscript variable where the cursor is
+		var pos:Int = currentCursorPos;
+		if (pos < 0) pos = 0;
+		if (pos > str.length-1) pos = str.length-1;
+		var begin:Int = 0;
+		var end:Int = str.length;
+		for (i in 0...thingsThatMeanTheresANewThing.length) {
+			var c = thingsThatMeanTheresANewThing.charAt(i);
+			var b = str.lastIndexOf(c, pos);
+			var e = str.indexOf(c, pos);
+			if (b != -1 && b+1 > begin+1) begin = b+1;
+			if (e != -1 && e < end) end = e;
+		}
+		var scriptVarStr = str.substring(begin, end);
+		currentHscriptVarStart = begin;
+		currentHscriptVarEnd = end;
+		
+
+		if (!fullSearch) {	//TODO: something better to restore search when pressing backspace
+			var prev = commandSearch;
+			commandSearch = [];
+			for (cmd in prev) {
+				cmd.searchIndex = cmd.isCommand ? cmd.name.toLowerCase().indexOf(strLower) : cmd.name.indexOf(scriptVarStr);
+				if (cmd.searchIndex != -1) {
+					commandSearch.push(cmd);
+				}
+			}
+		} else {
+			if (commandsFilter.value) for (cmdName in ConsoleCommandManager.commandsStringList) {
+				var searchIndex = cmdName.indexOf(strLower);
+				if (searchIndex != -1) {
+					var cmd = ConsoleCommandManager.commands.get(cmdName);
+					commandSearch.push({
+						name: cmd.name,
+						desc: cmd.desc,
+						argsDesc: cmd.argsDesc,
+						searchIndex: searchIndex,
+						isCommand: true
+					});
+				}
+			}
+		}
+
+		//root hscript variables/classes
+		if (fullSearch || scriptVarStr.length == 1) if (scriptVarStr.indexOf(".") == -1) {
+			for (f in consoleHscript.variableFields) {
+				if (!hscriptScriptsFilter.value && f.isScriptVar) continue;
+				if (f.isStatic) {
+					if (!hscriptClassFilter.value) continue;
+				} else if (f.type == "Function") {
+					if (!hscriptFunctionFilter.value) continue;
+				} else if (f.type == "Int" || f.type == "Float" || f.type == "String") {
+					if (!hscriptBasicTypesFilter.value) continue;
+				} else {
+					if (!hscriptObjectsFilter.value) continue;
+				}
+
+				var searchIndex = f.name.indexOf(scriptVarStr);
+				if (searchIndex != -1) {
+					commandSearch.push({
+						name: f.name,
+						desc: (f.isStatic ? "Class (" + f.type + ")" : f.type) + (f.value != "" ? " (" + f.value + ")" : "") + (f.extraDesc != null ? " (" + f.extraDesc + ")" : ""),
+						searchIndex: searchIndex,
+						isCommand: false,
+						autoComplete: f.autoComplete
+					});
+				}
+			}
+		}
+
+		//hscript var fields (after pressing .)
+		if (scriptVarStr.charAt(scriptVarStr.length-1) == ".") {
+			var fields = consoleHscript.tryGetFields(scriptVarStr.substr(0, -1));
+			for (f in fields) {
+				if (f.isStatic) {
+					if (!hscriptClassFilter.value) continue;
+				} else if (f.type == "Function") {
+					if (!hscriptFunctionFilter.value) continue;
+				} else if (f.type == "Int" || f.type == "Float" || f.type == "String") {
+					if (!hscriptBasicTypesFilter.value) continue;
+				} else {
+					if (!hscriptObjectsFilter.value) continue;
+				}
+				var full = scriptVarStr + f.name;
+				var searchIndex = full.indexOf(scriptVarStr);
+				if (searchIndex != -1) {
+					commandSearch.push({
+						name: full,
+						desc: f.type + (f.value != "" ? " (" + f.value + ")" : "") + (f.extraDesc != null ? " (" + f.extraDesc + ")" : ""),
+						searchIndex: searchIndex,
+						isCommand: false
+					});
+				}
+			}
+		}
+		commandSearch.sort(function(a, b) {
+			if (a.searchIndex < b.searchIndex) return 1;
+			else if (a.searchIndex > b.searchIndex) return -1;
+			else {
+				if (a.name.length < b.name.length) return 1;
+				else if (a.name.length > b.name.length) return -1;
+				else return 0;
+			}
+		});
+	}
+
+	private inline function getCommandSearchAutoComplete(cmd:ConsoleSearchData) {
+		return cmd.autoComplete != null ? cmd.autoComplete : cmd.name;
+	}
+	private inline function getConsoleInputStringForSearch(cmd:ConsoleSearchData) {
+		return cmd.isCommand ? consoleInputString.value : consoleInputString.value.substring(currentHscriptVarStart, currentHscriptVarEnd);
+	}
+
+	private function onInputTextCallback(data:ImGuiInputTextCallbackData) {
+
+		if (data.eventFlag == ImGuiInputTextFlags.CallbackHistory) { //when pressing up/down
+
+			var justStartedCycling = false;
+			if (commandSearch.length > 0 && !cyclingCommands && !cyclingPrevCommands) {
+				cyclingCommands = true;
+				cycleIndex = (data.eventKey == ImGuiKey.DownArrow) ? commandSearch.length-1 : 0;
+				justStartedCycling = true;
+			} else if (commandSearch.length == 0 && !cyclingPrevCommands && !cyclingCommands && consoleInputString.value == "" && prevCommands.length > 0 && data.eventKey == ImGuiKey.UpArrow) {
+				cyclingPrevCommands = true;
+				cycleIndex = 0;
+				justStartedCycling = true;
+			}
+
+			if (cyclingCommands) {
+				if (data.eventKey == ImGuiKey.UpArrow) {
+					cycleIndex--;
+					if (cycleIndex < 0) cycleIndex = commandSearch.length-1;
+					if (justStartedCycling && commandSearch.length > 1) cycleIndex = commandSearch.length-2; //feels better to go the next one above
+				} else {
+					cycleIndex++;
+					if (cycleIndex > commandSearch.length-1) cycleIndex = 0;
+				}
+
+				var autoComplete = getCommandSearchAutoComplete(commandSearch[cycleIndex]);
+				if (commandSearch[cycleIndex].isCommand) {
+					data.deleteChars(0, data.bufTextLen);
+					data.insertChars(0, autoComplete);
+					data.setSelection(data.bufTextLen, data.bufTextLen);
+					currentHscriptVarEnd = currentHscriptVarStart+autoComplete.length;
+				} else {
+					data.deleteChars(currentHscriptVarStart, currentHscriptVarEnd-currentHscriptVarStart);
+					data.insertChars(currentHscriptVarStart, autoComplete);
+					currentHscriptVarEnd = currentHscriptVarStart+autoComplete.length;
+					data.setSelection(currentHscriptVarEnd, currentHscriptVarEnd);
+				}
+			}
+			if (cyclingPrevCommands) {
+				if (data.eventKey == ImGuiKey.DownArrow) {
+					if (!justStartedCycling) cycleIndex--;
+					if (cycleIndex < 0) cycleIndex = 0;
+				} else {
+					if (!justStartedCycling) cycleIndex++;
+					if (cycleIndex > prevCommands.length-1) cycleIndex = prevCommands.length-1;
+				}
+				data.deleteChars(0, data.bufTextLen);
+				data.insertChars(0, prevCommands[cycleIndex]);
+				data.setSelection(data.bufTextLen, data.bufTextLen);
+			}
+		}
+		else if (data.eventFlag == ImGuiInputTextFlags.CallbackCompletion) { //when pressing tab
+			if (commandSearch.length > 0 && consoleInputString.value != getCommandSearchAutoComplete(commandSearch[commandSearch.length-1])) {
+				var autoComplete = getCommandSearchAutoComplete(commandSearch[commandSearch.length-1]);
+				if (commandSearch[commandSearch.length-1].isCommand) {
+					data.deleteChars(0, data.bufTextLen);
+					data.insertChars(0, autoComplete);
+					data.setSelection(data.bufTextLen, data.bufTextLen);
+				} else {
+					data.deleteChars(currentHscriptVarStart, currentHscriptVarEnd-currentHscriptVarStart);
+					data.insertChars(currentHscriptVarStart, autoComplete);
+					currentHscriptVarEnd = currentHscriptVarStart+autoComplete.length;
+					data.setSelection(currentHscriptVarEnd, currentHscriptVarEnd);
+				}
+			}
+		}
+		else if (data.eventFlag == ImGuiInputTextFlags.CallbackEdit) {
+			cyclingCommands = false;
+			cyclingPrevCommands = false;
+		} else if (data.eventFlag == ImGuiInputTextFlags.CallbackAlways) {
+			currentCursorPos = data.cursorPos;
+		}
+	}
+	#end
+
+	private function clearConsole() {
+		commandSearch = [];
+		consoleOutputCurrentIndex = 0;
+		wrapConsoleOutput = false;
+	}
+
+	private function tryExecuteCommand(str:String) {
+		if (!ConsoleCommandManager.tryExecute(str)) { //run hscript if there was no command
+			Logs.infos("Executing hscript: " + str, LIGHTGRAY, "Console");
+			Logs.infos(Std.string(consoleHscript.tryExecute(str)), LIGHTGRAY, "Console");
+		}
+	}
+
+	public static function consoleColorToImColor(color:ConsoleColor) {
+		return switch(color) {
+			case BLACK:			0xFF000000;
+			case DARKBLUE:		0xFF0909C3;
+			case DARKGREEN:		0xFF008800;
+			case DARKCYAN:		0xFF008888;
+			case DARKRED:		0xFF880000;
+			case DARKMAGENTA:	0xFF9A1CC5;
+			case DARKYELLOW:	0xFFBCBC00;
+			case LIGHTGRAY:		0xFFD4D4D4;
+			case GRAY:			0xFFA4A4A4;
+			case BLUE:			0xFF2A4AEA;
+			case GREEN:			0xFF00FF00;
+			case CYAN:			0xFF008CFF;
+			case RED:			0xFFFF0000;
+			case MAGENTA:		0xFFFF00FF;
+			case YELLOW:		0xFFFFFF00;
+			case WHITE | _:		0xFFFFFFFF;
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/funkin/backend/system/console/inspector/ConsoleInspector.hx b/source/funkin/backend/system/console/inspector/ConsoleInspector.hx
new file mode 100644
index 0000000000..70c326d789
--- /dev/null
+++ b/source/funkin/backend/system/console/inspector/ConsoleInspector.hx
@@ -0,0 +1,350 @@
+package funkin.backend.system.console.inspector;
+
+//WIP
+
+import openfl.Lib;
+import flixel.FlxState;
+import flixel.group.FlxSpriteGroup;
+import funkin.backend.scripting.HScript;
+import funkin.backend.scripting.ScriptPack;
+import funkin.game.Stage;
+
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
+import lime.tools.imgui.ImGuiPtr;
+#end
+#if foxlite
+import foxlite.FoxScene;
+import foxlite.group.FoxTypedGroup;
+import foxlite.group.FoxObjectGroup;
+import foxlite.FoxBasic;
+import foxlite.FoxObject;
+import foxlite.FoxModel;
+#end
+
+using funkin.backend.utils.ImGuiUtil;
+
+typedef InspectorObject = {
+	var obj:Dynamic;
+	var name:String;
+	var type:String;
+	var members:Array<InspectorObject>;
+	var memberIndex:Int;
+	var ?groupParent:InspectorObject;
+}
+
+class ConsoleInspector {
+
+	var hscript:ConsoleHscript;
+	var cachedInstanceFields:Map<String, Array<String>> = [];
+	public function new(hscript:ConsoleHscript) {
+		this.hscript = hscript;
+	}
+
+	#if IMGUI_ENABLED
+	var selectedObject:Dynamic = null;
+	var selectedObjectData:InspectorObject = null;
+	var selectedObjectValidThisFrame:Bool = false;
+	var justChangedObject:Bool = false;
+
+	var objectProperties:InspectorObjectProperties = new InspectorObjectProperties();
+	var gizmo:InspectorGizmo = new InspectorGizmo();
+	#if foxlite
+	var gizmo3D:InspectorGizmo3D = new InspectorGizmo3D();
+	#end
+
+	var currentStateObjects:Array<InspectorObject> = [];
+	var inspectorObjectsThatNeedUpdating:Array<InspectorObject> = [];
+
+	function updateObjects() {
+		var states:Array<FlxState> = [FlxG.state];
+		var stateToCheck:FlxState = FlxG.state;
+		while(stateToCheck.subState != null) {
+			states.push(stateToCheck.subState);
+			stateToCheck = stateToCheck.subState;
+		}
+		
+		if (currentStateObjects.length > states.length) {
+			currentStateObjects.resize(states.length);
+		}
+		for (index => state in states) {
+			if (currentStateObjects[index] == null || currentStateObjects[index].obj != state) {
+
+				var packageName = hscript.getFieldTypeName(state);
+				if (!cachedInstanceFields.exists(packageName)) {
+					cachedInstanceFields.set(packageName, Type.getInstanceFields(Type.getClass(state)));
+				}
+				var packageSplit = packageName.split(".");
+				var stateName = packageSplit[packageSplit.length-1];
+
+				currentStateObjects[index] = {
+					obj: state,
+					name: stateName,
+					type: packageName,
+					memberIndex: index,
+					members: []
+				};
+			}
+		}
+
+		for (index => inspectorObject in currentStateObjects) {
+			updateObjectMembers(index, inspectorObject);
+		}
+	}
+
+	function updateObjectMembers(index:Int, inspectorObject:InspectorObject, fromGroup:Bool = false) {
+		var objMembers:Array<Dynamic> = inspectorObject.obj.members;
+		#if foxlite
+		if (inspectorObject.obj is FoxScene) {
+			objMembers = inspectorObject.obj.foxGroup.members;
+		}
+		#end
+		if (objMembers == null) {
+			return;
+		}
+
+		//sort and remove if needed
+		var membersToRemove:Array<InspectorObject> = [];
+		for (member in inspectorObject.members) {
+			var currentIndex:Int = objMembers.indexOf(member.obj);
+			if (currentIndex == -1) {
+				membersToRemove.push(member);
+			}
+			member.memberIndex = currentIndex;
+		}
+		for (m in membersToRemove) inspectorObject.members.remove(m);
+		inspectorObject.members.sort(function(a, b) {
+           if(a.memberIndex < b.memberIndex) return -1;
+           else if(a.memberIndex > b.memberIndex) return 1;
+           else return 0;
+        });
+
+		//we have new members to add
+		if (inspectorObject.members.length != objMembers.length) {
+			var newList:Array<InspectorObject> = [];
+			var oldListIndex:Int = 0;
+			for (i in 0...objMembers.length) {
+				if (inspectorObject.members[oldListIndex] == null || inspectorObject.members[oldListIndex].memberIndex != i || inspectorObject.members[oldListIndex].obj != objMembers[i]) {
+					var member:Dynamic = objMembers[i];
+					var memberPackage = hscript.getFieldTypeName(objMembers[i]);
+					var memberPackageSplit = memberPackage.split(".");
+					var memberType = memberPackageSplit[memberPackageSplit.length-1];
+					var memberName:String = fromGroup ? inspectorObject.name + ".members[" + i + "]" : figureOutObjectName(inspectorObject.type, inspectorObject.obj, member);
+					var newObj = {
+						obj: objMembers[i],
+						name: memberName,
+						type: memberType,
+						memberIndex: i,
+						members: [],
+						groupParent: fromGroup ? inspectorObject : null
+					};
+					newList.push(newObj);
+					if (member is FlxTypedGroup || member is FlxTypedSpriteGroup #if foxlite || member is FoxScene || member is FoxTypedGroup || member is FoxObjectGroup #end) {
+						updateObjectMembers(i, newObj, true);
+					}
+				} else {
+					newList.push(inspectorObject.members[oldListIndex]);
+					oldListIndex++;
+				}
+			}
+			inspectorObject.members = newList;
+		}
+	}
+
+	public function displayUI() {
+		
+		updateObjects();
+
+		FlxG.mouse.visible = true; //TODO: rework this, temp force on
+		
+		ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX(), ImGuiUtil.getWindowSpaceY(), ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowSize(300, Lib.application.window.height, ImGuiCond.FirstUseEver);
+		if (ImGui.begin("Inspector")) {
+			ImGui.separatorText("Tools/Gizmo");
+			ImGui.indent();
+			if (ImGui.selectable("None (Q)", gizmo.gizmoMode == -1)) gizmo.gizmoMode = -1;
+			if (ImGui.selectable("Position (W)", gizmo.gizmoMode == 0)) gizmo.gizmoMode = 0;
+			if (ImGui.selectable("Rotation (E)", gizmo.gizmoMode == 1)) gizmo.gizmoMode = 1;
+			if (ImGui.selectable("Scale (R)", gizmo.gizmoMode == 2)) gizmo.gizmoMode = 2;
+			ImGui.unindent();
+			ImGui.separatorText("States");
+			for (index => member in currentStateObjects) {
+				var nodeID = member.name + index;
+				var flags = ImGuiTreeNodeFlags.DefaultOpen;
+				if (member.obj == selectedObject) flags |= ImGuiTreeNodeFlags.Selected;
+				if (ImGui.treeNodeEx(nodeID, flags, member.name + " (" + member.type + ")")) {
+					if (ImGui.isItemClicked()) {
+						selectObject(member.obj);
+					}
+					if (member.members.length > 0) {
+						generateTreeForMembers(nodeID, member);
+					}
+					ImGui.treePop();
+				}
+			}
+			//ImGui.separatorText("Cameras");
+		}
+		ImGui.end();
+
+		if (selectedObject != null) {
+			selectedObjectValidThisFrame = false;
+			for (member in currentStateObjects) {
+				if (member.obj == selectedObject) {
+					selectedObjectValidThisFrame = true;
+					selectedObjectData = member;
+					break;
+				}
+				checkForSelectedObjectThisFrame(member);
+			}
+
+			if (selectedObjectValidThisFrame) {
+				objectProperties.show(selectedObjectData, justChangedObject);
+				if (selectedObject is FlxObject) {
+					gizmo.show(selectedObjectData, cast selectedObject, justChangedObject);
+				} #if foxlite else if (selectedObject is FoxObject) {
+					gizmo3D.show(selectedObjectData, cast selectedObject, justChangedObject);
+				}
+				#end
+				justChangedObject = false;
+			} else {
+				selectedObject = null;
+				selectedObjectData = null;
+			}
+		}
+	}
+
+	function checkForSelectedObjectThisFrame(object:InspectorObject) {
+		if (selectedObjectValidThisFrame) return;
+		for (member in object.members) {
+			if (member.obj == selectedObject) {
+				selectedObjectValidThisFrame = true;
+				selectedObjectData = member;
+				return;
+			}
+			if (member.members.length > 0) {
+				checkForSelectedObjectThisFrame(member);
+			}
+		}
+	}
+
+	function generateTreeForMembers(id:String, object:InspectorObject) {
+		for (index => member in object.members) {
+			var valid = member.obj != null;
+			var nodeID = id + object.name + index;
+			var flags = ImGuiTreeNodeFlags.None;
+			if (member.members.length == 0) flags |= ImGuiTreeNodeFlags.Leaf;
+			if (valid && member.obj == selectedObject) flags |= ImGuiTreeNodeFlags.Selected;
+			if (ImGui.treeNodeEx(nodeID, flags, member.name + (valid ? " (" + member.type + ")" : ""))) {
+				if (valid && ImGui.isItemClicked()) {
+					selectObject(member.obj);
+				}
+				if (valid && member.members.length > 0) {
+					generateTreeForMembers(nodeID, member);
+				}
+				ImGui.treePop();
+			}
+		}
+	}
+
+	function selectObject(obj:Dynamic) {
+		if (selectedObject != obj) {
+			selectedObject = obj;
+			justChangedObject = true;
+		}
+	}
+
+	public function figureOutObjectName(packageName:String, parent:Dynamic, object:FlxBasic) {
+		if (object == null) return "Null Member";
+		if (!cachedInstanceFields.exists(packageName)) {
+			cachedInstanceFields.set(packageName, Type.getInstanceFields(Type.getClass(parent)));
+		}
+		var instanceFields:Array<String> = cachedInstanceFields.get(packageName);
+		var uselessFields:Array<String> = [];
+		for (field in instanceFields) {
+			if (field == "members") {
+				uselessFields.push(field);
+				continue;
+			}
+
+			var fieldObj:Dynamic = Reflect.getProperty(parent, field);
+			if (fieldObj != null) {
+				if (fieldObj is FlxBasic) {
+					if (object == fieldObj) {
+						return field;
+					} else if (fieldObj is Stage) {
+						var stage:Stage = cast fieldObj;
+						for (name => stageObj in stage.stageSprites) {
+							if (object == stageObj) return name;
+						}
+						for (name => posObj in stage.characterPoses) {
+							if (object == posObj) return name;
+						}
+					}
+				} else if (fieldObj is Array) {
+					var arr:Array<Dynamic> = cast fieldObj;
+					var firstMember = arr[0];
+					if (firstMember != null && firstMember is FlxBasic) {
+						for (index => arrayObj in arr) {
+							if (object == arrayObj) {
+								return field + "[" + index + "]";
+							}
+						}
+					}
+				} else {
+					uselessFields.push(field);
+				}
+			}
+		}
+		if (uselessFields.length > 0) { //these aren't flxbasic
+			for (field in uselessFields) {
+				instanceFields.remove(field);
+			}
+			cachedInstanceFields.set(packageName, instanceFields);
+		}
+
+		var scriptPacksToCheck:Array<ScriptPack> = [];
+		if (parent is MusicBeatState) {
+			var state:MusicBeatState = cast parent;
+			scriptPacksToCheck.push(state.stateScripts);
+		}
+		if (parent is PlayState) {
+			var playstate:PlayState = cast parent;
+			for (strumLineIndex => strumLine in playstate.strumLines.members) {
+				for (charIndex => char in strumLine.characters) {
+					if (object == char) {
+						return "strumLines[" + strumLineIndex + "].characters[" + charIndex + "] (" + char.curCharacter + ")";
+					}
+				}
+			}
+			scriptPacksToCheck.push(playstate.scripts);
+		}
+		
+		for (pack in scriptPacksToCheck) {
+			
+			for (script in pack.scripts) {
+				if (script is HScript) {
+					var hscript:HScript = cast script;
+					for (name => scriptObj in hscript.interp.variables) {
+						if (scriptObj is FlxBasic) {
+							if (scriptObj == object) return name;
+						} else if (scriptObj is Array) {
+							var arr:Array<Dynamic> = cast scriptObj;
+							var firstMember = arr[0];
+							if (firstMember != null && firstMember is FlxBasic) {
+								for (index => arrayObj in arr) {
+									if (object == arrayObj) {
+										return name + "[" + index + "]";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return "Unknown" + object.ID;
+	}
+	#end
+}
\ No newline at end of file
diff --git a/source/funkin/backend/system/console/inspector/InspectorGizmo.hx b/source/funkin/backend/system/console/inspector/InspectorGizmo.hx
new file mode 100644
index 0000000000..2a2ce0fda7
--- /dev/null
+++ b/source/funkin/backend/system/console/inspector/InspectorGizmo.hx
@@ -0,0 +1,495 @@
+package funkin.backend.system.console.inspector;
+
+import flixel.math.FlxMatrix;
+import flixel.math.FlxPoint;
+import openfl.Lib;
+import funkin.backend.system.console.inspector.ConsoleInspector.InspectorObject;
+
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
+import lime.tools.imgui.ImGuiPtr;
+#end
+
+class InspectorGizmo {
+
+	public var gizmoMode:Int = 0;
+	var lastViewportID:Int = 0;
+	var positionActive:Bool = false;
+	var positionX:Float = 0;
+	var positionY:Float = 0;
+	var rotationActive:Bool = false;
+	var rotationStartX:Float = 0;
+	var rotationStartY:Float = 0;
+	var rotationStartAngle:Float = 0;
+	var scaleActive:Bool = false;
+	var scaleX:Float = 0;
+	var scaleY:Float = 0;
+
+	var size:Float = 120;
+	var arrowWidth = 10;
+	var scaleBoxWidth = 15;
+
+	var moveSpeedPos:Float = 1;
+	var moveSpeedScale:Float = 0.05;
+
+	var snapPos:Float = 50;
+	var snapAngle:Float = 15;
+	var snapScale:Float = 0.25;
+
+	public function new() {}
+
+	#if IMGUI_ENABLED
+	inline function transformFlxPointToWindowSpace(point:FlxPoint) {
+		if ((ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0) {
+			point.x = (Lib.application.window.x + FlxG.scaleMode.offset.x) + (point.x * FlxG.scaleMode.scale.x);
+			point.y = (Lib.application.window.y + FlxG.scaleMode.offset.y) + (point.y * FlxG.scaleMode.scale.y);
+		} else {
+			point.x = (FlxG.scaleMode.offset.x) + (point.x * FlxG.scaleMode.scale.x);
+			point.y = (FlxG.scaleMode.offset.y) + (point.y * FlxG.scaleMode.scale.y);
+		}
+	}
+	inline function transformFlxPointOntoCamera(point:FlxPoint, camera:FlxCamera) {
+		point.subtract(camera.viewMarginLeft, camera.viewMarginTop);
+		point.x *= camera.zoom;
+		point.y *= camera.zoom;
+	}
+
+	function prepareObjectCamera(objectData:InspectorObject, basic:FlxBasic) {
+		var parentsList:Array<Dynamic> = [];
+		var oldDefaultCamerasList:Array<Array<FlxCamera>> = [];
+		
+		var parent = objectData.groupParent;
+		while(parent != null) {
+			parentsList.insert(0, parent.obj);
+			parent = parent.groupParent;
+		}
+
+		@:privateAccess
+		for (p in parentsList) {
+			oldDefaultCamerasList.push(FlxCamera._defaultCameras);
+			var group:FlxBasic = cast p;
+			if (group._cameras != null) FlxCamera._defaultCameras = group._cameras;
+		}
+
+		var camera = basic.getDefaultCamera();
+
+		@:privateAccess
+		if (oldDefaultCamerasList.length > 0) FlxCamera._defaultCameras = oldDefaultCamerasList[0]; //no point looping back, just grab first
+
+		return camera;
+	}
+
+	public function show(objectData:InspectorObject, object:FlxObject, justChanged:Bool) {
+		var sprite:FlxSprite = cast object;
+		var drawList = ImGui.getBackgroundDrawList(ImGui.getMainViewport());
+
+		if (justChanged) {
+			positionActive = false;
+			rotationActive = false;
+			scaleActive = false;
+		}
+
+		var camera = prepareObjectCamera(objectData, object);
+		var bounds = object.getScreenPosition(null, camera);
+		var position = bounds.clone();
+		var origin = bounds.clone();
+		if (sprite != null) {
+			bounds.subtractPoint(sprite.offset);
+			origin.addPoint(sprite.origin);
+		}
+		transformFlxPointOntoCamera(bounds, camera);
+		transformFlxPointToWindowSpace(bounds);
+		transformFlxPointOntoCamera(position, camera);
+		transformFlxPointToWindowSpace(position);
+		transformFlxPointOntoCamera(origin, camera);
+		transformFlxPointToWindowSpace(origin);
+
+		if (sprite == null)
+		{
+			var x = bounds.x;
+			var y = bounds.y;
+			var right = x + (object.width * camera.zoom);
+			var bottom = y + (object.height * camera.zoom);
+			/*var minX = Lib.application.window.x + FlxG.scaleMode.offset.x;
+			var minY = Lib.application.window.y + FlxG.scaleMode.offset.y;
+			var maxX = Lib.application.window.x + FlxG.scaleMode.offset.x + FlxG.scaleMode.gameSize.x;
+			var maxY = Lib.application.window.y + FlxG.scaleMode.offset.y + FlxG.scaleMode.gameSize.y;
+			
+			if (x < minX) x = minX;
+			if (y < minY) y = minY;
+			if (right > maxX) right = maxX;
+			if (bottom > maxY) bottom = maxY;*/
+			drawList.addRect([x, y, right, bottom], 0xFFB922F5, 0, 4);
+		}
+		else
+		{
+			if (sprite.frame != null) {
+				@:privateAccess
+				var matrix:FlxMatrix = sprite._matrix;
+
+				var pointTL = FlxPoint.get(0, 0);
+				var pointTR = FlxPoint.get(0 + sprite.frame.frame.width, 0);
+				var pointBL = FlxPoint.get(0, 0 + sprite.frame.frame.height);
+				var pointBR = FlxPoint.get(0 + sprite.frame.frame.width, 0 + sprite.frame.frame.height);
+				
+				pointTL = pointTL.transform(matrix);
+				pointTR = pointTR.transform(matrix);
+				pointBL = pointBL.transform(matrix);
+				pointBR = pointBR.transform(matrix);
+				transformFlxPointOntoCamera(pointTL, camera);
+				transformFlxPointOntoCamera(pointTR, camera);
+				transformFlxPointOntoCamera(pointBL, camera);
+				transformFlxPointOntoCamera(pointBR, camera);
+				transformFlxPointToWindowSpace(pointTL);
+				transformFlxPointToWindowSpace(pointTR);
+				transformFlxPointToWindowSpace(pointBL);
+				transformFlxPointToWindowSpace(pointBR);
+				drawList.addQuad([pointTL.x, pointTL.y, pointTR.x, pointTR.y, pointBR.x, pointBR.y, pointBL.x, pointBL.y], 0xFFB922F5, 4);
+
+				pointTL.put();
+				pointTR.put();
+				pointBL.put();
+				pointBR.put();
+			}
+		}
+
+		if (ImGui.isKeyPressed(ImGuiKey.Q)) gizmoMode = -1;
+		if (ImGui.isKeyPressed(ImGuiKey.W)) gizmoMode = 0;
+		if (ImGui.isKeyPressed(ImGuiKey.E)) gizmoMode = 1;
+		if (ImGui.isKeyPressed(ImGuiKey.R)) gizmoMode = 2;
+
+		if (gizmoMode > -1) {
+			var windowX = position.x-(size/2);
+			var windowY = position.y-(size/2);
+			ImGui.setNextWindowPos(windowX, windowY);
+			ImGui.setNextWindowSize(size, size);
+			var flags = ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoDocking | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoFocusOnAppearing;
+			if ((ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) == 0 || lastViewportID == ImGui.getMainViewport().id) {
+				flags |= ImGuiWindowFlags.NoBackground;
+				ImGui.setNextWindowBGAlpha(0);
+			}
+			ImGui.begin("2dGizmo", null, flags);
+			if ((ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0) lastViewportID = ImGui.getWindowViewport().id;
+			
+			if (gizmoMode == 0) {
+				showPositionGizmo(object, position);
+			} else if (gizmoMode == 1) {
+				showRotationGizmo(object, position);
+			} else if (gizmoMode == 2 && sprite != null) {
+				showScaleGizmo(sprite, position);
+			}
+
+			ImGui.end();	
+		}
+		
+	}
+
+	function showPositionGizmo(object:FlxObject, position:FlxPoint) {
+
+		var windowDrawList = ImGui.getWindowDrawList();
+		var windowX = position.x-(size/2);
+		var windowY = position.y-(size/2);
+		var halfSize = size/2;
+		var halfArrow = arrowWidth/2;
+		var halfSizeMinusHalfArrow = halfSize-halfArrow;
+		var halfSizePlusHalfArrow = halfSize+halfArrow;
+
+		ImGui.setCursorPos(halfSizeMinusHalfArrow, 0);
+		ImGui.invisibleButton("##vertArrow", arrowWidth, halfSizeMinusHalfArrow);
+		var vertHover = ImGui.isItemHovered();
+		var vertActive = ImGui.isItemActive();
+		var vertDragged = ImGui.isItemActive() && ImGui.isMouseDragging(0);
+		if (vertDragged) {
+			if (!positionActive) {
+				positionX = object.x;
+				positionY = object.y;
+				positionActive = true;
+			}
+			positionY += ImGuiIO.mouseDeltaY*moveSpeedPos;
+			if (ImGui.isKeyDown(ImGuiKey.LeftCtrl)) {
+				object.y = Math.fround(positionY / snapPos) * snapPos;
+			} else {
+				object.y = positionY;
+			}
+		}
+
+		ImGui.setCursorPos(halfSizePlusHalfArrow, halfSizeMinusHalfArrow);
+		ImGui.invisibleButton("##horiArrow", halfSizeMinusHalfArrow, arrowWidth);
+		var horiHover = ImGui.isItemHovered();
+		var horiActive = ImGui.isItemActive();
+		var horiDragged = ImGui.isItemActive() && ImGui.isMouseDragging(0);
+		if (horiDragged) {
+			if (!positionActive) {
+				positionX = object.x;
+				positionY = object.y;
+				positionActive = true;
+			}
+			positionX += ImGuiIO.mouseDeltaX*moveSpeedPos;
+			if (ImGui.isKeyDown(ImGuiKey.LeftCtrl)) {
+				object.x = Math.fround(positionX / snapPos) * snapPos;
+			} else {
+				object.x = positionX;
+			}
+		}
+
+		ImGui.setCursorPos(halfSizeMinusHalfArrow, halfSizeMinusHalfArrow);
+		ImGui.invisibleButton("##centerArrow", arrowWidth, arrowWidth);
+		var centerHover = ImGui.isItemHovered();
+		var centerActive = ImGui.isItemActive();
+		var centerDragged = ImGui.isItemActive() && ImGui.isMouseDragging(0);
+		if (centerDragged) {
+			if (!positionActive) {
+				positionX = object.x;
+				positionY = object.y;
+				positionActive = true;
+			}
+			positionX += ImGuiIO.mouseDeltaX*moveSpeedPos;
+			positionY += ImGuiIO.mouseDeltaY*moveSpeedPos;
+			if (ImGui.isKeyDown(ImGuiKey.LeftCtrl)) {
+				object.x = Math.fround(positionX / snapPos) * snapPos;
+				object.y = Math.fround(positionY / snapPos) * snapPos;
+			} else {
+				object.x = positionX;
+				object.y = positionY;
+			}
+		}
+
+		if (vertActive || horiActive || centerActive) {
+			var text = FlxMath.roundDecimal(object.x, 2) + ", " + FlxMath.roundDecimal(object.y, 2);
+			var size = ImGui.calcTextSize(text);
+			var offset = halfSize - (size.x/2);
+			ImGui.setCursorPos(offset, halfSizePlusHalfArrow);
+			windowDrawList.addRectFilled([windowX + offset, windowY + halfSizePlusHalfArrow, windowX + size.x + offset, windowY + halfSizePlusHalfArrow + size.y], 0x94000000, 2);
+			ImGui.text(text);
+		} else {
+			positionActive = false;
+		}
+
+		{
+			var color = 0xFF76BC02;
+			if (vertDragged) color = 0xFFC1F273;
+			else if (vertHover) color = 0xFF8ED914;
+			windowDrawList.addLine([windowX + halfSize, 
+									windowY + arrowWidth, 
+									windowX + halfSize, 
+									windowY + halfSizeMinusHalfArrow], color, arrowWidth/2);
+			windowDrawList.addTriangleFilled([windowX + halfSize, windowY, 
+										windowX + halfSize, windowY + arrowWidth,
+										windowX + halfSize - arrowWidth, windowY + arrowWidth], color);
+			windowDrawList.addTriangleFilled([windowX + halfSize, windowY,
+										windowX + halfSize, windowY + arrowWidth,
+										windowX + halfSize + arrowWidth, windowY + arrowWidth], color);
+		}
+
+		{
+			var color = 0xFFD72C47;
+			if (horiDragged) color = 0xFFFB899A;
+			else if (horiHover) color = 0xFFF35069;
+			windowDrawList.addLine([windowX + size - arrowWidth, 
+									windowY + halfSize, 
+									windowX + halfSizePlusHalfArrow, 
+									windowY + halfSize], color, arrowWidth/2);
+			windowDrawList.addTriangleFilled([windowX + size, windowY + halfSize, 
+										windowX + size - arrowWidth, windowY + halfSize,
+										windowX + size - arrowWidth, windowY + halfSize - arrowWidth], color);
+			windowDrawList.addTriangleFilled([windowX + size, windowY + halfSize, 
+										windowX + size - arrowWidth, windowY + halfSize,
+										windowX + size - arrowWidth, windowY + halfSize + arrowWidth], color);
+		}
+
+		{
+			var color = 0xFFA2A2A2;
+			if (centerDragged) color = 0xFFFFFFFF;
+			else if (centerHover) color = 0xFFC4C3C3;
+			windowDrawList.addRectFilled([windowX + halfSizeMinusHalfArrow, windowY + halfSizeMinusHalfArrow,
+										  windowX + halfSizePlusHalfArrow, windowY + halfSizePlusHalfArrow], color, 2);
+		}
+	}
+
+
+	function showRotationGizmo(object:FlxObject, position:FlxPoint) {
+
+		var windowDrawList = ImGui.getWindowDrawList();
+		var windowX = position.x-(size/2);
+		var windowY = position.y-(size/2);
+		var halfSize = size/2;
+		var halfArrow = arrowWidth/2;
+		var lineLength = halfSize-halfArrow;
+		var halfSizeMinusHalfArrow = halfSize-halfArrow;
+		var halfSizePlusHalfArrow = halfSize+halfArrow;
+
+		ImGui.setCursorPos(0, 0);
+		ImGui.invisibleButton("##rotation", size, size);
+		var hover = ImGui.isItemHovered();
+		var active = ImGui.isItemActive();
+		var dragged = ImGui.isItemActive() && ImGui.isMouseDragging(0);
+		if (dragged) {
+			var mousePos = ImGui.getMousePos();
+			if (!rotationActive) {
+				rotationActive = true;
+				rotationStartX = mousePos.x;
+				rotationStartY = mousePos.y;
+				rotationStartAngle = object.angle;
+			} else {
+				var start = FlxPoint.get(rotationStartX - position.x, rotationStartY - position.y);
+				var cur = FlxPoint.get(mousePos.x - position.x, mousePos.y - position.y);
+				start = start.normalize();
+				cur = cur.normalize();
+
+				object.angle = rotationStartAngle + (cur.degrees - start.degrees);
+				if (ImGui.isKeyDown(ImGuiKey.LeftCtrl)) {
+					object.angle = Math.fround(object.angle / snapAngle) * snapAngle;
+				}
+
+				var rad = (rotationStartAngle-90) * (Math.PI/180);
+				windowDrawList.addLine([windowX + halfSize, windowY + halfSize,
+					windowX + halfSize + (Math.cos(rad)*lineLength), windowY + halfSize + (Math.sin(rad)*lineLength)], 0xFF737373, halfArrow);
+				
+				start.put();
+				cur.put();
+			}
+		} else {
+			rotationActive = false;
+		}
+
+		var rad = (object.angle-90) * (Math.PI/180);
+		windowDrawList.addLine([windowX + halfSize, windowY + halfSize,
+								windowX + halfSize + (Math.cos(rad)*lineLength), windowY + halfSize + (Math.sin(rad)*lineLength)], 0xFFCDCDCD, halfArrow);
+
+		var color = 0xFF298cf5;
+		if (dragged) color = 0xff7fb6f1;
+		else if (hover) color = 0xff4a9aef;
+		windowDrawList.addCircle(windowX + halfSize, windowY + halfSize, halfSize-(halfArrow/2), color, 0, halfArrow);
+
+		if (active) {
+			var text = FlxMath.roundDecimal(object.angle, 2) + "°";
+			var size = ImGui.calcTextSize(text);
+			var offset = halfSize - (size.x/2);
+			ImGui.setCursorPos(offset, halfSizePlusHalfArrow);
+			windowDrawList.addRectFilled([windowX + offset, windowY + halfSizePlusHalfArrow, windowX + size.x + offset, windowY + halfSizePlusHalfArrow + size.y], 0x94000000, 2);
+			ImGui.text(text);
+		} else {
+			rotationActive = false;
+		}
+	}
+
+	function showScaleGizmo(sprite:FlxSprite, position:FlxPoint) {
+
+		var windowDrawList = ImGui.getWindowDrawList();
+		var windowX = position.x-(size/2);
+		var windowY = position.y-(size/2);
+		var halfSize = size/2;
+		var halfBox = scaleBoxWidth/2;
+		var halfSizeMinusHalfBox = halfSize-halfBox;
+		var halfSizePlusHalfBox = halfSize+halfBox;
+		var halfArrow = arrowWidth/2;
+		var halfSizeMinusHalfArrow = halfSize-halfArrow;
+		var halfSizePlusHalfArrow = halfSize+halfArrow;
+
+		ImGui.setCursorPos(halfSizeMinusHalfArrow, 0);
+		ImGui.invisibleButton("##vertArrow", arrowWidth, halfSizeMinusHalfArrow);
+		var vertHover = ImGui.isItemHovered();
+		var vertActive = ImGui.isItemActive();
+		var vertDragged = ImGui.isItemActive() && ImGui.isMouseDragging(0);
+		if (vertDragged) {
+			if (!scaleActive) {
+				scaleX = sprite.scale.x;
+				scaleY = sprite.scale.y;
+				scaleActive = true;
+			}
+			scaleY -= ImGuiIO.mouseDeltaY*moveSpeedScale;
+			if (ImGui.isKeyDown(ImGuiKey.LeftCtrl)) {
+				sprite.scale.y = Math.fround(scaleY / snapScale) * snapScale;
+			} else {
+				sprite.scale.y = scaleY;
+			}
+		}
+
+		ImGui.setCursorPos(halfSizePlusHalfArrow, halfSizeMinusHalfArrow);
+		ImGui.invisibleButton("##horiArrow", halfSizeMinusHalfArrow, arrowWidth);
+		var horiHover = ImGui.isItemHovered();
+		var horiActive = ImGui.isItemActive();
+		var horiDragged = ImGui.isItemActive() && ImGui.isMouseDragging(0);
+		if (horiDragged) {
+			if (!scaleActive) {
+				scaleX = sprite.scale.x;
+				scaleY = sprite.scale.y;
+				scaleActive = true;
+			}
+			scaleX += ImGuiIO.mouseDeltaX*moveSpeedScale;
+			if (ImGui.isKeyDown(ImGuiKey.LeftCtrl)) {
+				sprite.scale.x = Math.fround(scaleX / snapScale) * snapScale;
+			} else {
+				sprite.scale.x = scaleX;
+			}
+		}
+
+		ImGui.setCursorPos(halfSizeMinusHalfBox, halfSizeMinusHalfBox);
+		ImGui.invisibleButton("##scaleCenter", scaleBoxWidth, scaleBoxWidth);
+		var centerHover = ImGui.isItemHovered();
+		var centerActive = ImGui.isItemActive();
+		var centerDragged = ImGui.isItemActive() && ImGui.isMouseDragging(0);
+		if (centerDragged) {
+			if (!scaleActive) {
+				scaleX = sprite.scale.x;
+				scaleY = sprite.scale.y;
+				scaleActive = true;
+			}
+			scaleX += ImGuiIO.mouseDeltaX*moveSpeedScale;
+			scaleY -= ImGuiIO.mouseDeltaY*moveSpeedScale;
+			if (ImGui.isKeyDown(ImGuiKey.LeftCtrl)) {
+				sprite.scale.x = Math.fround(scaleX / snapScale) * snapScale;
+				sprite.scale.y = Math.fround(scaleY / snapScale) * snapScale;
+			} else {
+				sprite.scale.x = scaleX;
+				sprite.scale.y = scaleY;
+			}
+		}
+
+		if (vertActive || horiActive || centerActive) {
+			var text = FlxMath.roundDecimal(sprite.scale.x, 2) + ", " + FlxMath.roundDecimal(sprite.scale.y, 2);
+			var size = ImGui.calcTextSize(text);
+			var offset = halfSize - (size.x/2);
+			ImGui.setCursorPos(offset, halfSizePlusHalfArrow);
+			windowDrawList.addRectFilled([windowX + offset, windowY + halfSizePlusHalfArrow, windowX + size.x + offset, windowY + halfSizePlusHalfArrow + size.y], 0x94000000, 2);
+			ImGui.text(text);
+		} else {
+			scaleActive = false;
+		}
+
+		{
+			var color = 0xFF76BC02;
+			if (vertDragged) color = 0xFFC1F273;
+			else if (vertHover) color = 0xFF8ED914;
+			windowDrawList.addLine([windowX + halfSize, 
+									windowY + arrowWidth, 
+									windowX + halfSize, 
+									windowY + halfSizeMinusHalfArrow], color, arrowWidth/2);
+			windowDrawList.addRectFilled([windowX + halfSizeMinusHalfBox, windowY,
+										  windowX + halfSizePlusHalfBox, windowY + scaleBoxWidth], color);
+		}
+
+		{
+			var color = 0xFFD72C47;
+			if (horiDragged) color = 0xFFFB899A;
+			else if (horiHover) color = 0xFFF35069;
+			windowDrawList.addLine([windowX + size - arrowWidth,
+									windowY + halfSize,
+									windowX + halfSizePlusHalfArrow, 
+									windowY + halfSize], color, arrowWidth/2);
+			windowDrawList.addRectFilled([windowX + size - scaleBoxWidth, windowY + halfSizeMinusHalfBox,
+										  windowX + size, windowY + halfSizePlusHalfBox], color);
+		}
+
+		{
+			var color = 0xFFA2A2A2;
+			if (centerDragged) color = 0xFFFFFFFF;
+			else if (centerHover) color = 0xFFC4C3C3;
+			windowDrawList.addRectFilled([windowX + halfSizeMinusHalfBox, windowY + halfSizeMinusHalfBox,
+										  windowX + halfSizePlusHalfBox, windowY + halfSizePlusHalfBox], color);
+		}
+	}
+
+	#end
+}
\ No newline at end of file
diff --git a/source/funkin/backend/system/console/inspector/InspectorGizmo3D.hx b/source/funkin/backend/system/console/inspector/InspectorGizmo3D.hx
new file mode 100644
index 0000000000..ca0999f582
--- /dev/null
+++ b/source/funkin/backend/system/console/inspector/InspectorGizmo3D.hx
@@ -0,0 +1,174 @@
+package funkin.backend.system.console.inspector;
+
+import flixel.math.FlxMatrix;
+import flixel.math.FlxPoint;
+import openfl.Lib;
+import lime.math.Vector2;
+import openfl.geom.Vector3D;
+import funkin.backend.system.console.inspector.ConsoleInspector.InspectorObject;
+
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
+import lime.tools.imgui.ImGuiPtr;
+#end
+#if foxlite
+import foxlite.FoxScene;
+import foxlite.FoxBasic;
+import foxlite.FoxObject;
+import foxlite.FoxModel;
+import foxlite.FoxCamera;
+#end
+
+class InspectorGizmo3D {
+
+	var gizmoMode:Int = 0;
+	var lastViewportID:Int = 0;
+
+	var size:Float = 120;
+	var arrowWidth = 10;
+
+	var snapPos:Float = 0.1;
+	var snapAngle:Float = 15;
+	var snapScale:Float = 0.1;
+
+	public function new() {}
+
+	#if (IMGUI_ENABLED && foxlite)
+
+	inline function transformVector3DScreenSpaceToWindowSpace(point:Vector3D) {
+		if ((ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0) {
+			point.x = (Lib.application.window.x + FlxG.scaleMode.offset.x) + (point.x * FlxG.scaleMode.scale.x);
+			point.y = (Lib.application.window.y + FlxG.scaleMode.offset.y) + (point.y * FlxG.scaleMode.scale.y);
+		} else {
+			point.x = (FlxG.scaleMode.offset.x) + (point.x * FlxG.scaleMode.scale.x);
+			point.y = (FlxG.scaleMode.offset.y) + (point.y * FlxG.scaleMode.scale.y);
+		}
+	}
+
+	inline function transformVector3DWorldSpaceToScreenSpace(point:Vector3D, camera:FoxCamera, scene:FoxScene, clamp:Bool = false) {
+		var screen = camera.getScreenPoint(point);
+		point.x = screen.x;
+		point.y = screen.y;
+		point.z = screen.z;
+		point.x = ((point.x*0.5) + 0.5);
+		point.y = (-((point.y*0.5) + 0.5) + 1.0);
+		if (clamp) {
+			point.x = FlxMath.bound(point.x, 0, 1);
+			point.y = FlxMath.bound(point.y, 0, 1);
+		}
+		point.x *= scene.__width;
+		point.y *= scene.__height;
+	}
+
+	function figureOutScene(objectData:InspectorObject, object:FoxObject) {
+		var parent = objectData.groupParent;
+		while(parent != null) {
+			if (parent.obj is FoxScene) {
+				return parent.obj;
+			} else if (parent.obj is FoxBasic) {
+				var basic:FoxBasic = cast parent.obj;
+				if (basic.scene != null) return basic.scene;
+			}
+			parent = parent.groupParent;
+		}
+		return null;
+	}
+
+	public function show(objectData:InspectorObject, object:FoxObject, justChanged:Bool) {
+		var model:FoxModel = cast object;
+		var drawList = ImGui.getBackgroundDrawList(ImGui.getMainViewport());
+		var scene:FoxScene = object.scene;
+		if (scene == null) scene = figureOutScene(objectData, object);
+		var camera:FoxCamera = scene.foxCameras[0];
+		if (camera == null) return;
+
+		var position = camera.getScreenPoint(object.position);
+		position.x = ((position.x*0.5) + 0.5) * scene.__width;
+		position.y = (-((position.y*0.5) + 0.5) + 1.0) * scene.__height;
+
+		var position = object.position.clone();
+		transformVector3DWorldSpaceToScreenSpace(position, camera, scene);
+		transformVector3DScreenSpaceToWindowSpace(position);
+		if (position.z < 1.0) drawList.addCircleFilled(position.x, position.y, 10, 0xFFFF0000);
+
+		if (model != null) {
+			for (mesh in model.meshes) {
+				if (mesh.bounds != null) {
+					
+					var topTopLeft = model.transform.transformVector(new Vector3D(mesh.bounds.center.x - mesh.bounds.extents.x, mesh.bounds.center.y - mesh.bounds.extents.y, mesh.bounds.center.z - mesh.bounds.extents.z));
+					var topTopRight = model.transform.transformVector(new Vector3D(mesh.bounds.center.x + mesh.bounds.extents.x, mesh.bounds.center.y - mesh.bounds.extents.y, mesh.bounds.center.z - mesh.bounds.extents.z));
+					var topBottomLeft = model.transform.transformVector(new Vector3D(mesh.bounds.center.x - mesh.bounds.extents.x, mesh.bounds.center.y - mesh.bounds.extents.y, mesh.bounds.center.z + mesh.bounds.extents.z));
+					var topBottomRight = model.transform.transformVector(new Vector3D(mesh.bounds.center.x + mesh.bounds.extents.x, mesh.bounds.center.y - mesh.bounds.extents.y, mesh.bounds.center.z + mesh.bounds.extents.z));
+
+					var bottomTopLeft = model.transform.transformVector(new Vector3D(mesh.bounds.center.x - mesh.bounds.extents.x, mesh.bounds.center.y + mesh.bounds.extents.y, mesh.bounds.center.z - mesh.bounds.extents.z));
+					var bottomTopRight = model.transform.transformVector(new Vector3D(mesh.bounds.center.x + mesh.bounds.extents.x, mesh.bounds.center.y + mesh.bounds.extents.y, mesh.bounds.center.z - mesh.bounds.extents.z));
+					var bottomBottomLeft = model.transform.transformVector(new Vector3D(mesh.bounds.center.x - mesh.bounds.extents.x, mesh.bounds.center.y + mesh.bounds.extents.y, mesh.bounds.center.z + mesh.bounds.extents.z));
+					var bottomBottomRight = model.transform.transformVector(new Vector3D(mesh.bounds.center.x + mesh.bounds.extents.x, mesh.bounds.center.y + mesh.bounds.extents.y, mesh.bounds.center.z + mesh.bounds.extents.z));
+
+					transformVector3DWorldSpaceToScreenSpace(topTopLeft, camera, scene); transformVector3DScreenSpaceToWindowSpace(topTopLeft);
+					transformVector3DWorldSpaceToScreenSpace(topTopRight, camera, scene); transformVector3DScreenSpaceToWindowSpace(topTopRight);
+					transformVector3DWorldSpaceToScreenSpace(topBottomLeft, camera, scene); transformVector3DScreenSpaceToWindowSpace(topBottomLeft);
+					transformVector3DWorldSpaceToScreenSpace(topBottomRight, camera, scene); transformVector3DScreenSpaceToWindowSpace(topBottomRight);
+					transformVector3DWorldSpaceToScreenSpace(bottomTopLeft, camera, scene); transformVector3DScreenSpaceToWindowSpace(bottomTopLeft);
+					transformVector3DWorldSpaceToScreenSpace(bottomTopRight, camera, scene); transformVector3DScreenSpaceToWindowSpace(bottomTopRight);
+					transformVector3DWorldSpaceToScreenSpace(bottomBottomLeft, camera, scene); transformVector3DScreenSpaceToWindowSpace(bottomBottomLeft);
+					transformVector3DWorldSpaceToScreenSpace(bottomBottomRight, camera, scene); transformVector3DScreenSpaceToWindowSpace(bottomBottomRight);
+
+					//drawList.addQuad([topTopLeft.x, topTopLeft.y, topTopRight.x, topTopRight.y, topBottomRight.x, topBottomRight.y, topBottomLeft.x, topBottomLeft.y], 0xFFB922F5, 4);
+					if (topTopLeft.z < 1.0 && topTopRight.z < 1.0) drawList.addLine([topTopLeft.x, topTopLeft.y, topTopRight.x, topTopRight.y], 0xFFB922F5, 4);
+					if (topTopRight.z < 1.0 && topBottomRight.z < 1.0) drawList.addLine([topTopRight.x, topTopRight.y, topBottomRight.x, topBottomRight.y], 0xFFB922F5, 4);
+					if (topBottomRight.z < 1.0 && topBottomLeft.z < 1.0) drawList.addLine([topBottomRight.x, topBottomRight.y, topBottomLeft.x, topBottomLeft.y], 0xFFB922F5, 4);
+					if (topBottomLeft.z < 1.0 && topTopLeft.z < 1.0) drawList.addLine([topBottomLeft.x, topBottomLeft.y, topTopLeft.x, topTopLeft.y], 0xFFB922F5, 4);
+
+					if (topTopLeft.z < 1.0 && bottomTopLeft.z < 1.0) drawList.addLine([topTopLeft.x, topTopLeft.y, bottomTopLeft.x, bottomTopLeft.y], 0xFFB922F5, 4);
+					if (topTopRight.z < 1.0 && bottomTopRight.z < 1.0) drawList.addLine([topTopRight.x, topTopRight.y, bottomTopRight.x, bottomTopRight.y], 0xFFB922F5, 4);
+					if (topBottomLeft.z < 1.0 && bottomBottomLeft.z < 1.0) drawList.addLine([topBottomLeft.x, topBottomLeft.y, bottomBottomLeft.x, bottomBottomLeft.y], 0xFFB922F5, 4);
+					if (topBottomRight.z < 1.0 && bottomBottomRight.z < 1.0) drawList.addLine([topBottomRight.x, topBottomRight.y, bottomBottomRight.x, bottomBottomRight.y], 0xFFB922F5, 4);
+
+					if (bottomTopLeft.z < 1.0 && bottomTopRight.z < 1.0) drawList.addLine([bottomTopLeft.x, bottomTopLeft.y, bottomTopRight.x, bottomTopRight.y], 0xFFB922F5, 4);
+					if (bottomTopRight.z < 1.0 && bottomBottomRight.z < 1.0) drawList.addLine([bottomTopRight.x, bottomTopRight.y, bottomBottomRight.x, bottomBottomRight.y], 0xFFB922F5, 4);
+					if (bottomBottomRight.z < 1.0 && bottomBottomLeft.z < 1.0) drawList.addLine([bottomBottomRight.x, bottomBottomRight.y, bottomBottomLeft.x, bottomBottomLeft.y], 0xFFB922F5, 4);
+					if (bottomBottomLeft.z < 1.0 && bottomTopLeft.z < 1.0) drawList.addLine([bottomBottomLeft.x, bottomBottomLeft.y, bottomTopLeft.x, bottomTopLeft.y], 0xFFB922F5, 4);
+					//drawList.addQuad([bottomTopLeft.x, bottomTopLeft.y, bottomTopRight.x, bottomTopRight.y, bottomBottomRight.x, bottomBottomRight.y, bottomBottomLeft.x, bottomBottomLeft.y], 0xFFB922F5, 4);
+				}
+			}
+		}
+
+		if (justChanged) {
+
+		}
+
+		if (ImGui.isKeyPressed(ImGuiKey.Q)) gizmoMode = -1;
+		if (ImGui.isKeyPressed(ImGuiKey.W)) gizmoMode = 0;
+		if (ImGui.isKeyPressed(ImGuiKey.E)) gizmoMode = 1;
+		if (ImGui.isKeyPressed(ImGuiKey.R)) gizmoMode = 2;
+
+		if (gizmoMode > -1 && position.z < 1.0) {
+			var windowX = position.x-(size/2);
+			var windowY = position.y-(size/2);
+			ImGui.setNextWindowPos(windowX, windowY);
+			ImGui.setNextWindowSize(size, size);
+			var flags = ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoDocking | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoFocusOnAppearing;
+			if ((ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) == 0 || lastViewportID == ImGui.getMainViewport().id) {
+				flags |= ImGuiWindowFlags.NoBackground;
+				ImGui.setNextWindowBGAlpha(0);
+			}
+			ImGui.begin("3dGizmo", null, flags);
+			if ((ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0) lastViewportID = ImGui.getWindowViewport().id;
+			
+			if (gizmoMode == 0) {
+				//showPositionGizmo(object, position);
+			} else if (gizmoMode == 1) {
+				//showRotationGizmo(object, position);
+			} else if (gizmoMode == 2) {
+				//showScaleGizmo(sprite, position);
+			}
+
+			ImGui.end();	
+		}
+		
+	}
+
+	#end
+}
\ No newline at end of file
diff --git a/source/funkin/backend/system/console/inspector/InspectorObjectProperties.hx b/source/funkin/backend/system/console/inspector/InspectorObjectProperties.hx
new file mode 100644
index 0000000000..fbf052e856
--- /dev/null
+++ b/source/funkin/backend/system/console/inspector/InspectorObjectProperties.hx
@@ -0,0 +1,716 @@
+package funkin.backend.system.console.inspector;
+
+import openfl.Lib;
+import flixel.text.FlxText;
+import flixel.util.FlxColor;
+import funkin.backend.system.console.inspector.ConsoleInspector.InspectorObject;
+
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
+import lime.tools.imgui.ImGuiPtr;
+#end
+#if foxlite
+import foxlite.FoxScene;
+import foxlite.group.FoxTypedGroup;
+import foxlite.group.FoxObjectGroup;
+import foxlite.FoxBasic;
+import foxlite.FoxObject;
+import foxlite.FoxModel;
+import foxlite.mesh.buffer.FoxVertexBuffer;
+import foxlite.mesh.buffer.FoxVertexBufferType;
+#end
+
+using funkin.backend.utils.ImGuiUtil;
+
+class InspectorObjectProperties {
+
+	#if IMGUI_ENABLED
+	var boolPool:ImGuiPtrPool<ImGuiBoolPtr> = new ImGuiPtrPool<ImGuiBoolPtr>(function() {return new ImGuiBoolPtr(false);});
+	var floatPool:ImGuiPtrPool<ImGuiFloatPtr> = new ImGuiPtrPool<ImGuiFloatPtr>(function() {return new ImGuiFloatPtr(0.0);});
+	var intPool:ImGuiPtrPool<ImGuiIntPtr> = new ImGuiPtrPool<ImGuiIntPtr>(function() {return new ImGuiIntPtr(0);});
+	var float4Pool:ImGuiPtrPool<ImGuiFloat4Ptr> = new ImGuiPtrPool<ImGuiFloat4Ptr>(function() {return new ImGuiFloat4Ptr(0, 0, 0, 0);});
+	var stringPool:ImGuiPtrPool<ImGuiStringPtr> = new ImGuiPtrPool<ImGuiStringPtr>(function() {return new ImGuiStringPtr("");});
+	
+	var mainImageViewer:ImGuiImageViewer = new ImGuiImageViewer();
+	var imageViewerMap:Map<Int, ImGuiImageViewer> = [];
+
+	var tableFlags = ImGuiTableFlags.SizingStretchSame | ImGuiTableFlags.Resizable | ImGuiTableFlags.BordersOuter | ImGuiTableFlags.BordersV | ImGuiTableFlags.RowBg;
+
+	public function new() {}
+
+	public function show(objectData:InspectorObject, justChanged:Bool) {
+		boolPool.reset();
+		floatPool.reset();
+		intPool.reset();
+		float4Pool.reset();
+		stringPool.reset();
+
+		if (justChanged) {
+			mainImageViewer.viewReset = true;
+			imageViewerMap.clear();
+		}
+
+		var selectedObject:Dynamic = objectData.obj;
+
+		ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX() + Lib.application.window.width - 300, ImGuiUtil.getWindowSpaceY(), ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowSize(300, Lib.application.window.height, ImGuiCond.FirstUseEver);
+		if (ImGui.begin("Object Properties")) {
+			ImGui.text(objectData.name + " - " + objectData.type);
+
+			var basic:FlxBasic = selectedObject is FlxBasic ? cast selectedObject : null;
+			if (basic != null) {
+				showFlxBasicProperties(basic);
+				//TODO: script stuff here
+			}
+			#if foxlite
+			var foxbasic:FoxBasic = selectedObject is FoxBasic ? cast selectedObject : null;
+			if (foxbasic != null) {
+				showFoxBasicProps(foxbasic);
+			}
+			#end
+		}
+		ImGui.end();
+	}
+
+	function showFlxBasicProperties(basic:FlxBasic) {
+		var object:FlxObject = basic is FlxObject ? cast basic : null;
+		var sprite:FlxSprite = basic is FlxSprite ? cast basic : null;
+		var text:FlxText = basic is FlxText ? cast basic : null;
+		var funkinSprite:FunkinSprite = basic is FunkinSprite ? cast basic : null;
+		var funkinText:FunkinText = basic is FunkinText ? cast basic : null;
+
+		if (object != null) {
+			showFlxObjectTransformProperties(object, sprite, funkinSprite, funkinText);
+			if (sprite != null) {
+				showFlxSpriteGraphicsProperties(sprite);
+				showFlxSpriteAnimationProperties(sprite);
+			}
+			showFlxObjectPhysicsProperties(object);
+			if (text != null) {
+				showFlxTextProperties(text);
+			}
+		}
+
+		if (ImGui.collapsingHeader("Basic")) {
+			if (ImGui.beginTable("Basic##1", 2, tableFlags))
+			{
+				checkboxField("Active", "active", basic);
+				checkboxField("Visible", "visible", basic);
+				checkboxField("Alive", "alive", basic);
+				checkboxField("Exists", "exists", basic);
+				ImGui.endTable();
+			}
+		}
+	}
+
+	function showFlxObjectTransformProperties(object:FlxObject, ?sprite:FlxSprite = null, ?funkinSprite:FunkinSprite = null, ?funkinText:FunkinText = null) {
+		if (ImGui.collapsingHeader("Transform")) {
+			if (ImGui.beginTable("TransformTable", 2, tableFlags))
+			{
+				dragFloat2Field("Position", "x", "y", object);
+				dragFloat2Field("Width/Height", "width", "height", object);
+				if (sprite != null) {
+					dragFloat2Field("Scale", "x", "y", sprite.scale, 0.05);
+					dragFloat2Field("Origin", "x", "y", sprite.origin, 0.1);
+					dragFloat2Field("Offset", "x", "y", sprite.offset);
+				}
+				dragFloatField("Angle", "angle", object);
+				dragFloat2Field("Scroll Factor", "x", "y", object.scrollFactor, 0.05);
+				if (funkinSprite != null || funkinText != null) {
+					dragFloatField("Zoom Factor", "zoomFactor", object, 0.05);
+					checkboxField("Enabled", "zoomFactorEnabled", object);
+					dragFloatField("Angle Factor", "angleFactor", object, 0.05);
+					checkboxField("Enabled", "angleFactorEnabled", object);
+
+					dragFloat2Field("Skew", "x", "y", funkinSprite != null ? funkinSprite.skew : funkinText.skew, 0.05);
+				}
+
+				//TODO: scripting
+
+				ImGui.endTable();
+			}
+		}
+	}
+	function showFlxSpriteGraphicsProperties(sprite:FlxSprite) {
+		if (ImGui.collapsingHeader("Graphics")) {
+			if (sprite.graphic != null) {
+				ImGui.text("Key: " + sprite.graphic.key);
+				var wid = ImGui.getContentRegionAvail().x;
+				if (sprite.graphic.bitmap != null) {
+					mainImageViewer.drawCanvas(wid, 300, ImTextureID.fromBitmapData(sprite.graphic.bitmap), sprite.graphic.width, sprite.graphic.height);
+				}
+			}
+
+			if (ImGui.beginTable("GraphicsTable", 2, tableFlags))
+			{
+				colorField("Color", "color", sprite);
+				sliderFloatField("Alpha", "alpha", sprite, 0, 1);
+
+				checkboxField("Flip X", "flipX", sprite);
+				checkboxField("Flip Y", "flipY", sprite);
+				checkboxField("Antialiasing", "antialiasing", sprite);
+
+				enumAbstractField("Blend Mode", "blend", sprite, "openfl.display.BlendMode");
+
+				ImGui.endTable();
+			}
+		}
+	}
+
+	function showFlxSpriteAnimationProperties(sprite:FlxSprite) {
+		if (ImGui.collapsingHeader("Animation")) {
+			//TODO
+			ImGui.text("Not yet implemented");
+		}
+	}
+
+	function showFlxObjectPhysicsProperties(object:FlxObject) {
+		if (ImGui.collapsingHeader("Physics")) {
+			if (ImGui.beginTable("PhysicsTable", 2, tableFlags))
+			{
+				checkboxField("Moves", "moves", object);
+				checkboxField("Immovable", "immovable", object);
+				checkboxField("Solid", "solid", object);
+
+				dragFloat2Field("Velocity", "x", "y", object.velocity);
+				dragFloat2Field("Acceleration", "x", "y", object.acceleration);
+				dragFloat2Field("Drag", "x", "y", object.drag);
+				dragFloatField("Mass", "mass", object);
+				dragFloatField("Elasticity", "elasticity", object);
+				dragFloatField("Angular Velocity", "angularVelocity", object);
+				dragFloatField("Angular Acceleration", "angularAcceleration", object);
+				dragFloatField("Angular Drag", "angularDrag", object);
+				dragFloat2Field("Max Velocity", "x", "y", object.maxVelocity);
+				dragFloatField("Max Angular", "maxAngular", object);
+				ImGui.endTable();
+			}
+		}
+	}
+
+	function showFlxTextProperties(text:FlxText) {
+		if (ImGui.collapsingHeader("Text")) {
+			if (ImGui.beginTable("TextTable", 2, tableFlags))
+			{
+				inputTextFieldMultiline("Text", "text", text, 400, 200);
+				dragIntField("Size", "size", text);
+				inputTextField("Font", "font", text);
+				dragFloat2Field("Field Width/Height", "fieldWidth", "fieldHeight", text);
+				enumAbstractField("Alignment", "alignment", text, "flixel.text.FlxTextAlign");
+				dragFloatField("Letter Spacing", "letterSpacing", text);
+
+				colorField("Border Color", "borderColor", text);
+
+				{
+					ImGui.tableNextRow();
+					ImGui.tableSetColumnIndex(0);
+					ImGui.text("Border Style");
+					ImGui.tableSetColumnIndex(1);
+					var wid = ImGui.getContentRegionAvail().x;
+					ImGui.setNextItemWidth(wid);
+
+					var index = intPool.get();
+					var list = ["NONE", "SHADOW", "SHADOW_XY", "OUTLINE", "OUTLINE_FAST", "OUTLINE_CARDINAL"];
+					switch(text.borderStyle) { //not that easy to automate due to args on SHADOW_XY
+						case NONE:
+							index.value = 0;
+						case SHADOW:
+							index.value = 1;
+						case SHADOW_XY(offsetX, offsetY):
+							index.value = 2;
+						case OUTLINE:
+							index.value = 3;
+						case OUTLINE_FAST:
+							index.value = 4;
+						case OUTLINE_CARDINAL:
+							index.value = 5;
+					}			
+					if (ImGui.combo("##Border StyleborderStyle", index, list)) {
+						switch(index.value) {
+							case 0:
+								text.borderStyle = NONE;
+							case 1:
+								text.borderStyle = SHADOW;
+							case 2:
+								text.borderStyle = SHADOW_XY(0, 0);
+							case 3:
+								text.borderStyle = OUTLINE;
+							case 4:
+								text.borderStyle = OUTLINE_FAST;
+							case 5:
+								text.borderStyle = OUTLINE_CARDINAL;
+						}
+					}
+
+					switch(text.borderStyle) {
+						case SHADOW_XY(offsetX, offsetY):
+							//todo
+						default:
+					}	
+				}
+				dragFloatField("Border Size", "borderSize", text);
+				dragFloatField("Border Quality", "borderQuality", text);
+
+				checkboxField("Bold", "bold", text);
+				checkboxField("Underline", "underline", text);
+				checkboxField("Italic", "italic", text);
+				checkboxField("Word Wrap", "wordWrap", text);
+				checkboxField("Auto Size", "autoSize", text);
+				ImGui.endTable();
+			}				
+		}
+	}
+
+	#if foxlite
+	function showFoxBasicProps(basic:FoxBasic) {
+		var object:FoxObject = basic is FoxObject ? cast basic : null;
+		var model:FoxModel = basic is FoxModel ? cast basic : null;
+
+		if (object != null) {
+			ImGui.separator();
+			showFoxObjectTransformProperties(object);
+			if (model != null) showFoxModelGraphicsProperties(model);
+		}
+
+		if (ImGui.collapsingHeader("Basic")) {
+			if (ImGui.beginTable("Basic##1", 2, tableFlags))
+			{
+				textField("Name", basic.name);
+				checkboxField("Active", "active", basic);
+				checkboxField("Visible", "visible", basic);
+				ImGui.endTable();
+			}
+		}
+	}
+
+	function showFoxObjectTransformProperties(object:FoxObject) {
+		if (ImGui.collapsingHeader("Transform")) {
+			if (ImGui.beginTable("TransformTable", 2, tableFlags))
+			{
+				var dirty = false;
+				if (dragFloat3Field("Position", "x", "y", "z", object.position, 0.05)) dirty = true;
+				if (dragFloat3Field("Rotation", "angleX", "angleY", "angleZ", object)) dirty = true;
+				if (dragFloat3Field("Scale", "x", "y", "z", object.scale, 0.05)) dirty = true;
+				if (dirty) {
+					object.update(0.0); //force update transform
+				}
+				ImGui.endTable();
+			}
+		}
+	}
+
+	function showFoxModelGraphicsProperties(model:FoxModel) {
+		if (model != null && ImGui.collapsingHeader("Graphics")) {
+			if (ImGui.beginTable("Model##1", 2, tableFlags))
+			{
+				checkboxField("Frustrum Culling", "frustumCulling", model);
+				checkboxField("Cast Shadows", "castShadows", model);
+				checkboxField("Cast Colored Shadows", "castColoredShadows", model);
+				ImGui.endTable();
+			}
+
+			ImGui.separator();
+			
+			for (i => mesh in model.meshes) {
+				var nodeID = "mesh" + i;
+				if (ImGui.treeNode(nodeID, mesh.assetsKey != null ? mesh.assetsKey : "Mesh " + i)) {
+					ImGui.pushIDFromInt(i);
+					if (ImGui.beginTable("MeshTable" + i, 2, tableFlags))
+					{
+						textField("Key", mesh.assetsKey);
+						textField("Is Copy", mesh.__isCopy ? "True" : "False");
+						@:privateAccess {
+							final vertexBuffer  = mesh.buffers[FoxVertexBufferType.VERTICES],
+								  uvBuffer      = mesh.buffers[FoxVertexBufferType.UVS],
+								  normalBuffer  = mesh.buffers[FoxVertexBufferType.NORMALS],
+								  tangentBuffer = mesh.buffers[FoxVertexBufferType.TANGENTS],
+								  colorBuffer   = mesh.buffers[FoxVertexBufferType.COLORS],
+								  boneWeights   = mesh.buffers[FoxVertexBufferType.WEIGHTS],
+								  boneIndices   = mesh.buffers[FoxVertexBufferType.BONE_INDICES],
+								  indexBuffer   = mesh.buffers[FoxVertexBufferType.INDICES];
+							// this should be better
+							inline function stride(buffer:FoxVertexBuffer) return buffer.components * buffer.bytesPerElement;
+							if (vertexBuffer != null) textField("Vertex Buffer", 	  "Num: " + vertexBuffer.count  + ", Stride: " + stride(vertexBuffer)  + ", Size: " + (vertexBuffer.count  * stride(vertexBuffer) ));
+							if (uvBuffer != null) textField("UV Buffer", 			  "Num: " + uvBuffer.count      + ", Stride: " + stride(uvBuffer)      + ", Size: " + (uvBuffer.count      * stride(uvBuffer)     ));
+							if (indexBuffer != null) textField("Index Buffer",        "Num: " + indexBuffer.count   				    				   + ", Size: " + (indexBuffer.count   * stride(indexBuffer)  ));
+							if (normalBuffer != null) textField("Normal Buffer",      "Num: " + normalBuffer.count  + ", Stride: " + stride(normalBuffer)  + ", Size: " + (normalBuffer.count  * stride(normalBuffer) ));
+							if (tangentBuffer != null) textField("Tangent Buffer",    "Num: " + tangentBuffer.count + ", Stride: " + stride(tangentBuffer) + ", Size: " + (tangentBuffer.count * stride(tangentBuffer)));
+							if (colorBuffer != null) textField("Color Buffer", 		  "Num: " + colorBuffer.count   + ", Stride: " + stride(colorBuffer)   + ", Size: " + (colorBuffer.count   * stride(colorBuffer)  ));
+							if (boneWeights != null) textField("Bone Weights Buffer", "Num: " + boneWeights.count   + ", Stride: " + stride(boneWeights)   + ", Size: " + (boneWeights.count   * stride(boneWeights)  ));
+							if (boneIndices != null) textField("Bone Indices Buffer", "Num: " + boneIndices.count   + ", Stride: " + stride(boneIndices)   + ", Size: " + (boneIndices.count   * stride(boneIndices)  ));
+						}
+						ImGui.endTable();
+					}
+					
+					if (mesh.material != null) {
+						ImGui.separatorText("Material");
+						if (ImGui.beginTable("MaterialTable" + i, 2, tableFlags))
+						{
+							textField("Name", mesh.material.name);
+							textField("Key", mesh.material.assetsKey);
+							dragIntField("Render Priority", "renderPriority", mesh.material);
+							checkboxField("Depth Test", "depthTest", mesh.material);
+							enumAbstractField("Depth Func", "depthFunc", mesh.material, "foxlite.material.FoxDepthCompareMode");
+							checkboxField("Depth Write", "depthWrite", mesh.material);
+							checkboxField("Color Write", "colorWrite", mesh.material);
+							enumAbstractField("Culling", "culling", mesh.material, "foxlite.material.FoxTriangleFace");
+							enumAbstractField("Shadow Culling", "shadowCulling", mesh.material, "foxlite.material.FoxTriangleFace");
+							enumAbstractField("Blend Mode", "blendMode", mesh.material, "foxlite.material.FoxBlendMode");
+							sliderFloatField("Alpha Scissor", "alphaScissor", mesh.material, 0, 1);
+							ImGui.endTable();
+						}
+
+
+
+						if (ImGui.treeNode(nodeID + "textures", "Textures")) {
+							for (texName => tex in mesh.material.textures) {
+								ImGui.separatorText(texName);
+								var wid = ImGui.getContentRegionAvail().x;
+								@:privateAccess
+								var id:Int = tex.glTexture.__getTexture().id;
+								if (id != 0) {
+									if (!imageViewerMap.exists(id)) imageViewerMap.set(id, new ImGuiImageViewer());
+									imageViewerMap.get(id).drawCanvas(wid, 300, new ImTextureID(id), tex.width, tex.height);
+								}
+							}
+							ImGui.treePop();
+						}
+						if (ImGui.treeNode(nodeID + "params", "Parameters")) {
+							if (ImGui.beginTable("ParamsTable" + i, 2, tableFlags)) {
+								for (name => value in mesh.material.params) {
+									textField(name, Std.string(value));
+								}
+								ImGui.endTable();
+							}
+							ImGui.treePop();
+						}						
+					}
+					ImGui.popID();
+					ImGui.treePop();
+				}
+			}
+		}
+	}
+
+	#end
+
+	////////////////////////////////////
+
+	inline function dragFloatField(name:String, field:String, object:Dynamic, speed:Float = 1.0, min:Float = 0.0, max:Float = 0.0, format:String = "%.3f", flags:ImGuiSliderFlags = 0) {
+		var didChange:Bool = false;
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+
+		var wid = ImGui.getContentRegionAvail().x;
+		ImGui.setNextItemWidth(wid);
+
+		var f = floatPool.get();
+		f.value = Reflect.getProperty(object, field);
+		if (ImGui.dragFloat("##" + name + field, f, speed, min, max, format, flags)) {
+			Reflect.setProperty(object, field, f.value);
+			didChange = true;
+		}
+		return didChange;
+	}
+	inline function dragFloat2Field(name:String, field:String, field2:String, object:Dynamic, speed:Float = 1.0, min:Float = 0.0, max:Float = 0.0, format:String = "%.3f", flags:ImGuiSliderFlags = 0) {
+		var didChange:Bool = false;
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		var wid = ImGui.getContentRegionAvail().x / 2;
+		ImGui.setNextItemWidth(wid);
+
+		var f = floatPool.get();
+		f.value = Reflect.getProperty(object, field);
+		if (ImGui.dragFloat("##" + name + field, f, speed, min, max, format, flags)) {
+			Reflect.setProperty(object, field, f.value);
+			didChange = true;
+		}
+
+		ImGui.sameLine();
+		ImGui.setNextItemWidth(wid);
+
+		var f2 = floatPool.get();
+		f2.value = Reflect.getProperty(object, field2);
+		if (ImGui.dragFloat("##" + name + field2, f2, speed, min, max, format, flags)) {
+			Reflect.setProperty(object, field2, f2.value);
+			didChange = true;
+		}
+		return didChange;
+	}
+	inline function dragFloat3Field(name:String, field:String, field2:String, field3:String, object:Dynamic, speed:Float = 1.0, min:Float = 0.0, max:Float = 0.0, format:String = "%.3f", flags:ImGuiSliderFlags = 0) {
+		var didChange:Bool = false;
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		var wid = ImGui.getContentRegionAvail().x / 3;
+		ImGui.setNextItemWidth(wid);
+
+		var f = floatPool.get();
+		f.value = Reflect.getProperty(object, field);
+		if (ImGui.dragFloat("##" + name + field, f, speed, min, max, format, flags)) {
+			Reflect.setProperty(object, field, f.value);
+			didChange = true;
+		}
+
+		ImGui.sameLine();
+		ImGui.setNextItemWidth(wid);
+
+		var f2 = floatPool.get();
+		f2.value = Reflect.getProperty(object, field2);
+		if (ImGui.dragFloat("##" + name + field2, f2, speed, min, max, format, flags)) {
+			Reflect.setProperty(object, field2, f2.value);
+			didChange = true;
+		}
+
+		ImGui.sameLine();
+		ImGui.setNextItemWidth(wid);
+
+		var f3 = floatPool.get();
+		f3.value = Reflect.getProperty(object, field3);
+		if (ImGui.dragFloat("##" + name + field3, f3, speed, min, max, format, flags)) {
+			Reflect.setProperty(object, field3, f3.value);
+			didChange = true;
+		}
+		return didChange;
+	}
+	inline function sliderFloatField(name:String, field:String, object:Dynamic, min:Float, max:Float, format:String = "%.3f", flags:ImGuiSliderFlags = 0) {
+		var didChange:Bool = false;
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		var wid = ImGui.getContentRegionAvail().x;
+		ImGui.setNextItemWidth(wid);
+
+		var f = floatPool.get();
+		f.value = Reflect.getProperty(object, field);
+		if (ImGui.sliderFloat("##" + name + field, f, min, max, format, flags)) {
+			Reflect.setProperty(object, field, f.value);
+			didChange = true;
+		}
+		return didChange;
+	}
+	inline function dragIntField(name:String, field:String, object:Dynamic, speed:Float = 1.0, min:Int = 0, max:Int = 0, format:String = "%d", flags:ImGuiSliderFlags = 0) {
+		var didChange:Bool = false;
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		var wid = ImGui.getContentRegionAvail().x;
+		ImGui.setNextItemWidth(wid);
+
+		var i = intPool.get();
+		i.value = Reflect.getProperty(object, field);
+		if (ImGui.dragInt("##" + name + field, i, speed, min, max, format, flags)) {
+			Reflect.setProperty(object, field, i.value);
+			didChange = true;
+		}
+		return didChange;
+	}
+	inline function checkboxField(name:String, field:String, object:Dynamic) {
+		var didChange:Bool = false;
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		var b = boolPool.get(); b.value = Reflect.getProperty(object, field); 
+		if (ImGui.checkbox("##" + name + field, b)) {
+			Reflect.setProperty(object, field, b.value);
+			didChange = true;
+		}
+		return didChange;
+	}
+	inline function textField(name:String, text:String) {
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		ImGui.text(text);
+	}
+	inline function colorField(name:String, field:String, object:Dynamic, flags:ImGuiColorEditFlags = 0) {
+		var didChange:Bool = false;
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		var wid = ImGui.getContentRegionAvail().x;
+		ImGui.setNextItemWidth(wid);
+
+		var color:FlxColor = Reflect.getProperty(object, field);
+		var float4 = float4Pool.get();
+		float4.values[0] = color.redFloat;
+		float4.values[1] = color.greenFloat;
+		float4.values[2] = color.blueFloat;
+		float4.values[3] = color.alphaFloat;
+		if (ImGui.colorEdit4("##" + name + field, float4, flags)) {
+			Reflect.setProperty(object, field, FlxColor.fromRGBFloat(float4.values[0], float4.values[1], float4.values[2], float4.values[3]));
+			didChange = true;
+		}
+		return didChange;
+	}
+	inline function inputTextField(name:String, field:String, object:Dynamic, flags:ImGuiInputTextFlags = 0) {
+
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+
+		var wid = ImGui.getContentRegionAvail().x;
+		ImGui.setNextItemWidth(wid);
+
+		var s = stringPool.get();
+		s.value = Reflect.getProperty(object, field);
+		if (ImGui.inputText("##" + name + field, s, flags)) {
+			Reflect.setProperty(object, field, s.value);
+		}
+	}
+	inline function inputTextFieldMultiline(name:String, field:String, object:Dynamic, width:Float, height:Float, flags:ImGuiInputTextFlags = 0) {
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+		var s = stringPool.get();
+		s.value = Reflect.getProperty(object, field);
+		if (ImGui.inputTextMultiline("##" + name + field, s, width, height, flags)) {
+			Reflect.setProperty(object, field, s.value);
+		}
+	}
+	inline function enumFieldString(name:String, field:String, object:Dynamic, list:Array<String>) { //not working
+		var index = intPool.get();
+		index.value = list.indexOf(Std.string(Reflect.getProperty(object, field)));
+		if (ImGui.combo(name + "##" + field, index, list)) {
+			Reflect.setProperty(object, field, list[index.value]);
+		}
+	}
+	inline function enumAbstractField(name:String, field:String, object:Dynamic, type:String) {
+
+		ImGui.tableNextRow();
+		ImGui.tableSetColumnIndex(0);
+		ImGui.text(name);
+		ImGui.tableSetColumnIndex(1);
+
+		var t = Type.resolveClass(type + "_HSC");
+		if (t != null) {
+			var wid = ImGui.getContentRegionAvail().x;
+			ImGui.setNextItemWidth(wid);
+
+			var curValue = Reflect.getProperty(object, field);
+			var index = intPool.get();
+
+			var fields = Type.getClassFields(t);
+			var filteredFields:Array<String> = [];
+			for (f in fields) {
+				if (!f.startsWith("from") && !f.startsWith("to")) filteredFields.push(f);
+			}
+			index.value = -1;
+			for (i => f in filteredFields) {
+				if (Reflect.getProperty(t, f) == curValue) index.value = i;
+			}
+
+			if (ImGui.combo("##" + name + field, index, filteredFields)) {
+				Reflect.setProperty(object, field, Reflect.getProperty(t, filteredFields[index.value]));
+			}
+
+		}
+	}
+	#end
+}
+
+#if IMGUI_ENABLED
+//quick class that handles imgui pointers for temp values
+class ImGuiPtrPool<T> {
+	var members:Array<T> = [];
+	var used:Int = 0;
+	var constructor:Void->T;
+	public function new(constructor:Void->T) {
+		this.constructor = constructor;
+	}
+	public function reset() {
+		used = 0;
+	}
+	public function get():T {
+		if (used >= members.length) {
+			members.push(constructor());
+		}
+		var obj = members[used];
+		used++;
+		return obj;
+	}
+}
+
+//https://github.com/ocornut/imgui/blob/master/imgui_demo.cpp#L841
+class ImGuiImageViewer {
+	var gridEnabled:ImGuiBoolPtr = new ImGuiBoolPtr(false);
+	public var viewReset:Bool = true;
+	var viewOffsetX:Float = 0;
+	var viewOffsetY:Float = 0;
+	var zoom:ImGuiFloatPtr = new ImGuiFloatPtr(10.0);
+	var zoom100:ImGuiFloatPtr = new ImGuiFloatPtr(10.0);
+	var zoomMin:Float = 0.1;
+	var zoomMax:Float = 10000;
+
+	public function new() {}
+
+	public function drawOptions() {
+		ImGui.setNextItemWidth(150);
+		zoom100.value = zoom.value * 100;
+		if (ImGui.dragFloat("Zoom", zoom100, 5.0, zoomMin * 100.0, zoomMax * 100, "%.0f%%", ImGuiSliderFlags.AlwaysClamp))
+			zoom.value = zoom100.value / 100.0;
+	}
+
+	public function drawCanvas(canvas_size_x:Float, canvas_size_y:Float, image_tex_ref:ImTextureID, image_w:Int, image_h:Int) {
+		var drawList = ImGui.getWindowDrawList();
+		ImGui.invisibleButton("##Canvas", canvas_size_x, canvas_size_y);
+		var canvas_min = ImGui.getItemRectMin();
+		var canvas_max = ImGui.getItemRectMax();
+
+		if (viewReset) {
+			var xZoom = canvas_size_x / image_w;
+			var yZoom = canvas_size_y / image_h;
+			zoom.value = (image_w > image_h ? xZoom : yZoom);
+			viewOffsetX = (canvas_size_x * 0.5 / xZoom) - 0.5;
+			viewOffsetY = (canvas_size_y * 0.5 / yZoom) - 0.5;
+		}
+		viewReset = false;
+
+		if (ImGui.setItemKeyOwner(ImGuiKey.MouseWheelY)) {
+			if (ImGuiIO.mouseWheel != 0.0) {
+				zoom.value = FlxMath.bound(zoom.value * (1.0 + ImGuiIO.mouseWheel * 0.10), zoomMin, zoomMax);
+			}
+		}
+		var zoomValue = zoom.value;
+		if (ImGui.isItemActive() && ImGui.isMouseDragging(0)) {
+			viewOffsetX -= ImGuiIO.mouseDeltaX / zoomValue;
+			viewOffsetY -= ImGuiIO.mouseDeltaY / zoomValue;
+		}
+
+		var minX:Float = Std.int((canvas_min.x - (viewOffsetX * zoomValue)) + (canvas_size_x * 0.5));
+		var minY:Float = Std.int((canvas_min.y - (viewOffsetY * zoomValue)) + (canvas_size_y * 0.5));
+		var maxX:Float = Std.int(minX + image_w * zoomValue);
+		var maxY:Float = Std.int(minY + image_h * zoomValue);
+		drawList.addRect([canvas_min.x - 1.0, canvas_min.y - 1.0, canvas_max.x + 1.0, canvas_max.y + 1.0], 0xFFFFFFFF);
+		drawList.pushClipRect(canvas_min.x, canvas_min.y, canvas_max.x, canvas_max.y, true);
+		drawList.addRectFilled([minX, minY, maxX, maxY], 0xFF646464);
+		drawList.addImage(image_tex_ref, [minX, minY, maxX, maxY]);
+
+		if (gridEnabled.value && zoomValue > 6.0)
+		{
+			var step:Float = zoomValue;
+			for (px in Std.int((canvas_min.x - minX) / step)...Std.int((canvas_max.x - minX) / step)) {
+				drawList.addLineV(minX + px * step, canvas_min.y, canvas_max.y, 0x64FFFFFF, 1.0);
+			}
+			for (py in Std.int((canvas_min.y - minY) / step)...Std.int((canvas_max.y - minY) / step)) {
+				drawList.addLineH(canvas_min.x, canvas_max.x, minY + py * step, 0x64FFFFFF, 1.0);
+			}
+		}
+		drawList.popClipRect();
+	}
+
+	
+}
+#end
\ No newline at end of file
diff --git a/source/funkin/backend/system/framerate/AssetTreeInfo.hx b/source/funkin/backend/system/framerate/AssetTreeInfo.hx
index 4e63cec327..50984bd885 100644
--- a/source/funkin/backend/system/framerate/AssetTreeInfo.hx
+++ b/source/funkin/backend/system/framerate/AssetTreeInfo.hx
@@ -16,7 +16,7 @@ class AssetTreeInfo extends FramerateCategory {
 		visible = Options.fpsCounterAssets;
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		if ((lastUpdateTime += FlxG.rawElapsed) < 1)
diff --git a/source/funkin/backend/system/framerate/CodenameBuildField.hx b/source/funkin/backend/system/framerate/CodenameBuildField.hx
index 656c0fff9c..57bf752a2a 100644
--- a/source/funkin/backend/system/framerate/CodenameBuildField.hx
+++ b/source/funkin/backend/system/framerate/CodenameBuildField.hx
@@ -6,14 +6,17 @@ import openfl.text.TextField;
 class CodenameBuildField extends TextField {
 	public function new() {
 		super();
-		defaultTextFormat = Framerate.textFormat;
 		autoSize = LEFT;
 		multiline = wordWrap = false;
 		reload();
 	}
 
 	public function reload() {
-		#if COMPILE_EXPERIMENTAL
+		defaultTextFormat = Framerate.textFormat;
+
+		#if TEST_BUILD
+		text = '${Flags.VERSION_MESSAGE} (Test Build)';
+		#elseif COMPILE_EXPERIMENTAL
 		text = '${Flags.VERSION_MESSAGE} (Experimental Build)';
 		#else
 		text = '${Flags.VERSION_MESSAGE}';
diff --git a/source/funkin/backend/system/framerate/ConductorInfo.hx b/source/funkin/backend/system/framerate/ConductorInfo.hx
index a63729e2ae..c1c68daefe 100644
--- a/source/funkin/backend/system/framerate/ConductorInfo.hx
+++ b/source/funkin/backend/system/framerate/ConductorInfo.hx
@@ -8,7 +8,7 @@ class ConductorInfo extends FramerateCategory {
 		visible = Options.fpsCounterConductor;
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		var buf = new StringBuf();
diff --git a/source/funkin/backend/system/framerate/FlixelInfo.hx b/source/funkin/backend/system/framerate/FlixelInfo.hx
index 05b8409996..42d3347f6b 100644
--- a/source/funkin/backend/system/framerate/FlixelInfo.hx
+++ b/source/funkin/backend/system/framerate/FlixelInfo.hx
@@ -9,7 +9,7 @@ class FlixelInfo extends FramerateCategory {
 		visible = Options.fpsCounterFlixel;
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		@:privateAccess {
diff --git a/source/funkin/backend/system/framerate/Framerate.hx b/source/funkin/backend/system/framerate/Framerate.hx
index 6ab4c12955..8787478563 100644
--- a/source/funkin/backend/system/framerate/Framerate.hx
+++ b/source/funkin/backend/system/framerate/Framerate.hx
@@ -83,6 +83,7 @@ class Framerate extends Sprite {
 	}
 
 	public function reload() {
+		textFormat = new TextFormat(fontName, 12, -1);
 		for(c in categories)
 			c.reload();
 		#if SHOW_BUILD_ON_FPS
@@ -107,7 +108,7 @@ class Framerate extends Sprite {
 
 
 	var debugAlpha:Float = 0;
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		alpha = CoolUtil.fpsLerp(alpha, debugMode > 0 ? 1 : 0, 0.5);
 		debugAlpha = CoolUtil.fpsLerp(debugAlpha, debugMode > 1 ? 1 : 0, 0.5);
 
diff --git a/source/funkin/backend/system/framerate/FramerateCategory.hx b/source/funkin/backend/system/framerate/FramerateCategory.hx
index fddc40e06a..9a87f4783b 100644
--- a/source/funkin/backend/system/framerate/FramerateCategory.hx
+++ b/source/funkin/backend/system/framerate/FramerateCategory.hx
@@ -39,9 +39,11 @@ class FramerateCategory extends Sprite {
 		this.text.y = this.title.y + this.title.height + 2;
 	}
 
-	public function reload() {}
+	public function reload() {
+		for(label in [this.title, this.text]) label.defaultTextFormat = new TextFormat(Framerate.fontName, label == this.title ? 18 : 12, -1);
+	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 		super.__enterFrame(t);
 
diff --git a/source/funkin/backend/system/framerate/FramerateCounter.hx b/source/funkin/backend/system/framerate/FramerateCounter.hx
index 191440c230..cebfa9f51f 100644
--- a/source/funkin/backend/system/framerate/FramerateCounter.hx
+++ b/source/funkin/backend/system/framerate/FramerateCounter.hx
@@ -46,7 +46,7 @@ class FramerateCounter extends Sprite {
 		lastUpdateTime = 0;
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.001) return;
 
 		super.__enterFrame(t);
diff --git a/source/funkin/backend/system/framerate/MemoryCounter.hx b/source/funkin/backend/system/framerate/MemoryCounter.hx
index 39962e2399..0530d0bb7b 100644
--- a/source/funkin/backend/system/framerate/MemoryCounter.hx
+++ b/source/funkin/backend/system/framerate/MemoryCounter.hx
@@ -23,7 +23,7 @@ class MemoryCounter extends Sprite {
 			label.y = 0;
 			label.text = "MEM";
 			label.multiline = label.wordWrap = false;
-			label.defaultTextFormat = new TextFormat(Framerate.fontName, 12, -1);
+			label.defaultTextFormat = Framerate.textFormat;
 			label.selectable = false;
 			addChild(label);
 		}
@@ -33,11 +33,13 @@ class MemoryCounter extends Sprite {
 		#end
 	}
 
-	public function reload() {}
+	public function reload() {
+		for(label in [memoryText, memoryPeakText]) label.defaultTextFormat = Framerate.textFormat;
+	}
 
 	private var usingLegacy:Bool = false;
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 		super.__enterFrame(t);
 
diff --git a/source/funkin/backend/system/framerate/StatsInfo.hx b/source/funkin/backend/system/framerate/StatsInfo.hx
index 1dc6c3968e..63ef47270c 100644
--- a/source/funkin/backend/system/framerate/StatsInfo.hx
+++ b/source/funkin/backend/system/framerate/StatsInfo.hx
@@ -11,7 +11,7 @@ class StatsInfo extends FramerateCategory {
 		visible = Options.fpsCounterStats;
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		var buf = new StringBuf();
diff --git a/source/funkin/backend/system/framerate/SystemInfo.hx b/source/funkin/backend/system/framerate/SystemInfo.hx
index ce3fdaf280..603c06477a 100644
--- a/source/funkin/backend/system/framerate/SystemInfo.hx
+++ b/source/funkin/backend/system/framerate/SystemInfo.hx
@@ -182,7 +182,7 @@ class SystemInfo extends FramerateCategory {
 		visible = Options.fpsCounterSystem;
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		var buf = new StringBuf();
diff --git a/source/funkin/backend/system/macros/Macros.hx b/source/funkin/backend/system/macros/Macros.hx
index 801eda0c17..bc830a2fff 100644
--- a/source/funkin/backend/system/macros/Macros.hx
+++ b/source/funkin/backend/system/macros/Macros.hx
@@ -19,9 +19,28 @@ class Macros {
 			"flixel.addons.plugin", "flixel.addons.text", "flixel.addons.tile", "flixel.addons.transition",
 			"flixel.addons.util",
 			// OTHER LIBRARIES & STUFF
-			#if THREE_D_SUPPORT "away3d", "flx3d", #end
+			#if THREE_D_SUPPORT
+			/*
+				supposed to be deprecated but
+				were keeping them in the source for now
+				commenting them out here will make them
+				not show up during compiling....
+			*/
+			// "away3d", "flx3d",
+			#if foxlite
+			"foxlite",
+			"foxlite.animation", "foxlite.color", "foxlite.culling",
+			"foxlite.extra", "foxlite.flixel", "foxlite.funkin",
+			"foxlite.groups", "foxlite.instancing", "foxlite.lights",
+			"foxlite.loaders", "foxlite.materials", "foxlite.math",
+			"foxlite.mesh", "foxlite.polyfill", "foxlite.post",
+			"foxlite.renderer", "foxlite.skin", "foxlite.sky",
+			"foxlite.stencil", "foxlite.system", "foxlite.texture",
+			#end
+			#end
 			#if VIDEO_CUTSCENES "hxvlc.flixel", "hxvlc.openfl", #end
 			#if NAPE_ENABLED "nape", "flixel.addons.nape", #end
+			#if IMGUI_ENABLED "lime.tools.imgui", #end
 			// BASE HAXE
 			"DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting", "animate"
 		])
@@ -58,6 +77,9 @@ class Macros {
 
 		final macroPath = 'funkin.backend.system.macros.Macros';
 		Compiler.addMetadata('@:build($macroPath.buildLimeAssetLibrary())', 'lime.utils.AssetLibrary');
+		Compiler.addMetadata('@:build($macroPath.buildLimeApplication())', 'lime.app.Application');
+		Compiler.addMetadata('@:build($macroPath.buildLimeWindow())', 'lime.ui.Window');
+		Compiler.addMetadata('@:build($macroPath.buildOpenflAssets())', 'openfl.utils.Assets');
 
 		//Adds Compat for #if hscript blocks when you have hscript improved
 		if (Context.defined("hscript_improved") && !Context.defined("hscript")) {
@@ -73,5 +95,58 @@ class Macros {
 
 		return fields;
 	}
+
+	public static function buildLimeApplication():Array<Field> {
+		final fields:Array<Field> = Context.getBuildFields(), pos:Position = Context.currentPos();
+		for (f in fields) switch (f.kind) {
+			case FFun(func): switch (f.name) {
+				case "exec": switch (func.expr.expr) {
+					case EBlock(exprs): exprs.insert(1, macro funkin.backend.system.Main.preInit());
+					default:
+				}
+			}
+			default:
+		}
+
+		return fields;
+	}
+
+	public static function buildLimeWindow():Array<Field> {
+		final fields:Array<Field> = Context.getBuildFields(), pos:Position = Context.currentPos();
+		if (!Context.defined("DARK_MODE_WINDOW")) return fields;
+
+		for (f in fields) switch (f.kind) {
+			case FFun(func): switch (f.name) {
+				case "new": switch (func.expr.expr) {
+					case EBlock(exprs): exprs.push(macro funkin.backend.utils.NativeAPI.setDarkMode(title, true));
+					default:
+				}
+			}
+			default:
+		}
+
+		return fields;
+	}
+
+	public static function buildOpenflAssets():Array<Field> {
+		final fields:Array<Field> = Context.getBuildFields(), pos:Position = Context.currentPos();
+		for (f in fields) switch (f.name) {
+			case "allowHardwareTextures": fields.remove(f);
+			default:
+		}
+
+		fields.push({name: 'allowHardwareTextures', access: [APublic, AStatic], pos: pos, kind: FProp("get", "set", macro :Bool)});
+		fields.push({name: '__allowHardwareTextures', access: [APrivate, AStatic], pos: pos, kind: FVar(macro :Null<Bool>)});
+
+		fields.push({name: "get_allowHardwareTextures", access: [APublic, AStatic, AInline], pos: pos, kind: FFun({ret: macro :Bool, args: [], expr: macro {
+			return __allowHardwareTextures != null ? __allowHardwareTextures : !funkin.backend.system.Main.forceGPUOnlyBitmapsOff && funkin.options.Options.gpuOnlyBitmaps;
+		}})});
+		fields.push({name: "set_allowHardwareTextures", access: [APublic, AStatic, AInline], pos: pos, kind: FFun({ret: macro :Bool, args: [{name: "value", type: macro :Bool}], expr: macro {
+			__allowHardwareTextures = value;
+			return get_allowHardwareTextures();
+		}})});
+
+		return fields;
+	}
 }
 #end
\ No newline at end of file
diff --git a/source/funkin/backend/system/modules/ALSoftConfig.hx b/source/funkin/backend/system/modules/ALSoftConfig.hx
deleted file mode 100644
index 0b1b57a035..0000000000
--- a/source/funkin/backend/system/modules/ALSoftConfig.hx
+++ /dev/null
@@ -1,31 +0,0 @@
-package funkin.backend.system.modules;
-
-import haxe.io.Path;
-
-/*
- * A class that simply points OpenALSoft to a custom configuration file when
- * the game starts up.
- *
- * The config overrides a few global OpenALSoft settings with the aim of
- * improving audio quality on desktop targets.
- */
-@:keepInit class ALSoftConfig
-{
-	#if desktop
-	static function __init__():Void
-	{
-		var origin:String = #if hl Sys.getCwd() #else Sys.programPath() #end;
-
-		var configPath:String = Path.directory(Path.withoutExtension(origin));
-		#if windows
-		configPath += "/plugins/alsoft.ini";
-		#elseif mac
-		configPath = Path.directory(configPath) + "/Resources/plugins/alsoft.conf";
-		#else
-		configPath += "/plugins/alsoft.conf";
-		#end
-
-		Sys.putEnv("ALSOFT_CONF", configPath);
-	}
-	#end
-}
\ No newline at end of file
diff --git a/source/funkin/backend/system/modules/AudioSwitchFix.hx b/source/funkin/backend/system/modules/AudioSwitchFix.hx
deleted file mode 100644
index 3e89e373b4..0000000000
--- a/source/funkin/backend/system/modules/AudioSwitchFix.hx
+++ /dev/null
@@ -1,69 +0,0 @@
-package funkin.backend.system.modules;
-
-import flixel.FlxState;
-import flixel.sound.FlxSound;
-import funkin.backend.utils.NativeAPI;
-import lime.media.AudioManager;
-import lime.media.AudioSource;
-import haxe.Timer;
-
-/**
- * if you are stealing this keep this comment at least please lol
- *
- * hi gray itsa me yoshicrafter29 i fixed it hehe
- */
-@:dox(hide)
-class AudioSwitchFix {
-	public static function onAudioDisconnected() @:privateAccess {
-		var sources:Array<{source:AudioSource, playing:Bool, time:Float, gain:Float, pitch:Float, position:lime.math.Vector4}> = [];
-		for (source in AudioSource.activeSources) {
-			var wasPlaying = source.playing;
-			sources.push({
-				source: source,
-				playing: wasPlaying,
-				time: source.currentTime,
-				gain: source.gain,
-				pitch: source.pitch,
-				position: source.position
-			});
-
-			source.__backend.dispose();
-			if (wasPlaying) source.__backend.playing = true;
-		}
-
-		AudioManager.shutdown();
-		AudioManager.init();
-		// #if !lime_doc_gen
-		// if (AudioManager.context.type == OPENAL)
-		// {
-		// 	var alc = AudioManager.context.openal;
-
-		// 	var device = alc.openDevice();
-		// 	var ctx = alc.createContext(device);
-		// 	alc.makeContextCurrent(ctx);
-		// 	alc.processContext(ctx);
-		// }
-		// #end
-		
-		for (d in sources) {
-			d.source.__backend.init();
-			d.source.currentTime = d.time;
-			d.source.gain = d.gain;
-			d.source.pitch = d.pitch;
-			d.source.position = d.position;
-
-			if (d.playing) d.source.play();
-		}
-
-		Main.changeID++;
-		Main.audioDisconnected = false;
-	}
-
-	private static var timer:Timer;
-
-	private static function onRun() if (Main.audioDisconnected) onAudioDisconnected();
-	public static function init() {
-		NativeAPI.registerAudio();
-		if (timer == null) (timer = new Timer(1000)).run = onRun;
-	}
-}
\ No newline at end of file
diff --git a/source/funkin/backend/utils/AudioAnalyzer.hx b/source/funkin/backend/utils/AudioAnalyzer.hx
index c6f02cd6b9..74f4c11b98 100644
--- a/source/funkin/backend/utils/AudioAnalyzer.hx
+++ b/source/funkin/backend/utils/AudioAnalyzer.hx
@@ -1,67 +1,94 @@
 package funkin.backend.utils;
 
-import flixel.sound.FlxSound;
-import lime.media.AudioBuffer;
+#if lime_openal
+import sys.thread.Mutex;
+
 import lime.utils.ArrayBufferView.ArrayBufferIO;
 import lime.utils.ArrayBuffer;
 
-#if (lime_cffi && lime_vorbis)
-import lime.media.vorbis.Vorbis;
-import lime.media.vorbis.VorbisFile;
-#end
+import flixel.sound.FlxSound;
+import flixel.sound.FlxSoundData;
 
-#if (target.threaded)
-import sys.thread.Mutex;
-#end
+typedef ReadCallback = Int->Int->Void;
+typedef WindowFunction = Float->Float;
+
+final class WindowFunctions {
+	static inline final TWO_PI:Float = 6.283185307179586;
+	static inline final FOUR_PI:Float = 12.566370614359172;
+	static inline final SIX_PI:Float = 18.84955592153876;
+	static inline final EIGHT_PI:Float = 25.132741228718345;
+
+	public static inline function triangular(x:Float):Float
+		return 1.0 - Math.abs(x - 0.5) * 2.0;
 
-typedef AudioAnalyzerCallback = Int->Int->Void;
+	public static inline function hann(x:Float):Float
+		return 0.5 - 0.5 * FlxMath.fastCos(TWO_PI * x);
+
+	public static inline function hamming(x:Float):Float
+		return 0.53836 - 0.46164 * FlxMath.fastCos(TWO_PI * x);
+
+	public static inline function blackmanNuttall(x:Float):Float
+		return 0.3635819 - 0.4891775 * FlxMath.fastCos(TWO_PI * x) + 0.1365995 * FlxMath.fastCos(FOUR_PI * x)
+			- 0.0106411 * FlxMath.fastCos(SIX_PI * x);
+
+	public static inline function blackmanHarris(x:Float):Float
+		return 0.4243801 - 0.4973406 * FlxMath.fastCos(TWO_PI * x) + 0.0782793 * FlxMath.fastCos(FOUR_PI * x);
+
+	public static inline function flatTop(x:Float):Float
+		return 0.21557895 - 0.41663158 * FlxMath.fastCos(TWO_PI * x) + 0.277263158 * FlxMath.fastCos(FOUR_PI * x)
+			+ 0.083578947 * FlxMath.fastCos(SIX_PI * x) + 0.006947368 * FlxMath.fastCos(EIGHT_PI * x);
+}
+
+enum abstract TimeUnit(Int) from Int to Int {
+	var MILLISECOND = 0;
+	var SECOND = 1;
+	var SAMPLE = 2;
+}
 
 /**
- * An utility that analyze FlxSounds,
+ * An utility that analyze FlxSound,
  * can be used to make waveform or real-time audio visualizer.
- * 
- * FlxSound.amplitude works so if any case if your only checking for peak of current time, use that instead.
  */
 final class AudioAnalyzer {
 	/**
 	 * Get bytes from an audio buffer with specified position and wordSize
-	 * @param buffer The audio buffer to get byte from.
-	 * @param position The specified position to get the byte from the audio buffer.
-	 * @param wordSize How many bytes to get with to one byte (Usually it's bitsPerSample / 8 or bitsPerSample >> 3).
+	 * @param	buffer The audio buffer to get byte from.
+	 * @param	position The specified position to get the byte from the audio buffer.
+	 * @param	wordSize How many bytes to get with to one byte (Usually it's bitsPerSample / 8 or bitsPerSample >> 3).
 	 * @return Byte from the audio buffer with specified position.
 	 */
 	public static function getByte(buffer:ArrayBuffer, position:Int, wordSize:Int):Int {
-		if (wordSize == 2) return inline ArrayBufferIO.getInt16(buffer, position);
+		if (wordSize == 2) return ArrayBufferIO.getInt16(buffer, position);
 		else if (wordSize == 3) {
-			var b = inline ArrayBufferIO.getUint16(buffer, position) | (buffer.get(position + 2) << 16);
-			if (b & 0x800000 != 0) return b - 0x1000000;
-			else return b;
+			wordSize = ArrayBufferIO.getUint16(buffer, position) | (buffer.get(position + 2) << 16);
+			if (wordSize & 0x800000 != 0) return wordSize - 0x1000000;
+			else return wordSize;
 		}
-		else if (wordSize == 4) return inline ArrayBufferIO.getInt32(buffer, position);
-		else return inline ArrayBufferIO.getUint8(buffer, position) - 128;
+		else if (wordSize == 4) return ArrayBufferIO.getInt32(buffer, position);
+		else return ArrayBufferIO.getInt8(buffer, position);
 	}
 
 	/**
-	 * Gets levels from the frequencies with specified sample rate.
-	 * @param frequencies Frequencies input.
-	 * @param sampleRate Sample Rate input.
-	 * @param barCount How much bars to get.
-	 * @param levels The output for getting the values, to avoid memory leaks (Optional).
-	 * @param ratio How much ratio for smoothen the values from the previous levels values (Optional, use CoolUtil.getFPSRatio(1 - ratio) to simulate web AnalyserNode.smoothingTimeConstant, 0.35 of smoothingTime works most of the time).
-	 * @param minDb The minimum decibels to cap (Optional, default -63.0, -120 is pure silence).
-	 * @param maxDb The maximum decibels to cap (Optional, default -10.0, Above 0 is not recommended).
-	 * @param minFreq The minimum frequency to cap (Optional, default 20.0, Below 8.0 is not recommended).
-	 * @param maxFreq The maximum frequency to cap (Optional, default 22000.0, Above 23000.0 is not recommended).
-	 * @return Output of levels/bars that ranges from 0 to 1.
+	 * Gets spectrum from the frequencies with specified sample rate.
+	 * @param	frequencies	Frequencies input.
+	 * @param	sampleRate	Sample Rate input.
+	 * @param	barCount	How much bars to get.
+	 * @param	spectrum	The output for getting the values, to avoid memory leaks (Optional).
+	 * @param	ratio		How much ratio for smoothen the values from the previous spectrum values (Optional, use FlxMath.getElapsedLerp(1 - ratio) to simulate web AnalyserNode.smoothingTimeConstant, 0.35 of smoothingTime works most of the time).
+	 * @param	minDb		The minimum decibels to cap (Optional, default -63.0, -120 is pure silence).
+	 * @param	maxDb		The maximum decibels to cap (Optional, default -10.0, Above 0 is not recommended).
+	 * @param	minFreq		The minimum frequency to cap (Optional, default 20.0, Below 8.0 is not recommended).
+	 * @param	maxFreq		The maximum frequency to cap (Optional, default 20000.0, Above 23000.0 is not recommended).
+	 * @return	Output of spectrum/bars that ranges from 0 to 1.
 	 */
-	public static function getLevelsFromFrequencies(frequencies:Array<Float>, sampleRate:Int, barCount:Int, ?levels:Array<Float>, ratio = 0.0, minDb = -63.0, maxDb = -10.0, minFreq = 20.0, maxFreq = 22000.0):Array<Float> {
-		if (levels == null) levels = [];
-		levels.resize(barCount);
+	public static function getSpectrumFromFrequencies(frequencies:Array<Float>, sampleRate:Int, barCount:Int, ?spectrum:Array<Float>, ratio = 0.0, minDb = -63.0, maxDb = -10.0, minFreq = 20.0, maxFreq = 20000.0):Array<Float> {
+		if (spectrum == null) spectrum = [];
+		if (spectrum.length != barCount) spectrum.resize(barCount);
 
-		var logMin = Math.log(minFreq), logMax = Math.log(maxFreq);
-		var logRange = logMax - logMin, dbRange = maxDb - minDb, n = frequencies.length;
+		var logMin = Math.log(minFreq), n = frequencies.length - 1;
+		var logRange = Math.log(maxFreq) - logMin, dbRangeRate = 1 / (maxDb - minDb), rate = frequencies.length * 2 / sampleRate;
 		inline function calculateScale(i:Int)
-			return CoolUtil.bound(Math.exp(logMin + (logRange * i / (barCount + 1))) * n * 2 / sampleRate, 0, n - 1);
+			return FlxMath.bound(Math.exp(logMin + (logRange * i / (barCount + 1))) * rate, 0, n);
 
 		var s1 = calculateScale(0), s2;
 		var i1 = Math.floor(s1), i2;
@@ -81,138 +108,146 @@ final class AudioAnalyzer {
 			}
 			i1 = Math.floor(s1 = s2);
 
-			v = CoolUtil.bound(((20 * Math.log(v) / 2.302585092994046) - minDb) / dbRange, 0, 1);
-			if (ratio > 0 && ratio < 1 && v < levels[i]) levels[i] -= (levels[i] - v) * ratio;
-			else levels[i] = v;
+			v = FlxMath.bound((Math.log(v) * 8.685889638065035 - minDb) * dbRangeRate, 0, 1);
+			if (ratio > 0 && ratio < 1 && v < spectrum[i]) spectrum[i] -= (spectrum[i] - v) * ratio;
+			else spectrum[i] = v;
 		}
 
-		return levels;
+		return spectrum;
 	}
 
-	static var __reverseIndices:Array<Array<Int>> = [];
-	static var __windows:Array<Array<Float>> = [];
-	static var __twiddleReals:Array<Array<Float>> = [];
-	static var __twiddleImags:Array<Array<Float>> = [];
-	static var __freqReals:Array<Array<Float>> = [];
-	static var __freqImags:Array<Array<Float>> = [];
-	static var __freqCalculating:Int = 0;
-	#if (target.threaded)
-	static var __mutex:Mutex = new Mutex();
-	#end
+	/**
+	 * Gets levels from the frequencies with specified sample rate.
+	 * @param frequencies Frequencies input.
+	 * @param sampleRate Sample Rate input.
+	 * @param barCount How much bars to get.
+	 * @param levels The output for getting the values, to avoid memory leaks (Optional).
+	 * @param ratio How much ratio for smoothen the values from the previous levels values (Optional, use CoolUtil.getFPSRatio(1 - ratio) to simulate web AnalyserNode.smoothingTimeConstant, 0.35 of smoothingTime works most of the time).
+	 * @param minDb The minimum decibels to cap (Optional, default -63.0, -120 is pure silence).
+	 * @param maxDb The maximum decibels to cap (Optional, default -10.0, Above 0 is not recommended).
+	 * @param minFreq The minimum frequency to cap (Optional, default 20.0, Below 8.0 is not recommended).
+	 * @param maxFreq The maximum frequency to cap (Optional, default 22000.0, Above 23000.0 is not recommended).
+	 * @return Output of levels/bars that ranges from 0 to 1.
+	 * 
+	 * deprecated, use getSpectrumFromFrequencies instead.
+	 */
+	@:deprecated("Use getSpectrumFromFrequencies instead of getLevelsFromFrequencies.")
+	public static function getLevelsFromFrequencies(frequencies:Array<Float>, sampleRate:Int, barCount:Int, ?levels:Array<Float>, ratio = 0.0, minDb = -63.0, maxDb = -10.0, minFreq = 20.0, maxFreq = 22000.0):Array<Float>
+		return inline getSpectrumFromFrequencies(frequencies, sampleRate, barCount, levels, ratio, minDb, maxDb, minFreq, maxFreq);
+
+	static final _permutations:Map<Int, Array<Int>> = [];
+	static final _twiddleReals:Map<Int, Array<Float>> = [];
+	static final _twiddleImags:Map<Int, Array<Float>> = [];
+	static final _reals:Array<Array<Float>> = [];
+	static final _imags:Array<Array<Float>> = [];
+	static var _freqCalculating:Int = 0;
+	static final _mutex = new Mutex();
 
 	/**
 	 * Gets frequencies from the samples.
-	 * @param samples The samples (can be from AudioAnalyzer.getSamples).
-	 * @param fftN How much samples for the fft to get, Has to be power of two, or it won't work.
-	 * @param useWindowing Should fft related stuff use blackman windowing? (Web AnalyzerNode windowing), Most of the time it's not worth it.
-	 * @param frequencies The output for getting the frequencies, to avoid memory leaks (Optional).
-	 * @return Output of frequencies.
+	 * @param	samples		The samples (can be from FunkinAudioAnalyzer.getSamples).
+	 * @param	window		The windowing function to use when passed.
+	 * @param	frequencies	The output for getting the frequencies, to avoid memory leaks (Optional).
+	 * @return	Output of frequencies.
 	 */
-	public static function getFrequenciesFromSamples(samples:Array<Float>, fftN = 2048, useWindowing = false, ?frequencies:Array<Float>):Array<Float> {
-		var log = Math.floor(Math.log(fftN) / 0.6931471805599453);
-		if (log == 0) throw "AudioAnalyzer.getFrequenciesFromSamples: Cannot insert a fftN of 1";
-
-		var i = log - 1;
-		fftN = 1 << log;
-
-		#if (target.threaded) __mutex.acquire(); #end
-		var reals:Array<Float> = __freqReals[__freqCalculating], imags:Array<Float> = __freqImags[__freqCalculating];
-		if (reals == null) {
-			__freqReals.push(reals = []);
-			__freqImags.push(imags = []);
-		}
-		__freqCalculating++;
+	public static function getFrequenciesFromSamples(samples:Array<Float>, ?window:WindowFunction, ?frequencies:Array<Float>, ?fftN:Int):Array<Float> {
+		if (fftN == null) fftN = samples.length;
 
-		var reverseIndices:Array<Int> = __reverseIndices[i];
-		var windows:Array<Float> = __windows[i];
-		var twiddleReals:Array<Float> = __twiddleReals[i];
-		var twiddleImags:Array<Float> = __twiddleImags[i];
+		var bits = 0;
+		while ((fftN >>= 1) > 0) bits++;
+		if (bits == 0) throw "FunkinAudioAnalyzer.getFrequenciesFromSamples: Cannot insert a sample length or fftN of 1";
 
-		if (reverseIndices == null) {
-			__reverseIndices.resize(log);
-			__windows.resize(log);
-			__twiddleReals.resize(log);
-			__twiddleImags.resize(log);
+		fftN = 1 << bits;
+		var fftN2 = fftN >> 1, n = fftN - 1;
 
-			(reverseIndices = []).resize(fftN);
-			(windows = []).resize(fftN);
-			(twiddleReals = []).resize(fftN);
-			(twiddleImags = []).resize(fftN);
+		var permutation:Array<Int>, twiddleReal:Array<Float>, twiddleImag:Array<Float>;
+		_mutex.acquire();
 
-			var f;
+		var real:Array<Float> = _reals[_freqCalculating], imag:Array<Float> = _imags[_freqCalculating];
+		if (real == null) {
+			_reals.push(real = []);
+			_imags.push(imag = []);
+		}
+		_freqCalculating++;
+
+		if (_permutations.exists(bits)) {
+			permutation = _permutations.get(bits);
+			twiddleReal = _twiddleReals.get(bits);
+			twiddleImag = _twiddleImags.get(bits);
+		}
+		else {
+			(permutation = []).resize(fftN);
+			(twiddleReal = []).resize(fftN2);
+			(twiddleImag = []).resize(fftN2);
+
+			var ang:Float;
 			for (i in 0...fftN) {
-				f = 2 * Math.PI * (i / fftN);
-				windows[i] = 0.42 - 0.5 * Math.cos(f) + 0.08 * Math.cos(2 * f);
-				reverseIndices[i] = __bitReverse(i, log);
-				twiddleReals[i] = Math.cos(-f);
-				twiddleImags[i] = Math.sin(-f);
+				permutation[i] = _bitReverse(i, bits);
+				if (i < fftN2) {
+					twiddleReal[i] = Math.cos((ang = -6.283185307179586 * i / n));
+					twiddleImag[i] = Math.sin(ang);
+				}
 			}
 
-			__reverseIndices[i] = reverseIndices;
-			__windows[i] = windows;
-			__twiddleReals[i] = twiddleReals;
-			__twiddleImags[i] = twiddleImags;
+			_permutations.set(bits, permutation);
+			_twiddleReals.set(bits, twiddleReal);
+			_twiddleImags.set(bits, twiddleImag);
 		}
 
-		#if (target.threaded) __mutex.release(); #end
+		_mutex.release();
 
-		if (fftN > reals.length) {
-			reals.resize(fftN);
-			imags.resize(fftN);
+		if (fftN > real.length) {
+			real.resize(fftN);
+			imag.resize(fftN);
 		}
 
 		if (frequencies == null) frequencies = [];
-		frequencies.resize(1 << i);
+		if (frequencies.length != fftN2) frequencies.resize(fftN2);
 
-		i = samples.length;
-		while (i > 0) {
-			i--;
-			if (useWindowing) reals[reverseIndices[i]] = samples[i] * windows[i];
-			else reals[reverseIndices[i]] = samples[i];
-			imags[i] = 0;
+		var tr = 1 / n;
+		for (i in 0...fftN) {
+			real[permutation[i]] = samples[i];
+			if (window != null) real[permutation[i]] *= window(i * tr);
+			imag[i] = 0;
 		}
 
-		var size = 1, n = fftN, half = 1, k, i0, i1, t, tr:Float, ti:Float;
-		while ((size <<= 1) < fftN) {
-			n >>= 1;
-			i = 0;
-			while (i < fftN) {
-				k = 0;
-				while (k < half) {
-					i1 = (i0 = i + k) + half;
-					t = (k * n) % fftN;
-
-					tr = reals[i1] * twiddleReals[t] - imags[i1] * twiddleImags[t];
-					ti = reals[i1] * twiddleImags[t] + imags[i1] * twiddleReals[t];
-					reals[i1] = reals[i0] - tr;
-					imags[i1] = imags[i0] - ti;
-					reals[i0] += tr;
-					imags[i0] += ti;
-
-					k++;
+		var half = 1, g:Int, b:Int, r:Int, i0:Int, i1:Int, ti:Float;
+		while (fftN2 > 0) {
+			g = 0;
+			while (g < fftN) {
+				b = r = 0;
+				while (b < half) {
+					i1 = (i0 = g + b) + half;
+					tr = real[i1] * twiddleReal[r] - imag[i1] * twiddleImag[r];
+					ti = real[i1] * twiddleImag[r] + imag[i1] * twiddleReal[r];
+					real[i1] = real[i0] - tr;
+					imag[i1] = imag[i0] - ti;
+					real[i0] += tr;
+					imag[i0] += ti;
+					b++;
+					r += fftN2;
 				}
-				i += size;
+				g += half << 1;
 			}
-			half = size;
+			half <<= 1;
+			fftN2 >>= 1;
 		}
 
 		tr = 1.0 / fftN;
-		i = 1 << (log - 1);
-		while (i > 1) {
-			i--;
-			frequencies[i] = 2 * Math.sqrt(reals[i] * reals[i] + imags[i] * imags[i]) * tr;
-		}
-		frequencies[0] = Math.sqrt(reals[0] * reals[0] + imags[0] * imags[0]) * tr;
+		i0 = frequencies.length - 1;
+		for (i in 1...i0) frequencies[i] = 2 * Math.sqrt(real[i] * real[i] + imag[i] * imag[i]) * tr;
+		frequencies[0] = Math.sqrt(real[0] * real[0] + imag[0] * imag[0]) * tr;
+		frequencies[i0] = Math.sqrt(real[i0] * real[i0] + imag[i0] * imag[i0]) * tr;
 
-		#if (target.threaded) __mutex.acquire(); #end
-		__freqCalculating--;
-		#if (target.threaded) __mutex.release(); #end
+		_mutex.acquire();
+		_freqCalculating--;
+		_mutex.release();
 
 		return frequencies;
 	}
 
-	static function __bitReverse(x:Int, log:Int):Int {
-		var y = 0, i = log;
+	static function _bitReverse(x:Int, bits:Int):Int {
+		var y = 0, i = bits;
 		while (i > 0) {
 			y = (y << 1) | (x & 1);
 			x >>= 1;
@@ -227,346 +262,357 @@ final class AudioAnalyzer {
 	public var sound:FlxSound;
 
 	/**
-	 * How much samples for the fft to get.
-	 * Usually for getting the levels or frequencies of the sound.
-	 * 
-	 * Has to be power of two, or it won't work.
-	 */
-	public var fftN:Int;
-
-	/**
-	 * Should fft related stuff use blackman windowing? (Web AnalyzerNode windowing).
-	 * Most of the time looks bad with this.
+	 * The current data from sound.
 	 */
-	public var useWindowingFFT:Bool;
+	public var data(default, null):FlxSoundData;
 
 	/**
-	 * The current buffer from sound.
+	 * How much samples for the fourier transform to get.
+	 * Has to be power of two, or it won't work.
 	 */
-	public var buffer(default, null):AudioBuffer;
+	public var fftN:Int;
 
 	/**
 	 * The current byteSize from buffer.
-	 * Example the byteSize of 16 BitsPerSample is 32768 (1 << 16-1)
+	 * Example the byteSize of 16 BitsPerSample is 32768 (1 << (16 - 1))
 	 */
 	public var byteSize(default, null):Int;
 
-	var __toBits:Float;
-	var __wordSize:Int;
-	var __sampleSize:Int;
-
-	#if (lime_cffi && lime_vorbis)
-	var __vorbis:VorbisFile;
-	var __buffer:ArrayBuffer;
-	var __bufferSize:Int;
-	var __bufferLastSize:Int;
-	var __bufferTime:Float;
-	var __bufferLastTime:Float;
-	#end
-
-	// analyze
-	var __min:Array<Int> = [];
-	var __max:Array<Int> = [];
-	var __minByte:Int;
-	var __maxByte:Int;
-
-	// samples
-	var __sampleIndex:Int;
-	var __sampleChannel:Int;
-	var __sampleToValue:Float;
-	var __sampleOutputMerge:Bool;
-	var __sampleOutputLength:Int;
-	var __sampleOutput:Array<Float>;
-
-	// frequencies
-	var __freqSamples:Array<Float>;
-	var __frequencies:Array<Float>;
-
-	/**
-	 * Creates an analyzer for specified FlxSound
-	 * @param sound An FlxSound to analyze.
-	 * @param fftN How much samples for fft to get (Optional, default 2048, 4096 is recommended for highest quality).
-	 * @param useWindowingFFT Should fft related stuff use blackman windowing? (Web AnalyzerNode windowing).
-	 */
-	public function new(sound:FlxSound, fftN = 2048, useWindowingFFT = false) {
+	var _sampleSize:Int;
+	var _mins:Array<Int> = [];
+	var _maxs:Array<Int> = [];
+	//var _decoder:FunkinAudioDecoder;
+	//var _buffer:ArrayBuffer;
+	//var _bufferLen:Int;
+	//var _bufferLastSize:Int;
+	//var _bufferLastSample:Int;
+	var _sampleIndex:Int;
+	var _sampleChannel:Int;
+	var _sampleValue:Int;
+	var _sampleValueGain:Float;
+	var _sampleOutputMerge:Bool;
+	var _sampleOutputLength:Int;
+	var _sampleOutput:Array<Float>;
+	var _freqSamples:Array<Float>;
+	var _frequencies:Array<Float>;
+
+	public function new(sound:FlxSound, fftN = 4096) {
 		this.sound = sound;
 		this.fftN = fftN;
-		this.useWindowingFFT = useWindowingFFT;
-		__check();
+		_check();
 	}
 
-	function __check() if (sound != null && sound.buffer != buffer) {
-		byteSize = 1 << ((buffer = sound.buffer).bitsPerSample - 1);
-
-		#if (lime_cffi && lime_vorbis)
-		__vorbis = null;
-		__bufferLastSize = 0;
-		__bufferTime = Math.NaN;
-		__bufferLastTime = Math.NaN;
-		#end
+	function _check() {
+		if (sound != null && !sound.data.isDestroyed) {
+			if (sound.data != data)
+			{
+				byteSize = 1 << ((data = sound.data).bitsPerSample - 1);
+				_sampleSize = data.channels * (data.bitsPerSample >> 3);
+				_mins.resize(data.channels);
+				_maxs.resize(data.channels);
+				//_decoder?.destroy();
+			}
+		}
+		else data = null;
+	}
 
-		__toBits = buffer.sampleRate / 1000 * (__sampleSize = buffer.channels * (__wordSize = buffer.bitsPerSample >> 3));
-		__min.resize(buffer.channels);
-		__max.resize(buffer.channels);
+	/**
+	 * Gets spectrum from an attached sound from position.
+	 * @param	pos			Position to get (Optional).
+	 * @param	timeUnit	TimeUnit to use for positions (Optional).
+	 * @param	gain		How much gain multiplier will it affect the output. (Optional, default 1.0).
+	 * @param	barCount	How much bars to get.
+	 * @param	spectrum	The output for getting the values, to avoid memory leaks (Optional).
+	 * @param	ratio		How much ratio for smoothen the values from the previous spectrum values (Optional, use FlxMath.getElapsedLerp(1 - ratio) to simulate web AnalyserNode.smoothingTimeConstant, 0.35 of smoothingTime works most of the time).
+	 * @param	minDb		The minimum decibels to cap (Optional, default -63.0, -120 is pure silence).
+	 * @param	maxDb		The maximum decibels to cap (Optional, default -10.0, Above 0 is not recommended).
+	 * @param	minFreq		The minimum frequency to cap (Optional, default 20.0, Below 8.0 is not recommended).
+	 * @param	maxFreq		The maximum frequency to cap (Optional, default 20000.0, Above 23000.0 is not recommended).
+	 * @return	Output of spectrum/bars that ranges from 0 to 1.
+	 */
+	public function getSpectrum(?pos:Float, ?timeUnit:TimeUnit, ?gain:Float, ?window:WindowFunction, barCount:Int, ?spectrum:Array<Float>, ?ratio:Float, ?minDb:Float, ?maxDb:Float, ?minFreq:Float, ?maxFreq:Float):Array<Float> {
+		return getSpectrumFromFrequencies(_frequencies = getFrequencies(pos, timeUnit, gain, window, _frequencies), data.sampleRate, barCount, spectrum, ratio, minDb, maxDb, minFreq, maxFreq);
 	}
 
 	/**
 	 * Gets levels from an attached FlxSound from startPos, basically a minimized of frequencies.
-	 * @param startPos Start Position to get from sound in milliseconds.
-	 * @param volume How much volume multiplier will it affect the output. (Optional, default 1.0).
-	 * @param barCount How much bars to get.
-	 * @param levels The output for getting the values, to avoid memory leaks (Optional).
-	 * @param ratio How much ratio for smoothen the values from the previous levels values (Optional, use CoolUtil.getFPSRatio(1 - ratio) to simulate web AnalyserNode.smoothingTimeConstant, 0.35 of smoothingTime works most of the time).
-	 * @param minDb The minimum decibels to cap (Optional, default -63.0, -120 is pure silence).
-	 * @param maxDb The maximum decibels to cap (Optional, default -10.0, Above 0 is not recommended).
-	 * @param minFreq The minimum frequency to cap (Optional, default 20.0, Below 8.0 is not recommended).
-	 * @param maxFreq The maximum frequency to cap (Optional, default 22000.0, Above 23000.0 is not recommended).
-	 * @return Output of levels/bars that ranges from 0 to 1.
+	 * @param	startPos	Start Position to get from sound in milliseconds.
+	 * @param	volume		How much volume multiplier will it affect the output. (Optional, default 1.0).
+	 * @param	barCount	How much bars to get.
+	 * @param	levels		The output for getting the values, to avoid memory leaks (Optional).
+	 * @param	ratio		How much ratio for smoothen the values from the previous levels values (Optional, use CoolUtil.getFPSRatio(1 - ratio) to simulate web AnalyserNode.smoothingTimeConstant, 0.35 of smoothingTime works most of the time).
+	 * @param	minDb		The minimum decibels to cap (Optional, default -63.0, -120 is pure silence).
+	 * @param	maxDb		The maximum decibels to cap (Optional, default -10.0, Above 0 is not recommended).
+	 * @param	minFreq		The minimum frequency to cap (Optional, default 20.0, Below 8.0 is not recommended).
+	 * @param	maxFreq		The maximum frequency to cap (Optional, default 22000.0, Above 23000.0 is not recommended).
+	 * @return	Output of levels/bars that ranges from 0 to 1.
+	 * 
+	 * deprecated, use getLevels instead.
 	 */
+	@:deprecated("Use getSpectrum instead of getLevels.")
 	public function getLevels(?startPos:Float, ?volume:Float, barCount:Int, ?levels:Array<Float>, ?ratio:Float, ?minDb:Float, ?maxDb:Float, ?minFreq:Float, ?maxFreq:Float):Array<Float>
-		return inline getLevelsFromFrequencies(__frequencies = getFrequencies(startPos, volume, __frequencies), buffer.sampleRate, barCount, levels, ratio, minDb, maxDb, minFreq, maxFreq);
+		return inline getSpectrum(startPos, MILLISECOND, volume, null, barCount, levels, ratio, minDb, maxDb, minFreq, maxFreq);
 
 	/**
-	 * Gets frequencies from an attached FlxSound from startPos.
-	 * @param startPos Start Position to get from sound in milliseconds.
-	 * @param volume How much volume multiplier will it affect the output. (Optional, default 1.0).
-	 * @param frequencies The output for getting the frequencies, to avoid memory leaks (Optional).
-	 * @return Output of frequencies.
+	 * Gets frequencies from an attached sound from position.
+	 * @param	pos			Position to get. (Optional).
+	 * @param	timeUnit	TimeUnit to use for positions. (Optional).
+	 * @param	gain		How much gain multiplier will it affect the output. (Optional, default 1.0).
+	 * @param	window		The windowing function to use when passed.
+	 * @param	frequencies	The output for getting the frequencies, to avoid memory leaks (Optional).
+	 * @return	Output of frequencies.
 	 */
-	public function getFrequencies(?startPos:Float, ?volume:Float, ?frequencies:Array<Float>):Array<Float>
-		return inline getFrequenciesFromSamples(__freqSamples = getSamples(startPos != null ? startPos : sound.time, fftN, true, -1, volume, __freqSamples), fftN, useWindowingFFT, frequencies);
+	public function getFrequencies(?pos:Float, ?timeUnit:TimeUnit, ?gain:Float, ?window:WindowFunction, ?frequencies:Array<Float>):Array<Float> {
+		if (pos == null) {
+			if (sound == null) return frequencies;
+			_check();
+			if ((pos = sound.time / 1000 * data.sampleRate - fftN) < 0) pos = 0;
+			timeUnit = SAMPLE;
+		}
+		return getFrequenciesFromSamples(_freqSamples = getSamples(pos, timeUnit, fftN, true, -1, gain, _freqSamples), window, frequencies);
+	}
 
 	/**
-	 * Analyzes an attached FlxSound from startPos to endPos in milliseconds to get the amplitudes.
-	 * @param startPos Start Position to get from sound in milliseconds.
-	 * @param endPos End Position to get from sound in milliseconds.
-	 * @param outOrOutMin The output minimum value from the analyzer, indices is in channels (0 to -0.5 -> 0 to 0.5) (Optional, if outMax doesn't get passed in, it will be [min, max] with all channels combined instead).
-	 * @param outMax The output maximum value from the analyzer, indices is in channels (Optional).
-	 * @return Output of amplitude from given position.
+	 * Analyzes an attached sound from startPos to endPos in milliseconds to get the amplitudes.
+	 * @param	startPos		Start Position to get.
+	 * @param	endPos			End Position to get.
+	 * @param	timeUnit		TimeUnit to use for positions.
+	 * @param	outOrOutMins	The output minimum value from the analyzer, indices is in channels (0 to -0.5 -> 0 to 0.5) (Optional, if outMax doesn't get passed in, it will be [min, max] with all channels combined instead).
+	 * @param	outMaxs			The output maximum value from the analyzer, indices is in channels (Optional).
+	 * @return	Output			of amplitude from given position.
 	 */
-	public function analyze(startPos:Float, endPos:Float, ?outOrOutMin:Array<Float>, ?outMax:Array<Float>):Float {
-		var hasOut = outOrOutMin != null;
-		var hasTwoOut = hasOut && outMax != null;
-
-		if (hasTwoOut) for (i in 0...buffer.channels) __min[i] = __max[i] = 0;
-		__minByte = __maxByte = 0;
-
-		__check();
-		__read(startPos, endPos, hasTwoOut ? __analyzeCallback : __analyzeCallbackSimple);
-
-		if (hasOut) {
-			var f:Float;
-			if (hasTwoOut) for (i in 0...buffer.channels) {
-				if (outOrOutMin[i] < (f = __min[i] / byteSize)) outOrOutMin[i] = f;
-				if (outMax[i] < (f = __max[i] / byteSize)) outMax[i] = f;
-			}
-			else {
-				outOrOutMin.resize(2);
-				if (outOrOutMin[0] < (f = __minByte / byteSize)) outOrOutMin[0] = f;
-				if (outOrOutMin[1] < (f = __maxByte / byteSize)) outOrOutMin[1] = f;
+	public function analyze(startPos:Float, endPos:Float, ?timeUnit:TimeUnit, ?outOrOutMins:Array<Float>, ?outMaxs:Array<Float>):Float {
+		var hasOut = outOrOutMins != null;
+		var hasTwoOut = hasOut && outMaxs != null;
+
+		_check();
+		var conversion:Float = switch (timeUnit) {
+			case SAMPLE: 1;
+			case SECOND: data.sampleRate;
+			default: data.sampleRate / 1000;
+		}
+		for (i in 0...data.channels) _mins[i] = _maxs[i] = -0x7FFFFFFF;
+		if (startPos < endPos) _read(Math.floor(startPos * conversion), Math.floor(endPos * conversion), _analyzeRead);
+
+		var min = -0x7FFFFFFF, max = -0x7FFFFFFF, v = 1 / byteSize, f:Float;
+		for (i in 0...data.channels) {
+			if (hasTwoOut) {
+				if ((f = _mins[i] * v) > outOrOutMins[i]) outOrOutMins[i] = f;
+				if ((f = _maxs[i] * v) > outMaxs[i]) outMaxs[i] = f;
 			}
+			if (_maxs[i] > max) max = _maxs[i];
+			if (_mins[i] > min) min = _mins[i];
 		}
 
-		return (__maxByte + __minByte) / byteSize;
+		if (hasOut && outMaxs == null) {
+			if ((f = min * v) > outOrOutMins[0]) outOrOutMins[0] = f;
+			if ((f = max * v) > outOrOutMins[1]) outOrOutMins[1] = f;
+		}
+		return (max + min) * v;
 	}
 
-	function __analyzeCallback(b:Int, c:Int):Void
-		((b > __max[c]) ? (if ((__max[c] = b) > __maxByte) (__maxByte = b)) : (if (-b > __min[c]) (if ((__min[c] = -b) > __minByte) (__minByte = __min[c]))));
-
-	function __analyzeCallbackSimple(b:Int, c:Int):Void
-		((b > __maxByte) ? (__maxByte = b) : (if (-b > __minByte) (__minByte = -b)));
+	function _analyzeRead(b:Int, c:Int) ((b > _maxs[c]) ? (_maxs[c] = b) : (if (-b > _mins[c]) (_mins[c] = -b)));
 
 	/**
 	 * Gets samples from startPos with given length of samples.
-	 * @param startPos Start Position to get from sound in milliseconds.
-	 * @param length Length of Samples.
-	 * @param mono Merge all of the byte channels of samples in one channel instead (Optional).
-	 * @param channel What channels to get from? (-1 == All Channels, Optional, this will be ignored if mono is enabled).
-	 * @param volume How much volume multiplier will it affect the output. (Optional, default 1.0).
-	 * @param output An Output that gets passed into this function, usually for to avoid memory leaks (Optional).
-	 * @param outputMerge Merge with previous values (Optional, default false).
-	 * @return Output of samples.
+	 * @param	startPos		Start Position to get.
+	 * @param	timeUnit		TimeUnit to use for positions.
+	 * @param	length			Length of Samples.
+	 * @param	mono 			Merge all of the byte channels of samples in one channel instead (Optional).
+	 * @param	channel			What channels to get from? (-1 == All Channels, Optional, this will be ignored if mono is enabled).
+	 * @param	gain			How much gain multiplier will it affect the output. (Optional, default 1.0).
+	 * @param	output			An Output that gets passed into this function, usually for to avoid memory leaks (Optional).
+	 * @param	outputMerge		Merge with previous values (Optional, default false).
+	 * @return	Output of samples.
 	 */
-	public function getSamples(startPos:Float, length:Int, mono = true, channel = -1, volume = 1.0, ?output:Array<Float>, ?outputMerge = false):Array<Float> {
-		((!mono && (__sampleChannel = channel) == -1) ? (__sampleOutputLength = length * buffer.channels) : (__sampleOutputLength = length));
-		((output == null) ? (__sampleOutput = output = []) : (__sampleOutput = output)).resize(__sampleOutputLength);
-		((mono) ? (__sampleToValue = volume / (byteSize * buffer.channels)) : (__sampleToValue = 1.0 / byteSize));
-		__sampleOutputMerge = outputMerge;
-		__sampleIndex = 0;
-
-		__check();
-		__read(startPos, startPos + (length / __toBits * buffer.channels), mono ? __getSamplesCallbackMono : (channel == -1 ? __getSamplesCallback : __getSamplesCallbackChannel));
-
-		__sampleOutput = null;
+	public function getSamples(startPos:Float, ?timeUnit:TimeUnit, length:Int, mono = true, channel = -1, gain = 1.0, ?output:Array<Float>, ?outputMerge = false):Array<Float> {
+		_check();
+		((!mono && channel == -1) ? (_sampleOutputLength = length * data.channels) : (_sampleOutputLength = length));
+		if (((output == null) ? (_sampleOutput = output = []) : (_sampleOutput = output)).length != _sampleOutputLength) output.resize(_sampleOutputLength);
+		_sampleValueGain = gain;
+		_sampleOutputMerge = outputMerge;
+		_sampleIndex = 0;
+		_sampleValue = 0;
+
+		final samplePos = Math.floor(switch (timeUnit) {
+			case SAMPLE: startPos;
+			case SECOND: startPos * data.sampleRate;
+			default: startPos * data.sampleRate / 1000;
+		});
+		_sampleChannel = mono ? data.channels - 1 : channel;
+		if (length > 0) _read(samplePos, samplePos + length, mono ? _getSamplesCallbackMono : (channel == -1 ? _getSamplesCallback : _getSamplesCallbackChannel));
+
+		_sampleOutput = null;
 		return output;
 	}
 
-	function __getSamplesCallbackMono(b:Int, c:Int):Void if (__sampleIndex < __sampleOutputLength) {
-		if (c == 0) {
-			if (__sampleOutputMerge) __sampleOutput[__sampleIndex] += b * __sampleToValue;
-			else __sampleOutput[__sampleIndex] = b * __sampleToValue;
-		}
-		else if (c == buffer.channels) {
-			__sampleOutput[__sampleIndex] += b * __sampleToValue;
-			__sampleIndex++;
+	function _getSamplesCallbackMono(b:Int, c:Int):Void if (_sampleIndex < _sampleOutputLength) {
+		if (c == 0) _sampleValue = idiv(b, data.channels);
+		else _sampleValue += idiv(b, data.channels);
+
+		if (c == _sampleChannel) {
+			if (_sampleOutputMerge) _sampleOutput[_sampleIndex] += _sampleValue / byteSize;
+			else _sampleOutput[_sampleIndex] = _sampleValue / byteSize;
+			_sampleIndex++;
 		}
-		else
-			__sampleOutput[__sampleIndex] += b * __sampleToValue;
 	}
 
-	function __getSamplesCallbackChannel(b:Int, c:Int):Void if (__sampleIndex < __sampleOutputLength) {
-		if (c == __sampleChannel) {
-			if (__sampleOutputMerge) __sampleOutput[__sampleIndex] += b * __sampleToValue;
-			else __sampleOutput[__sampleIndex] = b * __sampleToValue;
-			__sampleIndex++;
+	function _getSamplesCallbackChannel(b:Int, c:Int):Void if (_sampleIndex < _sampleOutputLength) {
+		if (c == _sampleChannel) {
+			if (_sampleOutputMerge) _sampleOutput[_sampleIndex] += b / byteSize;
+			else _sampleOutput[_sampleIndex] = b / byteSize;
+			_sampleIndex++;
 		}
 	}
 
-	function __getSamplesCallback(b:Int, c:Int):Void if (__sampleIndex < __sampleOutputLength) {
-		if (__sampleOutputMerge) __sampleOutput[__sampleIndex] += b * __sampleToValue;
-		else __sampleOutput[__sampleIndex] = b * __sampleToValue;
-		__sampleIndex++;
+	function _getSamplesCallback(b:Int, c:Int):Void if (_sampleIndex < _sampleOutputLength) {
+		if (_sampleOutputMerge) _sampleOutput[_sampleIndex] += b / byteSize;
+		else _sampleOutput[_sampleIndex] = b / byteSize;
+		_sampleIndex++;
 	}
 
 	/**
-	 * Read an attached FlxSound from startPos to endPos in milliseconds with a callback.
-	 * @param startPos Start Position to get from sound in milliseconds.
-	 * @param endPos End Position to get from sound in milliseconds.
-	 * @param callback Int->Int->Void Byte->Channels->Void Callback to get the byte of a sample.
+	 * Read an attached sound from startPos to endPos in milliseconds with a callback.
+	 * @param	startPos	Start Position to get.
+	 * @param	endPos		End Position to get.
+	 * @param	timeUnitTimeUnit to use for positions.
+	 * @param	callback	Byte:Int->Channels:Int->Void Callback to get the byte of a sample.
 	 */
-	public function read(startPos:Float, endPos:Float, callback:AudioAnalyzerCallback) {
-		__check();
-		__read(startPos, endPos, callback);
+	public function read(startPos:Float, endPos:Float, ?timeUnit:TimeUnit, callback:ReadCallback) {
+		_check();
+		var conversion:Float = switch (timeUnit) {
+			case SAMPLE: 1;
+			case SECOND: data.sampleRate;
+			default: data.sampleRate / 1000;
+		}
+		if (startPos < endPos) _read(Math.floor(startPos * conversion), Math.floor(endPos * conversion), callback);
 	}
 
-	inline function __read(startPos:Float, endPos:Float, callback:AudioAnalyzerCallback) {
-		if (buffer.data != null) __readData(startPos, endPos, callback);
-		#if lime_cffi
-		else if (__canReadStream() && (startPos += __readStream(startPos, endPos, callback)) >= endPos) {}
-		#if lime_vorbis
-		else if (__prepareDecoder()) __readDecoder(startPos, endPos, callback);
-		#end
-		#end
-	}
+	function _read(startSample:Int, endSample:Int, callback:ReadCallback) {
+		// use data in ram if available
+		if (data.buffer.data != null) _readData(startSample * _sampleSize, endSample * _sampleSize, callback);
+		// use decoded datas that have been used in streaming sound to reduce jumping disk seeking
+		// if not use decoder and use seeking instead*
+		else if (sound.loaded) _readStream(startSample, endSample, callback);
 
-	inline function __readData(startPos:Float, endPos:Float, callback:AudioAnalyzerCallback) {
-		var pos = Math.floor(startPos * __toBits), end = Math.min(Math.floor(endPos * __toBits), buffer.data.buffer.length), c = 0;
-		pos -= pos % __sampleSize;
-		end -= end % __sampleSize;
+		// TODO
+		//else if ((!sound.loaded || (startSample = _readStream(startSample, endSample, callback)) < endSample) && _prepareDecoder())
+		//	_readDecoder(startSample, endSample, callback);
+	}
 
-		while (pos < end) {
-			callback(getByte(buffer.data.buffer, pos, __wordSize), c);
-			if (++c > buffer.channels) c = 0;
-			pos += __wordSize;
+	inline function _readData(startIndex:Int, endIndex:Int, callback:ReadCallback) {
+		if (endIndex > data.buffer.data.byteLength) endIndex = data.buffer.data.byteLength;
+		var buffer = data.buffer.data.buffer, byteRate = data.bitsPerSample >> 3, c = 0;
+		while (startIndex < endIndex) {
+			callback(getByte(buffer, startIndex, byteRate), c);
+			startIndex += byteRate;
+			if (++c == data.channels) c = 0;
 		}
 	}
 
-	#if lime_cffi
-	inline function __canReadStream():Bool
-		@:privateAccess return sound._source != null && sound._source.__backend != null && sound._source.__backend.playing;
-
-	inline function __readStream(startPos:Float, endPos:Float, callback:AudioAnalyzerCallback):Float @:privateAccess {
-		final backend = sound._source.__backend;
-
-		// TODO: Wrap it with try until i figured it out an effective way to do this...
-		// So... sometimes it just uses the decoder even if it looks good?? please help
-		var n = Math.floor((endPos - startPos) * __toBits);
-		var i = backend.bufferLengths.length - backend.requestBuffers - 1, time:Float;
-		while (++i < backend.bufferLengths.length) if (startPos >= (time = backend.bufferTimes[i] * 1000)) {
-			var pos = Math.floor((startPos - time) * __toBits), buf = backend.bufferDatas[i].buffer, size = backend.bufferLengths[i], c = 0;
-			while (pos >= size) {
-				if (++i >= backend.bufferLengths.length) break;
-				pos -= size;
-				buf = backend.bufferDatas[i].buffer;
-				size = backend.bufferLengths[i];
-			}
-			if (i >= backend.bufferLengths.length) break;
-			if ((pos -= pos % __sampleSize) < 0) pos = 0;
-			n -= pos % __sampleSize;
-
-			while (n > 0) {
-				callback(getByte(buf, pos, __wordSize), c);
-				if (++c > buffer.channels) c = 0;
-				if ((pos += __wordSize) >= size) {
-					if (++i >= backend.bufferLengths.length) break;
-					pos = 0;
-					buf = backend.bufferDatas[i].buffer;
-					size = backend.bufferLengths[i];
+	function _readStream(startSample:Int, endSample:Int, callback:ReadCallback):Int @:privateAccess {
+		final backend = sound.source.__backend;
+		if (backend.filledBuffers == 0) return startSample;
+
+		backend.mutex.acquire();
+
+		final max = backend.bufferViews.length;
+		var byteRate = data.bitsPerSample >> 3, i = max - backend.queuedBuffers, buffer:ArrayBuffer, bufferLen:Int, bufferSample:Int, pos:Int, c:Int;
+
+		while (i < max && startSample < endSample) {
+			if (startSample >= (bufferSample = backend.bufferCurs[i])) {
+				if ((pos = (startSample - bufferSample) * _sampleSize) < (bufferLen = backend.bufferLens[i])) {
+					buffer = backend.bufferViews[i].buffer;
+					c = 0;
+					while (startSample < endSample) {
+						callback(getByte(buffer, pos, byteRate), c);
+						if ((pos += byteRate) >= bufferLen) {
+							startSample++;
+							break;
+						}
+						else if (++c == data.channels) {
+							c = 0;
+							startSample++;
+						}
+					}
 				}
-				n -= __wordSize;
 			}
-
-			break;
+			i++;
 		}
 
-		return endPos - (n / __toBits);
+		backend.mutex.release();
+
+		return startSample;
 	}
 
-	#if lime_vorbis
-	inline function __prepareDecoder():Bool @:privateAccess {
-		if (buffer.__srcVorbisFile == null) return __vorbis != null;
-		if (__vorbis != null) return true;
-		if ((__vorbis = buffer.__srcVorbisFile.clone()) != null) { // IM HOPING IT HAVE A GC CLOSURE.
-			__buffer = new ArrayBuffer(__bufferSize = (buffer.sampleRate >> 1) * __sampleSize); // 0.5 seconds of buffers.
+	// TODO: Fix this and _readDecoder in the future.
+	inline function _prepareDecoder():Bool {
+		return false;
+		/*
+		if (_decoder != null) return true;
+		if (data.decoder != null && (_decoder = data.decoder.clone()) != null) {
+			_bufferLen = (data.sampleRate >> 2) * _sampleSize;
+			#if cpp
+			if (_buffer != null) {
+				if (_buffer.length < _bufferLen) {
+					_buffer.getData().resize(_bufferLen);
+					_buffer.fill(_buffer.length, _bufferLen - _buffer.length, 0);
+					@:privateAccess _buffer.length = _bufferLen;
+				}
+			}
+			else
+			#end
+				_buffer = new ArrayBuffer(_bufferLen);
 			return true;
 		}
 		return false;
+		*/
 	}
 
-	inline function __readDecoder(startPos:Float, endPos:Float, callback:AudioAnalyzerCallback) {
-		var n = Math.floor((endPos - startPos) * __toBits);
-		if ((n -= n % __sampleSize) > 0) {
-			var pos = Math.floor((startPos - __bufferTime * 1000) * __toBits);
-			pos -= pos % __sampleSize;
-
-			var doRead = __bufferLastSize == 0 || (pos < 0 && pos >= __bufferSize);
-			if (doRead) {
-				if (startPos < 1) {
-					__vorbis.rawSeek(0);
-					__bufferTime = 0;
-				}
-				else
-					__vorbis.timeSeek(__bufferTime = startPos / 1000);
+	/*
+	function _readDecoder(startSample:Int, endSample:Int, callback:ReadCallback) {
+		var pos = (startSample - _bufferLastSample) * _sampleSize, n = endSample - startSample, c = 0;
 
-				__bufferLastSize = pos = 0;
-			}
+		var doDecode = _bufferLastSize == 0 || (pos < 0 && pos >= _bufferLastSize);
+		if (doDecode) {
+			_decoder.seek(startSample);
+			_bufferLastSize = pos = 0;
+			doDecode = true;
+		}
 
-			var isBigEndian = lime.system.System.endianness == lime.system.Endian.BIG_ENDIAN, ranOut = false, c = 0, result;
-			while (true) {
-				if (doRead) {
-					result = __vorbis.read(__buffer, pos, __bufferSize - pos, isBigEndian, __wordSize, true);
-					if (result == Vorbis.HOLE) continue;
-					else if (result < 0) break;
-					else if (!(ranOut = result == 0)) {
-						__bufferLastTime = __vorbis.timeTell();
-						__bufferLastSize += result;
-						while (pos < __bufferLastSize) {
-							callback(getByte(__buffer, pos, __wordSize), c);
-							if (++c > buffer.channels) c = 0;
-							pos += __wordSize;
-							if ((n -= __wordSize) <= 0) break;
-						}
+		var result:Int;
+		while (n > 0) {
+			if (doDecode) {
+				_bufferLastSample = _decoder.tell();
+				result = _decoder.decode(_buffer, pos, _bufferLen - pos);
+				if (result == 0) break;
+
+				_bufferLastSize += result;
+				while (n > 0) {
+					callback(getByte(_buffer, pos, data.byteRate), c);
+					if (++c == data.channels) {
+						c = 0;
+						n--;
 					}
+					if ((pos += data.byteRate) >= _bufferLastSize) break;
 				}
-				else {
-					while (pos < __bufferLastSize) {
-						callback(getByte(__buffer, pos, __wordSize), c);
-						if (++c > buffer.channels) c = 0;
-						pos += __wordSize;
-						if ((n -= __wordSize) <= 0) break;
+			}
+			else {
+				while (n > 0) {
+					callback(getByte(_buffer, pos, data.byteRate), c);
+					if (++c == data.channels) {
+						c = 0;
+						n--;
 					}
-					doRead = true;
-					ranOut = pos >= __bufferSize;
-				}
-
-				if (n <= 0) break;
-				else if (doRead && ranOut) {
-					__bufferLastSize = pos = 0;
-					__bufferTime = __bufferLastTime;
+					if ((pos += data.byteRate) >= _bufferLastSize) break;
 				}
+				doDecode = true;
+				_bufferLastSize = pos = 0;
 			}
 		}
 	}
-	#end
-	#end
-}
\ No newline at end of file
+	*/
+
+	static inline function idiv(num:Int, denom:Int):Int return #if (cpp && !cppia) cpp.NativeMath.idiv(num, denom) #else Std.int(num / denom) #end;
+}
+#end
\ No newline at end of file
diff --git a/source/funkin/backend/utils/CoolUtil.hx b/source/funkin/backend/utils/CoolUtil.hx
index 382c476046..e7adfd9f1d 100644
--- a/source/funkin/backend/utils/CoolUtil.hx
+++ b/source/funkin/backend/utils/CoolUtil.hx
@@ -987,15 +987,13 @@ final class CoolUtil
 	 * Returns the screen position of an object, while taking the camera zoom into account.
 	 *
 	 * @param	object	Any `FlxObject`
-	 * @param   camera  The desired "screen" coordinate space. If `null`, `FlxG.camera` is used.
+	 * @param   camera  The desired "screen" coordinate space. If `null`, a default camera is used.
 	 * @param   result  Optional arg for the returning point
 	 * @return  The screen position of the object.
 	 */
 	public static function worldToScreenPosition(object:FlxObject, ?camera:FlxCamera, ?result:FlxPoint) {
-		if (result == null)
-			result = FlxPoint.get();
-		if (camera == null)
-			camera = FlxG.camera;
+		if (result == null) result = FlxPoint.get();
+		if (camera == null) camera = object.getDefaultCamera();
 
 		result.set(object.x, object.y);
 		result.x = (((result.x - camera.scroll.x * object.scrollFactor.x) * camera.zoom) - ((camera.width * 0.5) * (camera.zoom - camera.initialZoom)));
diff --git a/source/funkin/backend/utils/ImGuiUtil.hx b/source/funkin/backend/utils/ImGuiUtil.hx
new file mode 100644
index 0000000000..119eebb91d
--- /dev/null
+++ b/source/funkin/backend/utils/ImGuiUtil.hx
@@ -0,0 +1,127 @@
+package funkin.backend.utils;
+
+import flixel.input.keyboard.FlxKey;
+import openfl.Lib;
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
+#end
+
+class ImGuiUtil {
+	#if IMGUI_ENABLED
+	public static function toImGuiKey(key:FlxKey) {
+		switch(key) {
+			case FlxKey.ANY: return ImGuiKey.None;
+			case FlxKey.NONE: return ImGuiKey.None;
+			case FlxKey.A: return ImGuiKey.A;
+			case FlxKey.B: return ImGuiKey.B;
+			case FlxKey.C: return ImGuiKey.C;
+			case FlxKey.D: return ImGuiKey.D;
+			case FlxKey.E: return ImGuiKey.E;
+			case FlxKey.F: return ImGuiKey.F;
+			case FlxKey.G: return ImGuiKey.G;
+			case FlxKey.H: return ImGuiKey.H;
+			case FlxKey.I: return ImGuiKey.I;
+			case FlxKey.J: return ImGuiKey.J;
+			case FlxKey.K: return ImGuiKey.K;
+			case FlxKey.L: return ImGuiKey.L;
+			case FlxKey.M: return ImGuiKey.M;
+			case FlxKey.N: return ImGuiKey.N;
+			case FlxKey.O: return ImGuiKey.O;
+			case FlxKey.P: return ImGuiKey.P;
+			case FlxKey.Q: return ImGuiKey.Q;
+			case FlxKey.R: return ImGuiKey.R;
+			case FlxKey.S: return ImGuiKey.S;
+			case FlxKey.T: return ImGuiKey.T;
+			case FlxKey.U: return ImGuiKey.U;
+			case FlxKey.V: return ImGuiKey.V;
+			case FlxKey.W: return ImGuiKey.W;
+			case FlxKey.X: return ImGuiKey.X;
+			case FlxKey.Y: return ImGuiKey.Y;
+			case FlxKey.Z: return ImGuiKey.Z;
+			case FlxKey.ZERO: return ImGuiKey._0;
+			case FlxKey.ONE: return ImGuiKey._1;
+			case FlxKey.TWO: return ImGuiKey._2;
+			case FlxKey.THREE: return ImGuiKey._3;
+			case FlxKey.FOUR: return ImGuiKey._4;
+			case FlxKey.FIVE: return ImGuiKey._5;
+			case FlxKey.SIX: return ImGuiKey._6;
+			case FlxKey.SEVEN: return ImGuiKey._7;
+			case FlxKey.EIGHT: return ImGuiKey._8;
+			case FlxKey.NINE: return ImGuiKey._9;
+			case FlxKey.PAGEUP: return ImGuiKey.PageUp;
+			case FlxKey.PAGEDOWN: return ImGuiKey.PageDown;
+			case FlxKey.HOME: return ImGuiKey.Home;
+			case FlxKey.END: return ImGuiKey.End;
+			case FlxKey.INSERT: return ImGuiKey.Insert;
+			case FlxKey.ESCAPE: return ImGuiKey.Escape;
+			case FlxKey.MINUS: return ImGuiKey.Minus;
+			case FlxKey.PLUS: return ImGuiKey.Equal;
+			case FlxKey.DELETE: return ImGuiKey.Delete;
+			case FlxKey.BACKSPACE: return ImGuiKey.Backspace;
+			case FlxKey.LBRACKET: return ImGuiKey.LeftBracket;
+			case FlxKey.RBRACKET: return ImGuiKey.RightBracket;
+			case FlxKey.BACKSLASH: return ImGuiKey.Backslash;
+			case FlxKey.CAPSLOCK: return ImGuiKey.CapsLock;
+			case FlxKey.SCROLL_LOCK: return ImGuiKey.ScrollLock;
+			case FlxKey.NUMLOCK: return ImGuiKey.NumLock;
+			case FlxKey.SEMICOLON: return ImGuiKey.Semicolon;
+			case FlxKey.QUOTE: return ImGuiKey.Apostrophe;
+			case FlxKey.ENTER: return ImGuiKey.Enter;
+			case FlxKey.SHIFT: return ImGuiKey.LeftShift;
+			case FlxKey.COMMA: return ImGuiKey.Comma;
+			case FlxKey.PERIOD: return ImGuiKey.Period;
+			case FlxKey.SLASH: return ImGuiKey.Slash;
+			case FlxKey.GRAVEACCENT: return ImGuiKey.GraveAccent;
+			case FlxKey.CONTROL: return ImGuiKey.LeftCtrl;
+			case FlxKey.ALT: return ImGuiKey.LeftAlt;
+			case FlxKey.SPACE: return ImGuiKey.Space;
+			case FlxKey.UP: return ImGuiKey.UpArrow;
+			case FlxKey.DOWN: return ImGuiKey.DownArrow;
+			case FlxKey.LEFT: return ImGuiKey.LeftArrow;
+			case FlxKey.RIGHT: return ImGuiKey.RightArrow;
+			case FlxKey.TAB: return ImGuiKey.Tab;
+			case FlxKey.WINDOWS: return ImGuiKey.None; //no windows key
+			case FlxKey.MENU: return ImGuiKey.Menu;
+			case FlxKey.PRINTSCREEN: return ImGuiKey.PrintScreen;
+			case FlxKey.BREAK: return ImGuiKey.Pause;
+			case FlxKey.F1: return ImGuiKey.F1;
+			case FlxKey.F2: return ImGuiKey.F2;
+			case FlxKey.F3: return ImGuiKey.F3;
+			case FlxKey.F4: return ImGuiKey.F4;
+			case FlxKey.F5: return ImGuiKey.F5;
+			case FlxKey.F6: return ImGuiKey.F6;
+			case FlxKey.F7: return ImGuiKey.F7;
+			case FlxKey.F8: return ImGuiKey.F8;
+			case FlxKey.F9: return ImGuiKey.F9;
+			case FlxKey.F10: return ImGuiKey.F10;
+			case FlxKey.F11: return ImGuiKey.F11;
+			case FlxKey.F12: return ImGuiKey.F12;
+			case FlxKey.NUMPADZERO: return ImGuiKey.Keypad0;
+			case FlxKey.NUMPADONE: return ImGuiKey.Keypad1;
+			case FlxKey.NUMPADTWO: return ImGuiKey.Keypad2;
+			case FlxKey.NUMPADTHREE: return ImGuiKey.Keypad3;
+			case FlxKey.NUMPADFOUR: return ImGuiKey.Keypad4;
+			case FlxKey.NUMPADFIVE: return ImGuiKey.Keypad5;
+			case FlxKey.NUMPADSIX: return ImGuiKey.Keypad6;
+			case FlxKey.NUMPADSEVEN: return ImGuiKey.Keypad7;
+			case FlxKey.NUMPADEIGHT: return ImGuiKey.Keypad8;
+			case FlxKey.NUMPADNINE: return ImGuiKey.Keypad9;
+			case FlxKey.NUMPADMINUS: return ImGuiKey.KeypadSubtract;
+			case FlxKey.NUMPADPLUS: return ImGuiKey.KeypadAdd;
+			case FlxKey.NUMPADPERIOD: return ImGuiKey.KeypadDecimal;
+			case FlxKey.NUMPADMULTIPLY: return ImGuiKey.KeypadMultiply;
+			case FlxKey.NUMPADSLASH: return ImGuiKey.KeypadDivide;
+			default:
+		}
+		return ImGuiKey.None;
+	}
+
+	public static function getWindowSpaceX() {
+		return (ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0 ? Lib.application.window.x : 0;
+	}
+	public static function getWindowSpaceY() {
+		return (ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0 ? Lib.application.window.y : 0;
+	}
+	#end
+}
\ No newline at end of file
diff --git a/source/funkin/backend/utils/MathUtil.hx b/source/funkin/backend/utils/MathUtil.hx
index c71414edf3..5e6a3b4367 100644
--- a/source/funkin/backend/utils/MathUtil.hx
+++ b/source/funkin/backend/utils/MathUtil.hx
@@ -3,220 +3,232 @@ package funkin.backend.utils;
 import haxe.macro.Expr;
 
 final class MathUtil {
-        public static inline var EULER:Float = 2.718281828459;
-
-        /**
-         * Returns the maximum value in the arguments.
-         * @param args Array of values
-         *
-         * @return The maximum value
-        **/
-        public static function maxInt(...args:Int):Int {
-                var max = args[0];
-                for(i in 1...args.length) {
-                        var arg = args[i];
-                        if(arg > max)
-                                max = arg;
-                }
-                return max;
-        }
-
-        /**
-         * Returns the minimum value in the arguments.
-         * @param args Array of values
-         *
-         * @return The minimum value
-        **/
-        public static function minInt(...args:Int):Int {
-                var min = args[0];
-                for(i in 1...args.length) {
-                        var arg = args[i];
-                        if(arg < min)
-                                min = arg;
-                }
-                return min;
-        }
-
-        /**
-         * Returns the maximum value in the arguments.
-         *
-         * NOTE: If you are using this in compile time, you should use `MathUtil.maxSmart` instead of this for better performance.
-         *
-         * @param args Array of values
-         *
-         * @return The maximum value
-        **/
-        public static function max(...args:Float):Float {
-                var max = args[0];
-                for(i in 1...args.length) {
-                        var arg = args[i];
-                        if(arg > max)
-                                max = arg;
-                }
-                return max;
-        }
-
-        /**
-         * Returns the minimum value in the arguments.
-         *
-         * NOTE: If you are using this in compile time, you should use `MathUtil.minSmart` instead of this for better performance.
-         *
-         * @param args Array of values
-         *
-         * @return The minimum value
-        **/
-        public static function min(...args:Float):Float {
-                var min = args[0];
-                for(i in 1...args.length) {
-                        var arg = args[i];
-                        if(arg < min)
-                                min = arg;
-                }
-                return min;
-        }
-
-        /**
-         * Checks if a is less than b with considering a margin of error.
-         * * @param a Float
-         * @param b Float
-         * @param margin Float (Default: EPSILON)
-         * * @return Bool
-        **/
-        public static function lessThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-                return a < b - margin;
-        }
-
-        /**
-         * Checks if a is less than or equally b with considering a margin of error.
-         * * @param a Float
-         * @param b Float
-         * @param margin Float (Default: EPSILON)
-         * * @return Bool
-        **/
-        public static function lessThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-                return a <= b - margin;
-        }
-
-        /**
-         * Checks if a is greater than b with considering a margin of error.
-         * * @param a Float
-         * @param b Float
-         * @param margin Float (Default: EPSILON)
-         * * @return Bool
-        **/
-        public static function greaterThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-                return a > b + margin;
-        }
-
-        /**
-         * Checks if a is greater than or equally b with considering a margin of error.
-         * * @param a Float
-         * @param b Float
-         * @param margin Float (Default: EPSILON)
-         * * @return Bool
-        **/
-        public static function greaterThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-                return a >= b + margin;
-        }
-
-        /**
-         * Checks if a is approximately equal to b.
-         * * @param a Float
-         * @param b Float
-         * @param margin Float (Default: EPSILON)
-         * * @return Bool
-        **/
-        public static function equal(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-                return Math.abs(a - b) <= margin;
-        }
-
-        /**
-         * Checks if a are not approximately equal to b.
-         * * @param a Float
-         * @param b Float
-         * @param margin Float (Default: EPSILON)
-         * * @return Bool
-        **/
-        public static function notEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-                return Math.abs(a - b) > margin;
-        }
-
-        /**
-         * @param edge0 Float
-         * @param edge1 Float
-         * @param x Float
-         * @return Float
-        **/
-        public static function smoothStep(edge0:Float, edge1:Float, x:Float):Float {
-                var t = (x - edge0) / (edge1 - edge0);
-                var clamped = t < 0.0 ? 0.0 : (t > 1.0 ? 1.0 : t);
-                return clamped * clamped * (3.0 - 2.0 * clamped);
-        }
-
-        /**
-         * @param a Float
-         * @param b Float
-         * @param v Float
-         * @return Float
-        **/
-        public static function inverseLerp(a:Float, b:Float, v:Float):Float {
-                return (v - a) / (b - a);
-        }
-
-        /**
-         * @param v Float
-         * @return Float
-        **/
-        public static function fract(v:Float):Float {
-                return v - Math.floor(v);
-        }
-
-        /**
-         * Shortcut to `Math.max` but with infinite amount of arguments
-         *
-         * Might not preserve the order of arguments, please test this.
-         *
-         * Dont use this in hscript, it doesnt work, it only works on compile time
-        **/
-        @:dox(hide) public static macro function maxSmart(..._args:Expr):Expr {
-                return genericMinMaxSmart(_args.toArray(), "Math.max");
-        }
-
-        /**
-         * Shortcut to `Math.min` but with infinite amount of arguments
-         *
-         * Might not preserve the order of arguments, please test this.
-         *
-         * Dont use this in hscript, it doesnt work, it only works on compile time
-        **/
-        @:dox(hide) public static macro function minSmart(..._args:Expr):Expr {
-                return genericMinMaxSmart(_args.toArray(), "Math.min");
-        }
-
-        #if macro
-        @:dox(hide) private static function genericMinMaxSmart(_args:Array<Expr>, funcPath:String):Expr {
-                var args = _args.copy();
-                if (args.length == 0) return macro 0;
-
-                var func = funcPath.split(".");
-
-                function nested(lst:Array<Expr>):Expr {
-                        if (lst.length == 1) {
-                                return macro ${lst[0]};
-                        } else if (lst.length == 2) {
-                                return macro $p{func}(${lst[0]}, ${lst[1]});
-                        } else {
-                                var mid = Std.int(lst.length / 2);
-                                return macro $p{func}(${nested(lst.slice(0, mid))}, ${nested(lst.slice(mid, lst.length))});
-                        }
-                }
-
-                var expr = nested(args);
-
-                //var printer = new haxe.macro.Printer();
-                //trace(printer.printExpr(expr));
-
-                return macro $expr;
-        }
-        #end
+	public static inline var EULER:Float = 2.718281828459;
+
+	/**
+	 * Returns the maximum value in the arguments.
+	 * @param args Array of values
+	 *
+	 * @return The maximum value
+	**/
+	public static function maxInt(...args:Int):Int {
+		var max = args[0];
+		for(i in 1...args.length) {
+			var arg = args[i];
+			if(arg > max)
+				max = arg;
+		}
+		return max;
+	}
+
+	/**
+	 * Returns the minimum value in the arguments.
+	 * @param args Array of values
+	 *
+	 * @return The minimum value
+	**/
+	public static function minInt(...args:Int):Int {
+		var min = args[0];
+		for(i in 1...args.length) {
+			var arg = args[i];
+			if(arg < min)
+				min = arg;
+		}
+		return min;
+	}
+
+	/**
+	 * Returns the maximum value in the arguments.
+	 *
+	 * NOTE: If you are using this in compile time, you should use `MathUtil.maxSmart` instead of this for better performance.
+	 *
+	 * @param args Array of values
+	 *
+	 * @return The maximum value
+	**/
+	public static function max(...args:Float):Float {
+		var max = args[0];
+		for(i in 1...args.length) {
+			var arg = args[i];
+			if(arg > max)
+				max = arg;
+		}
+		return max;
+	}
+
+	/**
+	 * Returns the minimum value in the arguments.
+	 *
+	 * NOTE: If you are using this in compile time, you should use `MathUtil.minSmart` instead of this for better performance.
+	 *
+	 * @param args Array of values
+	 *
+	 * @return The minimum value
+	**/
+	public static function min(...args:Float):Float {
+		var min = args[0];
+		for(i in 1...args.length) {
+			var arg = args[i];
+			if(arg < min)
+				min = arg;
+		}
+		return min;
+	}
+
+	/**
+	 * Checks if a is less than b with considering a margin of error.
+	 * 
+	 * @param a Float
+	 * @param b Float
+	 * @param margin Float (Default: EPSILON)
+	 * 
+	 * @return Bool
+	**/
+	public static function lessThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+		return a < b - margin;
+	}
+
+	/**
+	 * Checks if a is less than or equally b with considering a margin of error.
+	 * 
+	 * @param a Float
+	 * @param b Float
+	 * @param margin Float (Default: EPSILON)
+	 * 
+	 * @return Bool
+	**/
+	public static function lessThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+		return a <= b - margin;
+	}
+
+	/**
+	 * Checks if a is greater than b with considering a margin of error.
+	 * 
+	 * @param a Float
+	 * @param b Float
+	 * @param margin Float (Default: EPSILON)
+	 * 
+	 * @return Bool
+	**/
+	public static function greaterThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+		return a > b + margin;
+	}
+
+	/**
+	 * Checks if a is greater than or equally b with considering a margin of error.
+	 * 
+	 * @param a Float
+	 * @param b Float
+	 * @param margin Float (Default: EPSILON)
+	 * 
+	 * @return Bool
+	**/
+	public static function greaterThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+		return a >= b + margin;
+	}
+
+	/**
+	 * Checks if a is approximately equal to b.
+	 * 
+	 * @param a Float
+	 * @param b Float
+	 * @param margin Float (Default: EPSILON)
+	 * 
+	 * @return Bool
+	**/
+	public static function equal(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+		return Math.abs(a - b) <= margin;
+	}
+
+	/**
+	 * Checks if a are not approximately equal to b.
+	 * 
+	 * @param a Float
+	 * @param b Float
+	 * @param margin Float (Default: EPSILON)
+	 * 
+	 * @return Bool
+	**/
+	public static function notEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+		return Math.abs(a - b) > margin;
+	}
+
+	/**
+	 * @param edge0 Float
+	 * @param edge1 Float
+	 * @param x Float
+	 * @return Float
+	**/
+	public static function smoothStep(edge0:Float, edge1:Float, x:Float):Float {
+		var t = (x - edge0) / (edge1 - edge0);
+		var clamped = t < 0.0 ? 0.0 : (t > 1.0 ? 1.0 : t);
+		return clamped * clamped * (3.0 - 2.0 * clamped);
+	}
+
+	/**
+	 * @param a Float
+	 * @param b Float
+	 * @param v Float
+	 * @return Float
+	**/
+	public static function inverseLerp(a:Float, b:Float, v:Float):Float {
+		return (v - a) / (b - a);
+	}
+
+	/**
+	 * @param v Float
+	 * @return Float
+	**/
+	public static function fract(v:Float):Float {
+		return v - Math.floor(v);
+	}
+
+	/**
+	 * Shortcut to `Math.max` but with infinite amount of arguments
+	 *
+	 * Might not preserve the order of arguments, please test this.
+	 *
+	 * Dont use this in hscript, it doesnt work, it only works on compile time
+	**/
+	@:dox(hide) public static macro function maxSmart(..._args:Expr):Expr {
+		return genericMinMaxSmart(_args.toArray(), "Math.max");
+	}
+
+	/**
+	 * Shortcut to `Math.min` but with infinite amount of arguments
+	 *
+	 * Might not preserve the order of arguments, please test this.
+	 *
+	 * Dont use this in hscript, it doesnt work, it only works on compile time
+	**/
+	@:dox(hide) public static macro function minSmart(..._args:Expr):Expr {
+		return genericMinMaxSmart(_args.toArray(), "Math.min");
+	}
+
+	#if macro
+	@:dox(hide) private static function genericMinMaxSmart(_args:Array<Expr>, funcPath:String):Expr {
+		var args = _args.copy();
+		if (args.length == 0) return macro 0;
+
+		var func = funcPath.split(".");
+
+		function nested(lst:Array<Expr>):Expr {
+			if (lst.length == 1) {
+				return macro ${lst[0]};
+			} else if (lst.length == 2) {
+				return macro $p{func}(${lst[0]}, ${lst[1]});
+			} else {
+				var mid = Std.int(lst.length / 2);
+				return macro $p{func}(${nested(lst.slice(0, mid))}, ${nested(lst.slice(mid, lst.length))});
+			}
+		}
+
+		var expr = nested(args);
+
+		//var printer = new haxe.macro.Printer();
+		//trace(printer.printExpr(expr));
+
+		return macro $expr;
+	}
+	#end
 }
diff --git a/source/funkin/backend/utils/NativeAPI.hx b/source/funkin/backend/utils/NativeAPI.hx
index d3b5e758e6..16e08c19b5 100644
--- a/source/funkin/backend/utils/NativeAPI.hx
+++ b/source/funkin/backend/utils/NativeAPI.hx
@@ -13,12 +13,6 @@ import flixel.util.FlxColor;
  * Some functions might not have effect on some platforms.
  */
 class NativeAPI {
-	@:dox(hide) public static function registerAudio() {
-		#if windows
-		Windows.registerAudio();
-		#end
-	}
-
 	@:dox(hide) public static function registerAsDPICompatible() {
 		#if windows
 		Windows.registerAsDPICompatible();
@@ -185,16 +179,7 @@ class NativeAPI {
 	public static function setConsoleColors(foregroundColor:ConsoleColor = NONE, ?backgroundColor:ConsoleColor = NONE) {
 		if(Main.noTerminalColor) return;
 
-		#if (windows && !hl)
-		if(foregroundColor == NONE)
-			foregroundColor = LIGHTGRAY;
-		if(backgroundColor == NONE)
-			backgroundColor = BLACK;
-
-		var fg:Int = cast foregroundColor;
-		var bg:Int = cast backgroundColor;
-		Windows.setConsoleColors((bg * 16) + fg);
-		#elseif sys
+		#if sys
 		Sys.print("\x1b[0m");
 		if(foregroundColor != NONE)
 			Sys.print("\x1b[" + Std.int(consoleColorToANSI(foregroundColor)) + "m");
diff --git a/source/funkin/backend/utils/XMLUtil.hx b/source/funkin/backend/utils/XMLUtil.hx
index ed30d6ba42..46f4086465 100644
--- a/source/funkin/backend/utils/XMLUtil.hx
+++ b/source/funkin/backend/utils/XMLUtil.hx
@@ -15,6 +15,8 @@ import funkin.backend.scripting.ScriptPack;
 import flixel.util.typeLimit.OneOfTwo;
 import funkin.backend.system.interfaces.IOffsetCompatible;
 import haxe.xml.Access;
+import flixel.graphics.frames.FlxFramesCollection;
+import flixel.graphics.frames.FlxAtlasFrames;
 import animate.FlxAnimateFrames;
 
 using StringTools;
@@ -109,6 +111,41 @@ final class XMLUtil {
 		return OK;
 	}
 
+	/**
+	 * Loads multiple sheets into 1 sprite,
+	 * for every `<spritesheet>characters/bf</spritesheet>` there is.
+	 * (Can also be spelled as `<sheet/>`, or `<spritesheet path="characters/bf" />`)
+	 * @param spr The sprite
+	 * @param node The XML node
+	 * @param parentFolder The parent folder
+	 */
+	public static function appendSpriteSheetsFromXML(spr:FunkinSprite, node:Access, ?parentFolder:String = ''):FlxFramesCollection {
+		if (spr == null) return null;
+		var defaultPath = '$parentFolder${node.getAtt("sprite").getDefault(spr.name)}';
+		if (!node.hasNode.spritesheet && !node.hasNode.sheet) {
+			spr.loadSprite(Paths.image(defaultPath, null, true));
+			return spr.frames;
+		}
+		var seenSheets:Array<String> = [defaultPath];
+		for (n in node.elements) {
+			if (n.name != 'spritesheet' && n.name != 'sheet') continue;
+			var path = n.x.get('path') ?? n.x.firstChild()?.nodeValue?.trim();
+			if (path == null) {
+				Logs.warn('Spritesheet node is missing text content or the path attribute. Skipping...');
+				continue;
+			}
+			if (seenSheets.contains(path)) {
+				Logs.warn('Spritesheet "${Paths.image(path)}" was already added. Skipping...');
+				continue;
+			}
+			if (!Paths.framesExists(path, true)) {
+				Logs.warn('Could not find a BitmapData asset with ID "${Paths.image(path)}". Skipping...');
+				continue;
+			}
+			seenSheets.push(path);
+		}
+		return spr.frames = Paths.getMultiFrames(seenSheets, false, false, null, false, null, spr.animateSettings);
+	}
 	/**
 	 * Sets the properties of a sprite based on a XML node.
 	 * @param spr The sprite
@@ -121,9 +158,9 @@ final class XMLUtil {
 
 		spr.name = node.getAtt("name");
 		spr.antialiasing = true;
-		if (loadGraphic)
-			spr.loadSprite(Paths.image('$parentFolder${node.getAtt("sprite").getDefault(spr.name)}', null, true));
-
+		if (loadGraphic) {
+			appendSpriteSheetsFromXML(spr, node, parentFolder);
+		}
 		spr.spriteAnimType = defaultAnimType;
 		if (node.has.type) {
 			spr.spriteAnimType = XMLAnimType.fromString(node.att.type, spr.spriteAnimType);
@@ -285,6 +322,7 @@ final class XMLUtil {
 		if (anim.has.forced) animData.forced = anim.att.forced == "true";
 		if (anim.has.indices) animData.indices = CoolUtil.parseNumberRange(anim.att.indices);
 		if (anim.has.label) animData.label = anim.att.label == "true";
+		if (anim.has.isAnimate) animData.isAnimate = anim.att.isAnimate == "true";
 
 		return animData;
 	}
@@ -311,7 +349,7 @@ final class XMLUtil {
 		if (animData.name != null) {
 			if (animData.fps <= 0 #if web || animData.fps == null #end) animData.fps = 24;
 
-			if (sprite.frames is FlxAnimateFrames) {
+			if ((sprite.frames is FlxAnimateFrames) == (animData.isAnimate ?? true)) {
 				if(animData.anim == null)
 					return MISSING_PROPERTY;
 
@@ -485,6 +523,7 @@ typedef AnimData = {
 	var animType:XMLAnimType;
 	var label:Bool;
 	var ?forced:Bool;
+	var ?isAnimate:Bool;
 }
 
 typedef BeatAnim = {
diff --git a/source/funkin/backend/utils/native/Windows.hx b/source/funkin/backend/utils/native/Windows.hx
index 706eba21c2..026521597d 100644
--- a/source/funkin/backend/utils/native/Windows.hx
+++ b/source/funkin/backend/utils/native/Windows.hx
@@ -28,107 +28,10 @@ import funkin.backend.utils.NativeAPI.MessageBoxIcon;
 #include <shellapi.h>
 #include <uxtheme.h>
 #include <psapi.h>
-
-#define SAFE_RELEASE(punk)  \\
-			  if ((punk) != NULL)  \\
-				{ (punk)->Release(); (punk) = NULL; }
-
-static long lastDefId = 0;
-
-class AudioFixClient : public IMMNotificationClient {
-	LONG _cRef;
-	IMMDeviceEnumerator *_pEnumerator;
-
-	public:
-	AudioFixClient() :
-		_cRef(1),
-		_pEnumerator(NULL)
-	{
-		HRESULT result = CoCreateInstance(__uuidof(MMDeviceEnumerator),
-							  NULL, CLSCTX_INPROC_SERVER,
-							  __uuidof(IMMDeviceEnumerator),
-							  (void**)&_pEnumerator);
-		if (result == S_OK) {
-			_pEnumerator->RegisterEndpointNotificationCallback(this);
-		}
-	}
-
-	~AudioFixClient()
-	{
-		SAFE_RELEASE(_pEnumerator);
-	}
-
-	ULONG STDMETHODCALLTYPE AddRef()
-	{
-		return InterlockedIncrement(&_cRef);
-	}
-
-	ULONG STDMETHODCALLTYPE Release()
-	{
-		ULONG ulRef = InterlockedDecrement(&_cRef);
-		if (0 == ulRef)
-		{
-			delete this;
-		}
-		return ulRef;
-	}
-
-	HRESULT STDMETHODCALLTYPE QueryInterface(
-								REFIID riid, VOID **ppvInterface)
-	{
-		return S_OK;
-	}
-
-	HRESULT STDMETHODCALLTYPE OnDeviceAdded(LPCWSTR pwstrDeviceId)
-	{
-		return S_OK;
-	};
-
-	HRESULT STDMETHODCALLTYPE OnDeviceRemoved(LPCWSTR pwstrDeviceId)
-	{
-		return S_OK;
-	}
-
-	HRESULT STDMETHODCALLTYPE OnDeviceStateChanged(
-								LPCWSTR pwstrDeviceId,
-								DWORD dwNewState)
-	{
-		return S_OK;
-	}
-
-	HRESULT STDMETHODCALLTYPE OnPropertyValueChanged(
-								LPCWSTR pwstrDeviceId,
-								const PROPERTYKEY key)
-	{
-		return S_OK;
-	}
-
-	HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged(
-		EDataFlow flow, ERole role,
-		LPCWSTR pwstrDeviceId)
-	{
-		::funkin::backend::_hx_system::Main_obj::audioDisconnected = true;
-		return S_OK;
-	};
-};
-
-AudioFixClient *curAudioFix;
 ')
 @:dox(hide)
 final class Windows {
 
-	public static var __audioChangeCallback:Void->Void = function() {
-		trace("test");
-	};
-
-
-	@:functionCode('
-	if (!curAudioFix) curAudioFix = new AudioFixClient();
-	')
-	public static function registerAudio() {
-		funkin.backend.system.Main.audioDisconnected = false;
-	}
-
 	@:functionCode('
 		int darkMode = enable ? 1 : 0;
 
diff --git a/source/funkin/editors/SaveSubstate.hx b/source/funkin/editors/SaveSubstate.hx
index 7202cf3738..be964248d2 100644
--- a/source/funkin/editors/SaveSubstate.hx
+++ b/source/funkin/editors/SaveSubstate.hx
@@ -2,6 +2,9 @@ package funkin.editors;
 
 import haxe.io.Path;
 import lime.ui.FileDialog;
+#if lime_funkin
+import lime.ui.FileDialogFilter;
+#end
 
 class SaveSubstate extends MusicBeatSubstate {
 	public var saveOptions:Map<String, Bool>;
@@ -26,6 +29,13 @@ class SaveSubstate extends MusicBeatSubstate {
 	public override function create() {
 		super.create();
 
+		#if lime_funkin
+		FileDialog.saveFile(FlxG.stage.window, "Save File", (fileName:String, activeFilter:FileDialogFilter) -> {
+			CoolUtil.safeSaveFile(fileName, data);
+			close();
+		}, [new FileDialogFilter("Specified File Extension", options.saveExt.getDefault(Path.extension(options.defaultSaveFile)))],
+			options.defaultSaveFile);
+		#else
 		var fileDialog = new FileDialog();
 		fileDialog.onCancel.add(function() close());
 		fileDialog.onSelect.add(function(str) {
@@ -33,6 +43,7 @@ class SaveSubstate extends MusicBeatSubstate {
 			close();
 		});
 		fileDialog.browse(SAVE, options.saveExt.getDefault(Path.extension(options.defaultSaveFile)), options.defaultSaveFile);
+		#end
 	}
 
 	public override function update(elapsed:Float) {
diff --git a/source/funkin/editors/alphabet/AlphabetSelection.hx b/source/funkin/editors/alphabet/AlphabetSelection.hx
index c11d085685..f5be0aac1e 100644
--- a/source/funkin/editors/alphabet/AlphabetSelection.hx
+++ b/source/funkin/editors/alphabet/AlphabetSelection.hx
@@ -5,6 +5,7 @@ import haxe.xml.Access;
 import funkin.game.Character;
 import funkin.editors.EditorTreeMenu;
 import funkin.options.type.NewOption;
+import funkin.options.type.FolderOption;
 import funkin.options.type.TextOption;
 import funkin.options.type.OptionType;
 
@@ -24,12 +25,43 @@ class AlphabetSelectionScreen extends EditorTreeMenuScreen {
 			]));
 		});
 
-		var modsList:Array<String> = [];
-		for (file in Paths.getFolderContent('data/alphabet/', true, BOTH)) // mods ? MODS : BOTH
-			if (Path.extension(file) == "xml") modsList.push(CoolUtil.getFilename(file));
+		var modsList:Array<String> = getAlphabetList();
 
-		for (typeface in modsList)
-			add(new AlphabetIconOption(typeface, getID('acceptTypeface'), typeface, () -> FlxG.switchState(new AlphabetEditor(typeface))));
+		function generateList(modsList:Array<String>, folderPath:String = ""):Array<FlxSprite> {
+			var list:Array<FlxSprite> = [];
+
+			for (char in modsList) {
+				if (char.endsWith("/")) {
+					var folderName = CoolUtil.getFilename(char.substr(0, char.length-1));
+
+					list.push(new FolderOption(folderName + ' >', getID('acceptFolder'), () -> {
+						var newModsList = getAlphabetList(char);
+						var newList:Array<FlxSprite> = generateList(newModsList, folderPath + folderName + "/");
+						parent.addMenu(new EditorTreeMenuScreen(folderPath + folderName, translate('desc-folder', [folderPath + folderName + "/"]), newList));
+					}));
+				}
+				else {
+					list.push(new AlphabetIconOption(char, getID('acceptTypeface'), folderPath + char, () -> FlxG.switchState(new AlphabetEditor(folderPath + char))));
+				}
+			}
+
+			return list;
+		}
+
+		for (o in generateList(modsList)) add(o);
+	}
+
+	// this is a duplicate of Character.getList, but using that would cause confusion and yea
+	public function getAlphabetList(folder:String = 'data/alphabet/'):Array<String> {
+		var list:Array<String> = [];
+		for (path in Paths.getFolderDirectories(folder, true, BOTH)) {
+			if(!path.endsWith("/")) path += "/";
+			list.push(path);
+		}
+		for (path in Paths.getFolderContent(folder, true, BOTH))
+			if (Path.extension(path) == "xml")
+				list.push(CoolUtil.getFilename(path));
+		return list;
 	}
 }
 
diff --git a/source/funkin/editors/character/CharacterSelection.hx b/source/funkin/editors/character/CharacterSelection.hx
index 1b9d2d702e..74e322a610 100644
--- a/source/funkin/editors/character/CharacterSelection.hx
+++ b/source/funkin/editors/character/CharacterSelection.hx
@@ -6,6 +6,7 @@ import funkin.editors.ui.UIImageExplorer.ImageSaveData;
 import funkin.editors.EditorTreeMenu;
 import funkin.options.type.IconOption;
 import funkin.options.type.NewOption;
+import funkin.options.type.FolderOption;
 import funkin.options.type.TextOption;
 import funkin.options.type.OptionType;
 
@@ -40,10 +41,10 @@ class CharacterSelectionScreen extends EditorTreeMenuScreen {
 				if (char.endsWith("/")) {
 					var folderName = CoolUtil.getFilename(char.substr(0, char.length-1));
 
-					list.push(new TextOption(folderName, getID('acceptFolder'), ' >', () -> {
+					list.push(new FolderOption(folderName + ' >', getID('acceptFolder'), () -> {
 						var newModsList = Character.getList(isMods, true, char);
 						var newList:Array<FlxSprite> = generateList(newModsList, isMods, folderPath + folderName + "/");
-						parent.addMenu(new EditorTreeMenuScreen(folderPath + folderName, translate('desc-folder', [folderPath + folderName + "/"]), newList));
+						parent.addMenu(new EditorTreeMenuScreen(folderName, translate('desc-folder', [folderPath + folderName + "/"]), newList));
 					}));
 				}
 				else {
diff --git a/source/funkin/editors/charter/ChartCreationScreen.hx b/source/funkin/editors/charter/ChartCreationScreen.hx
index c212481ed2..21bc282e0b 100644
--- a/source/funkin/editors/charter/ChartCreationScreen.hx
+++ b/source/funkin/editors/charter/ChartCreationScreen.hx
@@ -39,8 +39,8 @@ class ChartCreationScreen extends UISubstateWindow {
 			return text;
 		}
 
-		charFileList = Character.getList(true);
-		if (charFileList.length == 0) charFileList = Character.getList(false);
+		charFileList = Character.getList(true, false, null, true);
+		if (charFileList.length == 0) charFileList = Character.getList(false, false, null, true);
 
 		var chartTitle:UIText;
 		add(chartTitle = new UIText(windowSpr.x + 20, windowSpr.y + 30 + 16, 0, TU.translate("chartCreation.info"), 28));
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 6320112b0c..4e97377f7f 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -623,8 +623,25 @@ class Charter extends UIState {
 		noteTypes = PlayState.SONG.noteTypes;
 
 		FlxG.sound.setMusic(FlxG.sound.load(Paths.inst(__song, __diff, PlayState.SONG.meta.instSuffix)));
-		if (Assets.exists(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix)))
+
+		// force full load the audio datas for waveform, maybe in the future dont do this and
+		// make it so it continously loads the only necessary waveform data in preview?
+
+		if (FlxG.sound.music.data?.buffer != null && FlxG.sound.music.data.buffer.data == null) {
+			FlxG.sound.music.data.buffer.load();
+			FlxG.sound.music.data.buffer.decoder?.dispose();
+			FlxG.sound.music.data.buffer.decoder = null;
+		}
+
+		if (Assets.exists(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix))) {
 			vocals = FlxG.sound.load(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix));
+
+			if (vocals.data?.buffer != null && vocals.data.buffer.data == null) {
+				vocals.data.buffer.load();
+				vocals.data.buffer.decoder?.dispose();
+				vocals.data.buffer.decoder = null;
+			}
+		}
 		else
 			vocals = new FlxSound();
 
@@ -1179,6 +1196,7 @@ class Charter extends UIState {
 			var note:CharterNote = cast selected;
 			note.strumLineID = strumLines.members.indexOf(note.strumLine);
 			note.strumLine = null; // For static undos :D
+			CharterNote.callScriptOnNote('onCharterNoteDelete', note);
 			notesGroup.remove(note);
 			note.kill();
 		} else if (selected is CharterEvent) {
@@ -1198,9 +1216,11 @@ class Charter extends UIState {
 
 		notesGroup.autoSort = false;
 		selection.loop(function (n:CharterNote) {
+			final lastAlive = n.alive;
 			n.strumLine = strumLines.members[n.strumLineID];
 			n.revive();
 			notesGroup.add(n);
+			if (!lastAlive) CharterNote.callScriptOnNote('onCharterNoteRevive', n);
 		}, function (e:CharterEvent) {
 			e.revive();
 			(e.global ? rightEventsGroup : leftEventsGroup).add(e);
@@ -1744,7 +1764,6 @@ class Charter extends UIState {
 		if (selection == null || selection.length == 0) return;
 		selection.loop((n:CharterNote) -> {
 			noteDeleteAnims.deleteNotes.push({note: n, time: noteDeleteAnims.deleteTime});
-			CharterNote.callScriptOnNote('onCharterNoteDelete', n);
 		});
 		selection = deleteSelection(selection, true);
 	}
@@ -1759,7 +1778,6 @@ class Charter extends UIState {
 			if (oldNote != null && oldNote.step == note.step && oldNote.strumLineID == note.strumLineID && oldNote.id == note.id) {
 				noteDeleteAnims.deleteNotes.push({note: oldNote, time: noteDeleteAnims.deleteTime});
 				toDelete.push(oldNote);
-				CharterNote.callScriptOnNote('onCharterNoteDelete', oldNote);
 			}
 			oldNote = note;
 		}
diff --git a/source/funkin/editors/charter/CharterEventScreen.hx b/source/funkin/editors/charter/CharterEventScreen.hx
index a6cb28b873..15a1a1e090 100644
--- a/source/funkin/editors/charter/CharterEventScreen.hx
+++ b/source/funkin/editors/charter/CharterEventScreen.hx
@@ -185,7 +185,7 @@ class CharterEventScreen extends UISubstateWindow {
 						dropdown;
 					case TCharacter:
 						addLabel();
-						var charFileList = Character.getList(false);
+						var charFileList = Character.getList(false, false, null, true);
 						var textBox:UIAutoCompleteTextBox = new UIAutoCompleteTextBox(eventName.x, y, cast value);
 						textBox.suggestItems = charFileList;
 						paramsPanel.add(textBox); paramsFields.push(textBox);
diff --git a/source/funkin/editors/charter/CharterEventScreenNew.hx b/source/funkin/editors/charter/CharterEventScreenNew.hx
index 6f1fb7fd5e..f1396a71c2 100644
--- a/source/funkin/editors/charter/CharterEventScreenNew.hx
+++ b/source/funkin/editors/charter/CharterEventScreenNew.hx
@@ -177,7 +177,7 @@ class CharterEventScreenNew extends MusicBeatSubstate {
 						dropdown;
 					case TCharacter:
 						addLabel();
-						var charFileList = Character.getList(false);
+						var charFileList = Character.getList(false, false, null, true);
 						var textBox:UIAutoCompleteTextBox = new UIAutoCompleteTextBox(eventName.x+6, winHeight, cast value);
 						textBox.suggestItems = charFileList;
 						paramsPanel.add(textBox); paramsFields.push(textBox);
diff --git a/source/funkin/editors/charter/CharterSelection.hx b/source/funkin/editors/charter/CharterSelection.hx
index 172a8a5cd2..e7eee28031 100644
--- a/source/funkin/editors/charter/CharterSelection.hx
+++ b/source/funkin/editors/charter/CharterSelection.hx
@@ -37,7 +37,7 @@ class CharterSelectionScreen extends EditorTreeMenuScreen {
 		curSong = s;
 
 		var isVariant = s.variant != null && s.variant != '';
-		var screen = new EditorTreeMenuScreen((first || !isVariant) ? (s.name + (isVariant ? ' (${s.variant})' : '')) : s.variant, getID('selectDifficulty'));
+		var screen = new EditorTreeMenuScreen((first || !isVariant) ? (~/(.*[\/])/g.map(s.name, _->'') + (isVariant ? ' (${s.variant})' : '')) : s.variant, getID('selectDifficulty'));
 
 		for (d in s.difficulties) if (d != '') screen.add(makeChartOption(d, isVariant ? s.variant : null, s.name));
 		if (s.difficulties.length > 0 && s.variants.length > 0) screen.add(new Separator()); // Create a separator only when there are both difficulty and variant options available.
@@ -64,7 +64,7 @@ class CharterSelectionScreen extends EditorTreeMenuScreen {
 	public function makeSongOption(s:ChartMetaData):IconOption {
 		songList.push(s.name.toLowerCase());
 
-		var opt = new IconOption(s.name, getID('acceptSong'), s.icon, () -> openSongOption(s, true));
+		var opt = new IconOption(~/(.*[\/])/g.map(s.name, _->''), getID('acceptSong'), s.icon, () -> openSongOption(s, true));
 		opt.suffix = " >";
 		opt.editorFlashColor = s.color.getDefault(FlxColor.WHITE);
 
@@ -75,9 +75,30 @@ class CharterSelectionScreen extends EditorTreeMenuScreen {
 		super('editor.chart.name', 'charterSelection.desc', 'charterSelection.', 'newSong', 'newSongDesc', #if sys () -> {
 			parent.openSubState(new SongCreationScreen(saveSong));
 		} #end);
-		freeplayList = FreeplaySonglist.get(false);
+		freeplayList = FreeplaySonglist.get(false, 'songs/', false);
+
+		function generateList(modsList:Array<ChartMetaData>, folderPath:String = ""):Array<FlxSprite> {
+			var list:Array<FlxSprite> = [];
+
+			for (char in modsList) {
+				if (char.name.endsWith("/")) {
+					var folderName = CoolUtil.getFilename(char.name.substr(0, char.name.length-1));
+
+					list.push(new FolderOption(folderName + ' >', getID('acceptFolder'), () -> {
+						var newModsList = FreeplaySonglist.get(false, 'songs/' + folderPath + folderName + '/', false).songs;
+						var newList:Array<FlxSprite> = generateList(newModsList, folderPath + folderName + "/");
+						parent.addMenu(new EditorTreeMenuScreen(folderName, translate('desc-folder', [folderPath + folderName + "/"]), newList));
+					}));
+				}
+				else {
+					list.push(makeSongOption(char));
+				}
+			}
+
+			return list;
+		}
 
-		for (i => s in freeplayList.songs) add(makeSongOption(s));
+		for (o in generateList(freeplayList.songs)) add(o);
 	}
 
 	#if sys
@@ -101,11 +122,11 @@ class CharterSelectionScreen extends EditorTreeMenuScreen {
 		// Save Files
 		var instSuffix = creation.meta.instSuffix != null ? creation.meta.instSuffix : '', vocalsSuffix = creation.meta.vocalsSuffix != null ? creation.meta.vocalsSuffix : '';
 		CoolUtil.safeSaveFile('$songFolder/meta${variant != null ? "-" + variant : ""}.json', Json.stringify(Chart.filterMetaForSaving(creation.meta), null, Flags.JSON_PRETTY_PRINT));
-		if (creation.instBytes != null) sys.io.File.saveBytes('$songFolder/song/Inst$instSuffix.${Flags.SOUND_EXT}', creation.instBytes);
-		if (creation.voicesBytes != null) sys.io.File.saveBytes('$songFolder/song/Voices$vocalsSuffix.${Flags.SOUND_EXT}', creation.voicesBytes);
+		if (creation.instBytes != null) sys.io.File.saveBytes('$songFolder/song/Inst$instSuffix.${creation.instExt}', creation.instBytes);
+		if (creation.voicesBytes != null) sys.io.File.saveBytes('$songFolder/song/Voices$vocalsSuffix.${creation.voicesExt}', creation.voicesBytes);
 
-		if (creation.playerVocals != null) sys.io.File.saveBytes('$songFolder/song/Voices-Player$vocalsSuffix.${Flags.SOUND_EXT}', creation.playerVocals);
-		if (creation.oppVocals != null) sys.io.File.saveBytes('$songFolder/song/Voices-Opponent$vocalsSuffix.${Flags.SOUND_EXT}', creation.oppVocals);
+		if (creation.playerVocals != null) sys.io.File.saveBytes('$songFolder/song/Voices-Player$vocalsSuffix.${creation.playerExt}', creation.playerVocals);
+		if (creation.oppVocals != null) sys.io.File.saveBytes('$songFolder/song/Voices-Opponent$vocalsSuffix.${creation.oppExt}', creation.oppVocals);
 		#end
 
 		if (callback != null) callback(songFolder);
diff --git a/source/funkin/editors/charter/CharterStrumline.hx b/source/funkin/editors/charter/CharterStrumline.hx
index 14105e314b..614e84f07e 100644
--- a/source/funkin/editors/charter/CharterStrumline.hx
+++ b/source/funkin/editors/charter/CharterStrumline.hx
@@ -151,6 +151,12 @@ class CharterStrumline extends UISprite {
 		}
 		vocals.group = FlxG.sound.defaultMusicGroup;
 
+		if (vocals.data?.buffer != null && vocals.data.buffer.data == null) {
+			vocals.data.buffer.load();
+			vocals.data.buffer.decoder?.dispose();
+			vocals.data.buffer.decoder = null;
+		}
+
 		highlightColor = 0xFFFFFFFF;
 		if (icons[0] != null) {
 			var characterXML = Character.getXMLFromCharName(icons[0]);
diff --git a/source/funkin/editors/charter/CharterStrumlineScreen.hx b/source/funkin/editors/charter/CharterStrumlineScreen.hx
index 501317c642..34d58b9807 100644
--- a/source/funkin/editors/charter/CharterStrumlineScreen.hx
+++ b/source/funkin/editors/charter/CharterStrumlineScreen.hx
@@ -73,8 +73,8 @@ class CharterStrumlineScreen extends UISubstateWindow {
 		var title:UIText;
 		add(title = new UIText(windowSpr.x + 20, windowSpr.y + 30 + 16, 0, TU.translate("charterStrumlineScreen.title" + (creatingStrumLine ? "-creating" : "-editing")), 28));
 
-		var charFileList = Character.getList(true);
-		if (charFileList.length == 0) charFileList = Character.getList(false);
+		var charFileList = Character.getList(true, false, null, true);
+		if (charFileList.length == 0) charFileList = Character.getList(false, false, null, true);
 
 		charactersList = new UIButtonList<CharacterButton>(15, title.y + title.height + 36, 250, 269, null, FlxPoint.get(250, 54), null, 0);
 		charactersList.addButton.callback = () -> charactersList.add(new CharacterButton(0, 0, TU.translate("charterStrumLine.newChar"), charFileList, charactersList));
diff --git a/source/funkin/editors/charter/SongCreationScreen.hx b/source/funkin/editors/charter/SongCreationScreen.hx
index 2a345fa26d..53350e9380 100644
--- a/source/funkin/editors/charter/SongCreationScreen.hx
+++ b/source/funkin/editors/charter/SongCreationScreen.hx
@@ -21,6 +21,11 @@ typedef SongCreationData = {
 	var voicesBytes:Bytes;
 	@:optional var playerVocals:Bytes;
 	@:optional var oppVocals:Bytes;
+
+	var instExt:String;
+	var voicesExt:String;
+	@:optional var playerExt:String;
+	@:optional var oppExt:String;
 }
 
 class SongCreationScreen extends UISubstateWindow {
@@ -118,7 +123,7 @@ class SongCreationScreen extends UISubstateWindow {
 		denominatorStepper = new UINumericStepper(beatsPerMeasureStepper.x + 30 + 24, beatsPerMeasureStepper.y, 4, 1, 0, 1, null, 54);
 		songDataGroup.add(denominatorStepper);
 
-		instExplorer = new UIFileExplorer(songNameTextBox.x, songNameTextBox.y + 32 + 36, null, null, Flags.SOUND_EXT, function (path, res) {
+		instExplorer = new UIFileExplorer(songNameTextBox.x, songNameTextBox.y + 32 + 36, null, null, Flags.SOUND_EXTS, function (path, res) {
 			if (path == null || res == null) return;
 			var audioPlayer:UIAudioPlayer = new UIAudioPlayer(instExplorer.x + 8, instExplorer.y + 8, res);
 			instExplorer.members.push(audioPlayer);
@@ -129,7 +134,7 @@ class SongCreationScreen extends UISubstateWindow {
 			translate("instAudio"),
 			[new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFAD1212), "$")]);
 
-		voicesExplorer = new UIFileExplorer(instExplorer.x + 320 + 26, instExplorer.y, null, null, Flags.SOUND_EXT, function (path, res) {
+		voicesExplorer = new UIFileExplorer(instExplorer.x + 320 + 26, instExplorer.y, null, null, Flags.SOUND_EXTS, function (path, res) {
 			if (path == null || res == null) return;
 			var audioPlayer:UIAudioPlayer = new UIAudioPlayer(voicesExplorer.x + 8, voicesExplorer.y + 8, res);
 			voicesExplorer.members.push(audioPlayer);
@@ -202,7 +207,7 @@ class SongCreationScreen extends UISubstateWindow {
 		var menuTitle:UIText;
 		importAudioGroup.add(menuTitle = new UIText(windowSpr.x + 20, windowSpr.y + 30 + 16, 0, translate("importAudios"), 28));
 
-		importInstExplorer = new UIFileExplorer(menuTitle.x, menuTitle.y + menuTitle.height + 36, null, null, Flags.SOUND_EXT, function (path, res) {
+		importInstExplorer = new UIFileExplorer(menuTitle.x, menuTitle.y + menuTitle.height + 36, null, null, Flags.SOUND_EXTS, function (path, res) {
 			if (path == null || res == null) return;
 			var audioPlayer:UIAudioPlayer = new UIAudioPlayer(importInstExplorer.x + 8, importInstExplorer.y + 8, res);
 			importInstExplorer.members.push(audioPlayer);
@@ -213,7 +218,7 @@ class SongCreationScreen extends UISubstateWindow {
 			translate("instAudio"),
 			[new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFAD1212), "$")]);
 
-		importVoicesExplorer = new UIFileExplorer(importInstExplorer.x + 320 + 26, importInstExplorer.y, null, null, Flags.SOUND_EXT, function (path, res) {
+		importVoicesExplorer = new UIFileExplorer(importInstExplorer.x + 320 + 26, importInstExplorer.y, null, null, Flags.SOUND_EXTS, function (path, res) {
 			if (path == null || res == null) return;
 			var audioPlayer:UIAudioPlayer = new UIAudioPlayer(importVoicesExplorer.x + 8, importVoicesExplorer.y + 8, res);
 			importVoicesExplorer.members.push(audioPlayer);
@@ -230,13 +235,13 @@ class SongCreationScreen extends UISubstateWindow {
 			translate("songFileName"),
 			[new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFAD1212), "$")]);
 
-		importChartFile = new UIFileExplorer(importIdTextBox.x, importIdTextBox.y + importIdTextBox.height + 56, null, null, "fnfc", function (_, _) importIdTextBox.label.text = new haxe.io.Path(importChartFile.filePath).file);
+		importChartFile = new UIFileExplorer(importIdTextBox.x, importIdTextBox.y + importIdTextBox.height + 56, null, null, ["fnfc"], function (_, _) importIdTextBox.label.text = new haxe.io.Path(importChartFile.filePath).file);
 		importDataGroup.add(importChartFile);
 		addLabelOn(importChartFile, "").applyMarkup(
 			translate("songDataFile"),
 			[new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFAD1212), "$")]);
 
-		importMetaFile = new UIFileExplorer(importChartFile.x + 320 + 26, importChartFile.y, null, null, "json");
+		importMetaFile = new UIFileExplorer(importChartFile.x + 320 + 26, importChartFile.y, null, null, ["json"]);
 		importDataGroup.add(importMetaFile);
 		addLabelOn(importMetaFile, "").applyMarkup(
 			translate("songMetaFile"),
@@ -300,7 +305,7 @@ class SongCreationScreen extends UISubstateWindow {
 				saveButton.selectable = #if TEST_BUILD true #else project ? true : (importInstExplorer.file != null) #end;
 			} else if (curPage == 2) {
 				importIdTextBox.selectable = !project;
-				importChartFile.fileType = project ? "fnfc" : "json";
+				importChartFile.fileType = [project ? "fnfc" : "json"];
 				importMetaFile.selectable = name == translate("vslice");
 				saveButton.selectable = importChartFile.file != null && (!importMetaFile.selectable || importMetaFile.file != null) && (!importIdTextBox.selectable || importIdTextBox.label.text.trim().length > 0);
 			} else
@@ -378,12 +383,13 @@ class SongCreationScreen extends UISubstateWindow {
 					}
 					saveFromVSlice(files);
 				case 1 /*"V-Slice"*/:
+					final ogg = "ogg";
 					var songId = importIdTextBox.label.text;
 					var files:Map<String, Any> = [];
 					files.set('${songId}-metadata.json', importMetaFile.file);
 					files.set('${songId}-chart.json', importChartFile.file);
-					files.set('Inst.${Flags.SOUND_EXT}', importInstExplorer.file);
-					files.set('Voices.${Flags.SOUND_EXT}', importVoicesExplorer.file);
+					files.set('Inst.$ogg', importInstExplorer.file);
+					files.set('Voices.$ogg', importVoicesExplorer.file);
 					saveFromVSlice(files, songId);
 				default /*"Psych/Legacy FNF"*/:
 					var songId = importIdTextBox.label.text;
@@ -410,6 +416,8 @@ class SongCreationScreen extends UISubstateWindow {
 						meta: meta,
 						instBytes: importInstExplorer.file,
 						voicesBytes: importVoicesExplorer.file,
+						instExt: importInstExplorer.fileExt,
+						voicesExt: importVoicesExplorer.fileExt
 					}, (songFolder:String) -> {
 						#if sys
 						CoolUtil.safeSaveFile('$songFolder/${getChartSavePath(meta, "normal")}', Json.stringify(base, Flags.JSON_PRETTY_PRINT));
@@ -441,18 +449,21 @@ class SongCreationScreen extends UISubstateWindow {
 			if (onSave != null) onSave({
 				meta: meta,
 				instBytes: instExplorer.file,
-				voicesBytes: voicesExplorer.file
+				voicesBytes: voicesExplorer.file,
+				instExt: instExplorer.fileExt,
+				voicesExt: voicesExplorer.fileExt
 			}, null);
 		}
 	}
 
 	function saveFromVSlice(files:Map<String, Any>, ?name:String) {
+		final ogg = "ogg"; // vslice doesnt know about anything that isnt ogg. this should just be a constant
 		var songId = name == null && files.exists("manifest.json") ? Json.parse(files.get("manifest.json")).songId : name;
 		var vslicemeta:SwagMetadata = Json.parse(files.get('${songId}-metadata.json'));
 		var vslicechart:NewSwagSong = Json.parse(files.get('${songId}-chart.json'));
 		var playData = vslicemeta.playData;
 
-		var meta:ChartMetaData = formatMeta({name: songId, needsVoices: files.get('Voices.${Flags.SOUND_EXT}') != null});
+		var meta:ChartMetaData = formatMeta({name: songId, needsVoices: files.get('Voices.$ogg') != null});
 		var diffCharts:Array<ChartDataWithInfo> = [], events:Array<ChartEvent> = null;
 		VSliceParser.parse(vslicemeta, vslicechart, meta, diffCharts, songId);
 
@@ -461,10 +472,14 @@ class SongCreationScreen extends UISubstateWindow {
 
 		if (onSave != null) onSave({
 			meta: meta,
-			instBytes: files.get('Inst.${Flags.SOUND_EXT}'),
-			voicesBytes: files.get('Voices.${Flags.SOUND_EXT}'), //it may exist
-			playerVocals: files.get('Voices-${playData.characters.playerVocals != null ? playData.characters.playerVocals[0] : playData.characters.player}.${Flags.SOUND_EXT}'),
-			oppVocals: files.get('Voices-${playData.characters.opponentVocals != null ? playData.characters.opponentVocals[0] : playData.characters.opponent}.${Flags.SOUND_EXT}'),
+			instBytes: files.get('Inst.$ogg'),
+			voicesBytes: files.get('Voices.$ogg'), //it may exist
+			playerVocals: files.get('Voices-${playData.characters.playerVocals != null ? playData.characters.playerVocals[0] : playData.characters.player}.$ogg'),
+			oppVocals: files.get('Voices-${playData.characters.opponentVocals != null ? playData.characters.opponentVocals[0] : playData.characters.opponent}.$ogg'),
+			instExt:   ogg,
+			voicesExt: ogg,
+			playerExt: ogg,
+			oppExt:    ogg
 		}, (songFolder:String) -> {
 			#if sys
 			for (diff in diffCharts) CoolUtil.safeSaveFile('$songFolder/${getChartSavePath(meta, diff.diffName)}', Json.stringify(diff.chart, Flags.JSON_PRETTY_PRINT));
diff --git a/source/funkin/editors/stage/StageEditor.hx b/source/funkin/editors/stage/StageEditor.hx
index 961125b7af..9753891ab3 100644
--- a/source/funkin/editors/stage/StageEditor.hx
+++ b/source/funkin/editors/stage/StageEditor.hx
@@ -222,7 +222,6 @@ class StageEditor extends UIState {
 
 		axisGizmo = new AxisGizmo();
 		axisGizmo.cameras = [gizmosCamera];
-		add(axisGizmo);
 
 		uiCamera = new FlxCamera();
 		uiCamera.bgColor = 0;
@@ -272,6 +271,7 @@ class StageEditor extends UIState {
 
 		add(topMenuSpr);
 		add(uiGroup);
+		add(axisGizmo);
 
 		if(Framerate.isLoaded) {
 			Framerate.fpsCounter.alpha = 0.4;
@@ -397,7 +397,9 @@ class StageEditor extends UIState {
 		char.extra.set(exID("lowMemory"), parent.name == "low-memory");
 
 		chars.push(char);
-		stage.applyCharStuff(char, charPos.name, 0);
+		// stage.applyCharStuff(char, charPos.name, 0); it can grab characterPoses[char.curCharacter] which is REALLY BAD SINCE I DESTROY THEM
+		charPos.prepareCharacter(char, 0);
+		insert(members.indexOf(charPos), char);
 		charMap[charName] = char;
 
 		remove(charPos, true);
@@ -583,14 +585,12 @@ class StageEditor extends UIState {
 		stage.stageXML.x.addChild(node.x);
 		node.att.name = "character_" + stageSpritesWindow.buttons.members.length;
 
-		var char = new Character(0,0, "bf", false, true);
+		var char = new Character(0,0, Flags.DEFAULT_OPPONENT, false, true);
 		char.name = node.att.name;
 		char.debugMode = true;
-		// Play first anim, and make it the last frame
+		// Play first anim, and make it the last frame by reversing and stopping
 		var animToPlay = char.getAnimOrder()[0];
-		char.playAnim(animToPlay, true, NONE);
-		var lastIndx = char.animation.curAnim.numFrames - 1;
-		char.playAnim(animToPlay, true, NONE, false, lastIndx);
+		char.playAnim(animToPlay, true, NONE, true, 0);
 		char.stopAnimation();
 
 		// Add it to the stage
@@ -684,6 +684,36 @@ class StageEditor extends UIState {
 		return Options.editorStagePrettyPrint ? xmlThingYea : xmlThingYea.replace("\n", "");
 	}
 
+	function storeSpriteTransform(sprite:FunkinSprite) {
+		sprite.setPosition(CoolUtil.quantize(sprite.x, 100), CoolUtil.quantize(sprite.y, 100));
+		sprite.scale.set(CoolUtil.quantize(sprite.scale.x, 100), CoolUtil.quantize(sprite.scale.y, 100));
+		sprite.skew.set(CoolUtil.quantize(sprite.skew.x, 100), CoolUtil.quantize(sprite.skew.y, 100));
+		sprite.angle = CoolUtil.quantize(sprite.angle, 100);
+
+		var button:StageElementButton = cast(sprite.extra.get(exID("button")), StageElementButton);
+		button.xml.att.x = Std.string(sprite.x);
+		button.xml.att.y = Std.string(sprite.y);
+		button.xml.att.skewx = Std.string(sprite.skew.x);
+		button.xml.att.skewy = Std.string(sprite.skew.y);
+		button.xml.att.angle = Std.string(sprite.angle);
+
+		for (attrib in ["graphicSize", "graphicSizex", "graphicSizey"])
+			button.xml.x.remove(attrib);
+		if (MathUtil.equal(sprite.scale.x, sprite.scale.y)) {
+			button.xml.att.scale = Std.string(sprite.scale.x);
+		} else {
+			button.xml.att.scalex = Std.string(sprite.scale.x);
+			button.xml.att.scaley = Std.string(sprite.scale.y);
+		}
+
+		if (button.xml.has.width)
+			button.xml.att.width = Std.string(sprite.width);
+		if (button.xml.has.height)
+			button.xml.att.height = Std.string(sprite.height);
+
+		button.updateInfo();
+	}
+
 	function _edit_undo(_) {
 		UIState.playEditorSound(Flags.DEFAULT_EDITOR_UNDO_SOUND);
 		var undo = undos.undo();
@@ -706,7 +736,7 @@ class StageEditor extends UIState {
 				sprite.scale.set(oldInfo.scaleX, oldInfo.scaleY);
 				sprite.skew.set(oldInfo.skewX, oldInfo.skewY);
 				sprite.angle = oldInfo.angle;
-				cast(sprite.extra.get(exID("button")), StageElementButton).updateInfo();
+				storeSpriteTransform(sprite);
 		}
 	}
 
@@ -732,7 +762,7 @@ class StageEditor extends UIState {
 				sprite.scale.set(newInfo.scaleX, newInfo.scaleY);
 				sprite.skew.set(newInfo.skewX, newInfo.skewY);
 				sprite.angle = newInfo.angle;
-				cast(sprite.extra.get(exID("button")), StageElementButton).updateInfo();
+				storeSpriteTransform(sprite);
 		}
 	}
 
@@ -1117,6 +1147,7 @@ class StageEditor extends UIState {
 		if (prevMode == NONE && mouseMode == NONE) return;
 
 		if (prevMode != NONE && mouseMode == NONE) {
+			storeSpriteTransform(sprite);
 			undos.addToUndo(CTransform(sprite, {
 				x: storedPos.x,
 				y: storedPos.y,
diff --git a/source/funkin/editors/stage/StageSelection.hx b/source/funkin/editors/stage/StageSelection.hx
index 418e019022..786523e201 100644
--- a/source/funkin/editors/stage/StageSelection.hx
+++ b/source/funkin/editors/stage/StageSelection.hx
@@ -4,6 +4,7 @@ import funkin.editors.stage.StageCreationScreen.StageCreationData;
 import funkin.editors.EditorTreeMenu;
 import funkin.game.Stage;
 import funkin.options.type.NewOption;
+import funkin.options.type.FolderOption;
 import funkin.options.type.OptionType;
 import funkin.options.type.TextOption;
 
@@ -20,9 +21,9 @@ class StageSelection extends EditorTreeMenu {
 class StageSelectionScreen extends EditorTreeMenuScreen {
 	public var stages:Array<String> = [];
 
-	public function makeStageOption(stage:String):TextOption {
+	public function makeStageOption(stage:String, ?folder:String = ''):TextOption {
 		return new TextOption(stage, getID('acceptStage'), () -> {
-			FlxG.switchState(new StageEditor(stage));
+			FlxG.switchState(new StageEditor(folder + stage));
 		});
 	}
 
@@ -31,11 +32,36 @@ class StageSelectionScreen extends EditorTreeMenuScreen {
 			parent.openSubState(new StageCreationScreen(saveStage));
 		});
 
-		var modsList:Array<String> = Stage.getList(true, true);
-		for (stage in (modsList.length == 0 ? Stage.getList(false, true) : modsList)) {
-			stages.push(stage.toLowerCase());
-			add(makeStageOption(stage));
+		var isMods:Bool = true;
+		var modsList = Stage.getList(true, true, true);
+
+		if (modsList.length == 0) {
+			modsList = Stage.getList(false, true, true);
+			isMods = false;
 		}
+
+		function generateList(modsList:Array<String>, isMods:Bool, folderPath:String = ""):Array<FlxSprite> {
+			var list:Array<FlxSprite> = [];
+
+			for (char in modsList) {
+				if (char.endsWith("/")) {
+					var folderName = CoolUtil.getFilename(char.substr(0, char.length-1));
+
+					list.push(new FolderOption(folderName + ' >', getID('acceptFolder'), () -> {
+						var newModsList = Stage.getList(isMods, true, true, char);
+						var newList:Array<FlxSprite> = generateList(newModsList, isMods, folderPath + folderName + "/");
+						parent.addMenu(new EditorTreeMenuScreen(folderName, translate('desc-folder', [folderPath + folderName + "/"]), newList));
+					}));
+				}
+				else {
+					list.push(makeStageOption(char, folderPath));
+				}
+			}
+
+			return list;
+		}
+
+		for (o in generateList(modsList, isMods)) add(o);
 	}
 
 	public function saveStage(creation:StageCreationData) {
diff --git a/source/funkin/editors/ui/UIFileExplorer.hx b/source/funkin/editors/ui/UIFileExplorer.hx
index 4f75fd6efe..a2aed4afc6 100644
--- a/source/funkin/editors/ui/UIFileExplorer.hx
+++ b/source/funkin/editors/ui/UIFileExplorer.hx
@@ -2,6 +2,10 @@ package funkin.editors.ui;
 
 import haxe.io.Bytes;
 import lime.ui.FileDialog;
+import flixel.util.typeLimit.OneOfTwo;
+#if lime_funkin
+import lime.ui.FileDialogFilter;
+#end
 
 class UIFileExplorer extends UISliceSprite {
 	public var uploadButton:UIButton;
@@ -12,22 +16,33 @@ class UIFileExplorer extends UISliceSprite {
 
 	public var file:Bytes = null;
 	public var filePath:String = null;
+	public var fileExt:String = null; // avoid constant Path.extension checks
 	public var onFile:(String, Bytes)->Void;
 
 	public var uiElement:FlxSprite;
 	
-	public var fileType:String = "txt";
+	public var fileType:Array<String> = ["txt"];
 
-	public function new(x:Float, y:Float, ?w:Int, ?h:Int, fileType:String = "txt", ?onFile:(String, Bytes)->Void) {
+	public function new(x:Float, y:Float, ?w:Int, ?h:Int, fileType:OneOfTwo<String, Array<String>>, ?onFile:(String, Bytes)->Void) {
 		super(x, y, (w != null ? w : 320), (h != null ? h : 58), 'editors/ui/inputbox');
-		this.fileType = fileType;
+		if (fileType != null) {
+			// backward compat with custom editors
+			if (fileType is String) fileType = cast(fileType, String).split(';');
+			this.fileType = fileType;
+		}
 
 		if (onFile != null) this.onFile = onFile;
 
-		uploadButton = new UIButton(x + 8, y+ 8, null, function () {
+		uploadButton = new UIButton(x + 8, y + 8, null, function () {
+			#if lime_funkin
+			FileDialog.openFile(FlxG.stage.window, "Open File", (fileNames:Array<String>, activeFilter:FileDialogFilter) -> {
+				loadFile(fileNames[0]);
+			}, this.fileType != null ? [new FileDialogFilter("Specified File Extension", this.fileType.join(";"))] : null);
+			#else
 			var fileDialog = new FileDialog();
 			fileDialog.onSelect.add(loadFile);
-			fileDialog.browse(OPEN, this.fileType);
+			fileDialog.browse(OPEN, this.fileType[0]); // i dunno bro
+			#end
 		}, bWidth - 16, bHeight - 16);
 		members.push(uploadButton);
 
@@ -62,7 +77,9 @@ class UIFileExplorer extends UISliceSprite {
 	}
 
 	public function loadFile(path:String) {
+		if (path == null) return;
 		file = cast sys.io.File.getBytes(filePath = path);
+		fileExt = haxe.io.Path.extension(filePath);
 		deleteButton.visible = deleteButton.selectable = deleteIcon.visible = !(uploadButton.visible = uploadButton.selectable = false);
 
 		if (this.onFile != null) this.onFile(filePath, file);
diff --git a/source/funkin/editors/ui/UIImageExplorer.hx b/source/funkin/editors/ui/UIImageExplorer.hx
index cf6cdab31d..87c0e1fd2d 100644
--- a/source/funkin/editors/ui/UIImageExplorer.hx
+++ b/source/funkin/editors/ui/UIImageExplorer.hx
@@ -39,7 +39,7 @@ class UIImageExplorer extends UIFileExplorer {
 		return TU.translate("uiImageExplorer." + id, args);
 
 	public function new(x:Float, y:Float, image:String, ?w:Int, ?h:Int, ?onFile:(String, Bytes)->Void, ?directory:String = "images") {
-		super(x, y, w, h, "png, jpg", function (filePath, file) {
+		super(x, y, w, h, Flags.IMAGE_EXTS, function (filePath, file) {
 			if (filePath != null && file != null) uploadImage(filePath, file);
 			if (onFile != null) onFile(filePath, file);
 		});
diff --git a/source/funkin/editors/ui/UITextBox.hx b/source/funkin/editors/ui/UITextBox.hx
index 0cdcd999fb..e080da51f5 100644
--- a/source/funkin/editors/ui/UITextBox.hx
+++ b/source/funkin/editors/ui/UITextBox.hx
@@ -72,7 +72,10 @@ class UITextBox extends UISliceSprite implements IUIFocusable {
 		framesOffset = (selected ? 18 : (hovered ? 9 : 0));
 		@:privateAccess {
 			if (selected) {
-				__wasFocused = true;
+				if (!__wasFocused) {
+					FlxG.stage.window.textInputEnabled = true;
+					__wasFocused = true;
+				}
 				caretSpr.alpha = (FlxG.game.ticks % 666) >= 333 ? 1 : 0;
 
 				var curPos = switch (position) {
@@ -91,6 +94,7 @@ class UITextBox extends UISliceSprite implements IUIFocusable {
 				curPos.put();
 			} else {
 				if (__wasFocused) {
+					FlxG.stage.window.textInputEnabled = false;
 					__wasFocused = false;
 					if (onChange != null)
 						onChange(label.text);
diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx
index be9f722789..85580bfef0 100644
--- a/source/funkin/game/Character.hx
+++ b/source/funkin/game/Character.hx
@@ -372,7 +372,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 
 		xml = scripts.event("onCharacterXMLParsed", EventManager.get(CharacterXMLEvent).recycle(this, xml)).xml;
 
-		sprite = curCharacter;
+		name = sprite = curCharacter;
 		spriteAnimType = BEAT;
 		this.xml = xml; // Modders wassup :D
 
@@ -414,7 +414,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 		var hasInterval:Bool = xml.x.exists("interval");
 		if (hasInterval) beatInterval = Std.parseInt(xml.x.get("interval"));
 
-		loadSprite(Paths.image('characters/$sprite'));
+		XMLUtil.appendSpriteSheetsFromXML(this, xml, 'characters/');
 		
 		if (xml.x.exists("centercam")) centeredCamera = (xml.x.get("centercam") == "true");
 		else if (Flags.USE_LEGACY_CENTER_CAM) centeredCamera = true;
@@ -624,17 +624,30 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 		return icon;
 	}
 
-	public static function getList(?mods:Bool = false, includeFolders:Bool = false, folder:String = 'data/characters/'):Array<String> {
+	public static function getList(?mods:Bool = false, includeFolders:Bool = false, ?folder:String = null, ?recursive:Bool = false):Array<String> {
+		final defaultFolder:String = 'data/characters/';
+		if (folder == null) folder = defaultFolder;
 		var list:Array<String> = [];
-		if(includeFolders) {
+		if(includeFolders || recursive) {
 			for (path in Paths.getFolderDirectories(folder, true, mods ? MODS : BOTH)) {
 				if(!path.endsWith("/")) path += "/";
-				list.push(path);
+				if (recursive) {
+					list = list.concat(Character.getList(mods, includeFolders, path, recursive));
+				} else {
+					list.push(path);
+				}
 			}
 		}
 		for (path in Paths.getFolderContent(folder, true, mods ? MODS : BOTH))
-			if (Path.extension(path) == "xml")
-				list.push(CoolUtil.getFilename(path));
+			if (Path.extension(path) == "xml") {
+				if (recursive) {
+					var file:String = folder + CoolUtil.getFilename(path);
+					if (file.startsWith(defaultFolder)) file = file.substr(defaultFolder.length);
+					list.push(file);
+				} else {
+					list.push(CoolUtil.getFilename(path));
+				}
+			}
 		return list;
 	}
 }
diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index 71c56f74e9..301f605039 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -1114,7 +1114,7 @@ class PlayState extends MusicBeatState
 		if (notNull) PlayState.instance.gameAndCharsCall("onStageDestroy", [stage]);
 		scripts.call("destroy");
 
-		for (g in __cachedGraphics) g.useCount--;
+		for (g in __cachedGraphics) g.decrementUseCount();
 		@:privateAccess {
 			for (strumLine in strumLines.members) FlxG.sound.destroySound(strumLine.vocals);
 			if (FlxG.sound.music != inst) FlxG.sound.destroySound(inst);
@@ -1265,11 +1265,6 @@ class PlayState extends MusicBeatState
 	@:dox(hide)
 	override public function onFocus():Void
 	{
-		if (!paused && FlxG.autoPause) {
-			for (strumLine in strumLines.members) strumLine.vocals.resume();
-			inst.resume();
-			vocals.resume();
-		}
 		gameAndCharsCall("onFocus");
 		updateDiscordPresence();
 		super.onFocus();
@@ -1278,11 +1273,6 @@ class PlayState extends MusicBeatState
 	@:dox(hide)
 	override public function onFocusLost():Void
 	{
-		if (!paused && FlxG.autoPause) {
-			for (strumLine in strumLines.members) strumLine.vocals.pause();
-			inst.pause();
-			vocals.pause();
-		}
 		gameAndCharsCall("onFocusLost");
 		updateDiscordPresence();
 		super.onFocusLost();
diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx
index 27dd4cdf88..7bb81c284e 100644
--- a/source/funkin/game/Stage.hx
+++ b/source/funkin/game/Stage.hx
@@ -397,12 +397,19 @@ class Stage extends FlxBasic implements IBeatReceiver {
 	 * Gets a list of stages that are available to be used.
 	 * @param mods Whenever only the mods folder should be checked
 	**/
-	public static function getList(?mods:Bool = false, ?xmlOnly:Bool = false):Array<String> {
+	public static function getList(?mods:Bool = false, ?xmlOnly:Bool = false, includeFolders:Bool = false, folder:String = 'data/stages/'):Array<String> {
 		var list:Array<String> = [];
 		var extensions:Array<String> = ["xml"];
 		if (!xmlOnly) extensions.push("hx");
 
-		for (path in Paths.getFolderContent("data/stages/", false, mods ? MODS : BOTH)) {
+		if(includeFolders) {
+			for (path in Paths.getFolderDirectories(folder, true, mods ? MODS : BOTH)) {
+				if(!path.endsWith("/")) path += "/";
+				list.push(path);
+			}
+		}
+		
+		for (path in Paths.getFolderContent(folder, false, mods ? MODS : BOTH)) {
 			var extension = Path.extension(path);
 			if (extensions.contains(extension)) {
 				// list.pushOnce("test");
diff --git a/source/funkin/game/cutscenes/VideoCutscene.hx b/source/funkin/game/cutscenes/VideoCutscene.hx
index 0e8fbe7449..9d035f8d60 100644
--- a/source/funkin/game/cutscenes/VideoCutscene.hx
+++ b/source/funkin/game/cutscenes/VideoCutscene.hx
@@ -25,7 +25,7 @@ class VideoCutscene extends Cutscene {
 	var localPath:String;
 
 	#if VIDEO_CUTSCENES
-	var video:FlxVideoSprite;
+	final video:FlxVideoSprite = new FlxVideoSprite();
 	final mutex = new sys.thread.Mutex();
 
 	var cutsceneCamera:FlxCamera;
@@ -58,17 +58,14 @@ class VideoCutscene extends Cutscene {
 
 		parseSubtitles();
 
-		add(video = new FlxVideoSprite());
+		add(video);
 		video.antialiasing = true;
-		#if (hxvlc < version("2.0.0"))
-		video.autoPause = false;  // Imma handle it better inside this class, mainly because of the pause menu  - Nex
-		#end
 		video.bitmap.onEndReached.add(close);
 		video.bitmap.onFormatSetup.add(function() if (video.bitmap != null && video.bitmap.bitmapData != null) {
 			final width = video.bitmap.bitmapData.width;
 			final height = video.bitmap.bitmapData.height;
 			final scale:Float = Math.min(FlxG.width / width, FlxG.height / height);
-			video.setGraphicSize(Std.int(width * scale), Std.int(height * scale));
+			video.setGraphicSize(width * scale, height * scale);
 			video.updateHitbox();
 			video.screenCenter();
 		});
@@ -103,7 +100,7 @@ class VideoCutscene extends Cutscene {
 		FlxTween.tween(loadingBackdrop, {alpha: 1}, 0.5, {ease: FlxEase.sineInOut});
 
 		Main.execAsync(function() {
-			if (video.load(localPath)) new FlxTimer().start(0.001, function(_) {
+			if (video.load(localPath)) FlxTimer.wait(0.001, function() {
 				mutex.acquire(); onReady(); mutex.release();
 			});
 			else { mutex.acquire(); close(); mutex.release(); }
@@ -203,18 +200,6 @@ class VideoCutscene extends Cutscene {
 		}
 	}
 
-	#if (hxvlc < version("2.0.0"))
-	@:dox(hide) override public function onFocus() {
-		if(FlxG.autoPause && !paused) video.resume();
-		super.onFocus();
-	}
-
-	@:dox(hide) override public function onFocusLost() {
-		if(FlxG.autoPause && !paused) video.pause();
-		super.onFocusLost();
-	}
-	#end
-
 	public override function pauseCutscene() {
 		video.pause();
 		super.pauseCutscene();
diff --git a/source/funkin/import.hx b/source/funkin/import.hx
index 92619a7a59..e64b0f8acb 100644
--- a/source/funkin/import.hx
+++ b/source/funkin/import.hx
@@ -32,4 +32,8 @@ import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 
 using StringTools;
 using funkin.backend.utils.CoolUtil;
+
+#if IMGUI_ENABLED
+import lime.tools.imgui.*;
+#end
 #end
\ No newline at end of file
diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx
index 67aec63a87..aa4b314ffb 100644
--- a/source/funkin/menus/FreeplayState.hx
+++ b/source/funkin/menus/FreeplayState.hx
@@ -189,37 +189,6 @@ class FreeplayState extends MusicBeatState
 		interpColor = new FlxInterpolateColor(bg.color);
 	}
 
-	#if PRELOAD_ALL
-	/**
-	 * How much time a song stays selected until it autoplays.
-	 */
-	public var timeUntilAutoplay:Float = 1;
-	/**
-	 * Whenever the song autoplays when hovered over.
-	 */
-	public var disableAutoPlay:Bool = false;
-	/**
-	 * Whenever the autoplayed song gets async loaded.
-	 */
-	public var disableAsyncLoading:Bool = #if desktop false #else true #end;
-	/**
-	 * Time elapsed since last autoplay. If this time exceeds `timeUntilAutoplay`, the currently selected song will play.
-	 */
-	public var autoplayElapsed:Float = 0;
-	/**
-	 * Whenever the currently selected song instrumental is playing.
-	 */
-	public var songInstPlaying:Bool = true;
-	/**
-	 * Path to the currently playing song instrumental.
-	 */
-	public var curPlayingInst:String = null;
-	/**
-	 * If it should play the song automatically.
-	 */
-	public var autoplayShouldPlay:Bool = true;
-	#end
-
 	private var TEXT_FREEPLAY_SCORE = TU.getRaw("freeplay.score");
 
 	override function update(elapsed:Float)
@@ -265,46 +234,6 @@ class FreeplayState extends MusicBeatState
 		interpColor.fpsLerpTo(curSong.color, 0.0625);
 		bg.color = interpColor.color;
 
-		#if PRELOAD_ALL
-		var dontPlaySongThisFrame = false;
-		autoplayElapsed += elapsed;
-		if (!disableAutoPlay && !songInstPlaying && (autoplayElapsed > timeUntilAutoplay)) {
-			if (curPlayingInst != (curPlayingInst = Paths.inst(curSong.name, curDifficulties[curDifficulty], curSong.instSuffix))) {
-				var streamed = false;
-				/*if (Options.streamedMusic) {
-					var sound = Assets.getMusic(curPlayingInst, true, false);
-					streamed = sound != null;
-
-					if (streamed && autoplayShouldPlay) {
-						FlxG.sound.playMusic(sound, 0);
-						Conductor.changeBPM(curSong.bpm, curSong.beatsPerMeasure, curSong.stepsPerBeat);
-					}
-				}*/
-
-				if (!streamed) {
-					var huh:Void->Void = function() {
-						var soundPath = curPlayingInst;
-						var sound = null;
-						if (Assets.exists(soundPath, SOUND) || Assets.exists(soundPath, MUSIC))
-							sound = Assets.getSound(soundPath);
-						else
-							FlxG.log.error('Could not find a Sound asset with an ID of \'$soundPath\'.');
-
-						if (sound != null && autoplayShouldPlay) {
-							FlxG.sound.playMusic(sound, 0);
-							Conductor.changeBPM(curSong.bpm, curSong.beatsPerMeasure, curSong.stepsPerBeat);
-						}
-					}
-					if (!disableAsyncLoading) Main.execAsync(huh);
-					else huh();
-				}
-			}
-			songInstPlaying = true;
-			if (disableAsyncLoading/* && !Options.streamedMusic*/) dontPlaySongThisFrame = true;
-		}
-		#end
-
-
 		if (controls.BACK || FlxG.mouse.justPressedRight)
 		{
 			CoolUtil.playMenuSFX(CANCEL, 0.7);
@@ -316,8 +245,8 @@ class FreeplayState extends MusicBeatState
 			convertChart();
 		#end
 
-		if ((controls.ACCEPT || (FlxG.mouse.justPressed && grpSongs?.members[curSelected] != null && FlxG.mouse.overlaps(grpSongs.members[curSelected])))
-			#if PRELOAD_ALL && !dontPlaySongThisFrame #end)
+		if ((controls.ACCEPT || (FlxG.mouse.justPressed && grpSongs?.members[curSelected] != null
+			&& FlxG.mouse.overlaps(grpSongs.members[curSelected]))))
 		{
 			select();
 		}
@@ -351,10 +280,6 @@ class FreeplayState extends MusicBeatState
 
 		if (event.cancelled) return;
 
-		#if PRELOAD_ALL
-		autoplayShouldPlay = false;
-		#end
-
 		Options.freeplayLastSong = curSong.name;
 		Options.freeplayLastDifficulty = curDifficulties[curDifficulty];
 		Options.freeplayLastVariation = curSong.variant;
@@ -390,13 +315,6 @@ class FreeplayState extends MusicBeatState
 		updateCurSong();
 		updateScore();
 
-		#if PRELOAD_ALL
-		if (curSong != prevSong) {
-			autoplayElapsed = 0;
-			songInstPlaying = false;
-		}
-		#end
-
 		var text = validDifficulties ? curDifficulties[curDifficulty].toUpperCase() + (curSong != songs[curSelected] ? ' (${curSong.variant.toUpperCase()})' : '') : '-';
 		diffText.text = curDifficulties.length > 1 ? '< $text >' : text;
 	}
@@ -479,11 +397,6 @@ class FreeplayState extends MusicBeatState
 
 		changeDiff(0, true);
 
-		#if PRELOAD_ALL
-		autoplayElapsed = 0;
-		songInstPlaying = false;
-		#end
-
 		coopText.visible = curSong.coopAllowed || curSong.opponentModeAllowed;
 	}
 
@@ -491,8 +404,8 @@ class FreeplayState extends MusicBeatState
 		var event = event("onUpdateOptionsAlpha", EventManager.get(FreeplayAlphaUpdateEvent).recycle(0.6, 0.45, 1, 1, 0.25));
 		if (event.cancelled) return;
 
-		final idleAlpha = #if PRELOAD_ALL songInstPlaying ? event.idlePlayingAlpha : #end event.idleAlpha;
-		final selectedAlpha = #if PRELOAD_ALL songInstPlaying ? event.selectedPlayingAlpha : #end event.selectedAlpha;
+		final idleAlpha = event.idleAlpha;
+		final selectedAlpha = event.selectedAlpha;
 
 		for (i in 0...iconArray.length)
 			iconArray[i].alpha = lerp(iconArray[i].alpha, idleAlpha, event.lerp);
@@ -534,10 +447,18 @@ class FreeplayState extends MusicBeatState
 
 class FreeplaySonglist {
 	public var songs:Array<ChartMetaData> = [];
+	public static final EXCLUDE_SUBFOLDERS:Array<String> = ['charts', 'scripts', 'song'];
 
 	public function new() {}
 
-	public function getSongsFromSource(source:funkin.backend.assets.AssetSource, useTxt:Bool = true) {
+	public static function isSubSongDirectory(subs:Array<String>):Bool {
+		for (i in EXCLUDE_SUBFOLDERS) {
+			if (subs.contains(i)) return false;
+		}
+		return true;
+	}
+
+	public function getSongsFromSource(source:funkin.backend.assets.AssetSource, useTxt:Bool = true, ?startDir:String = 'songs/', ?flatten:Bool = true) {
 		var songsFound:Array<String> = null;
 		if (useTxt) {
 			var oldPath = Paths.txt('freeplaySonglist');
@@ -548,27 +469,49 @@ class FreeplaySonglist {
 				songsFound = CoolUtil.coolTextFile(oldPath);
 			}
 		}
-		if (songsFound == null) songsFound = Paths.getFolderDirectories("songs", false, source);
+		// todo: make this better
+		if (songsFound == null) {
+			songsFound = [];
+			var songDirs = Paths.getFolderDirectories(startDir, false, source);
+			if (!flatten) {
+				for (i in songDirs) {
+					var subs = Paths.getFolderDirectories('$startDir$i', false, source);
+					songsFound.push(isSubSongDirectory(subs) ? '$i/' : i);
+				}
+			} else {
+				function poop(a:Array<Dynamic>, startDir:String) {
+					for (i in a) {
+						var subs = Paths.getFolderDirectories('$startDir$i', false, source);
+						if (isSubSongDirectory(subs)) poop(subs, '$startDir$i/');
+						else songsFound.push(startDir.substr('songs/'.length) + i);
+					}
+				}
+				poop(songDirs, startDir);
+			}
+			// put folders at the top
+			songsFound = songsFound.filter(a -> a.endsWith('/'))
+				.concat(songsFound.filter(a -> !a.endsWith('/')));
+		}
 		if (songsFound.length > 0) {
-			for (s in songsFound) songs.push(Chart.loadChartMeta(s, source == MODS));
+			for (s in songsFound) songs.push(Chart.loadChartMeta(startDir.substr('songs/'.length) + s, source == MODS));
 			return false;
 		}
 		return true;
 	}
 
-	public static function get(useTxt:Bool = true) {
+	public static function get(useTxt:Bool = true, ?startDir:String = 'songs/', ?flatten:Bool = true) {
 		var songList = new FreeplaySonglist();
 
 		switch(Flags.SONGS_LIST_MOD_MODE) {
 			case 'prepend':
-				songList.getSongsFromSource(MODS, useTxt);
-				songList.getSongsFromSource(SOURCE, useTxt);
+				songList.getSongsFromSource(MODS, useTxt, startDir, flatten);
+				songList.getSongsFromSource(SOURCE, useTxt, startDir, flatten);
 			case 'append':
-				songList.getSongsFromSource(SOURCE, useTxt);
-				songList.getSongsFromSource(MODS, useTxt);
+				songList.getSongsFromSource(SOURCE, useTxt, startDir, flatten);
+				songList.getSongsFromSource(MODS, useTxt, startDir, flatten);
 			default /*case 'override'*/:
-				if (songList.getSongsFromSource(MODS, useTxt))
-					songList.getSongsFromSource(SOURCE, useTxt);
+				if (songList.getSongsFromSource(MODS, useTxt, startDir, flatten))
+					songList.getSongsFromSource(SOURCE, useTxt, startDir, flatten);
 		}
 
 		return songList;
diff --git a/source/funkin/menus/TitleState.hx b/source/funkin/menus/TitleState.hx
index f704be5e21..f710628b45 100644
--- a/source/funkin/menus/TitleState.hx
+++ b/source/funkin/menus/TitleState.hx
@@ -317,7 +317,7 @@ class IntroText {
 		for(e in lines) {
 			if (e is String) {
 				var text = cast(e, String);
-				for(k=>e in state.curWacky) text = text.replace('{introText${k+1}}', e);
+				for(k=>e in state.curWacky) text = text.replace('{introText${k+1}}', e.trim());
 				state.addMoreText(text);
 			} else if (e is Dynamic) {
 				var image:TitleStateImage = e;
diff --git a/source/funkin/menus/ui/Alphabet.hx b/source/funkin/menus/ui/Alphabet.hx
index a2991c8f15..6acbc98cf9 100644
--- a/source/funkin/menus/ui/Alphabet.hx
+++ b/source/funkin/menus/ui/Alphabet.hx
@@ -541,12 +541,6 @@ class Alphabet extends FlxSprite {
 		switch (node.nodeName) {
 			case "spritesheet":
 				final sheet = node.firstChild().nodeValue.trim();
-				if (frames == null)
-					frames = Paths.getFrames(sheet);
-				else {
-					for (frame in Paths.getFrames(sheet).frames)
-						frames.pushFrame(frame);
-				}
 				sheets.push(sheet);
 			case "defaultAnim":
 				var idx = ["UPPER", "LOWER"].indexOf(node.get("casing").toUpperCase()) + 1;
@@ -789,10 +783,9 @@ class Alphabet extends FlxSprite {
 		colorMode = (["offsets", "none"].indexOf(xml.get("colorMode")) + 1);
 		antialiasing = xml.get("antialiasing").getDefault("true") == "true";
 
-		frames = null;
-
 		for (node in xml.elements())
 			checkNode(node);
+		frames = Paths.getMultiFrames(sheets);
 	}
 
 	private static var alphabetProperties:Array<String> = ["fps", "advance", "lineGap", "forceCasing", "colorMode", "antialiasing"];
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index cabf10cb45..b959e5e998 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -4,6 +4,11 @@ import flixel.input.keyboard.FlxKey;
 import flixel.util.FlxSave;
 import openfl.Lib;
 
+#if IMGUI_ENABLED
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiIO;
+#end
+
 /**
  * The save data of the engine.
  * Mod save data is stored in `FlxG.save.data`.
@@ -44,13 +49,23 @@ class Options
 	public static var betaUpdates:Bool = false;
 	public static var splashesEnabled:Bool = true;
 	public static var legacyMemoryCounter:Bool = false;
-	@:dox(hide) @:doNotSave public static var hitWindow:Float = 250; // DEPRECATED
+
+	 // DEPRECATED
+	@:dox(hide) @:doNotSave public static var hitWindow:Float = 250;
+
+	/*
+	* The maximum LIMITED framerate the game can run at.
+	* CANNOT be changed through scripts.
+	* @since 1.1.0-rc2
+	*/
+	@:doNotSave public static inline final maxFrameRate:Int = 240;
+
 	public static var songOffset:Float = 0;
 	public static var framerate:Int = 120;
 	public static var gpuOnlyBitmaps:Bool = #if (mac || web) false #else true #end; // causes issues on mac and web
 	public static var language = "en"; // default to english, Flags.DEFAULT_LANGUAGE should not modify this
-	public static var streamedMusic:Bool = false;
-	public static var streamedVocals:Bool = false;
+	public static var streamedMusic:Bool = true;
+	public static var streamedVocals:Bool = true;
 	public static var quality:Int = 1;
 	public static var allowConfigWarning:Bool = true;
 	#if MODCHARTING_FEATURES
@@ -110,6 +125,31 @@ class Options
 	public static var characterDragging:Bool = true;
 	public static var playAnimOnOffset:Bool = false;
 
+	/**
+	 * CONSOLE
+	 */
+	public static var consoleTimeFilter:Bool = true;
+	public static var consoleTypeFilter:Bool = true;
+	public static var consoleInfoFilter:Bool = true;
+	public static var consoleWarningFilter:Bool = true;
+	public static var consoleErrorFilter:Bool = true;
+	public static var consoleTraceFilter:Bool = true;
+	public static var consoleVerboseFilter:Bool = true;
+	public static var consoleCommandsFilter:Bool = true;
+	public static var consoleClassFilter:Bool = true;
+	public static var consoleFunctionFilter:Bool = true;
+	public static var consoleBasicTypesFilter:Bool = true;
+	public static var consoleObjectsFilter:Bool = true;
+	public static var consoleScriptsFilter:Bool = true;
+	public static var consoleCountDuplicatedOutput:Bool = true;
+
+	#if IMGUI_ENABLED
+	/**
+	 * IMGUI
+	 */
+	public static var imguiMultiViewport:Bool = #if linux false #else true #end;
+	#end
+
 	/**
 	 * PLAYER 1 CONTROLS
 	 */
@@ -140,6 +180,7 @@ class Options
 	public static var P1_DEV_ACCESS:Array<FlxKey> = [SEVEN];
 	public static var P1_DEV_CONSOLE:Array<FlxKey> = [F2];
 	public static var P1_DEV_RELOAD:Array<FlxKey> = [F5];
+	public static var P1_DEV_INSPECTOR:Array<FlxKey> = [F4];
 
 	/**
 	* PLAYER 2 CONTROLS (ALT)
@@ -173,6 +214,7 @@ class Options
 	public static var P2_DEV_ACCESS:Array<FlxKey> = [];
 	public static var P2_DEV_CONSOLE:Array<FlxKey> = [];
 	public static var P2_DEV_RELOAD:Array<FlxKey> = [];
+	public static var P2_DEV_INSPECTOR:Array<FlxKey> = [];
 
 	/**
 	* SOLO GETTERS
@@ -206,6 +248,7 @@ class Options
 	public static var SOLO_DEV_ACCESS(get, null):Array<FlxKey>;
 	public static var SOLO_DEV_CONSOLE(get, null):Array<FlxKey>;
 	public static var SOLO_DEV_RELOAD(get, null):Array<FlxKey>;
+	public static var SOLO_DEV_INSPECTOR(get, null):Array<FlxKey>;
 
 	public static function load() {
 		var path = haxe.macro.Compiler.getDefine("SAVE_OPTIONS_PATH"), name = haxe.macro.Compiler.getDefine("SAVE_OPTIONS_NAME");
@@ -236,10 +279,23 @@ class Options
 		applyKeybinds();
 		applyQuality();
 
+		flixel.sound.FlxSoundData.allowStreaming = streamedMusic;
 		FlxG.sound.defaultMusicGroup.volume = volumeMusic;
 		FlxG.autoPause = autoPause;
-		if (FlxG.updateFramerate < framerate) FlxG.drawFramerate = FlxG.updateFramerate = framerate;
-		else FlxG.updateFramerate = FlxG.drawFramerate = framerate;
+
+		var _framerate = framerate;
+		if (_framerate > maxFrameRate) _framerate = 0;
+
+		if (FlxG.updateFramerate < framerate) FlxG.drawFramerate = FlxG.updateFramerate = _framerate;
+		else FlxG.updateFramerate = FlxG.drawFramerate = _framerate;
+
+		#if IMGUI_ENABLED
+		if (imguiMultiViewport) {
+			ImGuiIO.configFlags |= ImGuiConfigFlags.ViewportsEnable;
+		} else {
+			ImGuiIO.configFlags = ImGuiIO.configFlags & ~ImGuiConfigFlags.ViewportsEnable;
+		}
+		#end
 	}
 
 	public static function applyQuality() {
diff --git a/source/funkin/options/categories/AppearanceOptions.hx b/source/funkin/options/categories/AppearanceOptions.hx
index 8c65872558..9472ccf83d 100644
--- a/source/funkin/options/categories/AppearanceOptions.hx
+++ b/source/funkin/options/categories/AppearanceOptions.hx
@@ -3,16 +3,18 @@ package funkin.options.categories;
 import funkin.backend.system.framerate.Framerate;
 
 class AppearanceOptions extends TreeMenuScreen {
+	var framerateOption:NumOption; // use for changing the text
 	var fpsAdvancedOption:TextOption;
 	var lastFPSDebugMode:Int = 1; 
 
 	public function new() {
 		super('optionsTree.appearance-name', 'optionsTree.appearance-desc', 'AppearanceOptions.');
 
-		add(new NumOption(getNameID('framerate'), getDescID('framerate'),
-			30, 240, 1,
+		add(framerateOption = new NumOption(getNameID('framerate'), getDescID('framerate'),
+			30, Options.maxFrameRate + 1, 1,
 			'framerate', __changeFPS
 		));
+		if (framerateOption.currentValue > Options.maxFrameRate) __changeFPS(framerateOption.currentValue);
 		add(new Checkbox(getNameID('fpsCounter'), getDescID('fpsCounter'), 'fpsCounter', __changeFPSCounter));
 		add(new Checkbox(getNameID('flashingMenu'), getDescID('flashingMenu'), 'flashingMenu'));
 		add(new Checkbox(getNameID('colorHealthBar'), getDescID('colorHealthBar'), 'colorHealthBar'));
@@ -27,6 +29,10 @@ class AppearanceOptions extends TreeMenuScreen {
 
 	private function __changeFPS(value:Float) {
 		var framerate = Math.floor(value);
+		@:privateAccess if (framerate > Options.maxFrameRate) {
+			framerate = 0;
+			framerateOption.__number.text = TextOption.OPTION_VALUE_PREFIX + translate('framerate-unlimited');
+		}
 		if (FlxG.updateFramerate < framerate) FlxG.drawFramerate = FlxG.updateFramerate = framerate;
 		else FlxG.updateFramerate = FlxG.drawFramerate = framerate;
 	}
@@ -55,7 +61,7 @@ class AdvancedAppearanceOptions extends TreeMenuScreen {
 
 		add(new ArrayOption(getNameID('quality'), getDescID('quality'),
 			[0, 1, 2], [getID('quality-low'), getID('quality-high'), getID('quality-custom')],
-			'quality', __changeQuality, null
+			'quality', __changeQuality
 		));
 
 		for (option in (qualityOptions = [
diff --git a/source/funkin/options/categories/DebugOptions.hx b/source/funkin/options/categories/DebugOptions.hx
index b1a0263270..c8037c3ee0 100644
--- a/source/funkin/options/categories/DebugOptions.hx
+++ b/source/funkin/options/categories/DebugOptions.hx
@@ -23,5 +23,8 @@ class DebugOptions extends TreeMenuScreen {
 		#if (cpp && (windows || mac || linux))
 		add(new Checkbox(getNameID("legacyMemoryCounter"), getDescID("legacyMemoryCounter"), "legacyMemoryCounter"));
 		#end
+		#if IMGUI_ENABLED
+		add(new Checkbox(getNameID("imguiMultiViewport"), getDescID("imguiMultiViewport"), "imguiMultiViewport"));
+		#end
 	}
 }
\ No newline at end of file
diff --git a/source/funkin/options/categories/GameplayOptions.hx b/source/funkin/options/categories/GameplayOptions.hx
index 4b69ccd3e7..868c3c4c95 100644
--- a/source/funkin/options/categories/GameplayOptions.hx
+++ b/source/funkin/options/categories/GameplayOptions.hx
@@ -67,14 +67,7 @@ class AdvancedGameplayOptions extends TreeMenuScreen {
 	public function new() {
 		super('optionsMenu.advanced', 'optionsTree.gameplay.advanced-desc', 'GameplayOptions.Advanced.');
 
-		// Remove locked whenever this PR from FunkinCrew is merged.
-		// https://github.com/FunkinCrew/lime/pull/57
-		for (checkbox in [
-			new Checkbox(getNameID('streamedMusic'), getDescID('streamedMusic'), 'streamedMusic'),
-			new Checkbox(getNameID('streamedVocals'), getDescID('streamedVocals'), 'streamedVocals')
-		]) {
-			checkbox.locked = true;
-			add(checkbox);
-		}
+		add(new Checkbox(getNameID('streamedMusic'), getDescID('streamedMusic'), 'streamedMusic'));
+		add(new Checkbox(getNameID('streamedVocals'), getDescID('streamedVocals'), 'streamedVocals'));
 	}
 }
\ No newline at end of file
diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx
index 16ef9a16f6..7e18bcc479 100644
--- a/source/funkin/options/keybinds/KeybindsOptions.hx
+++ b/source/funkin/options/keybinds/KeybindsOptions.hx
@@ -145,6 +145,10 @@ class KeybindsOptions extends MusicBeatSubstate {
 					name: "developer.reloadState",
 					control: 'DEV_RELOAD'
 				},
+				{
+					name: "developer.openInspector",
+					control: 'DEV_INSPECTOR'
+				},
 			]
 		}
 	];
diff --git a/source/funkin/options/type/FolderOption.hx b/source/funkin/options/type/FolderOption.hx
new file mode 100644
index 0000000000..08b6db36a5
--- /dev/null
+++ b/source/funkin/options/type/FolderOption.hx
@@ -0,0 +1,25 @@
+package funkin.options.type;
+
+import flixel.util.FlxColor;
+
+/**
+ * Option type that has a folder button, and is yellow.
+ * - its kinda useless but if NewOption exists then so can this
+**/
+class FolderOption extends TextOption {
+	public var iconSpr:FlxSprite;
+
+	public function new(name:String, desc:String, callback:Void->Void) {
+		super(name, desc, callback);
+
+		__text.color = editorFlashColor = 0xFFFFAA44;
+		__text.x = 100;
+
+		iconSpr = new FlxSprite().loadGraphic(Paths.image("editors/folder"));
+		iconSpr.setPosition(90 - iconSpr.width, (__text.height - iconSpr.height) / 2);
+		iconSpr.scale.set(1.4, 1.4);
+		iconSpr.updateHitbox();
+		iconSpr.offset.set(15, -15);
+		add(iconSpr);
+	}
+}
\ No newline at end of file
diff --git a/source/haxe/Timer.hx b/source/haxe/Timer.hx
deleted file mode 100644
index 5092af8cc9..0000000000
--- a/source/haxe/Timer.hx
+++ /dev/null
@@ -1,297 +0,0 @@
-package haxe;
-
-#if !lime_cffi
-// Original haxe.Timer class
-
-/*
- * Copyright (C)2005-2018 Haxe Foundation
- *
- * 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.
- */
-/**
-	The Timer class allows you to create asynchronous timers on platforms that
-	support events.
-
-	The intended usage is to create an instance of the Timer class with a given
-	interval, set its run() method to a custom function to be invoked and
-	eventually call stop() to stop the Timer.
-
-	Note that a running Timer may or may not prevent the program to exit
-	automatically when main() returns.
-
-	It is also possible to extend this class and override its run() method in
-	the child class.
-**/
-class Timer
-{
-	#if (flash || js)
-	private var id:Null<Int>;
-	#elseif java
-	private var timer:java.util.Timer;
-	private var task:java.util.TimerTask;
-	#elseif (haxe_ver >= "3.4.0")
-	private var event:MainLoop.MainEvent;
-	#end
-
-	/**
-		Creates a new timer that will run every `time_ms` milliseconds.
-
-		After creating the Timer instance, it calls `this.run` repeatedly,
-		with delays of `time_ms` milliseconds, until `this.stop` is called.
-
-		The first invocation occurs after `time_ms` milliseconds, not
-		immediately.
-
-		The accuracy of this may be platform-dependent.
-	**/
-	public function new(time_ms:Int)
-	{
-		#if flash
-		var me = this;
-		id = untyped __global__["flash.utils.setInterval"](function()
-		{
-			me.run();
-		}, time_ms);
-		#elseif js
-		var me = this;
-		id = untyped setInterval(function() me.run(), time_ms);
-		#elseif java
-		timer = new java.util.Timer();
-		timer.scheduleAtFixedRate(task = new TimerTask(this), haxe.Int64.ofInt(time_ms), haxe.Int64.ofInt(time_ms));
-		#elseif (haxe_ver >= "3.4.0")
-		var dt = time_ms / 1000;
-		event = MainLoop.add(function()
-		{
-			@:privateAccess event.nextRun += dt;
-			run();
-		});
-		event.delay(dt);
-		#end
-	}
-
-	/**
-		Stops `this` Timer.
-
-		After calling this method, no additional invocations of `this.run`
-		will occur.
-
-		It is not possible to restart `this` Timer once stopped.
-	**/
-	public function stop()
-	{
-		#if (flash || js)
-		if (id == null) return;
-		#if flash
-		untyped __global__["flash.utils.clearInterval"](id);
-		#elseif js
-		untyped clearInterval(id);
-		#end
-		id = null;
-		#elseif java
-		if (timer != null)
-		{
-			timer.cancel();
-			timer = null;
-		}
-		task = null;
-		#elseif (haxe_ver >= "3.4.0")
-		if (event != null)
-		{
-			event.stop();
-			event = null;
-		}
-		#end
-	}
-
-	/**
-		This method is invoked repeatedly on `this` Timer.
-
-		It can be overridden in a subclass, or rebound directly to a custom
-		function:
-			var timer = new haxe.Timer(1000); // 1000ms delay
-			timer.run = function() { ... }
-
-		Once bound, it can still be rebound to different functions until `this`
-		Timer is stopped through a call to `this.stop`.
-	**/
-	public dynamic function run() {}
-
-	/**
-		Invokes `f` after `time_ms` milliseconds.
-
-		This is a convenience function for creating a new Timer instance with
-		`time_ms` as argument, binding its run() method to `f` and then stopping
-		`this` Timer upon the first invocation.
-
-		If `f` is null, the result is unspecified.
-	**/
-	public static function delay(f:Void->Void, time_ms:Int)
-	{
-		var t = new haxe.Timer(time_ms);
-		t.run = function()
-		{
-			t.stop();
-			f();
-		};
-		return t;
-	}
-
-	/**
-		Measures the time it takes to execute `f`, in seconds with fractions.
-
-		This is a convenience function for calculating the difference between
-		Timer.stamp() before and after the invocation of `f`.
-
-		The difference is passed as argument to Log.trace(), with "s" appended
-		to denote the unit. The optional `pos` argument is passed through.
-
-		If `f` is null, the result is unspecified.
-	**/
-	public static function measure<T>(f:Void->T, ?pos:PosInfos):T
-	{
-		var t0 = stamp();
-		var r = f();
-		Log.trace((stamp() - t0) + "s", pos);
-		return r;
-	}
-
-	/**
-		Returns a timestamp, in seconds with fractions.
-
-		The value itself might differ depending on platforms, only differences
-		between two values make sense.
-	**/
-	public static inline function stamp():Float
-	{
-		#if flash
-		return flash.Lib.getTimer() / 1000;
-		#elseif (neko || php)
-		return Sys.time();
-		#elseif js
-		return Date.now().getTime() / 1000;
-		#elseif cpp
-		return untyped __global__.__time_stamp();
-		#elseif python
-		return Sys.cpuTime();
-		#elseif sys
-		return Sys.time();
-		#else
-		return 0;
-		#end
-	}
-}
-
-#if java
-@:nativeGen
-private class TimerTask extends java.util.TimerTask
-{
-	var timer:Timer;
-
-	public function new(timer:Timer):Void
-	{
-		super();
-		this.timer = timer;
-	}
-
-	@:overload override public function run():Void
-	{
-		timer.run();
-	}
-}
-#end
-#else
-import lime.system.System;
-
-class Timer
-{
-	private static var sRunningTimers:Array<Timer> = [];
-
-	private var mTime:Float;
-	private var mFireAt:Float;
-	private var mRunning:Bool;
-
-	public function new(time:Float)
-	{
-		mTime = time;
-		sRunningTimers.push(this);
-		mFireAt = getMS() + mTime;
-		mRunning = true;
-	}
-
-	public static function delay(f:Void->Void, time:Int)
-	{
-		var t = new Timer(time);
-
-		t.run = function()
-		{
-			t.stop();
-			f();
-		};
-
-		return t;
-	}
-
-	private static function getMS():Float
-	{
-		return System.getTimer();
-	}
-
-	public static function measure<T>(f:Void->T, ?pos:PosInfos):T
-	{
-		var t0 = stamp();
-		var r = f();
-		Log.trace((stamp() - t0) + "s", pos);
-		return r;
-	}
-
-	dynamic public function run() {}
-
-	public static inline function stamp():Float
-	{
-		var timer = System.getTimer();
-		return (timer > 0 ? timer / 1000 : 0);
-	}
-
-	public function stop():Void
-	{
-		/*if (mRunning)
-		{
-
-			for (i in 0...sRunningTimers.length)
-			{
-				if (sRunningTimers[i] == this)
-				{
-					sRunningTimers[i] = null;
-					break;
-				}
-			}
-		}*/
-		mRunning = false;
-	}
-
-	@:noCompletion private function __check(inTime:Float)
-	{
-		if (inTime >= mFireAt)
-		{
-			mFireAt += mTime;
-			run();
-		}
-	}
-}
-#end
diff --git a/source/hscript/Config.hx b/source/hscript/Config.hx
index 3acd554b16..959e3938d6 100644
--- a/source/hscript/Config.hx
+++ b/source/hscript/Config.hx
@@ -7,6 +7,9 @@ class Config {
 		"flixel",
 
 		"funkin",
+		#if foxlite 
+		"foxlite", 
+		#end
 		#if MODCHARTING_FEATURES
 		"modchart.engine",
 		"modchart.backend.standalone",
@@ -23,6 +26,12 @@ class Config {
 		"haxe.xml",
 		"haxe.CallStack",
 		"funkin",
+		#if IMGUI_ENABLED
+		"lime.tools.imgui",
+		#end
+		#if foxlite 
+		"foxlite" 
+		#end
 		#end
 	];
 
diff --git a/source/lime/_internal/backend/html5/HTML5AudioSource.hx b/source/lime/_internal/backend/html5/HTML5AudioSource.hx
deleted file mode 100644
index 5d66fc04a5..0000000000
--- a/source/lime/_internal/backend/html5/HTML5AudioSource.hx
+++ /dev/null
@@ -1,283 +0,0 @@
-package lime._internal.backend.html5;
-
-import lime.math.Vector4;
-import lime.media.AudioSource;
-import lime.media.AudioManager;
-
-@:access(lime.media.AudioBuffer)
-class HTML5AudioSource
-{
-	private var completed:Bool;
-	private var gain:Float;
-	private var id:Int;
-	private var length:Null<Float>;
-	private var loops:Int;
-	private var parent:AudioSource;
-	private var playing:Bool;
-	private var position:Vector4;
-
-	public function new(parent:AudioSource)
-	{
-		this.parent = parent;
-
-		id = -1;
-		gain = 1;
-		position = new Vector4();
-	}
-
-	public function dispose():Void {
-		stop();
-	}
-
-	public function init():Void {}
-
-	public function play():Void
-	{
-		#if lime_howlerjs
-		if (playing || parent.buffer == null || parent.buffer.__srcHowl == null)
-		{
-			return;
-		}
-
-		playing = true;
-
-		var time = getCurrentTime();
-
-		completed = false;
-
-		var cacheVolume = untyped parent.buffer.__srcHowl._volume;
-		untyped parent.buffer.__srcHowl._volume = parent.gain;
-
-		id = parent.buffer.__srcHowl.play();
-
-		untyped parent.buffer.__srcHowl._volume = cacheVolume;
-		// setGain (parent.gain);
-
-		setPosition(parent.position);
-
-		parent.buffer.__srcHowl.on("end", howl_onEnd, id);
-
-		// Calling setCurrentTime causes html5 audio to replay from this position on next frame
-		#if force_html5_audio
-		if (time == 0) setCurrentTime(time);
-		#else
-		setCurrentTime(time);
-		#end
-		#end
-	}
-
-	public function pause():Void
-	{
-		#if lime_howlerjs
-		playing = false;
-
-		if (parent.buffer != null && parent.buffer.__srcHowl != null)
-		{
-			parent.buffer.__srcHowl.pause(id);
-		}
-		#end
-	}
-
-	public function stop():Void
-	{
-		#if lime_howlerjs
-		playing = false;
-
-		if (parent.buffer != null && parent.buffer.__srcHowl != null)
-		{
-			parent.buffer.__srcHowl.stop(id);
-			parent.buffer.__srcHowl.off("end", howl_onEnd, id);
-		}
-		#end
-	}
-
-	// Event Handlers
-	private function howl_onEnd()
-	{
-		#if lime_howlerjs
-		playing = false;
-
-		if (loops > 0)
-		{
-			loops--;
-			stop();
-			if (loopTime != null && loopTime > 0) setCurrentTime(loopTime);
-			play();
-			parent.onLoop.dispatch();
-			return;
-		}
-		else if (parent.buffer != null && parent.buffer.__srcHowl != null)
-		{
-			parent.buffer.__srcHowl.stop(id);
-			parent.buffer.__srcHowl.off("end", howl_onEnd, id);
-		}
-
-		completed = true;
-		parent.onComplete.dispatch();
-		#end
-	}
-
-	// Get & Set Methods
-	public function getCurrentTime():Float
-	{
-		if (id == -1)
-		{
-			return 0;
-		}
-
-		#if lime_howlerjs
-		if (completed)
-		{
-			return getLength();
-		}
-		else if (parent.buffer != null && parent.buffer.__srcHowl != null)
-		{
-			var time = parent.buffer.__srcHowl.seek(id) * 1000.0 - parent.offset;
-			if (time < 0) return 0;
-			return time;
-		}
-		#end
-
-		return 0;
-	}
-
-	public function getLatency():Float
-	{
-		var ctx = AudioManager.context.web;
-		if (ctx != null)
-		{
-			var baseLatency:Float = untyped ctx.baseLatency != null ? untyped ctx.baseLatency : 0;
-			var outputLatency:Float = untyped ctx.outputLatency != null ? untyped ctx.outputLatency : 0;
-
-			return (baseLatency + outputLatency) * 1000;
-		}
-
-		return 0;
-	}
-
-	public function setCurrentTime(value:Float):Float
-	{
-		#if lime_howlerjs
-		if (parent.buffer != null && parent.buffer.__srcHowl != null)
-		{
-			// if (playing) buffer.__srcHowl.play (id);
-			var pos = (value + parent.offset) / 1000;
-			if (pos < 0) pos = 0;
-			parent.buffer.__srcHowl.seek(pos, id);
-		}
-		#end
-
-		return value;
-	}
-
-	public function getGain():Float
-	{
-		return gain;
-	}
-
-	public function setGain(value:Float):Float
-	{
-		#if lime_howlerjs
-		// set howler volume only if we have an active id.
-		// Passing -1 might create issues in future play()'s.
-
-		if (parent.buffer != null && parent.buffer.__srcHowl != null && id != -1)
-		{
-			parent.buffer.__srcHowl.volume(value, id);
-		}
-		#end
-
-		return gain = value;
-	}
-
-	public function getLength():Null<Float>
-	{
-		if (length != 0)
-		{
-			return length;
-		}
-
-		#if lime_howlerjs
-		if (parent.buffer != null && parent.buffer.__srcHowl != null)
-		{
-			return parent.buffer.__srcHowl.duration() * 1000.0;
-		}
-		#end
-
-		return 0;
-	}
-
-	public function setLength(value:Null<Float>):Null<Float>
-	{
-		return length = value;
-	}
-
-	public function getLoops():Int
-	{
-		return loops;
-	}
-
-	public function setLoops(value:Int):Int
-	{
-		return loops = value;
-	}
-
-	public function getLoopTime():Float {
-		return loopTime;
-	}
-
-	public function setLoopTime(value:Float):Float {
-		return loopTime = value;
-	}
-
-	public function getPitch():Float
-	{
-		#if lime_howlerjs
-		return parent.buffer.__srcHowl.rate();
-		#else
-		return 1;
-		#end
-	}
-
-	public function setPitch(value:Float):Float
-	{
-		#if lime_howlerjs
-		parent.buffer.__srcHowl.rate(value);
-		#end
-
-		return getPitch();
-	}
-
-
-	public function getPosition():Vector4
-	{
-		return position;
-	}
-
-	public function setPosition(value:Vector4):Vector4
-	{
-		position.x = value.x;
-		position.y = value.y;
-		position.z = value.z;
-		position.w = value.w;
-
-		#if lime_howlerjs
-		if (parent.buffer != null && parent.buffer.__srcHowl != null && parent.buffer.__srcHowl.pos != null) parent.buffer.__srcHowl.pos(position.x, position.y, position.z, id);
-		// There are more settings to the position of the sound on the "pannerAttr()" function of howler. Maybe somebody who understands sound should look into it?
-		#end
-
-		return position;
-	}
-
-	public function getPan():Float
-	{
-		return position.x;
-	}
-
-	public function setPan(value:Float):Float
-	{
-		position.setTo(value, 0, -Math.sqrt(1 - value * value));
-		if (parent.buffer != null && parent.buffer.__srcHowl != null && parent.buffer.__srcHowl.stereo != null) parent.buffer.__srcHowl.stereo(value, id);
-		return value;
-	}
-}
diff --git a/source/lime/_internal/backend/native/NativeApplication.hx b/source/lime/_internal/backend/native/NativeApplication.hx
deleted file mode 100644
index ac8ab467ed..0000000000
--- a/source/lime/_internal/backend/native/NativeApplication.hx
+++ /dev/null
@@ -1,981 +0,0 @@
-package lime._internal.backend.native;
-
-import haxe.Timer;
-import lime._internal.backend.native.NativeCFFI;
-import lime.app.Application;
-import lime.graphics.opengl.GL;
-import lime.graphics.OpenGLRenderContext;
-import lime.graphics.RenderContext;
-import lime.math.Rectangle;
-import lime.media.AudioManager;
-import lime.system.Clipboard;
-import lime.system.Display;
-import lime.system.DisplayMode;
-import lime.system.JNI;
-import lime.system.Sensor;
-import lime.system.SensorType;
-import lime.system.System;
-import lime.ui.Gamepad;
-import lime.ui.Joystick;
-import lime.ui.JoystickHatPosition;
-import lime.ui.KeyCode;
-import lime.ui.KeyModifier;
-import lime.ui.Touch;
-import lime.ui.Window;
-
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(haxe.Timer)
-@:access(lime._internal.backend.native.NativeCFFI)
-@:access(lime._internal.backend.native.NativeOpenGLRenderContext)
-@:access(lime._internal.backend.native.NativeWindow)
-@:access(lime.app.Application)
-@:access(lime.graphics.opengl.GL)
-@:access(lime.graphics.OpenGLRenderContext)
-@:access(lime.graphics.Renderer)
-@:access(lime.system.Clipboard)
-@:access(lime.system.Sensor)
-@:access(lime.ui.Gamepad)
-@:access(lime.ui.Joystick)
-@:access(lime.ui.Window)
-class NativeApplication
-{
-	private var applicationEventInfo = new ApplicationEventInfo(UPDATE);
-	private var clipboardEventInfo = new ClipboardEventInfo();
-	private var currentTouches = new Map<Int, Touch>();
-	private var dropEventInfo = new DropEventInfo();
-	private var gamepadEventInfo = new GamepadEventInfo();
-	private var joystickEventInfo = new JoystickEventInfo();
-	private var keyEventInfo = new KeyEventInfo();
-	private var mouseEventInfo = new MouseEventInfo();
-	private var renderEventInfo = new RenderEventInfo(RENDER);
-	private var sensorEventInfo = new SensorEventInfo();
-	private var textEventInfo = new TextEventInfo();
-	private var touchEventInfo = new TouchEventInfo();
-	private var unusedTouchesPool = new List<Touch>();
-	private var windowEventInfo = new WindowEventInfo();
-
-	public var handle:Dynamic;
-
-	private var pauseTimer:Int;
-	private var parent:Application;
-	private var toggleFullscreen:Bool;
-
-	private static function __init__()
-	{
-		#if (lime_cffi && !macro)
-		var init = NativeCFFI;
-		#end
-	}
-
-	public function new(parent:Application):Void
-	{
-		this.parent = parent;
-		pauseTimer = -1;
-		toggleFullscreen = true;
-
-		AudioManager.init();
-
-		#if (ios || android || tvos)
-		Sensor.registerSensor(SensorType.ACCELEROMETER, 0);
-		#end
-
-		#if (!macro && lime_cffi)
-		handle = NativeCFFI.lime_application_create();
-		#end
-	}
-
-	private function advanceTimer():Void
-	{
-		#if lime_cffi
-		if (pauseTimer > -1)
-		{
-			var offset = System.getTimer() - pauseTimer;
-			for(timer in Timer.sRunningTimers) {
-				if(timer != null && timer.mRunning) timer.mFireAt += offset;
-			}
-			pauseTimer = -1;
-		}
-		#end
-	}
-
-	public function exec():Int
-	{
-		#if !macro
-		#if lime_cffi
-		NativeCFFI.lime_application_event_manager_register(handleApplicationEvent, applicationEventInfo);
-		NativeCFFI.lime_clipboard_event_manager_register(handleClipboardEvent, clipboardEventInfo);
-		NativeCFFI.lime_drop_event_manager_register(handleDropEvent, dropEventInfo);
-		NativeCFFI.lime_gamepad_event_manager_register(handleGamepadEvent, gamepadEventInfo);
-		NativeCFFI.lime_joystick_event_manager_register(handleJoystickEvent, joystickEventInfo);
-		NativeCFFI.lime_key_event_manager_register(handleKeyEvent, keyEventInfo);
-		NativeCFFI.lime_mouse_event_manager_register(handleMouseEvent, mouseEventInfo);
-		NativeCFFI.lime_render_event_manager_register(handleRenderEvent, renderEventInfo);
-		NativeCFFI.lime_text_event_manager_register(handleTextEvent, textEventInfo);
-		NativeCFFI.lime_touch_event_manager_register(handleTouchEvent, touchEventInfo);
-		NativeCFFI.lime_window_event_manager_register(handleWindowEvent, windowEventInfo);
-		#if (ios || android || tvos)
-		NativeCFFI.lime_sensor_event_manager_register(handleSensorEvent, sensorEventInfo);
-		#end
-		#end
-
-		#if (nodejs && lime_cffi)
-		NativeCFFI.lime_application_init(handle);
-
-		var eventLoop = function()
-		{
-			var active = NativeCFFI.lime_application_update(handle);
-
-			if (!active)
-			{
-				untyped process.exitCode = NativeCFFI.lime_application_quit(handle);
-				parent.onExit.dispatch(untyped process.exitCode);
-			}
-			else
-			{
-				untyped setImmediate(eventLoop);
-			}
-		}
-
-		untyped setImmediate(eventLoop);
-		return 0;
-		#elseif lime_cffi
-		var result = NativeCFFI.lime_application_exec(handle);
-
-		#if (!webassembly && !ios && !nodejs)
-		parent.onExit.dispatch(result);
-		#end
-
-		return result;
-		#end
-		#end
-
-		return 0;
-	}
-
-	public function exit():Void
-	{
-		AudioManager.shutdown();
-
-		#if (!macro && lime_cffi)
-		NativeCFFI.lime_application_quit(handle);
-		#end
-	}
-
-	private function handleApplicationEvent():Void
-	{
-		switch (applicationEventInfo.type)
-		{
-			case UPDATE:
-				updateTimer();
-
-				parent.onUpdate.dispatch(applicationEventInfo.deltaTime);
-
-			default:
-		}
-	}
-
-	private function handleClipboardEvent():Void
-	{
-		Clipboard.__update();
-	}
-
-	private function handleDropEvent():Void
-	{
-		for (window in parent.windows)
-		{
-			window.onDropFile.dispatch(#if hl @:privateAccess String.fromUTF8(dropEventInfo.file) #else dropEventInfo.file #end);
-		}
-	}
-
-	private function handleGamepadEvent():Void
-	{
-		switch (gamepadEventInfo.type)
-		{
-			case AXIS_MOVE:
-				var gamepad = Gamepad.devices.get(gamepadEventInfo.id);
-				if (gamepad != null) gamepad.onAxisMove.dispatch(gamepadEventInfo.axis, gamepadEventInfo.axisValue);
-
-			case BUTTON_DOWN:
-				var gamepad = Gamepad.devices.get(gamepadEventInfo.id);
-				if (gamepad != null) gamepad.onButtonDown.dispatch(gamepadEventInfo.button);
-
-			case BUTTON_UP:
-				var gamepad = Gamepad.devices.get(gamepadEventInfo.id);
-				if (gamepad != null) gamepad.onButtonUp.dispatch(gamepadEventInfo.button);
-
-			case CONNECT:
-				Gamepad.__connect(gamepadEventInfo.id);
-
-			case DISCONNECT:
-				Gamepad.__disconnect(gamepadEventInfo.id);
-		}
-	}
-
-	private function handleJoystickEvent():Void
-	{
-		switch (joystickEventInfo.type)
-		{
-			case AXIS_MOVE:
-				var joystick = Joystick.devices.get(joystickEventInfo.id);
-				if (joystick != null) joystick.onAxisMove.dispatch(joystickEventInfo.index, joystickEventInfo.x);
-
-			case HAT_MOVE:
-				var joystick = Joystick.devices.get(joystickEventInfo.id);
-				if (joystick != null) joystick.onHatMove.dispatch(joystickEventInfo.index, joystickEventInfo.eventValue);
-
-			case TRACKBALL_MOVE: // I guess this was just removed ??
-
-			case BUTTON_DOWN:
-				var joystick = Joystick.devices.get(joystickEventInfo.id);
-				if (joystick != null) joystick.onButtonDown.dispatch(joystickEventInfo.index);
-
-			case BUTTON_UP:
-				var joystick = Joystick.devices.get(joystickEventInfo.id);
-				if (joystick != null) joystick.onButtonUp.dispatch(joystickEventInfo.index);
-
-			case CONNECT:
-				Joystick.__connect(joystickEventInfo.id);
-
-			case DISCONNECT:
-				Joystick.__disconnect(joystickEventInfo.id);
-		}
-	}
-
-	private function handleKeyEvent():Void
-	{
-		var window = parent.__windowByID.get(keyEventInfo.windowID);
-
-		if (window != null)
-		{
-			var type:KeyEventType = keyEventInfo.type;
-			var int32:Float = keyEventInfo.keyCode;
-			var keyCode:KeyCode = Std.int(int32);
-			var modifier:KeyModifier = keyEventInfo.modifier;
-
-			switch (type)
-			{
-				case KEY_DOWN:
-					window.onKeyDown.dispatch(keyCode, modifier);
-
-				case KEY_UP:
-					window.onKeyUp.dispatch(keyCode, modifier);
-			}
-
-			#if (windows || linux)
-			if (keyCode == RETURN)
-			{
-				if (type == KEY_DOWN)
-				{
-					if (toggleFullscreen && modifier.altKey && (!modifier.ctrlKey && !modifier.shiftKey && !modifier.metaKey))
-					{
-						toggleFullscreen = false;
-
-						if (!window.onKeyDown.canceled)
-						{
-							window.fullscreen = !window.fullscreen;
-						}
-					}
-				}
-				else
-				{
-					toggleFullscreen = true;
-				}
-			}
-
-			#if rpi
-			if (keyCode == ESCAPE && modifier == KeyModifier.NONE && type == KEY_UP && !window.onKeyUp.canceled)
-			{
-				System.exit(0);
-			}
-			#end
-			#elseif mac
-			if (keyCode == F)
-			{
-				if (type == KEY_DOWN)
-				{
-					if (toggleFullscreen && (modifier.ctrlKey && modifier.metaKey) && (!modifier.altKey && !modifier.shiftKey))
-					{
-						toggleFullscreen = false;
-
-						if (!window.onKeyDown.canceled)
-						{
-							window.fullscreen = !window.fullscreen;
-						}
-					}
-				}
-				else
-				{
-					toggleFullscreen = true;
-				}
-			}
-			#elseif android
-			if (keyCode == APP_CONTROL_BACK && modifier == KeyModifier.NONE && type == KEY_UP && !window.onKeyUp.canceled)
-			{
-				var mainActivity = JNI.createStaticField("org/haxe/extension/Extension", "mainActivity", "Landroid/app/Activity;");
-				var moveTaskToBack = JNI.createMemberMethod("android/app/Activity", "moveTaskToBack", "(Z)Z");
-
-				moveTaskToBack(mainActivity.get(), true);
-			}
-			#end
-		}
-	}
-
-	private function handleMouseEvent():Void
-	{
-		var window = parent.__windowByID.get(mouseEventInfo.windowID);
-
-		if (window != null)
-		{
-			switch (mouseEventInfo.type)
-			{
-				case MOUSE_DOWN:
-					window.clickCount = mouseEventInfo.clickCount;
-					window.onMouseDown.dispatch(mouseEventInfo.x, mouseEventInfo.y, mouseEventInfo.button);
-					window.clickCount = 0;
-
-				case MOUSE_UP:
-					window.clickCount = mouseEventInfo.clickCount;
-					window.onMouseUp.dispatch(mouseEventInfo.x, mouseEventInfo.y, mouseEventInfo.button);
-					window.clickCount = 0;
-
-				case MOUSE_MOVE:
-					window.onMouseMove.dispatch(mouseEventInfo.x, mouseEventInfo.y);
-					window.onMouseMoveRelative.dispatch(mouseEventInfo.movementX, mouseEventInfo.movementY);
-
-				case MOUSE_WHEEL:
-					window.onMouseWheel.dispatch(mouseEventInfo.x, mouseEventInfo.y, UNKNOWN);
-
-				default:
-			}
-		}
-	}
-
-	private function handleRenderEvent():Void
-	{
-		// TODO: Allow windows to render independently
-
-		for (window in parent.__windows)
-		{
-			if (window == null) continue;
-
-			// parent.renderer = renderer;
-
-			switch (renderEventInfo.type)
-			{
-				case RENDER:
-					if (window.context != null)
-					{
-						window.__backend.render();
-						window.onRender.dispatch(window.context);
-
-						if (!window.onRender.canceled)
-						{
-							window.__backend.contextFlip();
-						}
-					}
-
-				case RENDER_CONTEXT_LOST:
-					if (window.__backend.useHardware && window.context != null)
-					{
-						switch (window.context.type)
-						{
-							case OPENGL, OPENGLES, WEBGL:
-								#if (lime_cffi && (lime_opengl || lime_opengles) && !display)
-								var gl = window.context.gl;
-								(gl : NativeOpenGLRenderContext).__contextLost();
-								if (GL.context == gl) GL.context = null;
-								#end
-
-							default:
-						}
-
-						window.context = null;
-						window.onRenderContextLost.dispatch();
-					}
-
-				case RENDER_CONTEXT_RESTORED:
-					if (window.__backend.useHardware)
-					{
-						// GL.context = new OpenGLRenderContext ();
-						// window.context.gl = GL.context;
-
-						window.onRenderContextRestored.dispatch(window.context);
-					}
-			}
-		}
-	}
-
-	private function handleSensorEvent():Void
-	{
-		var sensor = Sensor.sensorByID.get(sensorEventInfo.id);
-
-		if (sensor != null)
-		{
-			sensor.onUpdate.dispatch(sensorEventInfo.x, sensorEventInfo.y, sensorEventInfo.z);
-		}
-	}
-
-	private function handleTextEvent():Void
-	{
-		var window = parent.__windowByID.get(textEventInfo.windowID);
-
-		if (window != null)
-		{
-			switch (textEventInfo.type)
-			{
-				case TEXT_INPUT:
-					window.onTextInput.dispatch(#if hl @:privateAccess String.fromUTF8(textEventInfo.text) #else textEventInfo.text #end);
-
-				case TEXT_EDIT:
-					window.onTextEdit.dispatch(#if hl @:privateAccess String.fromUTF8(textEventInfo.text) #else textEventInfo.text #end, textEventInfo.start,
-						textEventInfo.length);
-
-				default:
-			}
-		}
-	}
-
-	private function handleTouchEvent():Void
-	{
-		switch (touchEventInfo.type)
-		{
-			case TOUCH_START:
-				var touch = unusedTouchesPool.pop();
-
-				if (touch == null)
-				{
-					touch = new Touch(touchEventInfo.x, touchEventInfo.y, touchEventInfo.id, touchEventInfo.dx, touchEventInfo.dy, touchEventInfo.pressure,
-						touchEventInfo.device);
-				}
-				else
-				{
-					touch.x = touchEventInfo.x;
-					touch.y = touchEventInfo.y;
-					touch.id = touchEventInfo.id;
-					touch.dx = touchEventInfo.dx;
-					touch.dy = touchEventInfo.dy;
-					touch.pressure = touchEventInfo.pressure;
-					touch.device = touchEventInfo.device;
-				}
-
-				currentTouches.set(touch.id, touch);
-
-				Touch.onStart.dispatch(touch);
-
-			case TOUCH_END:
-				var touch = currentTouches.get(touchEventInfo.id);
-
-				if (touch != null)
-				{
-					touch.x = touchEventInfo.x;
-					touch.y = touchEventInfo.y;
-					touch.dx = touchEventInfo.dx;
-					touch.dy = touchEventInfo.dy;
-					touch.pressure = touchEventInfo.pressure;
-
-					Touch.onEnd.dispatch(touch);
-
-					currentTouches.remove(touchEventInfo.id);
-					unusedTouchesPool.add(touch);
-				}
-
-			case TOUCH_MOVE:
-				var touch = currentTouches.get(touchEventInfo.id);
-
-				if (touch != null)
-				{
-					touch.x = touchEventInfo.x;
-					touch.y = touchEventInfo.y;
-					touch.dx = touchEventInfo.dx;
-					touch.dy = touchEventInfo.dy;
-					touch.pressure = touchEventInfo.pressure;
-
-					Touch.onMove.dispatch(touch);
-				}
-
-			default:
-		}
-	}
-
-	private function handleWindowEvent():Void
-	{
-		var window = parent.__windowByID.get(windowEventInfo.windowID);
-
-		if (window != null)
-		{
-			switch (windowEventInfo.type)
-			{
-				case WINDOW_ACTIVATE:
-					advanceTimer();
-					window.onActivate.dispatch();
-					AudioManager.resume();
-
-				case WINDOW_CLOSE:
-					window.close();
-
-				case WINDOW_DEACTIVATE:
-					window.onDeactivate.dispatch();
-					AudioManager.suspend();
-					pauseTimer = System.getTimer();
-
-				case WINDOW_ENTER:
-					window.onEnter.dispatch();
-
-				case WINDOW_EXPOSE:
-					window.onExpose.dispatch();
-
-				case WINDOW_FOCUS_IN:
-					window.onFocusIn.dispatch();
-
-				case WINDOW_FOCUS_OUT:
-					window.onFocusOut.dispatch();
-
-				case WINDOW_LEAVE:
-					window.onLeave.dispatch();
-
-				case WINDOW_MAXIMIZE:
-					window.__maximized = true;
-					window.__fullscreen = false;
-					window.__minimized = false;
-					window.onMaximize.dispatch();
-
-				case WINDOW_MINIMIZE:
-					window.__minimized = true;
-					window.__maximized = false;
-					window.__fullscreen = false;
-					window.onMinimize.dispatch();
-
-				case WINDOW_MOVE:
-					window.__x = windowEventInfo.x;
-					window.__y = windowEventInfo.y;
-					window.onMove.dispatch(windowEventInfo.x, windowEventInfo.y);
-
-				case WINDOW_RESIZE:
-					window.__width = windowEventInfo.width;
-					window.__height = windowEventInfo.height;
-					window.onResize.dispatch(windowEventInfo.width, windowEventInfo.height);
-
-				case WINDOW_RESTORE:
-					window.__fullscreen = false;
-					window.__minimized = false;
-					window.onRestore.dispatch();
-
-				case WINDOW_SHOW:
-					window.onShow.dispatch();
-
-				case WINDOW_HIDE:
-					window.onHide.dispatch();
-			}
-		}
-	}
-
-	private function updateTimer():Void
-	{
-		#if lime_cffi
-		if (Timer.sRunningTimers.length > 0)
-		{
-			var currentTime = System.getTimer();
-			var foundNull = false;
-			var timer;
-
-			for (i in 0...Timer.sRunningTimers.length)
-			{
-				timer = Timer.sRunningTimers[i];
-
-				if (timer != null && timer.mRunning)
-				{
-					if (currentTime >= timer.mFireAt)
-					{
-						timer.mFireAt += timer.mTime;
-						timer.run();
-					}
-				}
-				else
-				{
-					foundNull = true;
-				}
-			}
-
-			if (foundNull)
-			{
-				Timer.sRunningTimers = Timer.sRunningTimers.filter(function(val)
-				{
-					return val != null && val.mRunning;
-				});
-			}
-		}
-
-		#if (haxe_ver >= 4.2)
-		#if target.threaded
-		sys.thread.Thread.current().events.progress();
-		#else
-		// Duplicate code required because Haxe 3 can't handle
-		// #if (haxe_ver >= 4.2 && target.threaded)
-		@:privateAccess haxe.EntryPoint.processEvents();
-		#end
-		#else
-		@:privateAccess haxe.EntryPoint.processEvents();
-		#end
-		#end
-	}
-}
-
-@:keep /*private*/ class ApplicationEventInfo
-{
-	public var deltaTime:Int;
-	public var type:ApplicationEventType;
-
-	public function new(type:ApplicationEventType = null, deltaTime:Int = 0)
-	{
-		this.type = type;
-		this.deltaTime = deltaTime;
-	}
-
-	public function clone():ApplicationEventInfo
-	{
-		return new ApplicationEventInfo(type, deltaTime);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ApplicationEventType(Int)
-{
-	var UPDATE = 0;
-	var EXIT = 1;
-}
-
-@:keep /*private*/ class ClipboardEventInfo
-{
-	public var type:ClipboardEventType;
-
-	public function new(type:ClipboardEventType = null)
-	{
-		this.type = type;
-	}
-
-	public function clone():ClipboardEventInfo
-	{
-		return new ClipboardEventInfo(type);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ClipboardEventType(Int)
-{
-	var UPDATE = 0;
-}
-
-@:keep /*private*/ class DropEventInfo
-{
-	public var file:#if hl hl.Bytes #else String #end;
-	public var type:DropEventType;
-
-	public function new(type:DropEventType = null, file = null)
-	{
-		this.type = type;
-		this.file = file;
-	}
-
-	public function clone():DropEventInfo
-	{
-		return new DropEventInfo(type, file);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract DropEventType(Int)
-{
-	var DROP_FILE = 0;
-}
-
-@:keep /*private*/ class GamepadEventInfo
-{
-	public var axis:Int;
-	public var button:Int;
-	public var id:Int;
-	public var type:GamepadEventType;
-	public var axisValue:Float;
-
-	public function new(type:GamepadEventType = null, id:Int = 0, button:Int = 0, axis:Int = 0, value:Float = 0)
-	{
-		this.type = type;
-		this.id = id;
-		this.button = button;
-		this.axis = axis;
-		this.axisValue = value;
-	}
-
-	public function clone():GamepadEventInfo
-	{
-		return new GamepadEventInfo(type, id, button, axis, axisValue);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract GamepadEventType(Int)
-{
-	var AXIS_MOVE = 0;
-	var BUTTON_DOWN = 1;
-	var BUTTON_UP = 2;
-	var CONNECT = 3;
-	var DISCONNECT = 4;
-}
-
-@:keep /*private*/ class JoystickEventInfo
-{
-	public var id:Int;
-	public var index:Int;
-	public var type:JoystickEventType;
-	public var eventValue:Int;
-	public var x:Float;
-	public var y:Float;
-
-	public function new(type:JoystickEventType = null, id:Int = 0, index:Int = 0, value:Int = 0, x:Float = 0, y:Float = 0)
-	{
-		this.type = type;
-		this.id = id;
-		this.index = index;
-		this.eventValue = value;
-		this.x = x;
-		this.y = y;
-	}
-
-	public function clone():JoystickEventInfo
-	{
-		return new JoystickEventInfo(type, id, index, eventValue, x, y);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract JoystickEventType(Int)
-{
-	var AXIS_MOVE = 0;
-	var HAT_MOVE = 1;
-	var TRACKBALL_MOVE = 2;
-	var BUTTON_DOWN = 3;
-	var BUTTON_UP = 4;
-	var CONNECT = 5;
-	var DISCONNECT = 6;
-}
-
-@:keep /*private*/ class KeyEventInfo
-{
-	public var keyCode: Float;
-	public var modifier:Int;
-	public var type:KeyEventType;
-	public var windowID:Int;
-
-	public function new(type:KeyEventType = null, windowID:Int = 0, keyCode: Float = 0, modifier:Int = 0)
-	{
-		this.type = type;
-		this.windowID = windowID;
-		this.keyCode = keyCode;
-		this.modifier = modifier;
-	}
-
-	public function clone():KeyEventInfo
-	{
-		return new KeyEventInfo(type, windowID, keyCode, modifier);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract KeyEventType(Int)
-{
-	var KEY_DOWN = 0;
-	var KEY_UP = 1;
-}
-
-@:keep /*private*/ class MouseEventInfo
-{
-	public var button:Int;
-	public var movementX:Float;
-	public var movementY:Float;
-	public var type:MouseEventType;
-	public var windowID:Int;
-	public var x:Float;
-	public var y:Float;
-	public var clickCount:Int;
-
-	public function new(type:MouseEventType = null, windowID:Int = 0, x:Float = 0, y:Float = 0, button:Int = 0, movementX:Float = 0, movementY:Float = 0, clickCount:Int = 0)
-	{
-		this.type = type;
-		this.windowID = 0;
-		this.x = x;
-		this.y = y;
-		this.button = button;
-		this.movementX = movementX;
-		this.movementY = movementY;
-		this.clickCount = clickCount;
-	}
-
-	public function clone():MouseEventInfo
-	{
-		return new MouseEventInfo(type, windowID, x, y, button, movementX, movementY, clickCount);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract MouseEventType(Int)
-{
-	var MOUSE_DOWN = 0;
-	var MOUSE_UP = 1;
-	var MOUSE_MOVE = 2;
-	var MOUSE_WHEEL = 3;
-}
-
-@:keep /*private*/ class RenderEventInfo
-{
-	public var type:RenderEventType;
-
-	public function new(type:RenderEventType = null)
-	{
-		this.type = type;
-	}
-
-	public function clone():RenderEventInfo
-	{
-		return new RenderEventInfo(type);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract RenderEventType(Int)
-{
-	var RENDER = 0;
-	var RENDER_CONTEXT_LOST = 1;
-	var RENDER_CONTEXT_RESTORED = 2;
-}
-
-@:keep /*private*/ class SensorEventInfo
-{
-	public var id:Int;
-	public var x:Float;
-	public var y:Float;
-	public var z:Float;
-	public var type:SensorEventType;
-
-	public function new(type:SensorEventType = null, id:Int = 0, x:Float = 0, y:Float = 0, z:Float = 0)
-	{
-		this.type = type;
-		this.id = id;
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-
-	public function clone():SensorEventInfo
-	{
-		return new SensorEventInfo(type, id, x, y, z);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract SensorEventType(Int)
-{
-	var ACCELEROMETER = 0;
-}
-
-@:keep /*private*/ class TextEventInfo
-{
-	public var id:Int;
-	public var length:Int;
-	public var start:Int;
-	public var text:#if hl hl.Bytes #else String #end;
-	public var type:TextEventType;
-	public var windowID:Int;
-
-	public function new(type:TextEventType = null, windowID:Int = 0, text = null, start:Int = 0, length:Int = 0)
-	{
-		this.type = type;
-		this.windowID = windowID;
-		this.text = text;
-		this.start = start;
-		this.length = length;
-	}
-
-	public function clone():TextEventInfo
-	{
-		return new TextEventInfo(type, windowID, text, start, length);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TextEventType(Int)
-{
-	var TEXT_INPUT = 0;
-	var TEXT_EDIT = 1;
-}
-
-@:keep /*private*/ class TouchEventInfo
-{
-	public var device:Int;
-	public var dx:Float;
-	public var dy:Float;
-	public var id:Int;
-	public var pressure:Float;
-	public var type:TouchEventType;
-	public var x:Float;
-	public var y:Float;
-
-	public function new(type:TouchEventType = null, x:Float = 0, y:Float = 0, id:Int = 0, dx:Float = 0, dy:Float = 0, pressure:Float = 0, device:Int = 0)
-	{
-		this.type = type;
-		this.x = x;
-		this.y = y;
-		this.id = id;
-		this.dx = dx;
-		this.dy = dy;
-		this.pressure = pressure;
-		this.device = device;
-	}
-
-	public function clone():TouchEventInfo
-	{
-		return new TouchEventInfo(type, x, y, id, dx, dy, pressure, device);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TouchEventType(Int)
-{
-	var TOUCH_START = 0;
-	var TOUCH_END = 1;
-	var TOUCH_MOVE = 2;
-}
-
-@:keep /*private*/ class WindowEventInfo
-{
-	public var height:Int;
-	public var type:WindowEventType;
-	public var width:Int;
-	public var windowID:Int;
-	public var x:Int;
-	public var y:Int;
-
-	public function new(type:WindowEventType = null, windowID:Int = 0, width:Int = 0, height:Int = 0, x:Int = 0, y:Int = 0)
-	{
-		this.type = type;
-		this.windowID = windowID;
-		this.width = width;
-		this.height = height;
-		this.x = x;
-		this.y = y;
-	}
-
-	public function clone():WindowEventInfo
-	{
-		return new WindowEventInfo(type, windowID, width, height, x, y);
-	}
-}
-
-#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract WindowEventType(Int)
-{
-	var WINDOW_ACTIVATE = 0;
-	var WINDOW_CLOSE = 1;
-	var WINDOW_DEACTIVATE = 2;
-	var WINDOW_ENTER = 3;
-	var WINDOW_EXPOSE = 4;
-	var WINDOW_FOCUS_IN = 5;
-	var WINDOW_FOCUS_OUT = 6;
-	var WINDOW_LEAVE = 7;
-	var WINDOW_MAXIMIZE = 8;
-	var WINDOW_MINIMIZE = 9;
-	var WINDOW_MOVE = 10;
-	var WINDOW_RESIZE = 11;
-	var WINDOW_RESTORE = 12;
-	var WINDOW_SHOW = 13;
-	var WINDOW_HIDE = 14;
-}
diff --git a/source/lime/_internal/backend/native/NativeAudioSource.hx b/source/lime/_internal/backend/native/NativeAudioSource.hx
deleted file mode 100644
index 9f09b24471..0000000000
--- a/source/lime/_internal/backend/native/NativeAudioSource.hx
+++ /dev/null
@@ -1,804 +0,0 @@
-package lime._internal.backend.native;
-
-import sys.thread.Thread;
-import sys.thread.Mutex;
-
-import haxe.Timer;
-import haxe.Int64;
-
-import lime.media.openal.AL;
-import lime.media.openal.ALBuffer;
-import lime.media.openal.ALSource;
-
-#if lime_vorbis
-import lime.media.vorbis.Vorbis;
-import lime.media.vorbis.VorbisFile;
-import lime.media.vorbis.VorbisInfo;
-#end
-
-import lime.math.Vector2;
-import lime.math.Vector4;
-import lime.media.AudioBuffer;
-import lime.media.AudioSource;
-import lime.system.Endian;
-import lime.system.System;
-import lime.utils.ArrayBuffer;
-import lime.utils.ArrayBufferView.TypedArrayType;
-import lime.utils.ArrayBufferView;
-
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(haxe.Timer)
-@:access(lime.media.AudioBuffer)
-@:access(lime.utils.ArrayBufferView)
-class NativeAudioSource {
-	// Can hold up to 3 hours 44100 sampleRate audio, if you are into that, theorically.
-
-	public static var STREAM_BUFFER_SAMPLES:Int = 0x2000; // how much buffers will be generating every frequency (doesnt have to be pow of 2?).
-	public static var STREAM_MIN_BUFFERS:Int = 2; // how much buffers can a stream hold on minimum or starting.
-	public static var STREAM_MAX_BUFFERS:Int = 8; // how much limit of a buffers can be used for streamed audios, must be higher than minimum.
-	public static var STREAM_MAX_FLUSH_BUFFERS:Int = 3; // how much buffers can it play.
-	public static var STREAM_PROCESS_BUFFERS:Int = 2; // how much buffers can be processed in a frequency tick.
-	public static var POOL_MAX_BUFFERS:Int = 32; // how much buffers for the pool to hold.
-
-	public static var moreFormatsSupported:Null<Bool>;
-	public static var loopPointsSupported:Null<Bool>;
-	public static var stereoAnglesExtensionSupported:Null<Bool>;
-	public static var latencyExtensionSupported:Null<Bool>;
-
-	private static var bufferDataPool:Array<ArrayBufferView> = [];
-	private static var isBigEndian:Bool = System.endianness == Endian.BIG_ENDIAN;
-
-	public static function getALFormat(bitsPerSample:Int, channels:Int):Int {
-		if (moreFormatsSupported == null) moreFormatsSupported = AL.isExtensionPresent("AL_EXT_MCFORMATS");
-
-		// There was a code to also supports for X-Fi Renderer but, that kind of device is
-		// rare nowadays and none of sounds should have more than 24 bitsPerSample.
-		// https://github.com/kcat/openal-soft/issues/934
-
-		if (channels > 2 && moreFormatsSupported) {
-			if (channels == 3) return bitsPerSample == 32 ? 0x1209 : (bitsPerSample == 16 ? 0x1208 : 0x1207);
-			else if (channels == 4) return bitsPerSample == 32 ? 0x1206 : (bitsPerSample == 16 ? 0x1205 : 0x1204);
-			else if (channels == 6) return bitsPerSample == 32 ? 0x120C : (bitsPerSample == 16 ? 0x120B : 0x120A);
-			else if (channels == 7) return bitsPerSample == 32 ? 0x120F : (bitsPerSample == 16 ? 0x120E : 0x120D);
-			else if (channels == 8) return bitsPerSample == 32 ? 0x1212 : (bitsPerSample == 16 ? 0x1211 : 0x1210);
-			else return AL.FORMAT_MONO8;
-		}
-		else if (bitsPerSample == 32 && moreFormatsSupported) return channels == 2 ? 0x1203 : 0x1202;
-		else if (channels == 2) return bitsPerSample == 16 ? AL.FORMAT_STEREO16 : AL.FORMAT_STEREO8;
-		else return bitsPerSample == 16 ? AL.FORMAT_MONO16 : AL.FORMAT_MONO8;
-	}
-
-	private static function resetTimer(timer:Timer, time:Float, callback:Void->Void):Timer {
-		if (timer == null) (timer = new Timer(time)).run = callback;
-		else {
-			timer.mTime = time;
-			timer.mFireAt = Timer.getMS() + time;
-			timer.mRunning = true;
-			timer.run = callback;
-
-			if (!Timer.sRunningTimers.contains(timer)) Timer.sRunningTimers.push(timer);
-		}
-		return timer;
-	}
-
-	inline private static function getFloat(x:Int64):Float return x.high * 4294967296. + (x.low >> 0);
-
-	// Backward Compatibility Variables
-	var handle(get, set):ALSource; inline function get_handle() return source; inline function set_handle(v) return source = v;
-	var timer(get, set):Timer; inline function get_timer() return completeTimer; inline function set_timer(v) return completeTimer = v;
-	var length(get, set):Null<Float>; inline function get_length() return endTime; inline function set_length(v) return endTime = v;
-	var toLoop(get, set):Int; inline function get_toLoop() return streamLoops; inline function set_toLoop(v) return streamLoops = v;
-	var bufferSizes(get, set):Array<Int>; inline function get_bufferSizes() return bufferLengths; inline function set_bufferSizes(v) return bufferLengths = v;
-
-	var parent:AudioSource;
-	var disposed:Bool;
-	var streamed:Bool;
-	var playing:Bool;
-	var completed:Bool;
-	var lastTime:Float;
-
-	var position:Vector4;
-	var angles:Vector2;
-	var anglesArray:Array<Float>;
-	var endTime:Null<Float>;
-	var loopTime:Float;
-	var loops:Int;
-
-	var channels:Int;
-	var sampleRate:Int;
-	var wordSize:Int; // is bitsPerSample >> 3, ex: 8 bits is 1, 16 bits is 2, 32 bits is 4, etc.
-	var samples:Int;
-	var dataLength:Int;
-	var duration:Float;
-
-	var completeTimer:Timer;
-	var source:ALSource;
-	var buffer:ALBuffer;
-	var standaloneBuffer:Bool;
-	var format:Int; // AL.FORMAT_...
-	var arrayType:TypedArrayType;
-	var loopPoints:Array<Int>; // In Samples
-
-	static var streamSources:Array<NativeAudioSource> = [];
-	static var queuedStreamSources:Array<NativeAudioSource> = [];
-
-	static var streamMutex:Mutex = new Mutex();
-	static var streamTimer:Timer;
-
-	#if !ALLOW_MULTITHREADING
-	static var wasEmpty:Bool = false;
-	static var threadRunning:Bool = false;
-	static var streamThread:Thread;
-	#end
-
-	var streamRemove:Bool;
-
-	var bufferLength:Int; // Size in bytes for current streamed audio buffers.
-	var requestBuffers:Int;
-	var queuedBuffers:Int;
-	var streamLoops:Int;
-	var streamEnded:Bool;
-
-	// ORDERING IS CURRENT TO NEXT, STARTS FROM THE LENGTH OF THE ARRAYS
-	var bufferDatas:Array<ArrayBufferView>;
-	var bufferTimes:Array<Float>;
-	var bufferLengths:Array<Int>;
-
-	var buffers:Array<ALBuffer>;
-	var nextBuffer:Int = 0;
-
-	public function new(parent:AudioSource) {
-		this.parent = parent;
-
-		if (loopPointsSupported == null) loopPointsSupported = AL.isExtensionPresent("AL_SOFT_loop_points");
-		if (stereoAnglesExtensionSupported == null) stereoAnglesExtensionSupported = AL.isExtensionPresent("AL_EXT_STEREO_ANGLES");
-		if (latencyExtensionSupported == null) latencyExtensionSupported = AL.isExtensionPresent("AL_SOFT_source_latency");
-	}
-
-	public function dispose() {
-		streamMutex.acquire();
-		removeStream();
-
-		stop();
-		disposed = true;
-
-		position = null;
-		angles = null;
-		anglesArray = null;
-
-		if (source != null) {
-			if (streamed) AL.sourceUnqueueBuffers(source, AL.getSourcei(source, AL.BUFFERS_QUEUED));
-			else AL.sourcei(source, AL.BUFFER, AL.NONE);
-
-			AL.deleteSource(source);
-			source = null;
-		}
-
-		if (standaloneBuffer && buffer != null) {
-			AL.bufferData(buffer, 0, null, 0, 0);
-			AL.deleteBuffer(buffer);
-			buffer = null;
-		}
-		loopPoints = null;
-
-		if (buffers != null) {
-			for (buffer in buffers) AL.bufferData(buffer, 0, null, 0, 0);
-			AL.deleteBuffers(buffers);
-			buffers = null;
-		}
-
-		if (bufferDatas != null) {
-			for (data in bufferDatas) if (bufferDataPool.length < POOL_MAX_BUFFERS) bufferDataPool.push(data);
-			bufferDatas = null;
-		}
-
-		completeTimer = null;
-
-		bufferTimes = null;
-		bufferLengths = null;
-
-		streamMutex.release();
-	}
-
-	public function init() {
-		if (source != null || (disposed = parent == null || (source = AL.createSource()) == null)) return;
-		AL.sourcef(source, AL.MAX_GAIN, 32);
-		AL.distanceModel(AL.NONE);
-
-		if (position == null) position = new Vector4();
-		if (angles == null) angles = new Vector2(Math.PI / 6, -Math.PI / 6); // https://github.com/kcat/openal-soft/issues/1032
-		if (loopPoints == null) loopPoints = [0, 0];
-		if (stereoAnglesExtensionSupported && anglesArray == null) anglesArray = [0, 0];
-
-		resetBuffer();
-	}
-
-	public function resetBuffer() {
-		if (parent.buffer == null) return;
-
-		streamMutex.acquire();
-		removeStream();
-
-		stop();
-
-		if (streamed) AL.sourceUnqueueBuffers(source, AL.getSourcei(source, AL.BUFFERS_QUEUED));
-		else AL.sourcei(source, AL.BUFFER, AL.NONE);
-
-		streamMutex.release();
-
-		final audioBuffer = parent.buffer;
-		channels = audioBuffer.channels;
-		sampleRate = audioBuffer.sampleRate;
-		wordSize = audioBuffer.bitsPerSample >> 3;
-		format = getALFormat(audioBuffer.bitsPerSample, channels);
-		arrayType = wordSize == 4 ? TypedArrayType.Uint32 : (wordSize == 2 ? TypedArrayType.Uint16 : TypedArrayType.Int8);
-		standaloneBuffer = false;
-		loopTime = 0;
-		endTime = null;
-
-		if (buffer != null) {
-			if (standaloneBuffer) {
-				AL.bufferData(buffer, 0, null, 0, 0);
-				AL.deleteBuffer(buffer);
-			}
-			buffer = null;
-		}
-
-		if (audioBuffer.data != null) {
-			streamed = false;
-			samples = Std.int((dataLength = audioBuffer.data.byteLength) / wordSize / channels);
-		}
-		#if lime_vorbis
-		else if (audioBuffer.__srcVorbisFile != null) {
-			streamed = true;
-			dataLength = Std.int(getFloat(samples = Int64.toInt(audioBuffer.__srcVorbisFile.pcmTotal())) * channels * wordSize);
-		}
-		#end
-		else return;
-
-		duration = getFloat(samples) / sampleRate * 1000;
-
-		loopPoints[0] = 0;
-		loopPoints[1] = samples - 1;
-
-		if (streamed) {
-			final length = STREAM_BUFFER_SAMPLES * channels;
-			bufferLength = length * wordSize;
-
-			if (buffers == null) buffers = AL.genBuffers(STREAM_MAX_FLUSH_BUFFERS);
-			if (bufferDatas == null) {
-				bufferDatas = [];
-				bufferTimes = [];
-				bufferLengths = [];
-			}
-
-			for (i in 0...STREAM_MAX_BUFFERS) {
-				bufferTimes[i] = 0.0;
-				bufferLengths[i] = 0;
-
-				var data = bufferDataPool.pop();
-				if (data == null) data = new ArrayBufferView(length, arrayType);
-				else {
-					data.type = arrayType;
-					data.bytesPerElement = wordSize;
-					data.length = length;
-					if (data.byteLength != bufferLength) {
-						#if cpp
-						data.buffer.getData().resize(bufferLength);
-						data.buffer.fill(data.byteLength, bufferLength - data.byteLength, 0);
-						@:privateAccess data.buffer.length = bufferLength;
-						#else
-						data.buffer = new ArrayBuffer(bufferLength);
-						#end
-					}
-					data.byteLength = bufferLength;
-				}
-				bufferDatas[i] = data;
-			}
-		}
-		else {
-			if (buffers != null) {
-				for (buffer in buffers) AL.bufferData(buffer, 0, null, 0, 0);
-				AL.deleteBuffers(buffers);
-				buffers = null;
-
-				for (data in bufferDatas) if (bufferDataPool.length < POOL_MAX_BUFFERS) bufferDataPool.push(data);
-				bufferDatas.resize(0);
-			}
-
-			if (audioBuffer.__srcBuffer != null) {
-				if (AL.getBufferi(audioBuffer.__srcBuffer, AL.SIZE) != dataLength) {
-					AL.bufferData(audioBuffer.__srcBuffer, 0, null, 0, 0);
-					AL.deleteBuffer(audioBuffer.__srcBuffer);
-					if ((buffer = audioBuffer.__srcBuffer = AL.createBuffer()) != null)
-						AL.bufferData(buffer, format, audioBuffer.data, dataLength, sampleRate);
-				}
-				else
-					buffer = audioBuffer.__srcBuffer;
-			}
-			else if ((buffer = audioBuffer.__srcBuffer = AL.createBuffer()) != null)
-				AL.bufferData(buffer, format, audioBuffer.data, dataLength, sampleRate);
-
-			AL.sourcei(source, AL.BUFFER, buffer);
-		}
-
-		updateLoopPoints();
-	}
-
-	function updateLoopPoints() {
-		if (loops <= 0) return AL.sourcei(source, AL.LOOPING, AL.FALSE);
-
-		var time = getCurrentTime() + parent.offset, length = getRealLength();
-		final fixed = time >= length;
-		if (fixed) time = loopTime;
-
-		if (!streamed) {
-			var internalLoop = AL.TRUE;
-			if (length < duration - 1 && loopTime > 1) {
-				if (!loopPointsSupported) internalLoop = AL.FALSE;
-				else {
-					AL.sourceStop(source);
-					AL.sourcei(source, AL.BUFFER, AL.NONE);
-					if (!standaloneBuffer) {
-						if (standaloneBuffer = (buffer = AL.createBuffer()) != null)
-							AL.bufferData(buffer, format, parent.buffer.data, dataLength, sampleRate);
-						else {
-							buffer = parent.buffer.__srcBuffer;
-							internalLoop = AL.FALSE;
-						}
-					}
-					if (internalLoop == AL.TRUE) AL.bufferiv(buffer, 0x2015/*AL.LOOP_POINTS_SOFT*/, loopPoints);
-					AL.sourcei(source, AL.BUFFER, buffer);
-				}
-			}
-
-			AL.sourcei(source, AL.LOOPING, internalLoop);
-			if (playing) setCurrentTime(time - parent.offset);
-			else updateCompleteTimer();
-		}
-		else if (playing && (fixed || streamLoops > 0)) {
-			AL.sourcei(source, AL.LOOPING, AL.FALSE);
-			AL.sourceStop(source);
-			snapBuffersToTime(time, streamLoops > 0);
-			AL.sourcePlay(source);
-		}
-	}
-
-	// https://github.com/xiph/vorbis/blob/master/CHANGES#L39 bug in libvorbis <= 1.3.4
-	inline function streamSeek(samples:Int64)
-		if (samples <= 1) parent.buffer.__srcVorbisFile.rawSeek(0); else parent.buffer.__srcVorbisFile.pcmSeek(samples);
-
-	inline function streamTell():Int64
-		return parent.buffer.__srcVorbisFile.pcmTell();
-
-	inline function streamRead(buffer:ArrayBuffer, position:Int, length:Int, wordSize:Int):Int
-		return parent.buffer.__srcVorbisFile.read(buffer, position, length, isBigEndian, wordSize, true);
-
-	function readToBufferData(data:ArrayBufferView, currentPCM:Int64):Int {
-		var length = (Int64.ofInt(loopPoints[1]) - currentPCM) * channels * wordSize;
-		var n = length < bufferLength ? length.low : bufferLength, total = 0, result = 0, wasEOF = false;
-
-		try while (total < bufferLength) {
-			result = n > 0 ? streamRead(data.buffer, total, n, wordSize) : 0;
-
-			if (result == Vorbis.HOLE) continue;
-			else if (result <= Vorbis.EREAD) break;
-			else if (result == 0) {
-				if (streamEnded = wasEOF == (wasEOF = true) || loops <= streamLoops) break;
-
-				streamSeek(Int64.ofInt(loopPoints[0]));
-				streamLoops++;
-				if ((length = Int64.ofInt(loopPoints[1] - loopPoints[0]) * channels * wordSize) < (n = bufferLength - total)) n = length.low;
-			}
-			else {
-				total += result;
-				n -= result;
-				wasEOF = false;
-			}
-		}
-		catch (e:haxe.Exception) {
-			trace('NativeAudioSource readToBufferData Bug! error: ${e.details()}, streamEnded: $streamEnded, total: $total, n: $n');
-			return result;
-		}
-
-		if (result < 0) {
-			trace('NativeAudioSource readToBufferData Bug! reading result is $result, streamEnded: $streamEnded, total: $total, n: $n');
-			return result;
-		}
-		return total;
-	}
-
-	function fillBuffers(n:Int) {
-		final max = STREAM_MAX_BUFFERS - 1;
-		var i:Int, j:Int, data:ArrayBufferView, pcm:Int64, decoded:Int;
-		while (n-- > 0 && !streamEnded && (decoded = readToBufferData(data = bufferDatas[i = max - requestBuffers], pcm = streamTell())) > 0) {
-			j = i;
-			while (i < max) {
-				bufferDatas[i] = bufferDatas[++j];
-				bufferTimes[i] = bufferTimes[j];
-				bufferLengths[i] = bufferLengths[j];
-				i = j;
-			}
-			bufferDatas[max] = data;
-			bufferTimes[max] = getFloat(pcm) / sampleRate;
-			bufferLengths[max] = decoded;
-			requestBuffers++;
-		}
-	}
-
-	inline function flushBuffers() {
-		var i = STREAM_MAX_BUFFERS - (requestBuffers - queuedBuffers);
-		while (queuedBuffers < STREAM_MAX_FLUSH_BUFFERS && queuedBuffers < requestBuffers) {
-			AL.bufferData(buffers[nextBuffer], format, bufferDatas[i], bufferLengths[i], sampleRate);
-			AL.sourceQueueBuffer(source, buffers[nextBuffer]);
-			if (++nextBuffer == STREAM_MAX_FLUSH_BUFFERS) nextBuffer = 0;
-			queuedBuffers++;
-			i++;
-		}
-	}
-
-	inline function skipBuffers(n:Int) {
-		queuedBuffers -= (n = AL.sourceUnqueueBuffers(source, n).length);
-		requestBuffers -= n;
-	}
-
-	function snapBuffersToTime(time:Float, force:Bool) {
-		if (source == null || parent.buffer == null || parent.buffer.__srcVorbisFile == null) return;
-
-		streamMutex.acquire();
-
-		final sec = time / 1000;
-		if (!force) {
-			var bufferTime:Float;
-			for (i in (STREAM_MAX_BUFFERS - requestBuffers)...(STREAM_MAX_BUFFERS - STREAM_MIN_BUFFERS))
-				if (sec >= (bufferTime = bufferTimes[i]) && sec < bufferTime + (bufferLengths[i] / wordSize / channels / sampleRate))
-			{
-				skipBuffers(i - STREAM_MAX_BUFFERS + requestBuffers);
-				AL.sourcei(source, AL.SAMPLE_OFFSET, Math.floor((sec - bufferTime) * sampleRate));
-				return streamMutex.release();
-			}
-		}
-
-		AL.sourceUnqueueBuffers(source, AL.getSourcei(source, AL.BUFFERS_QUEUED));
-
-		streamEnded = false;
-		streamSeek(Int64.fromFloat(sec * sampleRate));
-
-		requestBuffers = queuedBuffers = streamLoops = nextBuffer = 0;
-		fillBuffers(STREAM_MIN_BUFFERS);
-		flushBuffers();
-		streamMutex.release();
-	}
-
-	static function streamBuffersUpdate() {
-		streamMutex.acquire();
-
-		var i:Int = streamSources.length, source:NativeAudioSource, process:Int, v:Int;
-		while (i-- > 0) {
-			if ((source = streamSources[i]).streamRemove) continue;
-			else if (source.parent.buffer == null) {
-				source.stopStream();
-				continue;
-			}
-
-			process = source.requestBuffers < STREAM_MIN_BUFFERS ? STREAM_MIN_BUFFERS - source.requestBuffers : 0;
-			process = STREAM_PROCESS_BUFFERS > process ? STREAM_PROCESS_BUFFERS : process;
-			if ((process = (v = STREAM_MAX_BUFFERS - source.requestBuffers) > process ? process : v) > 0) source.fillBuffers(process);
-		}
-
-		streamMutex.release();
-	}
-
-	#if !ALLOW_MULTITHREADING
-	static function streamThreadRun() {
-		while (Thread.readMessage(true)) streamBuffersUpdate();
-		threadRunning = false;
-	}
-	#end
-
-	static function streamUpdate() {
-		if (!streamMutex.tryAcquire()) return;
-
-		var i = queuedStreamSources.length, source:NativeAudioSource;
-		while (i-- > 0) streamSources.push(queuedStreamSources[i]);
-		queuedStreamSources.resize(0);
-
-		i = streamSources.length;
-		while (i-- > 0) {
-			if ((source = streamSources[i]).streamRemove || source.source == null) source.removeStream();
-			else {
-				source.skipBuffers(AL.getSourcei(source.source, AL.BUFFERS_PROCESSED));
-				source.flushBuffers();
-				if (AL.getSourcei(source.source, AL.SOURCE_STATE) == AL.STOPPED) {
-					AL.sourcePlay(source.source);
-					source.updateCompleteTimer();
-				}
-				if (source.streamEnded && source.requestBuffers == source.queuedBuffers) source.removeStream();
-			}
-		}
-
-		#if ALLOW_MULTITHREADING
-		if (streamSources.length != 0) funkin.backend.utils.ThreadUtil.execAsync(streamBuffersUpdate);
-		#else
-		if (streamSources.length == 0) {
-			if (wasEmpty) {
-				wasEmpty = false;
-				streamTimer.stop();
-				if (threadRunning) streamThread.sendMessage(1);
-			}
-			else {
-				wasEmpty = true;
-				streamTimer = resetTimer(streamTimer, 1000, streamUpdate);
-			}
-		}
-		else {
-			wasEmpty = false;
-			if (threadRunning || (threadRunning = (streamThread = Thread.create(streamThreadRun)) != null)) 
-				streamThread.sendMessage(1);
-		}
-		#end
-
-		streamMutex.release();
-	}
-
-	function removeStream() {
-		streamRemove = false;
-		queuedStreamSources.remove(this);
-		streamSources.remove(this);
-	}
-
-	function stopStream() {
-		streamRemove = true;
-		queuedStreamSources.remove(this);
-	}
-
-	function resetStream() {
-		streamRemove = false;
-		if (!queuedStreamSources.contains(this) && !streamSources.contains(this)) {
-			queuedStreamSources.push(this);
-			if (streamTimer == null || !streamTimer.mRunning) streamTimer = resetTimer(streamTimer, 0, streamUpdate);
-		}
-	}
-
-	function timer_onRun() {
-		final pitch = getPitch();
-		var timeRemaining = (getLength() - getCurrentTime()) / pitch;
-		if (timeRemaining > 50 && AL.getSourcei(source, AL.SOURCE_STATE) == AL.PLAYING && (!streamed || !streamEnded && streamLoops <= 0)) {
-			completeTimer = resetTimer(completeTimer, timeRemaining, timer_onRun);
-			return;
-		}
-
-		completeTimer.stop();
-
-		if (loops == 0) return complete();
-
-		if (streamLoops > 0) {
-			loops -= streamLoops;
-			streamLoops = 0;
-			completeTimer = resetTimer(completeTimer, (getLength() + parent.offset - loopTime) / pitch, timer_onRun);
-		}
-		else if (!loopPointsSupported || AL.getSourcei(source, AL.LOOPING) == AL.FALSE) {
-			loops--;
-			playing = true;
-			setCurrentTime(loopTime - parent.offset);
-		}
-
-		if (loops <= 0) {
-			loops = 0;
-			AL.sourcei(source, AL.LOOPING, AL.FALSE);
-		}
-
-		parent.onLoop.dispatch();
-	}
-
-	function updateCompleteTimer() {
-		if (playing) {
-			var timeRemaining = (getLength() - getCurrentTime()) / getPitch();
-			if (timeRemaining > 50) completeTimer = resetTimer(completeTimer, timeRemaining, timer_onRun);
-			else {
-				if (completeTimer != null) completeTimer.stop();
-				if (loops > 0) play();
-				else complete();
-			}
-		}
-		else if (completeTimer != null) 
-			completeTimer.stop();
-	}
-
-	public function play() {
-		if (playing || disposed) return;
-		final time = completed ? 0 : getCurrentTime();
-		playing = true;
-		setCurrentTime(time);
-	}
-
-	public function pause() {
-		if (!disposed) AL.sourcePause(source);
-		lastTime = getCurrentTime();
-		playing = false;
-		stopStream();
-		if (completeTimer != null) completeTimer.stop();
-	}
-
-	public function stop() {
-		if (!disposed) AL.sourceStop(source);
-		lastTime = 0;
-		streamLoops = 0;
-		playing = false;
-		stopStream();
-		if (completeTimer != null) completeTimer.stop();
-	}
-
-	public function complete() {
-		if (!completed) parent.onComplete.dispatch();
-		stop();
-		completed = true;
-	}
-
-	public function getCurrentTime():Float {
-		if (disposed) return 0.0;
-		else if (completed) return getLength();
-		else if (!playing) return lastTime - parent.offset;
-
-		var time = AL.getSourcef(source, AL.SEC_OFFSET);
-		if (streamed) {
-			if (playing && streamEnded && AL.getSourcei(source, AL.SOURCE_STATE) == AL.STOPPED) {
-				complete();
-				return getLength();
-			}
-			else if (bufferTimes != null)
-				time += bufferTimes[STREAM_MAX_BUFFERS - requestBuffers];
-		}
-		time *= 1000;
-
-		var length = getRealLength();
-		return if (loops <= 0 || time <= length) time - parent.offset;
-			else ((time - loopTime) % (length - loopTime)) + loopTime - parent.offset;
-	}
-
-	public function setCurrentTime(value:Float):Float {
-		if (disposed) return 0.0;
-
-		final length = getRealLength();
-		value = Math.isFinite(value) ? Math.max(Math.min(value + parent.offset, length), parent.offset) : parent.offset;
-
-		if (streamed) AL.sourceStop(source);
-		else AL.sourcef(source, AL.SEC_OFFSET, value / 1000);
-
-		final timeRemaining = (length - value) / getPitch();
-		if (playing) {
-			if (timeRemaining < 8 && value > 8) complete();
-			else {
-				completed = false;
-				if (streamed) {
-					snapBuffersToTime(value, false);
-					if (!streamEnded) resetStream();
-				}
-				if (AL.getSourcei(source, AL.SOURCE_STATE) != AL.PLAYING) AL.sourcePlay(source);
-				completeTimer = resetTimer(completeTimer, timeRemaining, timer_onRun);
-			}
-		}
-		else {
-			completed = timeRemaining < 8;
-			lastTime = value;
-			if (completeTimer != null) completeTimer.stop();
-		}
-
-		return value;
-	}
-
-	public function getPitch():Float {
-		return if (disposed) 1;
-			else AL.getSourcef(source, AL.PITCH);
-	}
-
-	public function setPitch(value:Float):Float {
-		if (disposed || (value = Math.max(value, 0)) == AL.getSourcef(source, AL.PITCH)) return value;
-		AL.sourcef(source, AL.PITCH, value);
-		updateCompleteTimer();
-		return value;
-	}
-
-	public function getGain():Float {
-		return if (disposed) 1;
-			else AL.getSourcef(source, AL.GAIN);
-	}
-
-	public function setGain(value:Float):Float {
-		value = Math.max(value, 0);
-		if (!disposed) AL.sourcef(source, AL.GAIN, value);
-		return value;
-	}
-
-	public function getLoops():Int return loops;
-
-	public function setLoops(value:Int):Int {
-		if (loops == (loops = value < 0 ? 0 : value)) return loops;
-		updateLoopPoints();
-		return loops;
-	}
-
-	public function getLoopTime():Float return loopTime - parent.offset;
-
-	public function setLoopTime(value:Float):Float {
-		if (loopTime == (loopTime = Math.max(Math.min(value + parent.offset, duration), 0))) return loopTime - parent.offset;
-		if ((loopPoints[0] = Std.int(value / 1000 * sampleRate)) >= samples) loopPoints[0] = samples - 1;
-		updateLoopPoints();
-		return loopTime - parent.offset;
-	}
-
-	public function getRealLength():Float return if (endTime == null) duration; else endTime;
-	public function getLength():Float return if (disposed) 0; else (inline getRealLength()) - parent.offset;
-
-	public function setLength(value:Null<Float>):Null<Float> {
-		if (endTime == (endTime = (value == null ? value : Math.max(Math.min(value + parent.offset, duration), 0)))) return endTime - parent.offset;
-		if ((loopPoints[1] = Std.int(getRealLength() / 1000 * sampleRate)) >= samples) loopPoints[1] = samples - 1;
-		updateLoopPoints();
-		return endTime - parent.offset;
-	}
-
-	public function getLatency():Float {
-		//#if (lime >= "8.4.0")
-		//if (latencyExtensionSupported) {
-		//	final offsets = AL.getSourcedvSOFT(source, AL.SEC_OFFSET_LATENCY_SOFT, 2);
-		//	if (offsets != null) return offsets[1] * 1000;
-		//}
-		//#end
-		return 0;
-	}
-
-	public function getAngles():Vector2 {
-		if (angles == null) angles = new Vector2(Math.PI / 6, -Math.PI / 6);
-		return angles;
-	}
-
-	public function setAngles(left:Float, right:Float):Vector2 {
-		if (angles == null) angles = new Vector2(left, right);
-		else angles.setTo(left, right);
-
-		if (!disposed && stereoAnglesExtensionSupported) {
-			anglesArray[0] = angles.x;
-			anglesArray[1] = angles.y;
-			AL.sourcei(source, 0x1214/*AL.SOURCE_SPATIALIZE_SOFT*/, AL.FALSE);
-			AL.sourcefv(source, 0x1030/*AL.STEREO_ANGLES*/, anglesArray);
-			AL.source3f(source, AL.POSITION, 0, 0, 0);
-		}
-		return angles;
-	}
-
-	public function getPosition():Vector4 {
-		if (position == null) position = new Vector4();
-		return position;
-	}
-
-	public function setPosition(value:Vector4):Vector4 {
-		position.x = value.x;
-		position.y = value.y;
-		position.z = value.z;
-		position.w = value.w;
-
-		// OpenAL Soft Positions doesn't seem to do anything but panning?
-		if (!disposed) {
-			if (stereoAnglesExtensionSupported) AL.sourcei(source, 0x1214/*AL.SOURCE_SPATIALIZE_SOFT*/, Math.abs(position.x) > 1e-04 ? AL.TRUE : AL.FALSE);
-			AL.sourcei(source, AL.MAX_DISTANCE, 1);
-			AL.source3f(source, AL.POSITION, position.x, position.y, position.z);
-		}
-		return position;
-	}
-
-	public function getPan():Float return getPosition().x;
-
-	public function setPan(value:Float):Float {
-		getPosition().setTo(value, 0, -Math.sqrt(1 - value * value));
-		if (!disposed) {
-			if (parent.buffer.channels > 1)
-				setAngles(Math.PI * (Math.min(-value * 2 + 1, 1)) / 6, -Math.PI * Math.min(value * 2 + 1, 1) / 6);
-			else
-				setPosition(position);
-		}
-		return value;
-	}
-}
\ No newline at end of file
diff --git a/source/lime/_internal/backend/native/NativeWindow.hx b/source/lime/_internal/backend/native/NativeWindow.hx
deleted file mode 100644
index 397d94ac90..0000000000
--- a/source/lime/_internal/backend/native/NativeWindow.hx
+++ /dev/null
@@ -1,766 +0,0 @@
-package lime._internal.backend.native;
-
-import haxe.io.Bytes;
-import lime._internal.backend.native.NativeCFFI;
-import lime.app.Application;
-import lime.graphics.cairo.Cairo;
-import lime.graphics.cairo.CairoFormat;
-import lime.graphics.cairo.CairoImageSurface;
-import lime.graphics.cairo.CairoSurface;
-import lime.graphics.opengl.GL;
-import lime.graphics.CairoRenderContext;
-import lime.graphics.Image;
-import lime.graphics.ImageBuffer;
-import lime.graphics.OpenGLRenderContext;
-import lime.graphics.RenderContext;
-import lime.math.Rectangle;
-import lime.math.Vector2;
-import lime.system.Display;
-import lime.system.DisplayMode;
-import lime.system.JNI;
-import lime.system.System;
-import lime.ui.MouseCursor;
-import lime.ui.Window;
-import lime.utils.UInt8Array;
-
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(lime._internal.backend.native.NativeCFFI)
-@:access(lime._internal.backend.native.NativeOpenGLRenderContext)
-@:access(lime.app.Application)
-@:access(lime.graphics.cairo.Cairo)
-@:access(lime.graphics.opengl.GL)
-@:access(lime.graphics.OpenGLRenderContext)
-@:access(lime.graphics.RenderContext)
-@:access(lime.system.DisplayMode)
-@:access(lime.ui.Window)
-class NativeWindow
-{
-	public var handle:Dynamic;
-
-	private var closing:Bool;
-	private var cursor:MouseCursor;
-	private var displayMode:DisplayMode;
-	private var frameRate:Float;
-	private var mouseLock:Bool;
-	private var parent:Window;
-	private var useHardware:Bool;
-	#if lime_cairo
-	private var cacheLock:Dynamic;
-	private var cairo:Cairo;
-	private var primarySurface:CairoSurface;
-	#end
-
-	public function new(parent:Window)
-	{
-		this.parent = parent;
-
-		cursor = DEFAULT;
-		displayMode = new DisplayMode(0, 0, 0, 0);
-
-		var attributes = parent.__attributes;
-		var contextAttributes = Reflect.hasField(attributes, "context") ? attributes.context : {};
-		var title = Reflect.hasField(attributes, "title") ? attributes.title : "Lime Application";
-		var flags = 0;
-
-		if (!Reflect.hasField(contextAttributes, "antialiasing")) contextAttributes.antialiasing = 0;
-		if (!Reflect.hasField(contextAttributes, "background")) contextAttributes.background = 0;
-		if (!Reflect.hasField(contextAttributes, "colorDepth")) contextAttributes.colorDepth = 24;
-		if (!Reflect.hasField(contextAttributes, "depth")) contextAttributes.depth = true;
-		if (!Reflect.hasField(contextAttributes, "hardware")) contextAttributes.hardware = true;
-		if (!Reflect.hasField(contextAttributes, "stencil")) contextAttributes.stencil = true;
-		if (!Reflect.hasField(contextAttributes, "vsync")) contextAttributes.vsync = false;
-
-		#if (cairo || (!lime_opengl && !lime_opengles))
-		contextAttributes.type = CAIRO;
-		#end
-		if (Reflect.hasField(contextAttributes, "type") && contextAttributes.type == CAIRO) contextAttributes.hardware = false;
-
-		if (Reflect.hasField(attributes, "allowHighDPI") && attributes.allowHighDPI) flags |= cast WindowFlags.WINDOW_FLAG_ALLOW_HIGHDPI;
-		if (Reflect.hasField(attributes, "alwaysOnTop") && attributes.alwaysOnTop) flags |= cast WindowFlags.WINDOW_FLAG_ALWAYS_ON_TOP;
-		if (Reflect.hasField(attributes, "borderless") && attributes.borderless) flags |= cast WindowFlags.WINDOW_FLAG_BORDERLESS;
-		if (Reflect.hasField(attributes, "fullscreen") && attributes.fullscreen) flags |= cast WindowFlags.WINDOW_FLAG_FULLSCREEN;
-		if (Reflect.hasField(attributes, "hidden") && attributes.hidden) flags |= cast WindowFlags.WINDOW_FLAG_HIDDEN;
-		if (Reflect.hasField(attributes, "maximized") && attributes.maximized) flags |= cast WindowFlags.WINDOW_FLAG_MAXIMIZED;
-		if (Reflect.hasField(attributes, "minimized") && attributes.minimized) flags |= cast WindowFlags.WINDOW_FLAG_MINIMIZED;
-		if (Reflect.hasField(attributes, "resizable") && attributes.resizable) flags |= cast WindowFlags.WINDOW_FLAG_RESIZABLE;
-
-		if (contextAttributes.antialiasing >= 4)
-		{
-			flags |= cast WindowFlags.WINDOW_FLAG_HW_AA_HIRES;
-		}
-		else if (contextAttributes.antialiasing >= 2)
-		{
-			flags |= cast WindowFlags.WINDOW_FLAG_HW_AA;
-		}
-
-		if (contextAttributes.colorDepth == 32) flags |= cast WindowFlags.WINDOW_FLAG_COLOR_DEPTH_32_BIT;
-		if (contextAttributes.depth) flags |= cast WindowFlags.WINDOW_FLAG_DEPTH_BUFFER;
-		if (contextAttributes.hardware) flags |= cast WindowFlags.WINDOW_FLAG_HARDWARE;
-		if (contextAttributes.stencil) flags |= cast WindowFlags.WINDOW_FLAG_STENCIL_BUFFER;
-		if (contextAttributes.vsync) flags |= cast WindowFlags.WINDOW_FLAG_VSYNC;
-
-		var width = Reflect.hasField(attributes, "width") ? attributes.width : #if desktop 800 #else 0 #end;
-		var height = Reflect.hasField(attributes, "height") ? attributes.height : #if desktop 600 #else 0 #end;
-
-		#if (!macro && lime_cffi)
-		handle = NativeCFFI.lime_window_create(parent.application.__backend.handle, width, height, flags, title);
-
-		#if (DARK_MODE_WINDOW && !macro)
-			funkin.backend.utils.NativeAPI.setDarkMode(title, true);
-		#end
-
-		if (handle != null)
-		{
-			parent.__width = NativeCFFI.lime_window_get_width(handle);
-			parent.__height = NativeCFFI.lime_window_get_height(handle);
-			parent.__x = NativeCFFI.lime_window_get_x(handle);
-			parent.__y = NativeCFFI.lime_window_get_y(handle);
-			parent.__hidden = (Reflect.hasField(attributes, "hidden") && attributes.hidden);
-			parent.id = NativeCFFI.lime_window_get_id(handle);
-		}
-
-		parent.__scale = NativeCFFI.lime_window_get_scale(handle);
-
-		var context = new RenderContext();
-		context.window = parent;
-
-		#if hl
-		var contextType = @:privateAccess String.fromUTF8(NativeCFFI.lime_window_get_context_type(handle));
-		#else
-		var contextType:String = NativeCFFI.lime_window_get_context_type(handle);
-		#end
-
-		switch (contextType)
-		{
-			case "opengl":
-				var gl = new NativeOpenGLRenderContext();
-
-				useHardware = true;
-
-				#if lime_opengl
-				context.gl = gl;
-				#end
-
-				context.gles2 = gl;
-				context.webgl = gl;
-				context.type = gl.type;
-				context.version = Std.string(gl.version);
-
-				if (gl.type == OPENGLES && gl.version >= 3)
-				{
-					context.gles3 = gl;
-					context.webgl2 = gl;
-				}
-
-				if (GL.context == null)
-				{
-					GL.context = gl;
-				}
-
-			default:
-				useHardware = false;
-
-				#if lime_cairo
-				context.cairo = cairo;
-				context.type = CAIRO;
-				context.version = "";
-
-				parent.context = context;
-				render();
-				#end
-				context.type = CAIRO;
-		}
-
-		contextAttributes.type = context.type;
-		context.attributes = contextAttributes;
-		parent.context = context;
-
-		setFrameRate(Reflect.hasField(attributes, "frameRate") ? attributes.frameRate : 60);
-		#end
-	}
-
-	public function alert(message:String, title:String):Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_alert(handle, message, title);
-			#end
-		}
-	}
-
-	public function close():Void
-	{
-		if (!closing)
-		{
-			closing = true;
-			parent.onClose.dispatch();
-
-			if (!parent.onClose.canceled)
-			{
-				if (handle != null)
-				{
-					#if (!macro && lime_cffi)
-					NativeCFFI.lime_window_close(handle);
-					#end
-					handle = null;
-				}
-			}
-			else
-			{
-				closing = false;
-			}
-		}
-	}
-
-	public function contextFlip():Void
-	{
-		#if (!macro && lime_cffi)
-		if (!useHardware)
-		{
-			#if lime_cairo
-			if (cairo != null)
-			{
-				primarySurface.flush();
-			}
-			#end
-			NativeCFFI.lime_window_context_unlock(handle);
-		}
-
-		NativeCFFI.lime_window_context_flip(handle);
-		#end
-	}
-
-	public function focus():Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_focus(handle);
-			#end
-		}
-	}
-
-	public function getCursor():MouseCursor
-	{
-		return cursor;
-	}
-
-	public function getDisplay():Display
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			var index = NativeCFFI.lime_window_get_display(handle);
-
-			if (index > -1)
-			{
-				return System.getDisplay(index);
-			}
-			#end
-		}
-
-		return null;
-	}
-
-	public function getDisplayMode():DisplayMode
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			#if hl
-			NativeCFFI.lime_window_get_display_mode(handle, displayMode);
-			#else
-			var data:Dynamic = NativeCFFI.lime_window_get_display_mode(handle);
-			displayMode.width = data.width;
-			displayMode.height = data.height;
-			displayMode.pixelFormat = data.pixelFormat;
-			displayMode.refreshRate = data.refreshRate;
-			#end
-			#end
-		}
-
-		return displayMode;
-	}
-
-	public function getFrameRate():Float
-	{
-		return frameRate;
-	}
-
-	public function getMouseLock():Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			mouseLock = NativeCFFI.lime_window_get_mouse_lock(handle);
-			#end
-		}
-
-		return mouseLock;
-	}
-
-	public function getTextInputEnabled():Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			return NativeCFFI.lime_window_get_text_input_enabled(handle);
-			#end
-		}
-
-		return false;
-	}
-
-	public function move(x:Int, y:Int):Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_move(handle, x, y);
-			#end
-		}
-	}
-
-	public function readPixels(rect:Rectangle):Image
-	{
-		var imageBuffer:ImageBuffer = null;
-
-		switch (parent.context.type)
-		{
-			case OPENGL, OPENGLES, WEBGL:
-				var gl = parent.context.webgl;
-				var windowWidth = Std.int(parent.__width * parent.__scale);
-				var windowHeight = Std.int(parent.__height * parent.__scale);
-
-				var x, y, width, height;
-
-				if (rect != null)
-				{
-					x = Std.int(rect.x);
-					y = Std.int((windowHeight - rect.y) - rect.height);
-					width = Std.int(rect.width);
-					height = Std.int(rect.height);
-				}
-				else
-				{
-					x = 0;
-					y = 0;
-					width = windowWidth;
-					height = windowHeight;
-				}
-
-				var data = new UInt8Array(width * height * 4);
-
-				gl.readPixels(x, y, width, height, gl.RGBA, gl.UNSIGNED_BYTE, data);
-
-				#if !js // TODO
-
-				var rowLength = width * 4;
-				var srcPosition = (height - 1) * rowLength;
-				var destPosition = 0;
-
-				var temp = Bytes.alloc(rowLength);
-				var buffer = data.buffer;
-				var rows = Std.int(height / 2);
-
-				while (rows-- > 0)
-				{
-					temp.blit(0, buffer, destPosition, rowLength);
-					buffer.blit(destPosition, buffer, srcPosition, rowLength);
-					buffer.blit(srcPosition, temp, 0, rowLength);
-
-					destPosition += rowLength;
-					srcPosition -= rowLength;
-				}
-				#end
-
-				imageBuffer = new ImageBuffer(data, width, height, 32, RGBA32);
-
-			default:
-				#if (!macro && lime_cffi)
-				#if !cs
-				imageBuffer = NativeCFFI.lime_window_read_pixels(handle, rect, new ImageBuffer(new UInt8Array(Bytes.alloc(0))));
-				#else
-				var data:Dynamic = NativeCFFI.lime_window_read_pixels(handle, rect, null);
-				if (data != null)
-				{
-					imageBuffer = new ImageBuffer(new UInt8Array(@:privateAccess new Bytes(data.data.length, data.data.b)), data.width, data.height,
-						data.bitsPerPixel);
-				}
-				#end
-				#end
-
-				if (imageBuffer != null)
-				{
-					imageBuffer.format = RGBA32;
-				}
-		}
-
-		if (imageBuffer != null)
-		{
-			return new Image(imageBuffer);
-		}
-
-		return null;
-	}
-
-	public function render():Void
-	{
-		#if (!macro && lime_cffi)
-		NativeCFFI.lime_window_context_make_current(handle);
-
-		if (!useHardware)
-		{
-			#if lime_cairo
-			var lock:Dynamic = NativeCFFI.lime_window_context_lock(handle);
-
-			if (lock != null
-				&& (cacheLock == null || cacheLock.pixels != lock.pixels || cacheLock.width != lock.width || cacheLock.height != lock.height))
-			{
-				primarySurface = CairoImageSurface.create(lock.pixels, CairoFormat.ARGB32, lock.width, lock.height, lock.pitch);
-
-				if (cairo != null)
-				{
-					cairo.recreate(primarySurface);
-				}
-				else
-				{
-					cairo = new Cairo(primarySurface);
-				}
-
-				parent.context.cairo = cairo;
-			}
-
-			cacheLock = lock;
-			#else
-			parent.context = null;
-			#end
-		}
-		#end
-	}
-
-	public function resize(width:Int, height:Int):Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_resize(handle, width, height);
-			#end
-		}
-	}
-
-	#if (lime >= "8.1.0")
-	public function setMinSize(width:Int, height:Int):Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_minimum_size(handle, width, height);
-			#end
-		}
-	}
-
-	public function setMaxSize(width:Int, height:Int):Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_maximum_size(handle, width, height);
-			#end
-		}
-	}
-	#end
-
-	public function setBorderless(value:Bool):Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_borderless(handle, value);
-			#end
-		}
-
-		return value;
-	}
-
-	public function setCursor(value:MouseCursor):MouseCursor
-	{
-		if (cursor != value)
-		{
-			if (value == null)
-			{
-				#if (!macro && lime_cffi)
-				NativeCFFI.lime_window_set_cursor(handle, 0);
-				#end
-			}
-			else
-			{
-				var type:MouseCursorType = switch (value)
-				{
-					case ARROW: ARROW;
-					case CROSSHAIR: CROSSHAIR;
-					case MOVE: MOVE;
-					case POINTER: POINTER;
-					case RESIZE_NESW: RESIZE_NESW;
-					case RESIZE_NS: RESIZE_NS;
-					case RESIZE_NWSE: RESIZE_NWSE;
-					case RESIZE_WE: RESIZE_WE;
-					case TEXT: TEXT;
-					case WAIT: WAIT;
-					case WAIT_ARROW: WAIT_ARROW;
-					default: DEFAULT;
-				}
-
-				#if (!macro && lime_cffi)
-				NativeCFFI.lime_window_set_cursor(handle, type);
-				#end
-			}
-
-			cursor = value;
-		}
-
-		return cursor;
-	}
-
-	public function setDisplayMode(value:DisplayMode):DisplayMode
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			#if hl
-			NativeCFFI.lime_window_set_display_mode(handle, value, displayMode);
-			#else
-			var data:Dynamic = NativeCFFI.lime_window_set_display_mode(handle, value);
-			displayMode.width = data.width;
-			displayMode.height = data.height;
-			displayMode.pixelFormat = data.pixelFormat;
-			displayMode.refreshRate = data.refreshRate;
-			#end
-			#end
-		}
-
-		return displayMode;
-	}
-
-	public function setMouseLock(value:Bool):Bool
-	{
-		if (mouseLock != value)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_mouse_lock(handle, value);
-			#end
-
-			mouseLock = value;
-		}
-
-		return mouseLock;
-	}
-
-	public function setTextInputEnabled(value:Bool):Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_text_input_enabled(handle, value);
-			#end
-		}
-
-		return value;
-	}
-
-	public function setTextInputRect(value:Rectangle):Rectangle
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_text_input_rect(handle, value);
-			#end
-		}
-
-		return value;
-	}
-
-	public function setFrameRate(value:Float):Float
-	{
-		// TODO: Support multiple independent frame rates per window
-
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_application_set_frame_rate(parent.application.__backend.handle, value);
-			#end
-		}
-
-		return frameRate = value;
-	}
-
-	public function setFullscreen(value:Bool):Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			value = NativeCFFI.lime_window_set_fullscreen(handle, value);
-
-			parent.__width = NativeCFFI.lime_window_get_width(handle);
-			parent.__height = NativeCFFI.lime_window_get_height(handle);
-			parent.__x = NativeCFFI.lime_window_get_x(handle);
-			parent.__y = NativeCFFI.lime_window_get_y(handle);
-			#end
-
-			if (value)
-			{
-				parent.onFullscreen.dispatch();
-			}
-		}
-
-		return value;
-	}
-
-	public function setIcon(image:Image):Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_icon(handle, image.buffer);
-			#end
-		}
-	}
-
-	public function setMaximized(value:Bool):Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			return NativeCFFI.lime_window_set_maximized(handle, value);
-			#end
-		}
-
-		return value;
-	}
-
-	public function setMinimized(value:Bool):Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			return NativeCFFI.lime_window_set_minimized(handle, value);
-			#end
-		}
-
-		return value;
-	}
-
-	public function setResizable(value:Bool):Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_resizable(handle, value);
-
-			// TODO: remove need for workaround
-
-			NativeCFFI.lime_window_set_borderless(handle, !parent.__borderless);
-			NativeCFFI.lime_window_set_borderless(handle, parent.__borderless);
-			#end
-		}
-
-		return value;
-	}
-
-	public function setTitle(value:String):String
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			return NativeCFFI.lime_window_set_title(handle, value);
-			#end
-		}
-
-		return value;
-	}
-
-	#if (lime >= "8.1.0")
-	public function setVisible(value:Bool):Bool
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_visible(handle, value);
-			#end
-		}
-
-		return value;
-	}
-
-	public function getOpacity():Float
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			return NativeCFFI.lime_window_get_opacity(handle);
-			#end
-		}
-
-		return 1.0;
-	}
-
-	public function setOpacity(value:Float):Void
-	{
-		if (handle != null)
-		{
-			#if (!macro && lime_cffi)
-			NativeCFFI.lime_window_set_opacity(handle, value);
-			#end
-		}
-	}
-	#end
-
-	public function warpMouse(x:Int, y:Int):Void
-	{
-		#if (!macro && lime_cffi)
-		NativeCFFI.lime_window_warp_mouse(handle, x, y);
-		#end
-	}
-}
-
-enum abstract MouseCursorType(Int) from Int to Int
-{
-	var HIDDEN = 0;
-	var ARROW = 1;
-	var CROSSHAIR = 2;
-	var DEFAULT = 3;
-	var MOVE = 4;
-	var POINTER = 5;
-	var RESIZE_NESW = 6;
-	var RESIZE_NS = 7;
-	var RESIZE_NWSE = 8;
-	var RESIZE_WE = 9;
-	var TEXT = 10;
-	var WAIT = 11;
-	var WAIT_ARROW = 12;
-}
-
-enum abstract WindowFlags(Int)
-{
-	var WINDOW_FLAG_FULLSCREEN = 0x00000001;
-	var WINDOW_FLAG_BORDERLESS = 0x00000002;
-	var WINDOW_FLAG_RESIZABLE = 0x00000004;
-	var WINDOW_FLAG_HARDWARE = 0x00000008;
-	var WINDOW_FLAG_VSYNC = 0x00000010;
-	var WINDOW_FLAG_HW_AA = 0x00000020;
-	var WINDOW_FLAG_HW_AA_HIRES = 0x00000060;
-	var WINDOW_FLAG_ALLOW_SHADERS = 0x00000080;
-	var WINDOW_FLAG_REQUIRE_SHADERS = 0x00000100;
-	var WINDOW_FLAG_DEPTH_BUFFER = 0x00000200;
-	var WINDOW_FLAG_STENCIL_BUFFER = 0x00000400;
-	var WINDOW_FLAG_ALLOW_HIGHDPI = 0x00000800;
-	var WINDOW_FLAG_HIDDEN = 0x00001000;
-	var WINDOW_FLAG_MINIMIZED = 0x00002000;
-	var WINDOW_FLAG_MAXIMIZED = 0x00004000;
-	var WINDOW_FLAG_ALWAYS_ON_TOP = 0x00008000;
-	var WINDOW_FLAG_COLOR_DEPTH_32_BIT = 0x00010000;
-}
\ No newline at end of file
diff --git a/source/lime/media/AudioBuffer.hx b/source/lime/media/AudioBuffer.hx
deleted file mode 100644
index 30c5448baa..0000000000
--- a/source/lime/media/AudioBuffer.hx
+++ /dev/null
@@ -1,518 +0,0 @@
-package lime.media;
-
-import haxe.io.Bytes;
-import haxe.io.Path;
-import lime._internal.backend.native.NativeCFFI;
-import lime._internal.format.Base64;
-import lime.app.Future;
-import lime.app.Promise;
-import lime.media.openal.AL;
-import lime.media.openal.ALBuffer;
-#if lime_vorbis
-import lime.media.vorbis.Vorbis;
-import lime.media.vorbis.VorbisFile;
-#end
-import lime.net.HTTPRequest;
-import lime.utils.Log;
-import lime.utils.UInt8Array;
-#if lime_howlerjs
-import lime.media.howlerjs.Howl;
-#end
-#if (js && html5)
-import js.html.Audio;
-#elseif flash
-import flash.media.Sound;
-import flash.net.URLRequest;
-#end
-
-@:access(lime._internal.backend.native.NativeCFFI)
-@:access(lime.utils.Assets)
-#if hl
-@:keep
-#end
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-
-/**
-	The `AudioBuffer` class represents a buffer of audio data that can be played back using an `AudioSource`. 
-	It supports a variety of audio formats and platforms, providing a consistent API for loading and managing audio data.
-
-	Depending on the platform, the audio backend may differ, but the class provides a unified interface for accessing 
-	audio data, whether it's stored in memory, loaded from a file, or streamed.
-
-	@see lime.media.AudioSource
-**/
-class AudioBuffer
-{
-	/**
-		The number of bits per sample in the audio data.
-	**/
-	public var bitsPerSample:Int;
-
-	/**
-		The number of audio channels (e.g., 1 for mono, 2 for stereo).
-	**/
-	public var channels:Int;
-
-	/**
-		The raw audio data stored as a `UInt8Array`.
-	**/
-	public var data:UInt8Array;
-
-	/**
-		The sample rate of the audio data, in Hz.
-	**/
-	public var sampleRate:Int;
-
-	/**
-		The source of the audio data. This can be an `Audio`, `Sound`, `Howl`, or other platform-specific object.
-	**/
-	public var src(get, set):Dynamic;
-
-	@:noCompletion private var __srcAudio:#if (js && html5) Audio #else Dynamic #end;
-	@:noCompletion private var __srcBuffer:#if lime_cffi ALBuffer #else Dynamic #end;
-	@:noCompletion private var __srcCustom:Dynamic;
-	@:noCompletion private var __srcHowl:#if lime_howlerjs Howl #else Dynamic #end;
-	@:noCompletion private var __srcSound:#if flash Sound #else Dynamic #end;
-	@:noCompletion private var __srcVorbisFile:#if lime_vorbis VorbisFile #else Dynamic #end;
-
-	#if commonjs
-	private static function __init__()
-	{
-		var p = untyped AudioBuffer.prototype;
-		untyped Object.defineProperties(p,
-			{
-				"src": {get: p.get_src, set: p.set_src}
-			});
-	}
-	#end
-
-	/**
-		Creates a new, empty `AudioBuffer` instance.
-	**/
-	public function new() {}
-
-	/**
-		Disposes of the resources used by this `AudioBuffer`, such as unloading any associated audio data.
-	**/
-	public function dispose():Void
-	{
-		#if (js && html5 && lime_howlerjs)
-		if (__srcHowl != null) __srcHowl.unload();
-		__srcHowl = null;
-		#end
-		#if lime_cffi
-		if (__srcBuffer != null) {
-			AL.bufferData(__srcBuffer, 0, null, 0, 0);
-			AL.deleteBuffer(__srcBuffer);
-		}
-		__srcBuffer = null;
-		#end
-		#if lime_vorbis
-		if (__srcVorbisFile != null) __srcVorbisFile.clear();
-		__srcVorbisFile = null;
-		#end
-	}
-
-	/**
-		Creates an `AudioBuffer` from a Base64-encoded string.
-
-		@param base64String The Base64-encoded audio data.
-		@return An `AudioBuffer` instance with the decoded audio data.
-	**/
-	public static function fromBase64(base64String:String):AudioBuffer
-	{
-		if (base64String == null) return null;
-
-		#if (js && html5 && lime_howlerjs)
-		// if base64String doesn't contain codec data, add it.
-		if (base64String.indexOf(",") == -1)
-		{
-			base64String = "data:" + __getCodec(Base64.decode(base64String)) + ";base64," + base64String;
-		}
-
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.src = new Howl({src: [base64String], preload: false});
-		return audioBuffer;
-		#elseif (lime_cffi && !macro)
-		#if !cs
-		// if base64String contains codec data, strip it then decode it.
-		var base64StringSplit = base64String.split(",");
-		var base64StringNoEncoding = base64StringSplit[base64StringSplit.length - 1];
-		var bytes:Bytes = Base64.decode(base64StringNoEncoding);
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.data = new UInt8Array(Bytes.alloc(0));
-
-		return NativeCFFI.lime_audio_load_bytes(bytes, audioBuffer);
-		#else
-		// if base64String contains codec data, strip it then decode it.
-		var base64StringSplit = base64String.split(",");
-		var base64StringNoEncoding = base64StringSplit[base64StringSplit.length - 1];
-		var bytes:Bytes = Base64.decode(base64StringNoEncoding);
-		var data:Dynamic = NativeCFFI.lime_audio_load_bytes(bytes, null);
-
-		if (data != null)
-		{
-			var audioBuffer = new AudioBuffer();
-			audioBuffer.bitsPerSample = data.bitsPerSample;
-			audioBuffer.channels = data.channels;
-			audioBuffer.data = new UInt8Array(@:privateAccess new Bytes(data.data.length, data.data.b));
-			audioBuffer.sampleRate = data.sampleRate;
-			return audioBuffer;
-		}
-		#end
-		#end
-
-		return null;
-	}
-
-	/**
-		Creates an `AudioBuffer` from a `Bytes` object.
-
-		@param bytes The `Bytes` object containing the audio data.
-		@return An `AudioBuffer` instance with the decoded audio data.
-	**/
-	public static function fromBytes(bytes:Bytes):AudioBuffer
-	{
-		if (bytes == null) return null;
-
-		#if (js && html5 && lime_howlerjs)
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.src = new Howl({src: ["data:" + __getCodec(bytes) + ";base64," + Base64.encode(bytes)], preload: false});
-
-		return audioBuffer;
-		#elseif (lime_cffi && !macro)
-		#if lime_vorbis
-		var vorbisFile = VorbisFile.fromBytes(bytes);
-		if (vorbisFile != null) return fromVorbisFile(vorbisFile);
-		#end
-		#if !cs
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.data = new UInt8Array(Bytes.alloc(0));
-
-		return NativeCFFI.lime_audio_load_bytes(bytes, audioBuffer);
-		#else
-		var data:Dynamic = NativeCFFI.lime_audio_load_bytes(bytes, null);
-
-		if (data != null)
-		{
-			var audioBuffer = new AudioBuffer();
-			audioBuffer.bitsPerSample = data.bitsPerSample;
-			audioBuffer.channels = data.channels;
-			audioBuffer.data = new UInt8Array(@:privateAccess new Bytes(data.data.length, data.data.b));
-			audioBuffer.sampleRate = data.sampleRate;
-			return audioBuffer;
-		}
-		#end
-		#end
-
-		return null;
-	}
-
-	/**
-		Creates an `AudioBuffer` from a file.
-
-		@param path The file path to the audio data.
-		@return An `AudioBuffer` instance with the audio data loaded from the file.
-	**/
-	public static function fromFile(path:String #if (js && html5 && lime_howlerjs), ?howlHtml5 = false #end):AudioBuffer
-	{
-		if (path == null) return null;
-
-		#if (js && html5 && lime_howlerjs)
-		var audioBuffer = new AudioBuffer();
-
-		#if force_html5_audio
-		audioBuffer.__srcHowl = new Howl({src: [path], html5: true, preload: false});
-		#else
-		audioBuffer.__srcHowl = new Howl({src: [path], html5: howlHtml5, preload: false});
-		#end
-
-		return audioBuffer;
-		#elseif flash
-		switch (Path.extension(path))
-		{
-			case "ogg", "wav":
-				return null;
-			default:
-		}
-
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.__srcSound = new Sound(new URLRequest(path));
-		return audioBuffer;
-		#elseif (lime_cffi && !macro)
-		#if !cs
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.data = new UInt8Array(Bytes.alloc(0));
-
-		//audioBuffer = NativeCFFI.lime_audio_load_file(path, audioBuffer);
-		//if (audioBuffer != null) audioBuffer.initBuffer();
-		//return audioBuffer;
-		return NativeCFFI.lime_audio_load_file(path, audioBuffer);
-		#else
-		var data:Dynamic = NativeCFFI.lime_audio_load_file(path, null);
-
-		if (data != null)
-		{
-			var audioBuffer = new AudioBuffer();
-			audioBuffer.bitsPerSample = data.bitsPerSample;
-			audioBuffer.channels = data.channels;
-			audioBuffer.data = new UInt8Array(@:privateAccess new Bytes(data.data.length, data.data.b));
-			audioBuffer.sampleRate = data.sampleRate;
-			//audioBuffer.initBuffer();
-			return audioBuffer;
-		}
-
-		return null;
-		#end
-		#else
-		return null;
-		#end
-	}
-
-	/**
-		Creates an `AudioBuffer` from an array of file paths.
-
-		@param paths An array of file paths to search for audio data.
-		@return An `AudioBuffer` instance with the audio data loaded from the first valid file found.
-	**/
-	public static function fromFiles(paths:Array<String> #if (js && html5 && lime_howlerjs), ?howlHtml5 = false #end):AudioBuffer
-	{
-		#if (js && html5 && lime_howlerjs)
-		var audioBuffer = new AudioBuffer();
-
-		#if force_html5_audio
-		audioBuffer.__srcHowl = new Howl({src: paths, html5: true, preload: false});
-		#else
-		audioBuffer.__srcHowl = new Howl({src: paths, html5: howlHtml5, preload: false});
-		#end
-
-		return audioBuffer;
-		#else
-		var buffer = null;
-
-		for (path in paths)
-		{
-			buffer = AudioBuffer.fromFile(path);
-			if (buffer != null) break;
-		}
-
-		return buffer;
-		#end
-	}
-
-	/**
-		Creates an `AudioBuffer` from a `VorbisFile`.
-
-		@param vorbisFile The `VorbisFile` object containing the audio data.
-		@return An `AudioBuffer` instance with the decoded audio data.
-	**/
-	#if lime_vorbis
-		
-	public static function fromVorbisFile(vorbisFile:VorbisFile):AudioBuffer
-	{
-		if (vorbisFile == null) return null;
-
-		var info = vorbisFile.info();
-
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.channels = info.channels;
-		audioBuffer.sampleRate = info.rate;
-		audioBuffer.bitsPerSample = 16;
-
-		final pcmTotal = vorbisFile.pcmTotal(-1);
-		if (!vorbisFile.seekable() || pcmTotal < (audioBuffer.sampleRate << 2)) {
-			vorbisFile.rawSeek(0);
-
-			final isBigEndian = lime.system.System.endianness == lime.system.Endian.BIG_ENDIAN;
-			final bytes = Bytes.alloc(Std.int((pcmTotal.high * 4294967296. + (pcmTotal.low >> 0)) * info.channels * (audioBuffer.bitsPerSample >> 3)));
-			var total = 0, result = 0;
-			do {
-				result = vorbisFile.read(bytes, total, 0x1000, isBigEndian, 2, true);
-				total += result;
-			} while (result > 0 || result == Vorbis.HOLE);
-
-			audioBuffer.data = new UInt8Array(bytes);
-			vorbisFile.clear();
-		}
-		else
-			audioBuffer.__srcVorbisFile = vorbisFile;
-
-		return audioBuffer;
-	}
-	#else
-	public static function fromVorbisFile(vorbisFile:Dynamic):AudioBuffer
-	{
-		return null;
-	}
-	#end
-
-	/**
-		Asynchronously loads an `AudioBuffer` from a file.
-
-		@param path The file path to the audio data.
-		@return A `Future` that resolves to the loaded `AudioBuffer`.
-	**/
-	public static function loadFromFile(path:String):Future<AudioBuffer>
-	{
-		#if (flash || (js && html5))
-		var promise = new Promise<AudioBuffer>();
-
-		var audioBuffer = AudioBuffer.fromFile(path);
-
-		if (audioBuffer != null)
-		{
-			#if flash
-			audioBuffer.__srcSound.addEventListener(flash.events.Event.COMPLETE, function(event)
-			{
-				promise.complete(audioBuffer);
-			});
-
-			audioBuffer.__srcSound.addEventListener(flash.events.ProgressEvent.PROGRESS, function(event)
-			{
-				promise.progress(Std.int(event.bytesLoaded), Std.int(event.bytesTotal));
-			});
-
-			audioBuffer.__srcSound.addEventListener(flash.events.IOErrorEvent.IO_ERROR, promise.error);
-			#elseif (js && html5 && lime_howlerjs)
-			if (audioBuffer != null)
-			{
-				audioBuffer.__srcHowl.on("load", function()
-				{
-					promise.complete(audioBuffer);
-				});
-
-				audioBuffer.__srcHowl.on("loaderror", function(id, msg)
-				{
-					promise.error(msg);
-				});
-
-				audioBuffer.__srcHowl.load();
-			}
-			#else
-			promise.complete(audioBuffer);
-			#end
-		}
-		else
-		{
-			promise.error(null);
-		}
-
-		return promise.future;
-		#else
-		// TODO: Streaming
-
-		var request = new HTTPRequest<AudioBuffer>();
-		return request.load(path).then(function(buffer)
-		{
-			if (buffer != null)
-			{
-				return Future.withValue(buffer);
-			}
-			else
-			{
-				return cast Future.withError("");
-			}
-		});
-		#end
-	}
-
-	/**
-		Asynchronously loads an `AudioBuffer` from multiple files.
-
-		@param paths An array of file paths to search for audio data.
-		@return A `Future` that resolves to the loaded `AudioBuffer`.
-	**/
-	public static function loadFromFiles(paths:Array<String>):Future<AudioBuffer>
-	{
-		#if (js && html5 && lime_howlerjs)
-		var promise = new Promise<AudioBuffer>();
-
-		var audioBuffer = AudioBuffer.fromFiles(paths);
-
-		if (audioBuffer != null)
-		{
-			audioBuffer.__srcHowl.on("load", function()
-			{
-				promise.complete(audioBuffer);
-			});
-
-			audioBuffer.__srcHowl.on("loaderror", function()
-			{
-				promise.error(null);
-			});
-
-			audioBuffer.__srcHowl.load();
-		}
-		else
-		{
-			promise.error(null);
-		}
-
-		return promise.future;
-		#else
-		return new Future(fromFiles.bind(paths), true);
-		#end
-	}
-
-	private static function __getCodec(bytes:Bytes):String
-	{
-		var signature = bytes.getString(0, 4);
-
-		switch (signature)
-		{
-			case "OggS":
-				return "audio/ogg";
-			case "fLaC":
-				return "audio/flac";
-			case "RIFF" if (bytes.getString(8, 4) == "WAVE"):
-				return "audio/wav";
-			default:
-				switch ([bytes.get(0), bytes.get(1), bytes.get(2)])
-				{
-					case [73, 68, 51] | [255, 251, _] | [255, 250, _] | [255, 243, _]: return "audio/mp3";
-					default:
-				}
-		}
-
-		Log.error("Unsupported sound format");
-		return null;
-	}
-
-	// Get & Set Methods
-	@:noCompletion private function get_src():Dynamic
-	{
-		#if (js && html5)
-		#if lime_howlerjs
-		return __srcHowl;
-		#else
-		return __srcAudio;
-		#end
-		#elseif flash
-		return __srcSound;
-		#elseif lime_vorbis
-		return __srcVorbisFile;
-		#else
-		return __srcCustom;
-		#end
-	}
-
-	@:noCompletion private function set_src(value:Dynamic):Dynamic
-	{
-		#if (js && html5)
-		#if lime_howlerjs
-		return __srcHowl = value;
-		#else
-		return __srcAudio = value;
-		#end
-		#elseif flash
-		return __srcSound = value;
-		#elseif lime_vorbis
-		return __srcVorbisFile = value;
-		#else
-		return __srcCustom = value;
-		#end
-	}
-}
diff --git a/source/lime/media/AudioSource.hx b/source/lime/media/AudioSource.hx
deleted file mode 100644
index 992bfdb5bf..0000000000
--- a/source/lime/media/AudioSource.hx
+++ /dev/null
@@ -1,257 +0,0 @@
-package lime.media;
-
-import lime.app.Event;
-import lime.math.Vector4;
-
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-/**
-	The `AudioSource` class provides a way to control audio playback in a Lime application. 
-	It allows for playing, pausing, and stopping audio, as well as controlling various 
-	audio properties such as gain, pitch, and looping.
-
-	Depending on the platform, the audio backend may vary, but the API remains consistent.
-
-	@see lime.media.AudioBuffer
-**/
-class AudioSource
-{
-	private static var activeSources:Array<AudioSource> = [];
-
-	/**
-		An event that is dispatched when the audio playback is complete.
-	**/
-	public var onComplete = new Event<Void->Void>();
-
-	/**
-		An event that is dispatched when the audio playback looped.
-	**/
-	public var onLoop = new Event<Void->Void>();
-
-	/**
-		The `AudioBuffer` associated with this `AudioSource`.
-	**/
-	public var buffer:AudioBuffer;
-
-	/**
-		An property if this 'AudioSource' is playing.
-	**/
-	public var playing(get, null):Bool;
-
-	/**
-		The current playback position of the audio, in milliseconds.
-	**/
-	public var currentTime(get, set):Float;
-
-	/**
-		The gain (volume) of the audio. A value of `1.0` represents the default volume.
-	**/
-	public var gain(get, set):Float;
-
-	/**
-		The length of the audio, in milliseconds.
-	**/
-	public var length(get, set):Null<Float>;
-
-	/**
-		The number of times the audio will loop. A value of `0` means the audio will not loop.
-	**/
-	public var loops(get, set):Int;
-
-	/**
-		In which audio playback time the audio will loop.
-	**/
-	public var loopTime(get, set):Float;
-
-	/**
-		The pitch of the audio. A value of `1.0` represents the default pitch.
-	**/
-	public var pitch(get, set):Float;
-
-	/**
-		The offset within the audio buffer to start playback, in samples.
-	**/
-	public var offset:Float;
-
-	/**
-		The 3D position of the audio source, represented as a `Vector4`.
-	**/
-	public var position(get, set):Vector4;
-
-	/**
-		The stereo pan of the audio source.
-	**/
-	public var pan(get, set):Float;
-
-	/**
-		The latency of the audio source.
-	**/
-	public var latency(get, never):Float;
-
-	@:noCompletion private var __backend:AudioSourceBackend;
-
-	/**
-		Creates a new `AudioSource` instance.
-		@param buffer The `AudioBuffer` to associate with this `AudioSource`.
-		@param offset The starting offset within the audio buffer, in samples.
-		@param length The length of the audio to play, in milliseconds. If `null`, the full buffer is used.
-		@param loops The number of times to loop the audio. `0` means no looping.
-	**/
-	public function new(buffer:AudioBuffer = null, offset:Float = 0, length:Null<Float> = null, loops:Int = 0)
-	{
-		this.buffer = buffer;
-		this.offset = offset;
-
-		__backend = new AudioSourceBackend(this);
-
-		if (length != null && length != 0)
-		{
-			this.length = length;
-		}
-
-		if (buffer != null)
-		{
-			init();
-		}
-
-		this.loops = loops;
-	}
-
-	/**
-		Releases any resources used by this `AudioSource`.
-	**/
-	inline public function dispose():Void
-	{
-		__backend.dispose();
-		activeSources.remove(this);
-	}
-
-	@:noCompletion inline private function init():Void
-	{
-		__backend.init();
-		if (!activeSources.contains(this)) activeSources.push(this);
-	}
-
-	/**
-		Starts or resumes audio playback.
-	**/
-	inline public function play():Void
-	{
-		__backend.play();
-	}
-
-	/**
-		Pauses audio playback.
-	**/
-	inline public function pause():Void
-	{
-		__backend.pause();
-	}
-
-	/**
-		Stops audio playback and resets the playback position to the beginning.
-	**/
-	inline public function stop():Void
-	{
-		__backend.stop();
-	}
-
-	// Get & Set Methods
-	@:noCompletion inline private function get_playing():Bool
-	{
-		@:privateAccess return __backend.playing;
-	}
-
-	@:noCompletion inline private function get_currentTime():Float
-	{
-		return __backend.getCurrentTime();
-	}
-
-	@:noCompletion inline private function set_currentTime(value:Float):Float
-	{
-		return __backend.setCurrentTime(value);
-	}
-
-	@:noCompletion inline private function get_gain():Float
-	{
-		return __backend.getGain();
-	}
-
-	@:noCompletion inline private function set_gain(value:Float):Float
-	{
-		return __backend.setGain(value);
-	}
-
-	@:noCompletion inline private function get_length():Null<Float>
-	{
-		return __backend.getLength();
-	}
-
-	@:noCompletion inline private function set_length(value:Null<Float>):Null<Float>
-	{
-		return __backend.setLength(value);
-	}
-
-	@:noCompletion inline private function get_loops():Int
-	{
-		return __backend.getLoops();
-	}
-
-	@:noCompletion inline private function set_loops(value:Int):Int
-	{
-		return __backend.setLoops(value);
-	}
-
-	@:noCompletion inline private function get_loopTime():Float
-	{
-		return __backend.getLoopTime();
-	}
-
-	@:noCompletion inline private function set_loopTime(value:Float):Float
-	{
-		return __backend.setLoopTime(value);
-	}
-
-	@:noCompletion inline private function get_pitch():Float
-	{
-		return __backend.getPitch();
-	}
-
-	@:noCompletion inline private function set_pitch(value:Float):Float
-	{
-		return __backend.setPitch(value);
-	}
-
-	@:noCompletion inline private function get_position():Vector4
-	{
-		return __backend.getPosition();
-	}
-
-	@:noCompletion inline private function set_position(value:Vector4):Vector4
-	{
-		return __backend.setPosition(value);
-	}
-
-	@:noCompletion inline private function get_pan():Float
-	{
-		return __backend.getPan();
-	}
-
-	@:noCompletion inline private function set_pan(value:Float):Float
-	{
-		return __backend.setPan(value);
-	}
-
-	@:noCompletion inline private function get_latency():Float
-	{
-		return __backend.getLatency();
-	}
-}
-
-#if (js && html5)
-@:noCompletion private typedef AudioSourceBackend = lime._internal.backend.html5.HTML5AudioSource;
-#else
-@:noCompletion private typedef AudioSourceBackend = lime._internal.backend.native.NativeAudioSource;
-#end
diff --git a/source/lime/media/vorbis/VorbisFile.hx b/source/lime/media/vorbis/VorbisFile.hx
deleted file mode 100644
index bd29a7a7f5..0000000000
--- a/source/lime/media/vorbis/VorbisFile.hx
+++ /dev/null
@@ -1,356 +0,0 @@
-package lime.media.vorbis;
-
-#if (!lime_doc_gen || lime_vorbis)
-import haxe.Int64;
-import haxe.io.Bytes;
-import lime._internal.backend.native.NativeCFFI;
-
-#if hl
-@:keep
-#end
-@:access(lime._internal.backend.native.NativeCFFI)
-class VorbisFile
-{
-	public var bitstream(default, null):Int;
-
-	@:noCompletion private var handle:Dynamic;
-
-	@:noCompletion var _filePath:String;
-	@:noCompletion var _bytes:Bytes;
-
-	@:noCompletion private function new(handle:Dynamic)
-	{
-		this.handle = handle;
-	}
-
-	public function bitrate(bitstream:Int = -1):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_bitrate(handle, bitstream);
-		#else
-		return 0;
-		#end
-	}
-
-	public function bitrateInstant():Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_bitrate_instant(handle);
-		#else
-		return 0;
-		#end
-	}
-
-	public function clear():Void
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		NativeCFFI.lime_vorbis_file_clear(handle);
-		#end
-		handle = null;
-		_filePath = null;
-		_bytes = null;
-	}
-
-	public function clone():VorbisFile
-	{
-		if (_filePath != null) return fromFile(_filePath);
-		if (_bytes != null) return fromBytes(_bytes);
-		return null;
-	}
-
-	public function comment(bitstream:Int = -1):VorbisComment
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_comment(handle, bitstream);
-
-		if (data != null)
-		{
-			var comment = new VorbisComment();
-			comment.userComments = data.userComments;
-			comment.vendor = data.vendor;
-			return comment;
-		}
-		#end
-
-		return null;
-	}
-
-	public function crosslap(other:VorbisFile):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_crosslap(handle, other.handle);
-		#else
-		return 0;
-		#end
-	}
-
-	public static function fromBytes(bytes:Bytes):VorbisFile
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var handle = NativeCFFI.lime_vorbis_file_from_bytes(bytes);
-
-		if (handle != null)
-		{
-			var vorbisFile = new VorbisFile(handle);
-			vorbisFile._bytes = bytes;
-			return vorbisFile;
-		}
-		#end
-
-		return null;
-	}
-
-	public static function fromFile(path:String):VorbisFile
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var handle = NativeCFFI.lime_vorbis_file_from_file(path);
-
-		if (handle != null)
-		{
-			var vorbisFile = new VorbisFile(handle);
-			vorbisFile._filePath = path;
-			return vorbisFile;
-		}
-		#end
-
-		return null;
-	}
-
-	public function info(bitstream:Int = -1):VorbisInfo
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_info(handle, bitstream);
-
-		if (data != null)
-		{
-			var info = new VorbisInfo();
-			info.bitrateLower = data.bitrateLower;
-			info.bitrateNominal = data.bitrateNominal;
-			info.bitrateUpper = data.bitrateUpper;
-			info.channels = data.channels;
-			info.rate = data.rate;
-			info.version = data.version;
-			return info;
-		}
-		#end
-
-		return null;
-	}
-
-	public function pcmSeek(pos:Int64):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_pcm_seek(handle, pos.low, pos.high);
-		#else
-		return 0;
-		#end
-	}
-
-	public function pcmSeekLap(pos:Int64):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_pcm_seek_lap(handle, pos.low, pos.high);
-		#else
-		return 0;
-		#end
-	}
-
-	public function pcmSeekPage(pos:Int64):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_pcm_seek_page(handle, pos.low, pos.high);
-		#else
-		return 0;
-		#end
-	}
-
-	public function pcmSeekPageLap(pos:Int64):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_pcm_seek_page_lap(handle, pos.low, pos.high);
-		#else
-		return 0;
-		#end
-	}
-
-	public function pcmTell():Int64
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_pcm_tell(handle);
-
-		if (data != null)
-		{
-			return Int64.make(data.high, data.low);
-		}
-		#end
-
-		return Int64.ofInt(0);
-	}
-
-	public function pcmTotal(bitstream:Int = -1):Int64
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_pcm_total(handle, bitstream);
-
-		if (data != null)
-		{
-			return Int64.make(data.high, data.low);
-		}
-		#end
-
-		return Int64.ofInt(0);
-	}
-
-	public function rawSeek(pos:Int64):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_raw_seek(handle, pos.low, pos.high);
-		#else
-		return 0;
-		#end
-	}
-
-	public function rawSeekLap(pos:Int64):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_raw_seek_lap(handle, pos.low, pos.high);
-		#else
-		return 0;
-		#end
-	}
-
-	public function rawTell():Int64
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_raw_tell(handle);
-
-		if (data != null)
-		{
-			return Int64.make(data.high, data.low);
-		}
-		#end
-
-		return Int64.ofInt(0);
-	}
-
-	public function rawTotal(bitstream:Int = -1):Int64
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_raw_total(handle, bitstream);
-
-		if (data != null)
-		{
-			return Int64.make(data.high, data.low);
-		}
-		#end
-
-		return Int64.ofInt(0);
-	}
-
-	public function read(buffer:Bytes, position:Int, length:Int = 4096, bigEndianPacking:Bool = false, wordSize:Int = 2, signed:Bool = true):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_read(handle, buffer, position, length, bigEndianPacking, wordSize, signed);
-		if (data == null) return 0;
-		bitstream = data.bitstream;
-		return data.returnValue;
-		#else
-		return 0;
-		#end
-	}
-
-	// public function readFilter (buffer:Bytes, length:Int = 4096, endianness:Endian = LITTLE_ENDIAN, wordSize:Int = 2, signed:Bool = true, bitstream:Int = 0, filter, filter_param
-	public function readFloat(pcmChannels:Bytes, samples:Int):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_read_float(handle, pcmChannels, samples);
-		if (data == null) return 0;
-		bitstream = data.bitstream;
-		return data.returnValue;
-		#else
-		return 0;
-		#end
-	}
-
-	public function seekable():Bool
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_seekable(handle);
-		#else
-		return false;
-		#end
-	}
-
-	public function serialNumber(bitstream:Int = -1):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_serial_number(handle, bitstream);
-		#else
-		return 0;
-		#end
-	}
-
-	public function streams():Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_streams(handle);
-		#else
-		return 0;
-		#end
-	}
-
-	public function timeSeek(s:Float):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_time_seek(handle, s);
-		#else
-		return 0;
-		#end
-	}
-
-	public function timeSeekLap(s:Float):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_time_seek_lap(handle, s);
-		#else
-		return 0;
-		#end
-	}
-
-	public function timeSeekPage(s:Float):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_time_seek_page(handle, s);
-		#else
-		return 0;
-		#end
-	}
-
-	public function timeSeekPageLap(s:Float):Int
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_time_seek_page_lap(handle, s);
-		#else
-		return 0;
-		#end
-	}
-
-	public function timeTell():Float
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_time_tell(handle);
-		#else
-		return 0;
-		#end
-	}
-
-	public function timeTotal(bitstream:Int = -1):Float
-	{
-		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_time_total(handle, bitstream);
-		#else
-		return 0;
-		#end
-	}
-}
-#end
diff --git a/source/lime/system/System.hx b/source/lime/system/System.hx
deleted file mode 100644
index 2184f5fe62..0000000000
--- a/source/lime/system/System.hx
+++ /dev/null
@@ -1,905 +0,0 @@
-package lime.system;
-
-import haxe.Constraints;
-import lime._internal.backend.native.NativeCFFI;
-import lime.app.Application;
-import lime.graphics.RenderContextAttributes;
-import lime.math.Rectangle;
-import lime.ui.WindowAttributes;
-import lime.utils.ArrayBuffer;
-import lime.utils.UInt8Array;
-import lime.utils.UInt16Array;
-#if flash
-import openfl.net.URLRequest;
-import openfl.system.Capabilities;
-import openfl.Lib;
-#end
-#if air
-import openfl.desktop.NativeApplication;
-#end
-#if ((js && html5) || electron)
-import js.html.Element;
-import js.Browser;
-#end
-#if sys
-import sys.io.Process;
-#end
-
-/**
-	Access operating system level settings and operations.
-**/
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(lime._internal.backend.native.NativeCFFI)
-@:access(lime.system.Display)
-@:access(lime.system.DisplayMode)
-#if (cpp && windows && !HXCPP_MINGW && !lime_disable_gpu_hint)
-@:cppFileCode('
-#if defined(HX_WINDOWS)
-extern "C" {
-	_declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001;
-	_declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
-}
-#endif
-')
-#end
-class System
-{
-	/**
-		Determines if the screen saver is allowed to start or not.
-	**/
-	public static var allowScreenTimeout(get, set):Bool;
-
-	/**
-		The path to the directory where the application is installed, along with
-		its supporting files. In many cases, this directory is read-only, and
-		attempts to write to files, create new files, or delete files in this
-		directory are likely fail.
-	**/
-	public static var applicationDirectory(get, never):String;
-
-	/**
-		The application's dedicated storage directory, which unique to each
-		application and user. Useful for storing settings on a user-specific
-		and application-specific basis.
-
-		This directory may or may not be removed when the application is
-		uninstalled, and it depends on the platform and installer technology
-		that is used.
-	**/
-	public static var applicationStorageDirectory(get, never):String;
-
-	/**
-		The path to the directory containing the user's desktop.
-	**/
-	public static var desktopDirectory(get, never):String;
-
-	public static var deviceModel(get, never):String;
-	public static var deviceVendor(get, never):String;
-	public static var disableCFFI:Bool;
-
-	/**
-		The path to the directory containing the user's documents.
-	**/
-	public static var documentsDirectory(get, never):String;
-
-	/**
-		The platform's default endianness for bytes.
-	**/
-	public static var endianness(get, never):Endian;
-
-	/**
-		The path to the directory where fonts are installed.
-	**/
-	public static var fontsDirectory(get, never):String;
-
-	/**
-		The number of available video displays.
-	**/
-	public static var numDisplays(get, never):Int;
-
-	public static var platformLabel(get, never):String;
-	public static var platformName(get, never):String;
-	public static var platformVersion(get, never):String;
-
-	/**
-		The path to the user's home directory.
-	**/
-	public static var userDirectory(get, never):String;
-
-	@:noCompletion private static var __applicationDirectory:String;
-	@:noCompletion private static var __applicationEntryPoint:Map<String, Function>;
-	@:noCompletion private static var __applicationStorageDirectory:String;
-	@:noCompletion private static var __desktopDirectory:String;
-	@:noCompletion private static var __deviceModel:String;
-	@:noCompletion private static var __deviceVendor:String;
-	@:noCompletion private static var __directories = new Map<SystemDirectory, String>();
-	@:noCompletion private static var __documentsDirectory:String;
-	@:noCompletion private static var __endianness:Endian;
-	@:noCompletion private static var __fontsDirectory:String;
-	@:noCompletion private static var __platformLabel:String;
-	@:noCompletion private static var __platformName:String;
-	@:noCompletion private static var __platformVersion:String;
-	@:noCompletion private static var __userDirectory:String;
-
-	#if (js && html5)
-	@:keep @:expose("lime.embed")
-	public static function embed(projectName:String, element:Dynamic, width:Null<Int> = null, height:Null<Int> = null, config:Dynamic = null):Void
-	{
-		if (__applicationEntryPoint == null) return;
-
-		if (__applicationEntryPoint.exists(projectName))
-		{
-			var htmlElement:Element = null;
-
-			if ((element is String))
-			{
-				htmlElement = cast Browser.document.getElementById(element);
-			}
-			else if (element == null)
-			{
-				htmlElement = cast Browser.document.createElement("div");
-			}
-			else
-			{
-				htmlElement = cast element;
-			}
-
-			if (htmlElement == null)
-			{
-				Browser.window.console.log("[lime.embed] ERROR: Cannot find target element: " + element);
-				return;
-			}
-
-			if (width == null)
-			{
-				width = 0;
-			}
-
-			if (height == null)
-			{
-				height = 0;
-			}
-
-			if (config == null) config = {};
-
-			if (Reflect.hasField(config, "background") && (config.background is String))
-			{
-				var background = StringTools.replace(Std.string(config.background), "#", "");
-
-				if (background.indexOf("0x") > -1)
-				{
-					config.background = Std.parseInt(background);
-				}
-				else
-				{
-					config.background = Std.parseInt("0x" + background);
-				}
-			}
-
-			config.element = htmlElement;
-			config.width = width;
-			config.height = height;
-
-			__applicationEntryPoint[projectName](config);
-		}
-	}
-	#end
-
-	#if (!lime_doc_gen || sys)
-	/**
-		Attempts to exit the application. Dispatches `onExit`, and will not
-		exit if the event is canceled.
-	**/
-	public static function exit(code:Int):Void
-	{
-		var currentApp = Application.current;
-		#if ((sys || (js && html5) || air) && !macro)
-		if (currentApp != null)
-		{
-			currentApp.onExit.dispatch(code);
-
-			if (currentApp.onExit.canceled)
-			{
-				return;
-			}
-		}
-		#end
-
-		#if sys
-		Sys.exit(code);
-		#elseif (js && html5)
-		if (currentApp != null && currentApp.window != null)
-		{
-			currentApp.window.close();
-		}
-		#elseif air
-		NativeApplication.nativeApplication.exit(code);
-		#end
-	}
-	#end
-
-	/**
-		Returns information about the video display with the specified ID.
-	**/
-	public static function getDisplay(id:Int):Display
-	{
-		#if (lime_cffi && !macro)
-		var displayInfo:Dynamic = NativeCFFI.lime_system_get_display(id);
-
-		if (displayInfo != null)
-		{
-			var display = new Display();
-			display.id = id;
-			#if hl
-			display.name = @:privateAccess String.fromUTF8(displayInfo.name);
-			#else
-			display.name = displayInfo.name;
-			#end
-			display.bounds = new Rectangle(displayInfo.bounds.x, displayInfo.bounds.y, displayInfo.bounds.width, displayInfo.bounds.height);
-
-			#if ios
-			var tablet = NativeCFFI.lime_system_get_ios_tablet();
-			var scale = Application.current.window.scale;
-			if (!tablet && scale > 2.46)
-			{
-				display.dpi = 401; // workaround for iPhone Plus
-			}
-			else
-			{
-				display.dpi = (tablet ? 132 : 163) * scale;
-			}
-			#elseif android
-			var getDisplayDPI = JNI.createStaticMethod("org/haxe/lime/GameActivity", "getDisplayXDPI", "()D");
-			display.dpi = Math.round(getDisplayDPI());
-			#else
-			display.dpi = displayInfo.dpi;
-			#end
-
-			display.supportedModes = [];
-
-			var displayMode;
-
-			#if hl
-			var supportedModes:hl.NativeArray<Dynamic> = displayInfo.supportedModes;
-			#else
-			var supportedModes:Array<Dynamic> = displayInfo.supportedModes;
-			#end
-			for (mode in supportedModes)
-			{
-				displayMode = new DisplayMode(mode.width, mode.height, mode.refreshRate, mode.pixelFormat);
-				display.supportedModes.push(displayMode);
-			}
-
-			var mode = displayInfo.currentMode;
-			var currentMode = new DisplayMode(mode.width, mode.height, mode.refreshRate, mode.pixelFormat);
-
-			for (mode in display.supportedModes)
-			{
-				if (currentMode.pixelFormat == mode.pixelFormat
-					&& currentMode.width == mode.width
-					&& currentMode.height == mode.height
-					&& currentMode.refreshRate == mode.refreshRate)
-				{
-					currentMode = mode;
-					break;
-				}
-			}
-
-			display.currentMode = currentMode;
-
-			return display;
-		}
-		#elseif (flash || html5)
-		if (id == 0)
-		{
-			var display = new Display();
-			display.id = 0;
-			display.name = "Generic Display";
-
-			#if flash
-			display.dpi = Capabilities.screenDPI;
-			display.currentMode = new DisplayMode(Std.int(Capabilities.screenResolutionX), Std.int(Capabilities.screenResolutionY), 60, ARGB32);
-			#elseif (js && html5)
-			// var div = Browser.document.createElement ("div");
-			// div.style.width = "1in";
-			// Browser.document.body.appendChild (div);
-			// var ppi = Browser.document.defaultView.getComputedStyle (div, null).getPropertyValue ("width");
-			// Browser.document.body.removeChild (div);
-			// display.dpi = Std.parseFloat (ppi);
-			display.dpi = 96 * Browser.window.devicePixelRatio;
-			display.currentMode = new DisplayMode(Browser.window.screen.width, Browser.window.screen.height, 60, ARGB32);
-			#end
-
-			display.supportedModes = [display.currentMode];
-			display.bounds = new Rectangle(0, 0, display.currentMode.width, display.currentMode.height);
-			return display;
-		}
-		#end
-
-		return null;
-	}
-
-	/**
-		The number of milliseconds since the application was initialized.
-	**/
-	public static function getTimer():Int
-	{
-		#if flash
-		return flash.Lib.getTimer();
-		#elseif ((js && !nodejs) || electron)
-		return Std.int(Browser.window.performance.now());
-		#elseif (lime_cffi && !macro)
-		return cast NativeCFFI.lime_system_get_timer();
-		#elseif cpp
-		return Std.int(untyped __global__.__time_stamp() * 1000);
-		#elseif sys
-		return Std.int(Sys.time() * 1000);
-		#else
-		return 0;
-		#end
-	}
-
-	#if (!lime_doc_gen || lime_cffi)
-	public static inline function load(library:String, method:String, args:Int = 0, lazy:Bool = false):Dynamic
-	{
-		#if !macro
-		return CFFI.load(library, method, args, lazy);
-		#else
-		return null;
-		#end
-	}
-	#end
-
-	/**
-		Opens a file with the suste, default application.
-
-		In a web browser, opens a URL with target `_blank`.
-	**/
-	public static function openFile(path:String):Void
-	{
-		if (path != null)
-		{
-			#if (sys && windows)
-			Sys.command("start", ["", path]);
-			#elseif mac
-			Sys.command("/usr/bin/open", [path]);
-			#elseif linux
-			// generally `xdg-open` should work in every distro
-			var cmd = Sys.command("xdg-open", [path, "&"]);
-			// run old command JUST IN CASE it fails, which it shouldn't
-			if (cmd != 0) cmd = Sys.command("/usr/bin/xdg-open", [path, "&"]);
-			#elseif (js && html5)
-			Browser.window.open(path, "_blank");
-			#elseif flash
-			Lib.getURL(new URLRequest(path), "_blank");
-			#elseif android
-			var openFile = JNI.createStaticMethod("org/haxe/lime/GameActivity", "openFile", "(Ljava/lang/String;)V");
-			openFile(path);
-			#elseif (lime_cffi && !macro)
-			NativeCFFI.lime_system_open_file(path);
-			#end
-		}
-	}
-
-	/**
-		Opens a URL with the specified target web browser window.
-	**/
-	public static function openURL(url:String, target:String = "_blank"):Void
-	{
-		if (url != null)
-		{
-			#if desktop
-			openFile(url);
-			#elseif (js && html5)
-			Browser.window.open(url, target);
-			#elseif flash
-			Lib.getURL(new URLRequest(url), target);
-			#elseif android
-			var openURL = JNI.createStaticMethod("org/haxe/lime/GameActivity", "openURL", "(Ljava/lang/String;Ljava/lang/String;)V");
-			openURL(url, target);
-			#elseif (lime_cffi && !macro)
-			NativeCFFI.lime_system_open_url(url, target);
-			#end
-		}
-	}
-
-	@:noCompletion private static function __copyMissingFields(target:Dynamic, source:Dynamic):Void
-	{
-		if (source == null || target == null) return;
-
-		for (field in Reflect.fields(source))
-		{
-			if (!Reflect.hasField(target, field))
-			{
-				Reflect.setField(target, field, Reflect.field(source, field));
-			}
-		}
-	}
-
-	@:noCompletion private static function __getDirectory(type:SystemDirectory):String
-	{
-		#if (lime_cffi && !macro)
-		if (__directories.exists(type))
-		{
-			return __directories.get(type);
-		}
-		else
-		{
-			var path:String;
-
-			if (type == APPLICATION_STORAGE)
-			{
-				var company = "MyCompany";
-				var file = "MyApplication";
-
-				if (Application.current != null)
-				{
-					if (Application.current.meta.exists("company"))
-					{
-						company = Application.current.meta.get("company");
-					}
-
-					if (Application.current.meta.exists("file"))
-					{
-						file = Application.current.meta.get("file");
-					}
-				}
-
-				#if hl
-				path = @:privateAccess String.fromUTF8(NativeCFFI.lime_system_get_directory(type, company, file));
-				#else
-				path = NativeCFFI.lime_system_get_directory(type, company, file);
-				#end
-			}
-			else
-			{
-				#if hl
-				path = @:privateAccess String.fromUTF8(NativeCFFI.lime_system_get_directory(type, null, null));
-				#else
-				path = NativeCFFI.lime_system_get_directory(type, null, null);
-				#end
-			}
-
-			#if windows
-			var seperator = "\\";
-			#else
-			var seperator = "/";
-			#end
-
-			if (path != null && path.length > 0 && !StringTools.endsWith(path, seperator))
-			{
-				path += seperator;
-			}
-
-			__directories.set(type, path);
-			return path;
-		}
-		#elseif flash
-		if (type != FONTS && Capabilities.playerType == "Desktop")
-		{
-			var propertyName = switch (type)
-			{
-				case APPLICATION: "applicationDirectory";
-				case APPLICATION_STORAGE: "applicationStorageDirectory";
-				case DESKTOP: "desktopDirectory";
-				case DOCUMENTS: "documentsDirectory";
-				default: "userDirectory";
-			}
-
-			return Reflect.getProperty(Type.resolveClass("flash.filesystem.File"), propertyName).nativePath;
-		}
-		#end
-
-		return null;
-	}
-
-	#if sys
-	private static function __parseArguments(attributes:WindowAttributes):Void
-	{
-		// TODO: Handle default arguments, like --window-fps=60
-
-		var arguments = Sys.args();
-		var stripQuotes = ~/^['"](.*)['"]$/;
-		var equals, argValue, parameters = null;
-		var windowParamPrefix = "--window-";
-
-		if (arguments != null)
-		{
-			for (argument in arguments)
-			{
-				equals = argument.indexOf("=");
-
-				if (equals > 0)
-				{
-					argValue = argument.substr(equals + 1);
-
-					if (stripQuotes.match(argValue))
-					{
-						argValue = stripQuotes.matched(1);
-					}
-
-					if (parameters == null) parameters = new Map<String, String>();
-					parameters.set(argument.substr(0, equals), argValue);
-				}
-			}
-		}
-
-		if (parameters != null)
-		{
-			if (attributes.parameters == null) attributes.parameters = {};
-			if (attributes.context == null) attributes.context = {};
-
-			for (parameter in parameters.keys())
-			{
-				argValue = parameters.get(parameter);
-
-				if (#if lime_disable_window_override false && #end StringTools.startsWith(parameter, windowParamPrefix))
-				{
-					switch (parameter.substr(windowParamPrefix.length))
-					{
-						case "allow-high-dpi":
-							attributes.allowHighDPI = __parseBool(argValue);
-						case "always-on-top":
-							attributes.alwaysOnTop = __parseBool(argValue);
-						case "antialiasing":
-							attributes.context.antialiasing = Std.parseInt(argValue);
-						case "background":
-							attributes.context.background = (argValue == "" || argValue == "null") ? null : Std.parseInt(argValue);
-						case "borderless":
-							attributes.borderless = __parseBool(argValue);
-						case "colorDepth":
-							attributes.context.colorDepth = Std.parseInt(argValue);
-						case "depth", "depth-buffer":
-							attributes.context.depth = __parseBool(argValue);
-						// case "display": windowConfig.display = Std.parseInt (argValue);
-						case "fullscreen":
-							attributes.fullscreen = __parseBool(argValue);
-						case "hardware":
-							attributes.context.hardware = __parseBool(argValue);
-						case "height":
-							attributes.height = Std.parseInt(argValue);
-						case "hidden":
-							attributes.hidden = __parseBool(argValue);
-						case "maximized":
-							attributes.maximized = __parseBool(argValue);
-						case "minimized":
-							attributes.minimized = __parseBool(argValue);
-						case "render-type", "renderer":
-							attributes.context.type = argValue;
-						case "render-version", "renderer-version":
-							attributes.context.version = argValue;
-						case "resizable":
-							attributes.resizable = __parseBool(argValue);
-						case "stencil", "stencil-buffer":
-							attributes.context.stencil = __parseBool(argValue);
-						// case "title": windowConfig.title = argValue;
-						case "vsync":
-							attributes.context.vsync = __parseBool(argValue);
-						case "width":
-							attributes.width = Std.parseInt(argValue);
-						case "x":
-							attributes.x = Std.parseInt(argValue);
-						case "y":
-							attributes.y = Std.parseInt(argValue);
-						default:
-					}
-				}
-				else if (!Reflect.hasField(attributes.parameters, parameter))
-				{
-					Reflect.setField(attributes.parameters, parameter, argValue);
-				}
-			}
-		}
-	}
-	#end
-
-	@:noCompletion private static inline function __parseBool(value:String):Bool
-	{
-		return (value == "true");
-	}
-
-	@:noCompletion private static function __registerEntryPoint(projectName:String, entryPoint:Function):Void
-	{
-		// executes first!!
-		#if (sys && !macro)
-		funkin.backend.system.Main.preInit();
-		#end
-
-		if (__applicationEntryPoint == null)
-		{
-			__applicationEntryPoint = new Map();
-		}
-
-		__applicationEntryPoint[projectName] = entryPoint;
-	}
-
-	@:noCompletion private static function __runProcess(command:String, args:Array<String> = null):String
-	{
-		#if sys
-		try
-		{
-			if (args == null) args = [];
-
-			var process = new Process(command, args);
-			var value = StringTools.trim(process.stdout.readLine().toString());
-			process.close();
-			return value;
-		}
-		catch (e:Dynamic) {}
-		#end
-		return null;
-	}
-
-	// Get & Set Methods
-	private static function get_allowScreenTimeout():Bool
-	{
-		#if (lime_cffi && !macro)
-		return NativeCFFI.lime_system_get_allow_screen_timeout();
-		#else
-		return true;
-		#end
-	}
-
-	private static function set_allowScreenTimeout(value:Bool):Bool
-	{
-		#if (lime_cffi && !macro)
-		return NativeCFFI.lime_system_set_allow_screen_timeout(value);
-		#else
-		return true;
-		#end
-	}
-
-	private static function get_applicationDirectory():String
-	{
-		if (__applicationDirectory == null)
-		{
-			__applicationDirectory = __getDirectory(APPLICATION);
-		}
-
-		return __applicationDirectory;
-	}
-
-	private static function get_applicationStorageDirectory():String
-	{
-		if (__applicationStorageDirectory == null)
-		{
-			__applicationStorageDirectory = __getDirectory(APPLICATION_STORAGE);
-		}
-
-		return __applicationStorageDirectory;
-	}
-
-	private static function get_deviceModel():String
-	{
-		if (__deviceModel == null)
-		{
-			#if (lime_cffi && !macro && (windows || ios || tvos))
-			#if hl
-			__deviceModel = @:privateAccess String.fromUTF8(NativeCFFI.lime_system_get_device_model());
-			#else
-			__deviceModel = NativeCFFI.lime_system_get_device_model();
-			#end
-			#elseif android
-			var manufacturer:String = JNI.createStaticField("android/os/Build", "MANUFACTURER", "Ljava/lang/String;").get();
-			var model:String = JNI.createStaticField("android/os/Build", "MODEL", "Ljava/lang/String;").get();
-			if (manufacturer != null && model != null)
-			{
-				if (StringTools.startsWith(model.toLowerCase(), manufacturer.toLowerCase()))
-				{
-					model = StringTools.trim(model.substr(manufacturer.length));
-					while (StringTools.startsWith(model, "-"))
-					{
-						model = StringTools.trim(model.substr(1));
-					}
-				}
-				__deviceModel = model;
-			}
-			#elseif mac
-			__deviceModel = __runProcess("sysctl", ["-n", "hw.model"]);
-			#elseif linux
-			__deviceModel = __runProcess("cat", ["/sys/devices/virtual/dmi/id/sys_vendor"]);
-			#end
-		}
-
-		return __deviceModel;
-	}
-
-	private static function get_deviceVendor():String
-	{
-		if (__deviceVendor == null)
-		{
-			#if (lime_cffi && !macro && windows && !html5)
-			#if hl
-			__deviceVendor = @:privateAccess String.fromUTF8(NativeCFFI.lime_system_get_device_vendor());
-			#else
-			__deviceVendor = NativeCFFI.lime_system_get_device_vendor();
-			#end
-			#elseif android
-			var vendor:String = JNI.createStaticField("android/os/Build", "MANUFACTURER", "Ljava/lang/String;").get();
-			if (vendor != null)
-			{
-				__deviceVendor = vendor.charAt(0).toUpperCase() + vendor.substr(1);
-			}
-			#elseif (ios || mac || tvos)
-			__deviceVendor = "Apple";
-			#elseif linux
-			__deviceVendor = __runProcess("cat", ["/sys/devices/virtual/dmi/id/product_name"]);
-			#end
-		}
-
-		return __deviceVendor;
-	}
-
-	private static function get_desktopDirectory():String
-	{
-		if (__desktopDirectory == null)
-		{
-			__desktopDirectory = __getDirectory(DESKTOP);
-		}
-
-		return __desktopDirectory;
-	}
-
-	private static function get_documentsDirectory():String
-	{
-		if (__documentsDirectory == null)
-		{
-			__documentsDirectory = __getDirectory(DOCUMENTS);
-		}
-
-		return __documentsDirectory;
-	}
-
-	private static function get_endianness():Endian
-	{
-		if (__endianness == null)
-		{
-			#if (ps3 || wiiu || flash)
-			__endianness = BIG_ENDIAN;
-			#else
-			var arrayBuffer = new ArrayBuffer(2);
-			var uint8Array = new UInt8Array(arrayBuffer);
-			var uint16array = new UInt16Array(arrayBuffer);
-			uint8Array[0] = 0xAA;
-			uint8Array[1] = 0xBB;
-			if (uint16array[0] == 0xAABB) __endianness = BIG_ENDIAN;
-			else
-				__endianness = LITTLE_ENDIAN;
-			#end
-		}
-
-		return __endianness;
-	}
-
-	private static function get_fontsDirectory():String
-	{
-		if (__fontsDirectory == null)
-		{
-			__fontsDirectory = __getDirectory(FONTS);
-		}
-
-		return __fontsDirectory;
-	}
-
-	private static function get_numDisplays():Int
-	{
-		#if (lime_cffi && !macro)
-		return NativeCFFI.lime_system_get_num_displays();
-		#else
-		return 1;
-		#end
-	}
-
-	private static function get_platformLabel():String
-	{
-		if (__platformLabel == null)
-		{
-			#if (lime_cffi && !macro && windows && !html5)
-			#if hl
-			var label:String = @:privateAccess String.fromUTF8(NativeCFFI.lime_system_get_platform_label());
-			#else
-			var label:String = NativeCFFI.lime_system_get_platform_label();
-			#end
-			if (label != null) __platformLabel = StringTools.trim(label);
-			#elseif linux
-			__platformLabel = __runProcess("lsb_release", ["-ds"]);
-			#else
-			var name = System.platformName;
-			var version = System.platformVersion;
-			if (name != null && version != null) __platformLabel = name + " " + version;
-			else if (name != null) __platformLabel = name;
-			#end
-		}
-
-		return __platformLabel;
-	}
-
-	private static function get_platformName():String
-	{
-		if (__platformName == null)
-		{
-			#if windows
-			__platformName = "Windows";
-			#elseif mac
-			__platformName = "macOS";
-			#elseif linux
-			__platformName = __runProcess("lsb_release", ["-is"]);
-			#elseif ios
-			__platformName = "iOS";
-			#elseif android
-			__platformName = "Android";
-			#elseif air
-			__platformName = "AIR";
-			#elseif flash
-			__platformName = "Flash Player";
-			#elseif tvos
-			__platformName = "tvOS";
-			#elseif tizen
-			__platformName = "Tizen";
-			#elseif blackberry
-			__platformName = "BlackBerry";
-			#elseif firefox
-			__platformName = "Firefox";
-			#elseif webos
-			__platformName = "webOS";
-			#elseif nodejs
-			__platformName = "Node.js";
-			#elseif js
-			__platformName = "HTML5";
-			#end
-		}
-
-		return __platformName;
-	}
-
-	private static function get_platformVersion():String
-	{
-		if (__platformVersion == null)
-		{
-			#if (lime_cffi && !macro && windows && !html5)
-			#if hl
-			__platformVersion = @:privateAccess String.fromUTF8(NativeCFFI.lime_system_get_platform_version());
-			#else
-			__platformVersion = NativeCFFI.lime_system_get_platform_version();
-			#end
-			#elseif android
-			var release = JNI.createStaticField("android/os/Build$VERSION", "RELEASE", "Ljava/lang/String;").get();
-			var api = JNI.createStaticField("android/os/Build$VERSION", "SDK_INT", "I").get();
-			if (release != null && api != null) __platformVersion = release + " (API " + api + ")";
-			#elseif (lime_cffi && !macro && (ios || tvos))
-			__platformVersion = NativeCFFI.lime_system_get_platform_version();
-			#elseif mac
-			__platformVersion = __runProcess("sw_vers", ["-productVersion"]);
-			#elseif linux
-			__platformVersion = __runProcess("lsb_release", ["-rs"]);
-			#elseif flash
-			__platformVersion = Capabilities.version;
-			#end
-		}
-
-		return __platformVersion;
-	}
-
-	private static function get_userDirectory():String
-	{
-		if (__userDirectory == null)
-		{
-			__userDirectory = __getDirectory(USER);
-		}
-
-		return __userDirectory;
-	}
-}
-
-#if (haxe_ver >= 4.0) enum #else @:enum #end abstract SystemDirectory(Int) from Int to Int from UInt to UInt
-{
-	var APPLICATION = 0;
-	var APPLICATION_STORAGE = 1;
-	var DESKTOP = 2;
-	var DOCUMENTS = 3;
-	var FONTS = 4;
-	var USER = 5;
-}
diff --git a/source/lime/ui/FileDialog.hx b/source/lime/ui/FileDialog.hx
deleted file mode 100644
index 418d711936..0000000000
--- a/source/lime/ui/FileDialog.hx
+++ /dev/null
@@ -1,411 +0,0 @@
-package lime.ui;
-
-import haxe.io.Bytes;
-import haxe.io.Path;
-import lime._internal.backend.native.NativeCFFI;
-import lime.app.Event;
-import lime.graphics.Image;
-import lime.system.BackgroundWorker;
-import lime.utils.ArrayBuffer;
-import lime.utils.Resource;
-#if hl
-import hl.Bytes as HLBytes;
-import hl.NativeArray;
-#end
-#if sys
-import sys.io.File;
-#end
-#if (js && html5)
-import js.html.Blob;
-#end
-
-/**
-	Simple file dialog used for asking user where to save a file, or select files to open.
-
-	Example usage:
-	```haxe
-	var fileDialog = new FileDialog();
-
-	fileDialog.onCancel.add( () -> trace("Canceled.") );
-
-	fileDialog.onSave.add( path -> trace("File saved in " + path) );
-
-	fileDialog.onOpen.add( res -> trace("Size of the file = " + (res:haxe.io.Bytes).length) );
-
-	if ( fileDialog.open("jpg", null, "Load file") )
-		trace("File dialog opened, waiting for selection...");
-	else
-		trace("This dialog is unsupported.");
-	```
-
-	Availability note: most file dialog operations are only available on desktop targets, though
-	`save()` is also available in HTML5.
-**/
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(lime._internal.backend.native.NativeCFFI)
-@:access(lime.graphics.Image)
-class FileDialog
-{
-	/**
-		Triggers when the user clicks "Cancel" during any operation, or when a function is unsupported
-		(such as `open()` on HTML5).
-	**/
-	public var onCancel = new Event<Void->Void>();
-
-	/**
-		Triggers when `open()` is successful. The `lime.utils.Resource` contains the file's data, and can
-		be implicitly cast to `haxe.io.Bytes`.
-	**/
-	public var onOpen = new Event<Resource->Void>();
-
-	/**
-		Triggers when `open()` is successful. The `lime.utils.Resource` contains the file's data, and can
-		be implicitly cast to `haxe.io.Bytes`, the String is the path to the file.
-	**/
-	public var onOpenFile = new Event<(Resource, String)->Void>(); // Added by @NeeEoo
-
-	/**
-		Triggers when `save()` is successful. The `String` is the path to the saved file.
-	**/
-	public var onSave = new Event<String->Void>();
-
-	/**
-		Triggers when `browse()` is successful and `type` is anything other than
-		`FileDialogType.OPEN_MULTIPLE`. The `String` is the path to the selected file.
-	**/
-	public var onSelect = new Event<String->Void>();
-
-	/**
-		Triggers when `browse()` is successful and `type` is `FileDialogType.OPEN_MULTIPLE`. The
-		`Array<String>` contains all selected file paths.
-	**/
-	public var onSelectMultiple = new Event<Array<String>->Void>();
-
-	public function new() {}
-
-	/**
-		Opens a file selection dialog. If successful, either `onSelect` or `onSelectMultiple` will trigger
-		with the result(s).
-
-		This function only works on desktop targets, and will return `false` otherwise.
-		@param type 		Type of the file dialog: `OPEN`, `SAVE`, `OPEN_DIRECTORY` or `OPEN_MULTIPLE`.
-		@param filter 		A filter to use when browsing. Asterisks are treated as wildcards. For example,
-		`"*.jpg"` will match any file ending in `.jpg`.
-		@param defaultPath 	The directory in which to start browsing and/or the default filename to
-		suggest. Defaults to `Sys.getCwd()`, with no default filename.
-		@param title 		The title to give the dialog window.
-		@return Whether `browse()` is supported on this target.
-	**/
-	public function browse(type:FileDialogType = null, filter:String = null, defaultPath:String = null, title:String = null):Bool
-	{
-		if (type == null) type = FileDialogType.OPEN;
-
-		#if desktop
-		var worker = new BackgroundWorker();
-
-		worker.doWork.add(function(_)
-		{
-			switch (type)
-			{
-				case OPEN:
-					#if linux
-					if (title == null) title = "Open File";
-					#end
-
-					var path = null;
-					#if (!macro && lime_cffi)
-					#if hl
-					var bytes = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath);
-					if (bytes != null)
-					{
-						path = @:privateAccess String.fromUTF8(cast bytes);
-					}
-					#else
-					path = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath);
-					#end
-					#end
-
-					worker.sendComplete(path);
-
-				case OPEN_MULTIPLE:
-					#if linux
-					if (title == null) title = "Open Files";
-					#end
-
-					var paths = null;
-					#if (!macro && lime_cffi)
-					#if hl
-					var bytes:NativeArray<HLBytes> = cast NativeCFFI.lime_file_dialog_open_files(title, filter, defaultPath);
-					if (bytes != null)
-					{
-						paths = [];
-						for (i in 0...bytes.length)
-						{
-							paths[i] = @:privateAccess String.fromUTF8(bytes[i]);
-						}
-					}
-					#else
-					paths = NativeCFFI.lime_file_dialog_open_files(title, filter, defaultPath);
-					#end
-					#end
-
-					worker.sendComplete(paths);
-
-				case OPEN_DIRECTORY:
-					#if linux
-					if (title == null) title = "Open Directory";
-					#end
-
-					var path = null;
-					#if (!macro && lime_cffi)
-					#if hl
-					var bytes = NativeCFFI.lime_file_dialog_open_directory(title, filter, defaultPath);
-					if (bytes != null)
-					{
-						path = @:privateAccess String.fromUTF8(cast bytes);
-					}
-					#else
-					path = NativeCFFI.lime_file_dialog_open_directory(title, filter, defaultPath);
-					#end
-					#end
-
-					worker.sendComplete(path);
-
-				case SAVE:
-					#if linux
-					if (title == null) title = "Save File";
-					#end
-
-					var path = null;
-					#if (!macro && lime_cffi)
-					#if hl
-					var bytes = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath);
-					if (bytes != null)
-					{
-						path = @:privateAccess String.fromUTF8(cast bytes);
-					}
-					#else
-					path = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath);
-					#end
-					#end
-
-					worker.sendComplete(path);
-			}
-		});
-
-		worker.onComplete.add(function(result)
-		{
-			switch (type)
-			{
-				case OPEN, OPEN_DIRECTORY, SAVE:
-					var path:String = cast result;
-
-					if (path != null)
-					{
-						// Makes sure the filename ends with extension
-						if (type == SAVE && filter != null && path.indexOf(".") == -1)
-						{
-							path += "." + filter;
-						}
-
-						onSelect.dispatch(path);
-					}
-					else
-					{
-						onCancel.dispatch();
-					}
-
-				case OPEN_MULTIPLE:
-					var paths:Array<String> = cast result;
-
-					if (paths != null && paths.length > 0)
-					{
-						onSelectMultiple.dispatch(paths);
-					}
-					else
-					{
-						onCancel.dispatch();
-					}
-			}
-		});
-
-		worker.run();
-
-		return true;
-		#else
-		onCancel.dispatch();
-		return false;
-		#end
-	}
-
-	/**
-		Shows an open file dialog. If successful, `onOpen` will trigger with the file contents.
-
-		This function only works on desktop targets, and will return `false` otherwise.
-		@param filter 		A filter to use when browsing. Asterisks are treated as wildcards. For example,
-		`"*.jpg"` will match any file ending in `.jpg`.
-		@param defaultPath 	The directory in which to start browsing and/or the default filename to
-		suggest. Defaults to `Sys.getCwd()`, with no default filename.
-		@param title 		The title to give the dialog window.
-		@return Whether `open()` is supported on this target.
-	**/
-	public function open(filter:String = null, defaultPath:String = null, title:String = null):Bool
-	{
-		#if (desktop && sys)
-		var worker = new BackgroundWorker();
-
-		worker.doWork.add(function(_)
-		{
-			#if linux
-			if (title == null) title = "Open File";
-			#end
-
-			var path = null;
-			#if (!macro && lime_cffi)
-			#if hl
-			var bytes = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath);
-			if (bytes != null) path = @:privateAccess String.fromUTF8(cast bytes);
-			#else
-			path = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath);
-			#end
-			#end
-
-			worker.sendComplete(path);
-		});
-
-		worker.onComplete.add(function(path:String)
-		{
-			if (path != null)
-			{
-				try
-				{
-					var data = File.getBytes(path);
-					onOpen.dispatch(data);
-					onOpenFile.dispatch(data, path); // Added by @NeeEoo
-					return;
-				}
-				catch (e:Dynamic) {}
-			}
-
-			onCancel.dispatch();
-		});
-
-		worker.run();
-
-		return true;
-		#else
-		onCancel.dispatch();
-		return false;
-		#end
-	}
-
-	/**
-		Shows an open file dialog. If successful, `onSave` will trigger with the selected path.
-
-		This function only works on desktop and HMTL5 targets, and will return `false` otherwise.
-		@param data 		The file contents, in `haxe.io.Bytes` format. (Implicit casting possible.)
-		@param filter 		A filter to use when browsing. Asterisks are treated as wildcards. For example,
-		`"*.jpg"` will match any file ending in `.jpg`. Used only if targeting deskop.
-		@param defaultPath 	The directory in which to start browsing and/or the default filename to
-		suggest. When targeting destkop, this defaults to `Sys.getCwd()` with no default filename. When targeting
-		HTML5, this defaults to the browser's download directory, with a default filename based on the MIME type.
-		@param title 		The title to give the dialog window.
-		@param type 		The default MIME type of the file, in case the type can't be determined from the
-		file data. Used only if targeting HTML5.
-		@return Whether `save()` is supported on this target.
-	**/
-	public function save(data:Resource, filter:String = null, defaultPath:String = null, title:String = null, type:String = "application/octet-stream"):Bool
-	{
-		if (data == null)
-		{
-			onCancel.dispatch();
-			return false;
-		}
-
-		#if (desktop && sys)
-		var worker = new BackgroundWorker();
-
-		worker.doWork.add(function(_)
-		{
-			#if linux
-			if (title == null) title = "Save File";
-			#end
-
-			var path = null;
-			#if (!macro && lime_cffi)
-			#if hl
-			var bytes = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath);
-			path = @:privateAccess String.fromUTF8(cast bytes);
-			#else
-			path = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath);
-			#end
-			#end
-
-			worker.sendComplete(path);
-		});
-
-		worker.onComplete.add(function(path:String)
-		{
-			if (path != null)
-			{
-				try
-				{
-					File.saveBytes(path, data);
-					onSave.dispatch(path);
-					return;
-				}
-				catch (e:Dynamic) {}
-			}
-
-			onCancel.dispatch();
-		});
-
-		worker.run();
-
-		return true;
-		#elseif (js && html5)
-		// TODO: Cleaner API for mimeType detection
-
-		var defaultExtension = "";
-
-		if (Image.__isPNG(data))
-		{
-			type = "image/png";
-			defaultExtension = ".png";
-		}
-		else if (Image.__isJPG(data))
-		{
-			type = "image/jpeg";
-			defaultExtension = ".jpg";
-		}
-		else if (Image.__isGIF(data))
-		{
-			type = "image/gif";
-			defaultExtension = ".gif";
-		}
-		else if (Image.__isWebP(data))
-		{
-			type = "image/webp";
-			defaultExtension = ".webp";
-		}
-
-		var path = defaultPath != null ? Path.withoutDirectory(defaultPath) : "download" + defaultExtension;
-		var buffer = (data : Bytes).getData();
-		buffer = buffer.slice(0, (data : Bytes).length);
-
-		#if commonjs
-		untyped #if haxe4 js.Syntax.code #else __js__ #end ("require ('file-saver')")(new Blob([buffer], {type: type}), path, true);
-		#else
-		untyped window.saveAs(new Blob([buffer], {type: type}), path, true);
-		#end
-		onSave.dispatch(path);
-		return true;
-		#else
-		onCancel.dispatch();
-		return false;
-		#end
-	}
-}
diff --git a/source/lime/utils/Log.hx b/source/lime/utils/Log.hx
index de13c0403f..91421d7ab1 100644
--- a/source/lime/utils/Log.hx
+++ b/source/lime/utils/Log.hx
@@ -19,7 +19,9 @@ class Log
 		if (level >= LogLevel.DEBUG)
 		{
 			#if js
-			untyped #if haxe4 js.Syntax.code #else __js__ #end ("console").debug("[" + info.className + "] " + message);
+			untyped js.Syntax.code ("console").debug("[" + info.className + "] " + message);
+			#elseif !macro
+			FunkinLogs.trace('[${info.className}] $message', INFO, LIGHTGRAY);
 			#else
 			println("[" + info.className + "] " + Std.string(message));
 			#end
@@ -53,7 +55,7 @@ class Log
 		if (level >= LogLevel.INFO)
 		{
 			#if !macro
-			FunkinLogs.trace('[${info.className}] $message', INFO, RED);
+			FunkinLogs.trace('[${info.className}] $message', INFO, CYAN);
 			#else
 			println("[" + info.className + "] " + Std.string(message));
 			#end
@@ -64,10 +66,8 @@ class Log
 	{
 		#if sys
 		Sys.print(Std.string(message));
-		#elseif flash
-		untyped __global__["trace"](Std.string(message));
 		#elseif js
-		untyped #if haxe4 js.Syntax.code #else __js__ #end ("console").log(message);
+		untyped js.Syntax.code ("console").log(message);
 		#else
 		trace(message);
 		#end
@@ -77,10 +77,8 @@ class Log
 	{
 		#if sys
 		Sys.println(Std.string(message));
-		#elseif flash
-		untyped __global__["trace"](Std.string(message));
 		#elseif js
-		untyped #if haxe4 js.Syntax.code #else __js__ #end ("console").log(message);
+		untyped js.Syntax.code ("console").log(message);
 		#else
 		trace(Std.string(message));
 		#end
@@ -135,14 +133,14 @@ class Log
 		#end
 
 		#if js
-		if (untyped #if haxe4 js.Syntax.code #else __js__ #end ("typeof console") == "undefined")
+		if (untyped js.Syntax.code ("typeof console") == "undefined")
 		{
-			untyped #if haxe4 js.Syntax.code #else __js__ #end ("console = {}");
+			untyped js.Syntax.code ("console = {}");
 		}
-		if (untyped #if haxe4 js.Syntax.code #else __js__ #end ("console").log == null)
+		if (untyped js.Syntax.code ("console").log == null)
 		{
-			untyped #if haxe4 js.Syntax.code #else __js__ #end ("console").log = function() {};
+			untyped js.Syntax.code ("console").log = function() {};
 		}
 		#end
 	}
-}
\ No newline at end of file
+}
diff --git a/source/lime/utils/ObjectPool.hx b/source/lime/utils/ObjectPool.hx
deleted file mode 100644
index f05715c35e..0000000000
--- a/source/lime/utils/ObjectPool.hx
+++ /dev/null
@@ -1,347 +0,0 @@
-package lime.utils;
-
-import haxe.ds.ObjectMap;
-
-
-/**
- 	A generic object pool for reusing objects.
- **/
-#if !lime_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-#if !js @:generic #end class ObjectPool<T>
-{
-	/**
-  		The number of active objects in the pool.
-  	**/
-	public var activeObjects(default, null):Int;
-
-	/**
-   		The number of inactive objects in the pool.
-   	**/
-	public var inactiveObjects(default, null):Int;
-
-	/**
- 		The total size of the object pool (both active and inactive objects).
-  	**/
-	public var size(get, set):Null<Int>;
-
-	@:noCompletion private var __inactiveObject0:T;
-	@:noCompletion private var __inactiveObject1:T;
-	@:noCompletion private var __inactiveObjectList:List<T>;
-	@:noCompletion private var __pool:Map<T, Bool>;
-	@:noCompletion private var __size:Null<Int>;
-
-	/**
-   		Creates a new ObjectPool instance.
-   
-   		@param create A function that creates a new instance of type T.
-   		@param clean A function that cleans up an instance of type T before it is reused.
-   		@param size The maximum size of the object pool.
-   	**/
-	public function new(create:Void->T = null, clean:T->Void = null, size:Null<Int> = null)
-	{
-		__pool = cast new ObjectMap();
-
-		activeObjects = 0;
-		inactiveObjects = 0;
-
-		__inactiveObject0 = null;
-		__inactiveObject1 = null;
-		__inactiveObjectList = new List<T>();
-
-		if (create != null)
-		{
-			this.create = create;
-		}
-		if (clean != null)
-		{
-			this.clean = clean;
-		}
-		if (size != null)
-		{
-			this.size = size;
-		}
-	}
-	/**
-   		Adds an object to the object pool.
-   
-   		@param object The object to add to the pool.
-   	**/
-	public function add(object:T):Void
-	{
-		if (object != null && !__pool.exists(object))
-		{
-			__pool.set(object, false);
-			clean(object);
-			__addInactive(object);
-		}
-	}
-
-	/**
-		Dynamic function.
-
-   		Cleans up an object before returning it to the pool.
-   
-   		@param object The object to clean up.
-  	**/
-	public dynamic function clean(object:T):Void {}
-
-	/**
-  		Clears the object pool, removing all objects.
-  	**/
-	public function clear():Void
-	{
-		__pool = cast new ObjectMap();
-
-		activeObjects = 0;
-		inactiveObjects = 0;
-
-		__inactiveObject0 = null;
-		__inactiveObject1 = null;
-		__inactiveObjectList.clear();
-	}
-
-	/**
-		Dynamic function.
-
-   		Creates a new Object.
-     	**/
-	public dynamic function create():T
-	{
-		return null;
-	}
-
-	/**
-   		Creates a new object and adds it to the pool, or returns an existing inactive object from the pool.
-   
-   		@return The object retrieved from the pool, or null if the pool is full and no new objects can be created.
-  	**/
-	public function get():T
-	{
-		var object = null;
-
-		if (inactiveObjects > 0)
-		{
-			object = __getInactive();
-		}
-		else if (__size == null || activeObjects < __size)
-		{
-			object = create();
-
-			if (object != null)
-			{
-				__pool.set(object, true);
-				activeObjects++;
-			}
-		}
-
-		return object;
-	}
-
-	/**
-   		Releases an active object back into the pool.
-   
-   		@param object The object to release.
-   	**/
-	public function release(object:T):Void
-	{
-		#if lime_pool_debug
-		if (object == null || !__pool.exists(object))
-		{
-			Log.error("Object is not a member of the pool");
-		}
-		else if (!__pool.get(object))
-		{
-			Log.error("Object has already been released");
-		}
-		#end
-
-		activeObjects--;
-
-		if (__size == null || activeObjects + inactiveObjects < __size)
-		{
-			clean(object);
-			__addInactive(object);
-		}
-		else
-		{
-			__pool.remove(object);
-		}
-	}
-
-	/**
-   		Removes an object from the pool.
-    
-   		@param object The object to remove from the pool.
-   	**/
-	public function remove(object:T):Void
-	{
-		if (object != null && __pool.exists(object))
-		{
-			__pool.remove(object);
-
-			if (__inactiveObject0 == object)
-			{
-				__inactiveObject0 = null;
-				inactiveObjects--;
-			}
-			else if (__inactiveObject1 == object)
-			{
-				__inactiveObject1 = null;
-				inactiveObjects--;
-			}
-			else if (__inactiveObjectList.remove(object))
-			{
-				inactiveObjects--;
-			}
-			else
-			{
-				activeObjects--;
-			}
-		}
-	}
-
-	@:noCompletion private inline function __addInactive(object:T):Void
-	{
-		#if lime_pool_debug
-		__pool.set(object, false);
-		#end
-
-		if (__inactiveObject0 == null)
-		{
-			__inactiveObject0 = object;
-		}
-		else if (__inactiveObject1 == null)
-		{
-			__inactiveObject1 = object;
-		}
-		else
-		{
-			__inactiveObjectList.add(object);
-		}
-
-		inactiveObjects++;
-	}
-
-	@:noCompletion private inline function __getInactive():T
-	{
-		var object = null;
-
-		if (__inactiveObject0 != null)
-		{
-			object = __inactiveObject0;
-			__inactiveObject0 = null;
-		}
-		else if (__inactiveObject1 != null)
-		{
-			object = __inactiveObject1;
-			__inactiveObject1 = null;
-		}
-		else
-		{
-			object = __inactiveObjectList.pop();
-
-			if (__inactiveObjectList.length > 0)
-			{
-				__inactiveObject0 = __inactiveObjectList.pop();
-			}
-
-			if (__inactiveObjectList.length > 0)
-			{
-				__inactiveObject1 = __inactiveObjectList.pop();
-			}
-		}
-
-		#if lime_pool_debug
-		__pool.set(object, true);
-		#end
-
-		inactiveObjects--;
-		activeObjects++;
-
-		return object;
-	}
-
-	@:noCompletion private function __removeInactive(count:Int):Void
-	{
-		if (count <= 0 || inactiveObjects == 0) return;
-
-		if (__inactiveObject0 != null)
-		{
-			__pool.remove(__inactiveObject0);
-			__inactiveObject0 = null;
-			inactiveObjects--;
-			count--;
-		}
-
-		if (count == 0 || inactiveObjects == 0) return;
-
-		if (__inactiveObject1 != null)
-		{
-			__pool.remove(__inactiveObject1);
-			__inactiveObject1 = null;
-			inactiveObjects--;
-			count--;
-		}
-
-		if (count == 0 || inactiveObjects == 0) return;
-
-		for (object in __inactiveObjectList)
-		{
-			__pool.remove(object);
-			__inactiveObjectList.remove(object);
-			inactiveObjects--;
-			count--;
-
-			if (count == 0 || inactiveObjects == 0) return;
-		}
-	}
-
-	// Get & Set Methods
-	@:noCompletion private function get_size():Null<Int>
-	{
-		return __size;
-	}
-
-	@:noCompletion private function set_size(value:Null<Int>):Null<Int>
-	{
-		if (value == null)
-		{
-			__size = null;
-		}
-		else
-		{
-			var current = inactiveObjects + activeObjects;
-			__size = value;
-
-			if (current > value)
-			{
-				__removeInactive(current - value);
-			}
-			else if (value > current)
-			{
-				var object;
-
-				for (i in 0...(value - current))
-				{
-					object = create();
-
-					if (object != null)
-					{
-						__pool.set(object, false);
-						__inactiveObjectList.add(object);
-						inactiveObjects++;
-					}
-					else
-					{
-						break;
-					}
-				}
-			}
-		}
-
-		return value;
-	}
-}
diff --git a/source/openfl/display/DisplayObjectRenderer.hx b/source/openfl/display/DisplayObjectRenderer.hx
deleted file mode 100644
index 0267742463..0000000000
--- a/source/openfl/display/DisplayObjectRenderer.hx
+++ /dev/null
@@ -1,864 +0,0 @@
-package openfl.display;
-
-#if !flash
-import openfl.display._internal.Context3DGraphics;
-import openfl.display.Bitmap;
-import openfl.display.DisplayObject;
-import openfl.display.Tilemap;
-import openfl.events.EventDispatcher;
-import openfl.events.RenderEvent;
-import openfl.geom.ColorTransform;
-import openfl.geom.Matrix;
-import openfl.geom.Point;
-import openfl.geom.Rectangle;
-import openfl.text.TextField;
-#if lime
-import lime._internal.graphics.ImageCanvasUtil; // TODO
-import lime.graphics.cairo.Cairo;
-import lime.graphics.RenderContext;
-import lime.graphics.RenderContextType;
-#end
-
-#if !openfl_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(openfl.display._internal.Context3DGraphics)
-@:access(lime.graphics.ImageBuffer)
-@:access(openfl.display.Bitmap)
-@:access(openfl.display.BitmapData)
-@:access(openfl.display.DisplayObject)
-@:access(openfl.display.Graphics)
-@:access(openfl.display.Tilemap)
-@:access(openfl.display3D.Context3D)
-@:access(openfl.events.RenderEvent)
-@:access(openfl.filters.BitmapFilter)
-@:access(openfl.geom.ColorTransform)
-@:access(openfl.geom.Rectangle)
-@:access(openfl.geom.Transform)
-@:access(openfl.text.TextField)
-@:allow(openfl.display._internal)
-@:allow(openfl.display)
-@:allow(openfl.text)
-class DisplayObjectRenderer extends EventDispatcher
-{
-	@:noCompletion private var __allowSmoothing:Bool;
-	@:noCompletion private var __blendMode:BlendMode;
-	@:noCompletion private var __cleared:Bool;
-	@SuppressWarnings("checkstyle:Dynamic") @:noCompletion private var __context:#if lime RenderContext #else Dynamic #end;
-	@:noCompletion private var __overrideBlendMode:BlendMode;
-	@:noCompletion private var __pixelRatio:Float;
-	@:noCompletion private var __roundPixels:Bool;
-	@:noCompletion private var __stage:Stage;
-	@:noCompletion private var __tempColorTransform:ColorTransform;
-	@:noCompletion private var __transparent:Bool;
-	@SuppressWarnings("checkstyle:Dynamic") @:noCompletion private var __type:#if lime RenderContextType #else Dynamic #end;
-	@:noCompletion private var __worldAlpha:Float;
-	@:noCompletion private var __worldColorTransform:ColorTransform;
-	@:noCompletion private var __worldTransform:Matrix;
-
-	@:noCompletion private function new()
-	{
-		super();
-
-		__allowSmoothing = true;
-		__pixelRatio = 1;
-		__tempColorTransform = new ColorTransform();
-		__worldAlpha = 1;
-	}
-
-	@:noCompletion private function __clear():Void {}
-
-	@:noCompletion private function __getAlpha(value:Float):Float
-	{
-		return value * __worldAlpha;
-	}
-
-	@:noCompletion private function __getColorTransform(value:ColorTransform):ColorTransform
-	{
-		if (__worldColorTransform != null)
-		{
-			__tempColorTransform.__copyFrom(__worldColorTransform);
-			__tempColorTransform.__combine(value);
-			return __tempColorTransform;
-		}
-		else
-		{
-			return value;
-		}
-	}
-
-	@:noCompletion private function __popMask():Void {}
-
-	@:noCompletion private function __popMaskObject(object:DisplayObject, handleScrollRect:Bool = true):Void {}
-
-	@:noCompletion private function __popMaskRect():Void {}
-
-	@:noCompletion private function __pushMask(mask:DisplayObject):Void {}
-
-	@:noCompletion private function __pushMaskObject(object:DisplayObject, handleScrollRect:Bool = true):Void {}
-
-	@:noCompletion private function __pushMaskRect(rect:Rectangle, transform:Matrix):Void {}
-
-	@:noCompletion private function __render(object:IBitmapDrawable):Void {}
-
-	@:noCompletion private function __renderEvent(displayObject:DisplayObject):Void
-	{
-		var renderer = this;
-		#if lime
-		if (displayObject.__customRenderEvent != null && displayObject.__renderable)
-		{
-			displayObject.__customRenderEvent.allowSmoothing = renderer.__allowSmoothing;
-			displayObject.__customRenderEvent.objectMatrix.copyFrom(displayObject.__renderTransform);
-			displayObject.__customRenderEvent.objectColorTransform.__copyFrom(displayObject.__worldColorTransform);
-			displayObject.__customRenderEvent.renderer = renderer;
-
-			switch (renderer.__type)
-			{
-				case OPENGL:
-					if (!renderer.__cleared) renderer.__clear();
-
-					var renderer:OpenGLRenderer = cast renderer;
-					renderer.setShader(displayObject.__worldShader);
-					renderer.__context3D.__flushGL();
-
-					displayObject.__customRenderEvent.type = RenderEvent.RENDER_OPENGL;
-
-				case CAIRO:
-					displayObject.__customRenderEvent.type = RenderEvent.RENDER_CAIRO;
-
-				case DOM:
-					if (displayObject.stage != null && displayObject.__worldVisible)
-					{
-						displayObject.__customRenderEvent.type = RenderEvent.RENDER_DOM;
-					}
-					else
-					{
-						displayObject.__customRenderEvent.type = RenderEvent.CLEAR_DOM;
-					}
-
-				case CANVAS:
-					displayObject.__customRenderEvent.type = RenderEvent.RENDER_CANVAS;
-
-				default:
-					return;
-			}
-
-			renderer.__setBlendMode(displayObject.__worldBlendMode);
-			renderer.__pushMaskObject(displayObject);
-
-			displayObject.dispatchEvent(displayObject.__customRenderEvent);
-
-			renderer.__popMaskObject(displayObject);
-
-			if (renderer.__type == OPENGL)
-			{
-				var renderer:OpenGLRenderer = cast renderer;
-				renderer.setViewport();
-			}
-		}
-		#end
-	}
-
-	@:noCompletion private function __resize(width:Int, height:Int):Void {}
-
-	@:noCompletion private function __setBlendMode(value:BlendMode):Void {}
-
-	@:noCompletion private function __shouldCacheHardware(displayObject:DisplayObject, value:Null<Bool>):Null<Bool>
-	{
-		if (displayObject == null) return null;
-
-		switch (displayObject.__drawableType)
-		{
-			case SPRITE, STAGE:
-				if (value == true) return true;
-				value = __shouldCacheHardware_DisplayObject(displayObject, value);
-				if (value == true) return true;
-
-				if (displayObject.__children != null)
-				{
-					for (child in displayObject.__children)
-					{
-						value = __shouldCacheHardware_DisplayObject(child, value);
-						if (value == true) return true;
-					}
-				}
-
-				return value;
-
-			case TEXT_FIELD:
-				return value == true ? true : false;
-
-			case TILEMAP:
-				return true;
-
-			default:
-				return __shouldCacheHardware_DisplayObject(displayObject, value);
-		}
-	}
-
-	@:noCompletion private function __shouldCacheHardware_DisplayObject(displayObject:DisplayObject, value:Null<Bool>):Null<Bool>
-	{
-		if (value == true || displayObject.__filters != null) return true;
-
-		if (value == false || (displayObject.__graphics != null && !Context3DGraphics.isCompatible(displayObject.__graphics)))
-		{
-			return false;
-		}
-
-		return null;
-	}
-
-	@:noCompletion private function __updateCacheBitmap(displayObject:DisplayObject, force:Bool):Bool
-	{
-		if (displayObject == null) return false;
-		var renderer = this;
-
-		switch (displayObject.__drawableType)
-		{
-			case BITMAP:
-				var bitmap:Bitmap = cast displayObject;
-				// TODO: Handle filters without an intermediate draw
-				if (bitmap.__bitmapData == null
-					|| (bitmap.__filters == null #if lime && renderer.__type == OPENGL #end && bitmap.__cacheBitmap == null)) return false;
-				force = (bitmap.__bitmapData.image != null && bitmap.__bitmapData.image.version != bitmap.__imageVersion);
-
-			case TEXT_FIELD:
-				var textField:TextField = cast displayObject;
-				if (textField.__filters == null #if lime && renderer.__type == OPENGL #end && textField.__cacheBitmap == null
-					&& !textField.__domRender) return false;
-				if (force) textField.__renderDirty = true;
-				force = force || textField.__dirty;
-
-			case TILEMAP:
-				var tilemap:Tilemap = cast displayObject;
-				if (tilemap.__filters == null #if lime && renderer.__type == OPENGL #end && tilemap.__cacheBitmap == null) return false;
-
-			default:
-		}
-
-		#if lime
-		if (displayObject.__isCacheBitmapRender) return false;
-		#if openfl_disable_cacheasbitmap
-		return false;
-		#end
-
-		var colorTransform = ColorTransform.__pool.get();
-		colorTransform.__copyFrom(displayObject.__worldColorTransform);
-		if (renderer.__worldColorTransform != null) colorTransform.__combine(renderer.__worldColorTransform);
-		var updated = false;
-
-		// TODO: Do not force cacheAsBitmap on OpenGL once Scale-9 is properly supported in Context3DShape
-		if (displayObject.cacheAsBitmap
-			|| (renderer.__type != OPENGL && !colorTransform.__isDefault(true))
-			|| (renderer.__type == OPENGL && displayObject.scale9Grid != null))
-		{
-			var rect = null;
-
-			var needRender = (displayObject.__cacheBitmap == null
-				|| (displayObject.__renderDirty && (force || (displayObject.__children != null && displayObject.__children.length > 0)))
-				|| displayObject.opaqueBackground != displayObject.__cacheBitmapBackground);
-			var softwareDirty = needRender
-				|| (displayObject.__graphics != null && displayObject.__graphics.__softwareDirty)
-				|| !displayObject.__cacheBitmapColorTransform.__equals(colorTransform, true);
-			var hardwareDirty = needRender || (displayObject.__graphics != null && displayObject.__graphics.__hardwareDirty);
-
-			var renderType = renderer.__type;
-
-			if (softwareDirty || hardwareDirty)
-			{
-				#if !openfl_force_gl_cacheasbitmap
-				if (renderType == OPENGL)
-				{
-					if (#if !openfl_disable_gl_cacheasbitmap __shouldCacheHardware(displayObject, null) == false #else true #end)
-					{
-						#if (js && html5)
-						renderType = CANVAS;
-						#else
-						renderType = CAIRO;
-						#end
-					}
-				}
-				#end
-
-				if (softwareDirty && (renderType == CANVAS || renderType == CAIRO)) needRender = true;
-				if (hardwareDirty && renderType == OPENGL) needRender = true;
-			}
-
-			var updateTransform = (needRender || !displayObject.__cacheBitmap.__worldTransform.equals(displayObject.__worldTransform));
-			var hasFilters = #if !openfl_disable_filters displayObject.__filters != null #else false #end;
-
-			#if !openfl_enable_cacheasbitmap
-			if (renderer.__type == DOM && !hasFilters)
-			{
-				return false;
-			}
-			#end
-
-			if (hasFilters && !needRender)
-			{
-				for (filter in displayObject.__filters)
-				{
-					if (filter.__renderDirty)
-					{
-						needRender = true;
-						break;
-					}
-				}
-			}
-
-			if (displayObject.__cacheBitmapMatrix == null)
-			{
-				displayObject.__cacheBitmapMatrix = new Matrix();
-			}
-
-			var bitmapMatrix = (displayObject.__cacheAsBitmapMatrix != null ? displayObject.__cacheAsBitmapMatrix : displayObject.__renderTransform);
-
-			if (!needRender
-				&& (bitmapMatrix.a != displayObject.__cacheBitmapMatrix.a
-					|| bitmapMatrix.b != displayObject.__cacheBitmapMatrix.b
-					|| bitmapMatrix.c != displayObject.__cacheBitmapMatrix.c
-					|| bitmapMatrix.d != displayObject.__cacheBitmapMatrix.d))
-			{
-				needRender = true;
-			}
-
-			if (!needRender
-				&& renderer.__type != OPENGL
-				&& displayObject.__cacheBitmapData != null
-				&& displayObject.__cacheBitmapData.image != null
-				&& displayObject.__cacheBitmapData.image.version < displayObject.__cacheBitmapData.__textureVersion)
-			{
-				needRender = true;
-			}
-
-			// Ensure that cached bitmap is updated after changes to scrollRect
-			if (!needRender)
-			{
-				var current = displayObject;
-				while (current != null)
-				{
-					if (current.scrollRect != null)
-					{
-						// TODO: do we need to update transform if scroll rects haven't changed?
-						updateTransform = true;
-						break;
-					}
-					current = current.parent;
-				}
-			}
-
-			displayObject.__cacheBitmapMatrix.copyFrom(bitmapMatrix);
-			displayObject.__cacheBitmapMatrix.tx = 0;
-			displayObject.__cacheBitmapMatrix.ty = 0;
-
-			// TODO: Handle dimensions better if object has a scrollRect?
-
-			var bitmapWidth = 0, bitmapHeight = 0;
-			var filterWidth = 0, filterHeight = 0;
-			var offsetX = 0., offsetY = 0.;
-
-			#if (openfl_disable_hdpi || openfl_disable_hdpi_cacheasbitmap)
-			var pixelRatio = 1;
-			#else
-			var pixelRatio = __pixelRatio;
-			#end
-
-			if (updateTransform || needRender)
-			{
-				rect = Rectangle.__pool.get();
-
-				displayObject.__getFilterBounds(rect, displayObject.__cacheBitmapMatrix);
-
-				filterWidth = rect.width > 0 ? Math.floor(rect.width * pixelRatio) : 0;
-				filterHeight = rect.height > 0 ? Math.floor(rect.height * pixelRatio) : 0;
-
-				offsetX = rect.x > 0 ? Math.ceil(rect.x) : Math.floor(rect.x);
-				offsetY = rect.y > 0 ? Math.ceil(rect.y) : Math.floor(rect.y);
-
-				if (displayObject.__cacheBitmapData != null)
-				{
-					if (filterWidth > displayObject.__cacheBitmapData.width || filterHeight > displayObject.__cacheBitmapData.height)
-					{
-						bitmapWidth = Math.ceil(Math.max(filterWidth * 1.25, displayObject.__cacheBitmapData.width));
-						bitmapHeight = Math.ceil(Math.max(filterHeight * 1.25, displayObject.__cacheBitmapData.height));
-						needRender = true;
-					}
-					else
-					{
-						bitmapWidth = displayObject.__cacheBitmapData.width;
-						bitmapHeight = displayObject.__cacheBitmapData.height;
-					}
-				}
-				else
-				{
-					bitmapWidth = filterWidth;
-					bitmapHeight = filterHeight;
-				}
-			}
-
-			if (needRender)
-			{
-				updateTransform = true;
-				displayObject.__cacheBitmapBackground = displayObject.opaqueBackground;
-
-				if (filterWidth >= 0.5 && filterHeight >= 0.5)
-				{
-					var needsFill = (displayObject.opaqueBackground != null
-						&& (bitmapWidth != filterWidth || bitmapHeight != filterHeight));
-					var fillColor = displayObject.opaqueBackground != null ? (0xFF << 24) | displayObject.opaqueBackground : 0;
-					var bitmapColor = needsFill ? 0 : fillColor;
-					var allowFramebuffer = (renderer.__type == OPENGL);
-
-					if (displayObject.__cacheBitmapData == null
-						|| bitmapWidth > displayObject.__cacheBitmapData.width
-						|| bitmapHeight > displayObject.__cacheBitmapData.height)
-					{
-						displayObject.__cacheBitmapData = new BitmapData(bitmapWidth, bitmapHeight, true, bitmapColor);
-
-						if (displayObject.__cacheBitmap == null) displayObject.__cacheBitmap = new Bitmap();
-						displayObject.__cacheBitmap.__bitmapData = displayObject.__cacheBitmapData;
-						displayObject.__cacheBitmapRenderer = null;
-					}
-					else
-					{
-						displayObject.__cacheBitmapData.__fillRect(displayObject.__cacheBitmapData.rect, bitmapColor, allowFramebuffer);
-					}
-
-					if (needsFill)
-					{
-						rect.setTo(0, 0, filterWidth, filterHeight);
-						displayObject.__cacheBitmapData.__fillRect(rect, fillColor, allowFramebuffer);
-					}
-				}
-				else
-				{
-					ColorTransform.__pool.release(colorTransform);
-
-					displayObject.__cacheBitmap = null;
-					displayObject.__cacheBitmapData = null;
-					displayObject.__cacheBitmapData2 = null;
-					displayObject.__cacheBitmapData3 = null;
-					displayObject.__cacheBitmapRenderer = null;
-
-					if (displayObject.__drawableType == TEXT_FIELD)
-					{
-						var textField:TextField = cast displayObject;
-						if (textField.__cacheBitmap != null)
-						{
-							textField.__cacheBitmap.__renderTransform.tx -= textField.__offsetX * pixelRatio;
-							textField.__cacheBitmap.__renderTransform.ty -= textField.__offsetY * pixelRatio;
-						}
-					}
-
-					return true;
-				}
-			}
-			else
-			{
-				// Should we retain these longer?
-
-				displayObject.__cacheBitmapData = displayObject.__cacheBitmap.bitmapData;
-				displayObject.__cacheBitmapData2 = null;
-				displayObject.__cacheBitmapData3 = null;
-			}
-
-			if (updateTransform || needRender)
-			{
-				displayObject.__cacheBitmap.__worldTransform.copyFrom(displayObject.__worldTransform);
-
-				if (bitmapMatrix == displayObject.__renderTransform)
-				{
-					displayObject.__cacheBitmap.__renderTransform.identity();
-					displayObject.__cacheBitmap.__renderTransform.scale(1 / pixelRatio, 1 / pixelRatio);
-					displayObject.__cacheBitmap.__renderTransform.tx = displayObject.__renderTransform.tx + offsetX;
-					displayObject.__cacheBitmap.__renderTransform.ty = displayObject.__renderTransform.ty + offsetY;
-				}
-				else
-				{
-					displayObject.__cacheBitmap.__renderTransform.copyFrom(displayObject.__cacheBitmapMatrix);
-					displayObject.__cacheBitmap.__renderTransform.invert();
-					displayObject.__cacheBitmap.__renderTransform.concat(displayObject.__renderTransform);
-					displayObject.__cacheBitmap.__renderTransform.a *= 1 / pixelRatio;
-					displayObject.__cacheBitmap.__renderTransform.d *= 1 / pixelRatio;
-					displayObject.__cacheBitmap.__renderTransform.tx += offsetX;
-					displayObject.__cacheBitmap.__renderTransform.ty += offsetY;
-				}
-			}
-
-			displayObject.__cacheBitmap.smoothing = renderer.__allowSmoothing;
-			displayObject.__cacheBitmap.__renderable = displayObject.__renderable;
-			displayObject.__cacheBitmap.__worldAlpha = displayObject.__worldAlpha;
-			displayObject.__cacheBitmap.__worldBlendMode = displayObject.__worldBlendMode;
-			displayObject.__cacheBitmap.__worldShader = displayObject.__worldShader;
-			// displayObject.__cacheBitmap.__scrollRect = displayObject.__scrollRect;
-			// displayObject.__cacheBitmap.filters = displayObject.filters;
-			displayObject.__cacheBitmap.mask = displayObject.__mask;
-
-			if (needRender)
-			{
-				#if lime
-				if (displayObject.__cacheBitmapRenderer == null || renderType != displayObject.__cacheBitmapRenderer.__type)
-				{
-					if (renderType == OPENGL)
-					{
-						displayObject.__cacheBitmapRenderer = new OpenGLRenderer(cast(renderer, OpenGLRenderer).__context3D, displayObject.__cacheBitmapData);
-					}
-					else
-					{
-						if (displayObject.__cacheBitmapData.image == null)
-						{
-							var color = displayObject.opaqueBackground != null ? (0xFF << 24) | displayObject.opaqueBackground : 0;
-							displayObject.__cacheBitmapData = new BitmapData(bitmapWidth, bitmapHeight, true, color);
-							displayObject.__cacheBitmap.__bitmapData = displayObject.__cacheBitmapData;
-						}
-
-						#if (js && html5)
-						ImageCanvasUtil.convertToCanvas(displayObject.__cacheBitmapData.image);
-						displayObject.__cacheBitmapRenderer = new CanvasRenderer(displayObject.__cacheBitmapData.image.buffer.__srcContext);
-						#else
-						displayObject.__cacheBitmapRenderer = new CairoRenderer(new Cairo(displayObject.__cacheBitmapData.getSurface()));
-						#end
-					}
-
-					displayObject.__cacheBitmapRenderer.__worldTransform = new Matrix();
-					displayObject.__cacheBitmapRenderer.__worldColorTransform = new ColorTransform();
-				}
-				#else
-				return false;
-				#end
-
-				if (displayObject.__cacheBitmapColorTransform == null) displayObject.__cacheBitmapColorTransform = new ColorTransform();
-
-				displayObject.__cacheBitmapRenderer.__stage = displayObject.stage;
-
-				displayObject.__cacheBitmapRenderer.__allowSmoothing = renderer.__allowSmoothing;
-				displayObject.__cacheBitmapRenderer.__setBlendMode(NORMAL);
-				displayObject.__cacheBitmapRenderer.__worldAlpha = 1 / displayObject.__worldAlpha;
-
-				displayObject.__cacheBitmapRenderer.__worldTransform.copyFrom(displayObject.__renderTransform);
-				displayObject.__cacheBitmapRenderer.__worldTransform.invert();
-				displayObject.__cacheBitmapRenderer.__worldTransform.concat(displayObject.__cacheBitmapMatrix);
-				displayObject.__cacheBitmapRenderer.__worldTransform.tx -= offsetX;
-				displayObject.__cacheBitmapRenderer.__worldTransform.ty -= offsetY;
-				displayObject.__cacheBitmapRenderer.__worldTransform.scale(pixelRatio, pixelRatio);
-
-				displayObject.__cacheBitmapRenderer.__pixelRatio = pixelRatio;
-
-				displayObject.__cacheBitmapRenderer.__worldColorTransform.__copyFrom(colorTransform);
-				displayObject.__cacheBitmapRenderer.__worldColorTransform.__invert();
-
-				displayObject.__isCacheBitmapRender = true;
-
-				if (displayObject.__cacheBitmapRenderer.__type == OPENGL)
-				{
-					var parentRenderer:OpenGLRenderer = cast renderer;
-					var childRenderer:OpenGLRenderer = cast displayObject.__cacheBitmapRenderer;
-
-					var context = childRenderer.__context3D;
-
-					var cacheRTT = context.__state.renderToTexture;
-					var cacheRTTDepthStencil = context.__state.renderToTextureDepthStencil;
-					var cacheRTTAntiAlias = context.__state.renderToTextureAntiAlias;
-					var cacheRTTSurfaceSelector = context.__state.renderToTextureSurfaceSelector;
-
-					// var cacheFramebuffer = context.__contextState.__currentGLFramebuffer;
-
-					var cacheBlendMode = parentRenderer.__blendMode;
-					parentRenderer.__suspendClipAndMask();
-					childRenderer.__copyShader(parentRenderer);
-					// childRenderer.__copyState (parentRenderer);
-
-					displayObject.__cacheBitmapData.__setUVRect(context, 0, 0, filterWidth, filterHeight);
-					childRenderer.__setRenderTarget(displayObject.__cacheBitmapData);
-					if (displayObject.__cacheBitmapData.image != null)
-						displayObject.__cacheBitmapData.__textureVersion = displayObject.__cacheBitmapData.image.version
-						+ 1;
-
-					displayObject.__cacheBitmapData.__drawGL(displayObject, childRenderer);
-
-					if (hasFilters)
-					{
-						var needSecondBitmapData = true;
-						var needCopyOfOriginal = false;
-
-						for (filter in displayObject.__filters)
-						{
-							// if (filter.__needSecondBitmapData) {
-							// 	needSecondBitmapData = true;
-							// }
-							if (filter.__preserveObject)
-							{
-								needCopyOfOriginal = true;
-							}
-						}
-
-						var bitmap = displayObject.__cacheBitmapData;
-						var bitmap2 = null;
-						var bitmap3 = null;
-
-						// if (needSecondBitmapData) {
-						if (displayObject.__cacheBitmapData2 == null
-							|| bitmapWidth > displayObject.__cacheBitmapData2.width
-							|| bitmapHeight > displayObject.__cacheBitmapData2.height)
-						{
-							displayObject.__cacheBitmapData2 = new BitmapData(bitmapWidth, bitmapHeight, true, 0);
-						}
-						else
-						{
-							displayObject.__cacheBitmapData2.fillRect(displayObject.__cacheBitmapData2.rect, 0);
-							if (displayObject.__cacheBitmapData2.image != null)
-							{
-								displayObject.__cacheBitmapData2.__textureVersion = displayObject.__cacheBitmapData2.image.version + 1;
-							}
-						}
-						displayObject.__cacheBitmapData2.__setUVRect(context, 0, 0, filterWidth, filterHeight);
-						bitmap2 = displayObject.__cacheBitmapData2;
-						// } else {
-						// 	bitmap2 = bitmapData;
-						// }
-
-						if (needCopyOfOriginal)
-						{
-							if (displayObject.__cacheBitmapData3 == null
-								|| bitmapWidth > displayObject.__cacheBitmapData3.width
-								|| bitmapHeight > displayObject.__cacheBitmapData3.height)
-							{
-								displayObject.__cacheBitmapData3 = new BitmapData(bitmapWidth, bitmapHeight, true, 0);
-							}
-							else
-							{
-								displayObject.__cacheBitmapData3.fillRect(displayObject.__cacheBitmapData3.rect, 0);
-								if (displayObject.__cacheBitmapData3.image != null)
-								{
-									displayObject.__cacheBitmapData3.__textureVersion = displayObject.__cacheBitmapData3.image.version + 1;
-								}
-							}
-							displayObject.__cacheBitmapData3.__setUVRect(context, 0, 0, filterWidth, filterHeight);
-							bitmap3 = displayObject.__cacheBitmapData3;
-						}
-
-						childRenderer.__setBlendMode(NORMAL);
-						childRenderer.__worldAlpha = 1;
-						childRenderer.__worldTransform.identity();
-						childRenderer.__worldColorTransform.__identity();
-
-						// var sourceRect = bitmap.rect;
-						// if (__tempPoint == null) __tempPoint = new Point ();
-						// var destPoint = __tempPoint;
-						var shader, cacheBitmap;
-
-						for (filter in displayObject.__filters)
-						{
-							if (filter.__preserveObject)
-							{
-								childRenderer.__setRenderTarget(bitmap3);
-								childRenderer.__renderFilterPass(bitmap, childRenderer.__defaultDisplayShader, filter.__smooth);
-							}
-
-							for (i in 0...filter.__numShaderPasses)
-							{
-								shader = filter.__initShader(childRenderer, i, filter.__preserveObject ? bitmap3 : null);
-								childRenderer.__setBlendMode(filter.__shaderBlendMode);
-								childRenderer.__setRenderTarget(bitmap2);
-								childRenderer.__renderFilterPass(bitmap, shader, filter.__smooth);
-
-								cacheBitmap = bitmap;
-								bitmap = bitmap2;
-								bitmap2 = cacheBitmap;
-							}
-
-							filter.__renderDirty = false;
-						}
-
-						displayObject.__cacheBitmap.__bitmapData = bitmap;
-					}
-
-					parentRenderer.__blendMode = NORMAL;
-					parentRenderer.__setBlendMode(cacheBlendMode);
-					parentRenderer.__copyShader(childRenderer);
-
-					if (cacheRTT != null)
-					{
-						context.setRenderToTexture(cacheRTT, cacheRTTDepthStencil, cacheRTTAntiAlias, cacheRTTSurfaceSelector);
-					}
-					else
-					{
-						context.setRenderToBackBuffer();
-					}
-
-					// context.__bindGLFramebuffer (cacheFramebuffer);
-
-					// parentRenderer.__restoreState (childRenderer);
-					parentRenderer.__resumeClipAndMask(childRenderer);
-					parentRenderer.setViewport();
-
-					displayObject.__cacheBitmapColorTransform.__copyFrom(colorTransform);
-				}
-				else
-				{
-					#if (js && html5)
-					displayObject.__cacheBitmapData.__drawCanvas(displayObject, cast displayObject.__cacheBitmapRenderer);
-					#else
-					displayObject.__cacheBitmapData.__drawCairo(displayObject, cast displayObject.__cacheBitmapRenderer);
-					#end
-
-					if (hasFilters)
-					{
-						var needSecondBitmapData = false;
-						var needCopyOfOriginal = false;
-
-						for (filter in displayObject.__filters)
-						{
-							if (filter.__needSecondBitmapData)
-							{
-								needSecondBitmapData = true;
-							}
-							if (filter.__preserveObject)
-							{
-								needCopyOfOriginal = true;
-							}
-						}
-
-						var bitmap = displayObject.__cacheBitmapData;
-						var bitmap2 = null;
-						var bitmap3 = null;
-
-						if (needSecondBitmapData)
-						{
-							if (displayObject.__cacheBitmapData2 == null
-								|| displayObject.__cacheBitmapData2.image == null
-								|| bitmapWidth > displayObject.__cacheBitmapData2.width
-								|| bitmapHeight > displayObject.__cacheBitmapData2.height)
-							{
-								displayObject.__cacheBitmapData2 = new BitmapData(bitmapWidth, bitmapHeight, true, 0);
-							}
-							else
-							{
-								displayObject.__cacheBitmapData2.fillRect(displayObject.__cacheBitmapData2.rect, 0);
-							}
-							bitmap2 = displayObject.__cacheBitmapData2;
-						}
-						else
-						{
-							bitmap2 = bitmap;
-						}
-
-						if (needCopyOfOriginal)
-						{
-							if (displayObject.__cacheBitmapData3 == null
-								|| displayObject.__cacheBitmapData3.image == null
-								|| bitmapWidth > displayObject.__cacheBitmapData3.width
-								|| bitmapHeight > displayObject.__cacheBitmapData3.height)
-							{
-								displayObject.__cacheBitmapData3 = new BitmapData(bitmapWidth, bitmapHeight, true, 0);
-							}
-							else
-							{
-								displayObject.__cacheBitmapData3.fillRect(displayObject.__cacheBitmapData3.rect, 0);
-							}
-							bitmap3 = displayObject.__cacheBitmapData3;
-						}
-
-						if (displayObject.__tempPoint == null) displayObject.__tempPoint = new Point();
-						var destPoint = displayObject.__tempPoint;
-						var cacheBitmap, lastBitmap;
-
-						for (filter in displayObject.__filters)
-						{
-							if (filter.__preserveObject)
-							{
-								bitmap3.copyPixels(bitmap, bitmap.rect, destPoint);
-							}
-
-							lastBitmap = filter.__applyFilter(bitmap2, bitmap, bitmap.rect, destPoint);
-
-							if (filter.__preserveObject)
-							{
-								lastBitmap.draw(bitmap3, null,
-									displayObject.__objectTransform != null ? displayObject.__objectTransform.__colorTransform : null);
-							}
-							filter.__renderDirty = false;
-
-							if (needSecondBitmapData && lastBitmap == bitmap2)
-							{
-								cacheBitmap = bitmap;
-								bitmap = bitmap2;
-								bitmap2 = cacheBitmap;
-							}
-						}
-
-						if (displayObject.__cacheBitmapData != bitmap)
-						{
-							// TODO: Fix issue with swapping __cacheBitmap.__bitmapData
-							// __cacheBitmapData.copyPixels (bitmap, bitmap.rect, destPoint);
-
-							// Adding __cacheBitmapRenderer = null; makes this work
-							cacheBitmap = displayObject.__cacheBitmapData;
-							displayObject.__cacheBitmapData = bitmap;
-							displayObject.__cacheBitmapData2 = cacheBitmap;
-							displayObject.__cacheBitmap.__bitmapData = displayObject.__cacheBitmapData;
-							displayObject.__cacheBitmapRenderer = null;
-						}
-
-						displayObject.__cacheBitmap.__imageVersion = displayObject.__cacheBitmapData.__textureVersion;
-					}
-
-					displayObject.__cacheBitmapColorTransform.__copyFrom(colorTransform);
-
-					if (!displayObject.__cacheBitmapColorTransform.__isDefault(true))
-					{
-						displayObject.__cacheBitmapColorTransform.alphaMultiplier = 1;
-						displayObject.__cacheBitmapData.colorTransform(displayObject.__cacheBitmapData.rect, displayObject.__cacheBitmapColorTransform);
-					}
-				}
-
-				displayObject.__isCacheBitmapRender = false;
-			}
-
-			if (updateTransform || needRender)
-			{
-				Rectangle.__pool.release(rect);
-			}
-
-			updated = updateTransform;
-		}
-		else if (displayObject.__cacheBitmap != null)
-		{
-			if (renderer.__type == DOM)
-			{
-				var domRenderer:DOMRenderer = cast renderer;
-				domRenderer.__renderDrawableClear(displayObject.__cacheBitmap);
-			}
-
-			displayObject.__cacheBitmap = null;
-			displayObject.__cacheBitmapData = null;
-			displayObject.__cacheBitmapData2 = null;
-			displayObject.__cacheBitmapData3 = null;
-			displayObject.__cacheBitmapColorTransform = null;
-			displayObject.__cacheBitmapRenderer = null;
-
-			updated = true;
-		}
-
-		ColorTransform.__pool.release(colorTransform);
-
-		if (updated && displayObject.__drawableType == TEXT_FIELD)
-		{
-			var textField:TextField = cast displayObject;
-			if (textField.__cacheBitmap != null)
-			{
-				textField.__cacheBitmap.__renderTransform.tx -= textField.__offsetX;
-				textField.__cacheBitmap.__renderTransform.ty -= textField.__offsetY;
-			}
-		}
-
-		return updated;
-		#else
-		return false;
-		#end
-	}
-}
-#else
-typedef DisplayObjectRenderer = Dynamic;
-#end
diff --git a/source/openfl/display/GraphicsShader.hx b/source/openfl/display/GraphicsShader.hx
deleted file mode 100644
index 72c0ed9776..0000000000
--- a/source/openfl/display/GraphicsShader.hx
+++ /dev/null
@@ -1,89 +0,0 @@
-package openfl.display;
-
-import openfl.utils.ByteArray;
-
-#if !openfl_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-class GraphicsShader extends Shader
-{
-	@:glVertexHeader("attribute float openfl_Alpha;
-attribute vec4 openfl_ColorMultiplier;
-attribute vec4 openfl_ColorOffset;
-attribute vec4 openfl_Position;
-attribute vec2 openfl_TextureCoord;
-
-varying float openfl_Alphav;
-varying vec4 openfl_ColorMultiplierv;
-varying vec4 openfl_ColorOffsetv;
-varying vec2 openfl_TextureCoordv;
-
-uniform mat4 openfl_Matrix;
-uniform bool openfl_HasColorTransform;
-uniform vec2 openfl_TextureSize;")
-	@:glVertexBody("openfl_Alphav = openfl_Alpha;
-openfl_TextureCoordv = openfl_TextureCoord;
-
-if (openfl_HasColorTransform) {
-	openfl_ColorMultiplierv = openfl_ColorMultiplier;
-	openfl_ColorOffsetv = openfl_ColorOffset / 255.0;
-}
-
-gl_Position = openfl_Matrix * openfl_Position;")
-	@:glVertexSource("#pragma header
-
-void main(void) {
-	#pragma body
-}")
-	@:glFragmentHeader("varying float openfl_Alphav;
-varying vec4 openfl_ColorMultiplierv;
-varying vec4 openfl_ColorOffsetv;
-varying vec2 openfl_TextureCoordv;
-
-uniform bool openfl_HasColorTransform;
-uniform vec2 openfl_TextureSize;
-uniform sampler2D bitmap;")
-	@:glFragmentBody("vec4 color = texture2D (bitmap, openfl_TextureCoordv);
-
-if (color.a == 0.0) {
-	gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
-} else if (openfl_HasColorTransform) {
-	color = vec4(color.rgb / color.a, color.a);
-
-	mat4 colorMultiplier = mat4(0);
-	colorMultiplier[0][0] = openfl_ColorMultiplierv.x;
-	colorMultiplier[1][1] = openfl_ColorMultiplierv.y;
-	colorMultiplier[2][2] = openfl_ColorMultiplierv.z;
-	colorMultiplier[3][3] = 1.0; // openfl_ColorMultiplierv.w;
-
-	color = clamp(openfl_ColorOffsetv + (color * colorMultiplier), 0.0, 1.0);
-
-	if (color.a > 0.0) {
-		gl_FragColor = vec4(color.rgb * color.a * openfl_Alphav, color.a * openfl_Alphav);
-	} else {
-		gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
-	}
-} else {
-	gl_FragColor = color * openfl_Alphav;
-}")
-	#if emscripten
-	@:glFragmentSource("#pragma header
-
-void main(void) {
-	#pragma body
-
-	gl_FragColor = gl_FragColor.bgra;
-}")
-	#else
-	@:glFragmentSource("#pragma header
-
-void main(void) {
-	#pragma body
-}")
-	#end
-	public function new(code:ByteArray = null)
-	{
-		super(code);
-	}
-}
diff --git a/source/openfl/display3D/Context3D.hx b/source/openfl/display3D/Context3D.hx
deleted file mode 100644
index 8443824dcb..0000000000
--- a/source/openfl/display3D/Context3D.hx
+++ /dev/null
@@ -1,2718 +0,0 @@
-package openfl.display3D;
-
-#if !flash
-import openfl.display3D.utils.UInt8Buff;
-import openfl.display3D._internal.Context3DState;
-import openfl.display3D._internal.GLBuffer;
-import openfl.display3D._internal.GLFramebuffer;
-import openfl.display3D._internal.GLTexture;
-import openfl.display._internal.SamplerState;
-import openfl.display3D.textures.CubeTexture;
-import openfl.display3D.textures.RectangleTexture;
-import openfl.display3D.textures.TextureBase;
-import openfl.display3D.textures.Texture;
-import openfl.display3D.textures.VideoTexture;
-import openfl.display.BitmapData;
-import openfl.display.Stage;
-import openfl.display.Stage3D;
-import openfl.errors.Error;
-import openfl.errors.IllegalOperationError;
-import openfl.events.EventDispatcher;
-import openfl.geom.Matrix3D;
-import openfl.geom.Point;
-import openfl.geom.Rectangle;
-import openfl.utils._internal.Float32Array;
-import openfl.utils._internal.UInt16Array;
-import openfl.utils._internal.UInt8Array;
-import openfl.utils.AGALMiniAssembler;
-import openfl.utils.ByteArray;
-#if lime
-import lime.graphics.opengl.GL;
-import lime.graphics.Image;
-import lime.graphics.ImageBuffer;
-import lime.graphics.RenderContext;
-import lime.graphics.WebGLRenderContext;
-import lime.math.Rectangle as LimeRectangle;
-import lime.math.Vector2;
-#end
-
-/**
-	The Context3D class provides a context for rendering geometrically defined graphics.
-	A rendering context includes a drawing surface and its associated resources and
-	state. When possible, the rendering context uses the hardware graphics processing
-	unit (GPU). Otherwise, the rendering context uses software. (If rendering through
-	Context3D is not supported on a platform, the stage3Ds property of the Stage object
-	contains an empty list.)
-
-	The Context3D rendering context is a programmable pipeline that is very similar to
-	OpenGL ES 2, but is abstracted so that it is compatible with a range of hardware and
-	GPU interfaces. Although designed for 3D graphics, the rendering pipeline does not
-	mandate that the rendering is three dimensional. Thus, you can create a 2D renderer
-	by supplying the appropriate vertex and pixel fragment programs. In both the 3D and
-	2D cases, the only geometric primitive supported is the triangle.
-
-	Get an instance of the Context3D class by calling the requestContext3D() method of a
-	Stage3D object. A limited number of Context3D objects can exist per stage; one for
-	each Stage3D in the Stage.stage3Ds list. When the context is created, the Stage3D
-	object dispatches a context3DCreate event. A rendering context can be destroyed and
-	recreated at any time, such as when another application that uses the GPU gains
-	focus. Your code should anticipate receiving multiple context3DCreate events.
-	Position the rendering area on the stage using the x and y properties of the
-	associated Stage3D instance.
-
-	To render and display a scene (after getting a Context3D object), the following steps
-	are typical:
-
-	1. Configure the main display buffer attributes by calling `configureBackBuffer()`.
-	2. Create and initialize your rendering resources, including:
-	   * Vertex and index buffers defining the scene geometry
-	   * Vertex and pixel programs (shaders) for rendering the scene
-	   * Textures
-	3. Render a frame:
-	   * Set the render state as appropriate for an object or collection of objects in
-	   the scene.
-	   * Call the `drawTriangles()` method to render a set of triangles.
-	   * Change the rendering state for the next group of objects.
-	   * Call `drawTriangles()` to draw the triangles defining the objects.
-	   * Repeat until the scene is entirely rendered.
-	   * Call the `present()` method to display the rendered scene on the stage.
-
-	The following limits apply to rendering:
-
-	Resource limits:
-
-	| Resource | Number allowed | Total memory |
-	| --- | --- | --- |
-	| Vertex buffers | 4096 | 256 MB |
-	| Index buffers | 4096 | 128 MB |
-	| Programs | 4096 | 16 MB |
-	| Textures | 4096 | 128 MB |
-	| Cube textures | 4096 | 256 MB |
-
-	AGAL limits: 200 opcodes per program.
-
-	Draw call limits: 32,768 `drawTriangles()` calls for each `present()` call.
-
-	The following limits apply to textures:
-
-	Texture limits for AIR 32 bit:
-
-	| Texture | Maximum size | Total GPU memory |
-	| --- | --- | --- |
-	| Normal Texture (below Baseline extended) | 2048x2048 | 512 MB |
-	| Normal Texture (Baseline extended and above) | 4096x4096 | 512 MB |
-	| Rectangular Texture (below Baseline extended) | 2048x2048 | 512 MB |
-	| Rectangular Texture (Baseline extended and above) | 4096x4096 | 512 MB |
-	| Cube Texture | 1024x1024 | 256 MB |
-
-	Texture limits for AIR 64 bit (Desktop):
-
-	| Texture | Maximum size | Total GPU memory |
-	| --- | --- | --- |
-	| Normal Texture (below Baseline extended) | 2048x2048 | 512 MB |
-	| Normal Texture (Baseline extended to Standard) | 4096x4096 | 512 MB |
-	| Normal Texture (Standard extended and above) | 4096x4096 | 2048 MB |
-	| Rectangular Texture (below Baseline extended) | 2048x2048 | 512 MB |
-	| Rectangular Texture (Baseline extended to Standard) | 4096x4096 | 512 MB |
-	| Rectangular Texture (Standard extended and above) | 4096x4096 | 2048 MB |
-	| Cube Texture | 1024x1024 | 256 MB |
-
-	512 MB is the absolute limit for textures, including the texture memory required
-	for mipmaps. However, for Cube Textures, the memory limit is 256 MB.
-
-	You cannot create Context3D objects with the Context3D constructor. It is
-	constructed and available as a property of a Stage3D instance. The Context3D class
-	can be used on both desktop and mobile platforms, both when running in Flash Player
-	and AIR.
-**/
-#if !openfl_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(openfl.display3D._internal.Context3DState)
-@:access(openfl.display3D.textures.CubeTexture)
-@:access(openfl.display3D.textures.RectangleTexture)
-@:access(openfl.display3D.textures.TextureBase)
-@:access(openfl.display3D.textures.Texture)
-@:access(openfl.display3D.textures.VideoTexture)
-@:access(openfl.display3D.IndexBuffer3D)
-@:access(openfl.display3D.Program3D)
-@:access(openfl.display3D.VertexBuffer3D)
-@:access(openfl.display.BitmapData)
-@:access(openfl.display.Bitmap)
-@:access(openfl.display.DisplayObjectRenderer)
-@:access(openfl.display.Shader)
-@:access(openfl.display.Stage)
-@:access(openfl.display.Stage3D)
-@:access(openfl.geom.Point)
-@:access(openfl.geom.Rectangle)
-@:final class Context3D extends EventDispatcher
-{
-	/**
-		Indicates if Context3D supports video texture.
-	**/
-	public static var supportsVideoTexture(default, null):Bool = #if (js && html5) true #else false #end;
-
-	/**
-		Specifies the height of the back buffer, which can be changed by a successful
-		call to the `configureBackBuffer()` method. The height may be modified when the
-		browser zoom factor changes if the `wantsBestResolutionOnBrowserZoom` parameter
-		is set to `true` in the last successful call to the `configureBackBuffer()`
-		method. The change in height can be detected by registering an event listener
-		for the browser zoom change event.
-	**/
-	public var backBufferHeight(default, null):Int = 0;
-
-	/**
-		Specifies the width of the back buffer, which can be changed by a successful
-		call to the `configureBackBuffer()` method. The width may be modified when the
-		browser zoom factor changes if the `wantsBestResolutionOnBrowserZoom` parameter
-		is set to `true` in the last successful call to the `configureBackBuffer()`
-		method. The change in width can be detected by registering an event listener
-		for the browser zoom change event.
-	**/
-	public var backBufferWidth(default, null):Int = 0;
-
-	/**
-		The type of graphics library driver used by this rendering context. Indicates
-		whether the rendering is using software, a DirectX driver, or an OpenGL driver.
-		Also indicates whether hardware rendering failed. If hardware rendering fails,
-		Flash Player uses software rendering for Stage3D and `driverInfo` contains one
-		of the following values:
-
-		* "Software Hw_disabled=userDisabled" - The Enable hardware acceleration
-		checkbox in the Adobe Flash Player Settings UI is not selected.
-		* "Software Hw_disabled=oldDriver" - There are known problems with the
-		hardware graphics driver. Updating the graphics driver may fix this problem.
-		* "Software Hw_disabled=unavailable" - Known problems with the hardware
-		graphics driver or hardware graphics initialization failure.
-		* "Software Hw_disabled=explicit" - The content explicitly requested software
-		rendering through requestContext3D.
-		* "Software Hw_disabled=domainMemory" - The content uses domainMemory, which
-		requires a license when used with Stage3D hardware rendering. Visit
-		adobe.com/go/fpl.
-	**/
-	public var driverInfo(default, null):String = "OpenGL (Direct blitting)";
-
-	/**
-		Specifies whether errors encountered by the renderer are reported to the
-		application.
-
-		When `enableErrorChecking` is `true`, the `clear()`, and `drawTriangles()`
-		methods are synchronous and can throw errors. When `enableErrorChecking`
-		is `false`, the default, the `clear()`, and `drawTriangles()` methods are
-		asynchronous and errors are not reported. Enabling error checking reduces
-		rendering performance. You should only enable error checking when debugging.
-	**/
-	public var enableErrorChecking(get, set):Bool;
-
-	/**
-		Specifies the maximum height of the back buffer. The inital value is the system
-		limit in the platform. The property can be set to a value smaller than or equal
-		to, but not greater than, the system limit. The property can be set to a value
-		greater than or equal to, but not smaller than, the minimum limit. The minimum
-		limit is a constant value, 32, when the back buffer is not configured. The
-		minimum limit will be the value of the `height` parameter in the last successful
-		call to the `configureBackBuffer()` method after the back buffer is configured.
-	**/
-	public var maxBackBufferHeight(default, null):Int;
-
-	/**
-		Specifies the maximum width of the back buffer. The inital value is the system
-		limit in the platform. The property can be set to a value smaller than or equal
-		to, but not greater than, the system limit. The property can be set to a value
-		greater than or equal to, but not smaller than, the minimum limit. The minimum
-		limit is a constant value, 32, when the back buffer is not configured. The
-		minimum limit will be the value of the width parameter in the last successful
-		call to the `configureBackBuffer()` method after the back buffer is configured.
-	**/
-	public var maxBackBufferWidth(default, null):Int;
-
-	/**
-		The feature-support profile in use by this Context3D object.
-	**/
-	public var profile(default, null):Context3DProfile = STANDARD;
-
-	/**
-		Returns the total GPU memory allocated by Stage3D data structures of an
-		application.
-
-		Whenever a GPU resource object is created, memory utilized is stored in
-		Context3D. This memory includes index buffers, vertex buffers,
-		textures (excluding video texture), and programs that were created through this
-		Context3D.
-
-		API totalGPUMemory returns the total memory consumed by the above resources to
-		the user. Default value returned is 0. The total GPU memory returned is in bytes.
-		The information is only provided in Direct mode on mobile, and in Direct and
-		GPU modes on desktop. (On desktop, using `<renderMode>gpu</renderMode>` will
-		fall back to `<renderMode>direct</renderMode>`)
-
-		This API can be used when the SWF version is 32 or later.
-	**/
-	public var totalGPUMemory(get, never):Int;
-
-	@:noCompletion private static var __driverInfo:String;
-	@:noCompletion private static var __glDepthStencil:Int = -1;
-	@:noCompletion private static var __glMaxTextureMaxAnisotropy:Int = -1;
-	@:noCompletion private static var __glMaxViewportDims:Int = -1;
-	@:noCompletion private static var __glMemoryCurrentAvailable:Int = -1;
-	@:noCompletion private static var __glMemoryTotalAvailable:Int = -1;
-	@:noCompletion private static var __glTextureMaxAnisotropy:Int = -1;
-
-	@:noCompletion private var gl:#if lime WebGLRenderContext #else Dynamic #end;
-	@:noCompletion private var __backBufferAntiAlias:Int;
-	@:noCompletion private var __backBufferTexture:RectangleTexture;
-	@:noCompletion private var __backBufferWantsBestResolution:Bool;
-	@:noCompletion private var __backBufferWantsBestResolutionOnBrowserZoom:Bool;
-	@:noCompletion private var __cleared:Bool;
-	@:noCompletion private var __context:#if lime RenderContext #else Dynamic #end;
-	@:noCompletion private var __contextState:Context3DState;
-	@:noCompletion private var __renderStage3DProgram:Program3D;
-	@:noCompletion private var __enableErrorChecking:Bool;
-	@:noCompletion private var __fragmentConstants:Float32Array;
-	@:noCompletion private var __frontBufferTexture:RectangleTexture;
-	@:noCompletion private var __positionScale:Float32Array; // TODO: Better approach?
-	@:noCompletion private var __present:Bool;
-	@:noCompletion private var __programs:Map<String, Program3D>;
-	@:noCompletion private var __quadIndexBuffer:IndexBuffer3D;
-	@:noCompletion private var __quadIndexBufferCount:Int;
-	@:noCompletion private var __quadIndexBufferElements:Int;
-	@:noCompletion private var __stage:Stage;
-	@:noCompletion private var __stage3D:Stage3D;
-	@:noCompletion private var __state:Context3DState;
-	@:noCompletion private var __vertexConstants:Float32Array;
-
-	@:noCompletion private function new(stage:Stage, contextState:Context3DState = null, stage3D:Stage3D = null)
-	{
-		super();
-
-		__stage = stage;
-		__contextState = contextState;
-		__stage3D = stage3D;
-
-		__context = stage.window.context;
-		#if (js && html5 && dom)
-		gl = GL.context;
-		#else
-		gl = __context.webgl;
-		#end
-
-		if (__contextState == null) __contextState = new Context3DState();
-		__state = new Context3DState();
-
-		#if lime
-		__vertexConstants = new Float32Array(4 * 128);
-		__fragmentConstants = new Float32Array(4 * 128);
-		__positionScale = new Float32Array([1.0, 1.0, 1.0, 1.0]);
-		#end
-		__programs = new Map<String, Program3D>();
-
-		if (__glMaxViewportDims == -1)
-		{
-			#if (js && html5)
-			__glMaxViewportDims = gl.getParameter(gl.MAX_VIEWPORT_DIMS);
-			#else
-			__glMaxViewportDims = 16384;
-			#end
-		}
-
-		maxBackBufferWidth = __glMaxViewportDims;
-		maxBackBufferHeight = __glMaxViewportDims;
-
-		if (__glMaxTextureMaxAnisotropy == -1)
-		{
-			var extension:Dynamic = gl.getExtension("EXT_texture_filter_anisotropic");
-
-			#if (js && html5)
-			if (extension == null
-				|| !Reflect.hasField(extension, "MAX_TEXTURE_MAX_ANISOTROPY_EXT")) extension = gl.getExtension("MOZ_EXT_texture_filter_anisotropic");
-			if (extension == null
-				|| !Reflect.hasField(extension, "MAX_TEXTURE_MAX_ANISOTROPY_EXT")) extension = gl.getExtension("WEBKIT_EXT_texture_filter_anisotropic");
-			#end
-
-			if (extension != null)
-			{
-				__glTextureMaxAnisotropy = extension.TEXTURE_MAX_ANISOTROPY_EXT;
-				__glMaxTextureMaxAnisotropy = gl.getParameter(extension.MAX_TEXTURE_MAX_ANISOTROPY_EXT);
-			}
-			else
-			{
-				__glTextureMaxAnisotropy = 0;
-				__glMaxTextureMaxAnisotropy = 0;
-			}
-		}
-
-		#if lime
-		if (__glDepthStencil == -1)
-		{
-			#if (js && html5)
-			__glDepthStencil = gl.DEPTH_STENCIL;
-			#else
-			if (__context.type == OPENGLES && Std.parseFloat(__context.version) >= 3)
-			{
-				__glDepthStencil = __context.gles3.DEPTH24_STENCIL8;
-			}
-			else
-			{
-				var extension = gl.getExtension("OES_packed_depth_stencil");
-				if (extension != null)
-				{
-					__glDepthStencil = extension.DEPTH24_STENCIL8_OES;
-				}
-				else
-				{
-					extension = gl.getExtension("EXT_packed_depth_stencil");
-					if (extension != null)
-					{
-						__glDepthStencil = extension.DEPTH24_STENCIL8_EXT;
-					}
-					else
-					{
-						__glDepthStencil = 0;
-					}
-				}
-			}
-			#end
-		}
-
-		if (__glMemoryTotalAvailable == -1)
-		{
-			var extension = gl.getExtension("NVX_gpu_memory_info");
-			if (extension != null)
-			{
-				__glMemoryTotalAvailable = extension.GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX;
-				__glMemoryCurrentAvailable = extension.GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX;
-			}
-		}
-		#end
-
-		if (__driverInfo == null)
-		{
-			var vendor = gl.getParameter(gl.VENDOR);
-			var version = gl.getParameter(gl.VERSION);
-			var renderer = gl.getParameter(gl.RENDERER);
-			var glslVersion = gl.getParameter(gl.SHADING_LANGUAGE_VERSION);
-
-			__driverInfo = "OpenGL Vendor=" + vendor + " Version=" + version + " Renderer=" + renderer + " GLSL=" + glslVersion;
-		}
-
-		driverInfo = __driverInfo;
-
-		__quadIndexBufferElements = Math.floor(0xFFFF / 4);
-		__quadIndexBufferCount = __quadIndexBufferElements * 6;
-
-		#if lime
-		var data = new UInt16Array(__quadIndexBufferCount);
-
-		var index:UInt = 0;
-		var vertex:UInt = 0;
-
-		for (i in 0...__quadIndexBufferElements)
-		{
-			data[index] = vertex;
-			data[index + 1] = vertex + 1;
-			data[index + 2] = vertex + 2;
-			data[index + 3] = vertex + 2;
-			data[index + 4] = vertex + 1;
-			data[index + 5] = vertex + 3;
-
-			index += 6;
-			vertex += 4;
-		}
-
-		__quadIndexBuffer = createIndexBuffer(__quadIndexBufferCount);
-		__quadIndexBuffer.uploadFromTypedArray(data);
-		#end
-	}
-
-	/**
-		Clears the color, depth, and stencil buffers associated with this Context3D
-		object and fills them with the specified values.
-
-		Set the `mask` parameter to specify which buffers to clear. Use the constants
-		defined in the Context3DClearMask class to set the `mask` parameter. Use the
-		bitwise OR operator, "|", to add multiple buffers to the mask (or use
-		Context3DClearMask.ALL). When rendering to the back buffer, the
-		`configureBackBuffer()` method must be called before any `clear()` calls.
-
-		**Note:** If you specify a parameter value outside the allowed range, Numeric
-		parameter values are silently clamped to the range zero to one. Likewise, if
-		stencil is greater than 0xff it is set to 0xff.
-
-		@param	red	the red component of the color with which to clear the color buffer,
-		in the range zero to one.
-		@param	green	the green component of the color with which to clear the color
-		buffer, in the range zero to one.
-		@param	blue	the blue component of the color with which to clear the color
-		buffer, in the range zero to one.
-		@param	alpha	the alpha component of the color with which to clear the color
-		buffer, in the range zero to one. The alpha component is not used for blending.
-		It is written to the buffer alpha directly.
-		@param	depth	the value with which to clear the depth buffer, in the range
-		zero to one.
-		@param	stencil	the 8-bit value with which to clear the stencil buffer, in a
-		range of 0x00 to 0xff.
-		@param	mask	specifies which buffers to clear.
-		@throws	Error	Object Disposed: If this Context3D object has been disposed by a calling
-		dispose() or because the underlying rendering hardware has been lost.
-		@throws	Error	3768: The Stage3D API may not be used during background execution.
-	**/
-	public function clear(red:Float = 0, green:Float = 0, blue:Float = 0, alpha:Float = 1, depth:Float = 1, stencil:UInt = 0,
-			mask:UInt = Context3DClearMask.ALL):Void
-	{
-		__flushGLFramebuffer();
-		__flushGLViewport();
-
-		var clearMask = 0;
-
-		if (mask & Context3DClearMask.COLOR != 0)
-		{
-			if (__state.renderToTexture == null)
-			{
-				if (__stage.context3D == this && !__stage.__renderer.__cleared) __stage.__renderer.__cleared = true;
-				__cleared = true;
-			}
-
-			clearMask |= gl.COLOR_BUFFER_BIT;
-
-			if (#if openfl_disable_context_cache true #else __contextState.colorMaskRed != true
-				|| __contextState.colorMaskGreen != true
-				|| __contextState.colorMaskBlue != true
-				|| __contextState.colorMaskAlpha != true #end)
-			{
-				gl.colorMask(true, true, true, true);
-				__contextState.colorMaskRed = true;
-				__contextState.colorMaskGreen = true;
-				__contextState.colorMaskBlue = true;
-				__contextState.colorMaskAlpha = true;
-			}
-
-			gl.clearColor(red, green, blue, alpha);
-		}
-
-		if (mask & Context3DClearMask.DEPTH != 0)
-		{
-			clearMask |= gl.DEPTH_BUFFER_BIT;
-
-			if (#if openfl_disable_context_cache true #else __contextState.depthMask != true #end)
-			{
-				gl.depthMask(true);
-				__contextState.depthMask = true;
-			}
-
-			gl.clearDepth(depth);
-		}
-
-		if (mask & Context3DClearMask.STENCIL != 0)
-		{
-			clearMask |= gl.STENCIL_BUFFER_BIT;
-
-			if (#if openfl_disable_context_cache true #else __contextState.stencilWriteMask != 0xFF #end)
-			{
-				gl.stencilMask(0xFF);
-				__contextState.stencilWriteMask = 0xFF;
-			}
-
-			gl.clearStencil(stencil);
-			__contextState.stencilWriteMask = 0xFF;
-		}
-
-		if (clearMask == 0) return;
-
-		__setGLScissorTest(false);
-		gl.clear(clearMask);
-	}
-
-	/**
-		Sets the viewport dimensions and other attributes of the rendering buffer.
-
-		Rendering is double-buffered. The back buffer is swapped with the visible,
-		front buffer when the `present()` method is called. The minimum size of the
-		buffer is 32x32 pixels. The maximum size of the back buffer is limited by the
-		device capabilities and can also be set by the user through the properties
-		`maxBackBufferWidth` and `maxBackBufferHeight`. Configuring the buffer is a
-		slow operation. Avoid changing the buffer size or attributes during normal
-		rendering operations.
-
-		@param	width	width in pixels of the buffer.
-		@param	height	height in pixels of the buffer.
-		@param	antiAlias	an integer value specifying the requested antialiasing
-		quality. The value correlates to the number of subsamples used when
-		antialiasing. Using more subsamples requires more calculations to be performed,
-		although the relative performance impact depends on the specific rendering
-		hardware. The type of antialiasing and whether antialiasing is performed at all is
-		dependent on the device and rendering mode. Antialiasing is not supported at all by
-		the software rendering context.
-		| --- | --- |
-		| 0 | No antialiasing |
-		| 2 | Minimal antialiasing |
-		| 4 | High-quality antialiasing |
-		| 16 | Very high-quality antialiasing |
-		@param	enableDepthAndStencil	`false` indicates no depth or stencil buffer is
-		created, `true` creates a depth and a stencil buffer. For an AIR 3.2 or later
-		application compiled with SWF version 15 or higher, if the `renderMode` element in
-		the application descriptor file is `direct`, then the `depthAndStencil` element in
-		the application descriptor file must have the same value as this argument. By
-		default, the value of the `depthAndStencil` element is `false`.
-		@param	wantsBestResolution	`true` indicates that if the device supports HiDPI
-		screens it will attempt to allocate a larger back buffer than indicated with the
-		`width` and `height` parameters. Since this add more pixels and potentially changes
-		the result of shader operations this is turned off by default. Use
-		`Stage.contentsScaleFactor` to determine by how much the native back buffer was
-		scaled up.
-		@param	wantsBestResolutionOnBrowserZoom	`true` indicates that the size of the
-		back buffer should increase in proportion to the increase in the browser zoom
-		factor. The setting of this value is persistent across multiple browser zooms.
-		The default value of the parameter is `false`. Set `maxBackBufferWidth` and
-		`maxBackBufferHeight` properties to limit the back buffer size increase. Use
-		`backBufferWidth` and `backBufferHeight` to determine the current size of the
-		back buffer.
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error	Bad Input Size: The `width` or `height` parameter is either less
-		than the minimum back buffer allowed size or greater than the maximum back buffer
-		size allowed.
-		@throws	Error	3709: The `depthAndStencil` flag in the application descriptor
-		must match the `enableDepthAndStencil` Boolean passed to `configureBackBuffer()`
-		on the Context3D object.
-	**/
-	public function configureBackBuffer(width:Int, height:Int, antiAlias:Int, enableDepthAndStencil:Bool = true, wantsBestResolution:Bool = false,
-			wantsBestResolutionOnBrowserZoom:Bool = false):Void
-	{
-		#if !openfl_dpi_aware
-		if (wantsBestResolution)
-		{
-			width = Std.int(width * __stage.window.scale);
-			height = Std.int(height * __stage.window.scale);
-		}
-		#end
-
-		if (__stage3D == null)
-		{
-			backBufferWidth = width;
-			backBufferHeight = height;
-
-			__backBufferAntiAlias = antiAlias;
-			__state.backBufferEnableDepthAndStencil = enableDepthAndStencil;
-			__backBufferWantsBestResolution = wantsBestResolution;
-			__backBufferWantsBestResolutionOnBrowserZoom = wantsBestResolutionOnBrowserZoom;
-		}
-		else
-		{
-			if (__backBufferTexture == null || backBufferWidth != width || backBufferHeight != height)
-			{
-				if (__backBufferTexture != null) __backBufferTexture.dispose();
-				if (__frontBufferTexture != null) __frontBufferTexture.dispose();
-
-				__backBufferTexture = createRectangleTexture(width, height, BGRA, true);
-				__frontBufferTexture = createRectangleTexture(width, height, BGRA, true);
-
-				if (__stage3D.__vertexBuffer == null)
-				{
-					__stage3D.__vertexBuffer = createVertexBuffer(4, 5);
-				}
-
-				#if openfl_dpi_aware
-				var scaledWidth = width;
-				var scaledHeight = height;
-				#else
-				var scaledWidth = wantsBestResolution ? width : Std.int(width * __stage.window.scale);
-				var scaledHeight = wantsBestResolution ? height : Std.int(height * __stage.window.scale);
-				#end
-				var vertexData = new Vector<Float>([
-					scaledWidth, scaledHeight, 0, 1, 1, 0, scaledHeight, 0, 0, 1, scaledWidth, 0, 0, 1, 0, 0, 0, 0, 0, 0.0
-				]);
-
-				__stage3D.__vertexBuffer.uploadFromVector(vertexData, 0, 20);
-
-				if (__stage3D.__indexBuffer == null)
-				{
-					__stage3D.__indexBuffer = createIndexBuffer(6);
-
-					var indexData = new Vector<UInt>([0, 1, 2, 2, 1, 3]);
-
-					__stage3D.__indexBuffer.uploadFromVector(indexData, 0, 6);
-				}
-			}
-
-			backBufferWidth = width;
-			backBufferHeight = height;
-
-			__backBufferAntiAlias = antiAlias;
-			__state.backBufferEnableDepthAndStencil = enableDepthAndStencil;
-			__backBufferWantsBestResolution = wantsBestResolution;
-			__backBufferWantsBestResolutionOnBrowserZoom = wantsBestResolutionOnBrowserZoom;
-			__state.__primaryGLFramebuffer = __backBufferTexture.__getGLFramebuffer(enableDepthAndStencil, antiAlias, 0);
-			__frontBufferTexture.__getGLFramebuffer(enableDepthAndStencil, antiAlias, 0);
-		}
-	}
-
-	/**
-		Creates a CubeTexture object.
-
-		Use a CubeTexture object to upload cube texture bitmaps to the rendering context
-		and to reference a cube texture during rendering. A cube texture consists of six
-		equal-sized, square textures arranged in a cubic topology and are useful for
-		describing environment maps.
-
-		You cannot create CubeTexture objects with a CubeTexture constructor; use this
-		method instead. After creating a CubeTexture object, upload the texture bitmap
-		data using the CubeTexture `uploadFromBitmapData()`, `uploadFromByteArray()`, or
-		`uploadCompressedTextureFromByteArray()` methods.
-
-		@param size	The texture edge length in texels.
-		@param format	The texel format, of the Context3DTextureFormat enumerated list.
-		Texture compression lets you store texture images in compressed format directly on
-		the GPU, which saves GPU memory and memory bandwidth. Typically, compressed
-		textures are compressed offline and uploaded to the GPU in compressed form
-		using the `Texture.uploadCompressedTextureFromByteArray` method. Flash Player 11.4
-		and AIR 3.4 on desktop platforms added support for runtime texture compression,
-		which may be useful in certain situations, such as when rendering dynamic
-		textures from vector art. Note that this feature is not currently available on
-		mobile platforms and an ArgumentError (Texture Format Mismatch) will be thrown
-		instead. To use runtime texture compression, perform the following steps:
-		1. Create the texture object by calling the `Context3D.createCubeTexture()`
-		method, passing either `openfl.display3D.Context3DTextureFormat.COMPRESSED` or
-		`openfl.display3D.Context3DTextureFormat.COMPRESSED_ALPHA` as the format
-		parameter.
-		2. Using the openfl.display3D.textures.Texture instance returned by
-		`createCubeTexture()`, call either
-		`openfl.display3D.textures.CubeTexture.uploadFromBitmapData()` or
-		`openfl.display3D.textures.CubeTexture.uploadFromByteArray()` to upload and
-		compress the texture in one step.
-		@param optimizeForRenderToTexture	Set to true if the texture is likely to be
-		used as a render target.
-		@param streamingLevels	The MIP map level that must be loaded before the image
-		is rendered. Texture streaming offers the ability to load and display the
-		smallest mip levels first, progressively displaying higher quality images as the
-		textures are loaded. End users can view lower-quality images in an application
-		while the higher quality images load.
-
-		By default, streamingLevels is 0, meaning that the highest quality image in the
-		MIP map must be loaded before the image is rendered. This parameter was added in
-		Flash Player 11.3 and AIR 3.3. Using the default value maintains the behavior of
-		the previous versions of Flash Player and AIR.
-
-		Set streamingLevels to a value between 1 and the number of images in the MIP map
-		to enable texture streaming. For example, you have a MIP map that includes at the
-		highest quality a main image at 64x64 pixels. Lower quality images in the MIP map
-		are 32x32, 16x16, 8x8, 4x4, 2x2, and 1x1 pixels, for 7 images in total, or 7
-		levels. Level 0 is the highest quality image. The maximum value of this property
-		is log2(min(width,height)). Therefore, for a main image that is 64x64 pixels, the
-		maximum value of streamingLevels is 7. Set this property to 3 to render the image
-		after the 8x8 pixel image loads.
-
-		**Note:** Setting this property to a value > 0 can impact memory usage and
-		performance.
-
-		@return	A new CubeTexture object
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error	Resource Limit Exceeded: if too many Texture objects are created
-		or the amount of memory allocated to textures is exceeded.
-		@throws	ArgumentError	Depth Texture Not Implemented: if you attempt to create
-		a depth texture.
-		@throws	ArgumentError	Texture Size Is Zero: if the size parameter is not greater
-		than zero.
-		@throws	ArgumentError	Texture Not Power Of Two: if the size parameter is not a
-		power of two.
-		@throws	ArgumentError	Texture Too Big: if the size parameter is greater than
-		1024.
-		@throws	Error	Texture Creation Failed: if the CubeTexture object could not be
-		created by the rendering context (but information about the reason is not
-		available).
-		@throws	ArgumentError	Invalid streaming level: if streamingLevels is greater or
-		equal to `log2(size)`.
-	**/
-	public function createCubeTexture(size:Int, format:Context3DTextureFormat, optimizeForRenderToTexture:Bool, streamingLevels:Int = 0):CubeTexture
-	{
-		return new CubeTexture(this, size, format, optimizeForRenderToTexture, streamingLevels);
-	}
-
-	/**
-		Creates an IndexBuffer3D object.
-
-		Use an IndexBuffer3D object to upload a set of triangle indices to the rendering
-		context and to reference that set of indices for rendering. Each index in the
-		index buffer references a corresponding vertex in a vertex buffer. Each set of
-		three indices identifies a triangle. Pass the IndexBuffer3D object to the
-		`drawTriangles()` method to render one or more triangles defined in the index
-		buffer.
-
-		You cannot create IndexBuffer3D objects with the IndexBuffer3D class constructor;
-		use this method instead. After creating a IndexBuffer3D object, upload the
-		indices using the IndexBuffer3D `uploadFromVector()` or `uploadFromByteArray()`
-		methods.
-
-		@param	numIndices	the number of vertices to be stored in the buffer.
-		@param	bufferUsage	the expected buffer usage. Use one of the constants defined
-		in Context3DBufferUsage. The hardware driver can do appropriate optimization
-		when you set it correctly. This parameter is only available after Flash 12/AIR 4.
-		@return	A new IndexBuffer3D object
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error	Resource Limit Exceeded: if too many index buffers are created
-		or the amount of memory allocated to index buffers is exceeded.
-		@throws	Error	3768: The Stage3D API may not be used during background execution.
-		@throws	ArgumentError	Buffer Too Big: when `numIndices` is greater than or equal
-		to 0xf0000.
-	**/
-	public function createIndexBuffer(numIndices:Int, bufferUsage:Context3DBufferUsage = STATIC_DRAW):IndexBuffer3D
-	{
-		return new IndexBuffer3D(this, numIndices, bufferUsage);
-	}
-
-	/**
-		Creates a Program3D object.
-
-		Use a Program3D object to upload shader programs to the rendering context and
-		to reference uploaded programs during rendering. A Program3D object stores
-		two programs, a vertex program and a fragment program (also known as a pixel
-		program). The programs are written in a binary shader assembly language.
-
-		You cannot create Program3D objects with a Program3D constructor; use this method
-		instead. After creating a Program3D object, upload the programs using the
-		Program3D `upload()` method.
-
-		@param	format	(Experimental) Set the format of this Program3D instance to AGAL
-		(default) or to GLSL for use on GL-based renderers
-		@return	A new Program3D object
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error	The number of programs exceeds 4096 or the total memory size
-		exceeds 16MB (use dispose to free Program3D resources).
-	**/
-	public function createProgram(format:Context3DProgramFormat = AGAL):Program3D
-	{
-		return new Program3D(this, format);
-	}
-
-	/**
-		Creates a Rectangle Texture object.
-
-		Use a RectangleTexture object to upload texture bitmaps to the rendering context
-		and to reference a texture during rendering.
-
-		You cannot create RectangleTexture objects with a RectangleTexture constructor;
-		use this method instead. After creating a RectangleTexture object, upload the
-		texture bitmaps using the Texture `uploadFromBitmapData()` or
-		`uploadFromByteArray()` methods.
-
-		Note that 32-bit integer textures are stored in a packed BGRA format to match
-		the OpenFL BitmapData format. Floating point textures use a conventional RGBA
-		format.
-
-		Rectangle textures are different from regular 2D textures in that their width and
-		height do not have to be powers of two. Also, they do not contain mip maps.
-		They are most useful for use in render to texture cases. If a rectangle texture
-		is used with a sampler that uses mip map filtering or repeat wrapping the
-		drawTriangles call will fail. Rectangle texture also do not allow streaming. The
-		only texture formats supported by Rectangle textures are BGRA, BGR_PACKED,
-		BGRA_PACKED. The compressed texture formats are not supported by Rectangle
-		Textures.
-
-		@param	width	The texture width in texels.
-		@param	height	The texture height in texels.
-		@param	format	The texel format, of the Context3DTextureFormat enumerated list.
-		@param	optimizeForRenderToTexture	Set to true if the texture is likely to be
-		used as a render target.
-		@return	A new RectangleTexture object
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling dispose() or because the underlying rendering hardware has been lost.
-		@throws	Error	Resource Limit Exceeded: if too many Texture objects are created
-		or the amount of memory allocated to textures is exceeded.
-		@throws	ArgumentError	Texture Size Is Zero: if both the width or height
-		parameters are not greater than zero.
-		@throws	ArgumentError	Texture Too Big: if either the width or the height
-		parameter is greater than 2048.
-		@throws	Error	Texture Creation Failed: if the Texture object could not be
-		created by the rendering context (but information about the reason is not
-		available).
-		@throws	Error	Requires Baseline Profile Or Above: if rectangular texture is
-		created with baseline constrained profile.
-	**/
-	public function createRectangleTexture(width:Int, height:Int, format:Context3DTextureFormat, optimizeForRenderToTexture:Bool):RectangleTexture
-	{
-		return new RectangleTexture(this, width, height, format, optimizeForRenderToTexture);
-	}
-
-	/**
-		Creates a Texture object.
-
-		Use a Texture object to upload texture bitmaps to the rendering context and to
-		reference a texture during rendering.
-
-		You cannot create Texture objects with a Texture constructor; use this method
-		instead. After creating a Texture object, upload the texture bitmaps using the
-		Texture `uploadFromBitmapData()`, `uploadFromByteArray()`, or
-		`uploadCompressedTextureFromByteArray()` methods.
-
-		Note that 32-bit integer textures are stored in a packed BGRA format to match
-		the OpenFL BitmapData format. Floating point textures use a conventional RGBA
-		format.
-
-		@param	width	The texture width in texels.
-		@param	height	The texture height in texels.
-		@param	format	The texel format, of the Context3DTextureFormat enumerated list.
-		Texture compression lets you store texture images in compressed format directly
-		on the GPU, which saves GPU memory and memory bandwidth. Typically, compressed
-		textures are compressed offline and uploaded to the GPU in compressed form using
-		the Texture.uploadCompressedTextureFromByteArray method. Flash Player 11.4 and
-		AIR 3.4 on desktop platforms added support for runtime texture compression, which
-		may be useful in certain situations, such as when rendering dynamic textures from
-		vector art. Note that this feature is not currently available on mobile platforms
-		and an ArgumentError (Texture Format Mismatch) will be thrown instead. To use
-		runtime texture compression, perform the following steps:
-		1. Create the texture object by calling the `Context3D.createTexture()` method,
-		passing either `openfl.display3D.Context3DTextureFormat.COMPRESSED` or
-		`openfl.display3D.Context3DTextureFormat.COMPRESSED_ALPHA` as the format
-		parameter.
-		2. Using the openfl.display3D.textures.Texture instance returned by
-		`createTexture()`, call either
-		`openfl.display3D.textures.Texture.uploadFromBitmapData()` or
-		`openfl.display3D.textures.Texture.uploadFromByteArray()` to upload and compress
-		the texture in one step.
-		@param	optimizeForRenderToTexture	Set to true if the texture is likely to be
-		used as a render target.
-		@param	streamingLevels	The MIP map level that must be loaded before the image is
-		rendered. Texture streaming offers the ability to load and display the smallest
-		mip levels first, progressively displaying higher quality images as the textures
-		are loaded. End users can view lower-quality images in an application while the
-		higher quality images load.
-
-		By default, streamingLevels is 0, meaning that the highest quality image in the
-		MIP map must be loaded before the image is rendered. This parameter was added in
-		Flash Player 11.3 and AIR 3.3. Using the default value maintains the behavior of
-		the previous versions of Flash Player and AIR.
-
-		Set `streamingLevels` to a value between 1 and the number of images in the MIP map
-		to enable texture streaming. For example, you have a MIP map that includes at
-		the highest quality a main image at 64x64 pixels. Lower quality images in the
-		MIP map are 32x32, 16x16, 8x8, 4x4, 2x2, and 1x1 pixels, for 7 images in total,
-		or 7 levels. Level 0 is the highest quality image. The maximum value of this
-		property is log2(min(width,height)). Therefore, for a main image that is
-		64x64 pixels, the maximum value of streamingLevels is 7. Set this property to
-		3 to render the image after the 8x8 pixel image loads.
-
-		**Note:** Setting this property to a value > 0 can impact memory usage and
-		performance.
-
-		@return	A new Texture object
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a calling dispose() or because the underlying rendering hardware has been lost.
-		@throws	Error	Resource Limit Exceeded: if too many Texture objects are created or the amount of memory allocated to textures is exceeded.
-		@throws	ArgumentError	Depth Texture Not Implemented: if you attempt to create a depth texture.
-		@throws	ArgumentError	Texture Size Is Zero: if both the width or height parameters are not greater than zero.
-		@throws	ArgumentError	Texture Not Power Of Two: if both the width and height parameters are not a power of two.
-		@throws	ArgumentError	Texture Too Big: if either the width or the height parameter is greater than 2048 for baseline and baseline constrained profile or if either the width or the height parameter is greater than 4096 for profile baseline extended and above.
-		@throws	Error	Texture Creation Failed: if the Texture object could not be created by the rendering context (but information about the reason is not available).
-		@throws	ArgumentError	Invalid streaming level: if streamingLevels is greater or equal to log2(min(width,height)).
-	**/
-	public function createTexture(width:Int, height:Int, format:Context3DTextureFormat, optimizeForRenderToTexture:Bool, streamingLevels:Int = 0):Texture
-	{
-		return new Texture(this, width, height, format, optimizeForRenderToTexture, streamingLevels);
-	}
-
-	/**
-		Creates a VertexBuffer3D object.
-
-		Use a VertexBuffer3D object to upload a set of vertex data to the rendering
-		context. A vertex buffer contains the data needed to render each point in the
-		scene geometry. The data attributes associated with each vertex typically
-		includes position, color, and texture coordinates and serve as the input to
-		the vertex shader program. Identify the data values that correspond to one of
-		the inputs of the vertex program using the `setVertexBufferAt()` method. You can
-		specify up to sixty-four 32-bit values for each vertex.
-
-		You cannot create VertexBuffer3D objects with a VertexBuffer3D constructor; use
-		this method instead. After creating a VertexBuffer3D object, upload the vertex
-		data using the VertexBuffer3D `uploadFromVector()` or `uploadFromByteArray()`
-		methods.
-
-		@param	numVertices	the number of vertices to be stored in the buffer. The
-		maximum number of vertices in a single buffer is 65535.
-		@param	data32PerVertex	the number of 32-bit(4-byte) data values associated
-		with each vertex. The maximum number of 32-bit data elements per vertex is 64
-		(or 256 bytes). Note that only eight attribute registers are accessible by a
-		vertex shader program at any given time. Use `setVertextBufferAt()` to select
-		attributes from within a vertex buffer.
-		@param	bufferUsage	the expected buffer usage. Use one of the constants defined
-		in Context3DBufferUsage. The hardware driver can do appropriate optimization when
-		you set it correctly. This parameter is only available after Flash 12/AIR 4
-		@return	A new VertexBuffer3D object
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error	Resource Limit Exceeded: if too many vertex buffer objects are
-		created or the amount of memory alloted to vertex buffers is exceeded.
-		@throws	ArgumentError	Buffer Too Big: when `numVertices` is greater than 0x10000
-		or `data32PerVertex` is greater than 64.
-		@throws	ArgumentError	Buffer Has Zero Size: when `numVertices` is zero or
-		`data32PerVertex` is zero.
-		@throws	ArgumentError	Buffer Creation Failed: if the VertexBuffer3D object
-		could not be created by the rendering context (but additional information about
-		the reason is not available).
-		@throws	Error	3768: The Stage3D API may not be used during background execution.
-	**/
-	public function createVertexBuffer(numVertices:Int, data32PerVertex:Int, bufferUsage:Context3DBufferUsage = STATIC_DRAW):VertexBuffer3D
-	{
-		return new VertexBuffer3D(this, numVertices, data32PerVertex, bufferUsage);
-	}
-
-	/**
-		Creates a VideoTexture object.
-
-		Use a VideoTexture object to obtain video frames as texture from NetStream object
-		or Camera object and to upload the video frames to the rendering context.
-
-		The VideoTexture object cannot be created with the VideoTexture constructor; use
-		this method instead. After creating a VideoTexture object, attach NetStream
-		object or Camera Object to get the video frames with the VideoTexture
-		`attachNetStream()` or `attachCamera()` methods.
-
-		Note that this method returns null if the system doesn't support this feature.
-
-		VideoTexture does not contain mipmaps. If VideoTexture is used with a sampler
-		that uses mip map filtering or repeat wrapping, the drawTriangles call will fail.
-		VideoTexture can be treated as BGRA texture by the shaders. The attempt to
-		instantiate the VideoTexture Object will fail if the Context3D was requested
-		with sotfware rendering mode.
-
-		A maximum of 4 VideoTexture objects are available per Context3D instance. On
-		mobile the actual number of supported VideoTexture objects may be less than 4
-		due to platform limitations.
-
-		@return	A new VideoTexture object
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error	Resource Limit Exceeded: if too many Texture objects are created
-		or the amount of memory allocated to textures is exceeded.
-		@throws	Error	Texture Creation Failed: if the Texture object could not be
-		created by the rendering context (but information about the reason is not
-		available).
-	**/
-	public function createVideoTexture():VideoTexture
-	{
-		#if (js && html5)
-		return new VideoTexture(this);
-		#else
-		throw new Error("Video textures are not supported on this platform");
-		return null;
-		#end
-	}
-
-	/**
-		Frees all resources and internal storage associated with this Context3D.
-
-		All index buffers, vertex buffers, textures, and programs that were created
-		through this Context3D are disposed just as if calling `dispose()` on each of
-		them individually. In addition, the Context3D itself is disposed freeing all
-		temporary buffers and the back buffer. If you call `configureBackBuffer()`,
-		`clear()`, `drawTriangles()`, `createCubeTexture()`, `createTexture()`,
-		`createProgram()`, `createIndexBuffer()`, `createVertexBuffer()`, or
-		`drawToBitmapData()` after calling `dispose()`, the runtime throws an exception.
-
-		Warning: calling `dispose()` on a Context3D while there is still a event
-		listener for `Events.CONTEXT3D_CREATE` set on the asociated Stage3D object the
-		`dispose()` call will simulate a device loss. It will create a new Context3D on
-		the Stage3D and issue the `Events.CONTEXT3D_CREATE` event again. If this is not
-		desired remove the event listener from the Stage3D object before calling
-		`dispose()` or set the `recreate` parameter to `false`.
-
-		@param	recreate	Whether to allow this Stage3D object to create itself again
-	**/
-	public function dispose(recreate:Bool = true):Void
-	{
-		// TODO: Dispose all related buffers
-
-		gl = null;
-		__dispose();
-	}
-
-	/**
-		Draws the current render buffer to a bitmap.
-
-		The current contents of the back render buffer are copied to a BitmapData
-		object. This is potentially a very slow operation that can take up to a second.
-		Use with care. Note that this function does not copy the front render buffer
-		(the one shown on stage), but the buffer being drawn to. To capture the rendered
-		image as it appears on the stage, call `drawToBitmapData()` immediately before you
-		calling `present()`.
-
-		Beginning with AIR 25, two new parameters have been introduced in the API
-		`drawToBitmapData()`. This API now takes three parameters. The first one is the
-		existing parameter `destination:BitmapData`. The second parameter is
-		`srcRect:Rectangle`, which is target rectangle on Stage3D. The third parameter is
-		`destPoint:Point`, which is the coordinate on the destination bitmap. The
-		parameters `srcRect` and `destPoint` are optional and default to
-		`(0,0,bitmapWidth,bitmapHeight)` and `(0,0)`, respectively.
-
-		When the image is drawn, it is not scaled to fit the bitmap. Instead, the
-		contents are clipped to the size of the destination bitmap.
-
-		OpenFL BitmapData objects store colors already multiplied by the alpha component.
-		For example, if the "pure" rgb color components of a pixel are (0x0A, 0x12, 0xBB)
-		and the alpha component is 0x7F (.5), then the pixel is stored in the
-		BitmapData object with the rgba values: (0x05, 0x09, 0x5D, 0x7F). You can set the
-		blend factors so that the colors rendered to the buffer are multiplied by alpha
-		or perform the operation in the fragment shader. The rendering context does not
-		validate that the colors are stored in premultiplied format.
-
-		@param	destination	The target BitmapData for this drawing operation
-		@param	srcRect	The source rectangle in the current Stage3D context
-		@param	destPoint A destination point to write to in the target BitmapData
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by
-		a calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error	3768: The Stage3D API may not be used during background execution.
-		@throws	Error	3802: If either one of the parameters `destPoint:Point` or
-		`srcRect:Rectangle` is outside the bitmap/stage3D coordinate bound, or if
-		non-numeric(NaN) values are passed as input.
-	**/
-	public function drawToBitmapData(destination:BitmapData, srcRect:Rectangle = null, destPoint:Point = null):Void
-	{
-		#if lime
-		if (destination == null) return;
-
-		var sourceRect = srcRect != null ? srcRect.__toLimeRectangle() : new LimeRectangle(0, 0, backBufferWidth, backBufferHeight);
-		var destVector = destPoint != null ? destPoint.__toLimeVector2() : new Vector2();
-
-		if (__stage.context3D == this)
-		{
-			if (__stage.window != null)
-			{
-				if (__stage3D != null)
-				{
-					destVector.setTo(Std.int(-__stage3D.x), Std.int(-__stage3D.y));
-				}
-
-				var image = __stage.window.readPixels();
-				destination.image.copyPixels(image, sourceRect, destVector);
-			}
-		}
-		else if (__backBufferTexture != null)
-		{
-			var cacheRenderToTexture = __state.renderToTexture;
-			setRenderToBackBuffer();
-
-			__flushGLFramebuffer();
-			__flushGLViewport();
-			//! EDITED BY NE_EO TO REDUCE GARBAGE MEMORY
-			var buffer = UInt8Buff.get(backBufferWidth * backBufferHeight * 4); // new UInt8Array(backBufferWidth * backBufferHeight * 4);
-			var data = buffer.buffer;
-			gl.readPixels(0, 0, backBufferWidth, backBufferHeight, __backBufferTexture.__format, gl.UNSIGNED_BYTE, data);
-
-			var image = new Image(new ImageBuffer(data, backBufferWidth, backBufferHeight, 32, BGRA32));
-			destination.image.copyPixels(image, sourceRect, destVector);
-
-			if (cacheRenderToTexture != null)
-			{
-				setRenderToTexture(cacheRenderToTexture, __state.renderToTextureDepthStencil, __state.renderToTextureAntiAlias,
-					__state.renderToTextureSurfaceSelector);
-			}
-
-			buffer.put();
-		}
-		#end
-	}
-
-	/**
-		Render the specified triangles using the current buffers and state of this
-		Context3D object.
-
-		For each triangle, the triangle vertices are processed by the vertex shader
-		program and the triangle surface is processed by the pixel shader program. The
-		output color from the pixel program for each pixel is drawn to the render
-		target depending on the stencil operations, depth test, source and destination
-		alpha, and the current blend mode. The render destination can be the main render
-		buffer or a texture.
-
-		If culling is enabled, (with the `setCulling()` method), then triangles can be
-		discarded from the scene before the pixel program is run. If stencil and depth
-		testing are enabled, then output pixels from the pixel program can be discarded
-		without updating the render destination. In addition, the pixel program can
-		decide not to output a color for a pixel.
-
-		The rendered triangles are not displayed in the viewport until you call the
-		`present()` method. After each `present()` call, the `clear()` method must be
-		called before the first `drawTriangles()` call or rendering fails.
-
-		When `enableErrorChecking` is `false`, this function returns immediately, does
-		not wait for results, and throws exceptions only if this Context3D instance has
-		been disposed or there are too many draw calls. If the rendering context state
-		is invalid rendering fails silently. When the `enableErrorChecking` property is
-		`true`, this function returns after the triangles are drawn and throws exceptions
-		for any drawing errors or invalid context state.
-
-		@param	indexBuffer:IndexBuffer3D — a set of vertex indices referencing the
-		vertices to render.
-		@param	firstIndex:int (default = 0) — the index of the first vertex index
-		selected to render. Default 0.
-		@param	numTriangles:int (default = -1) — the number of triangles to render.
-		Each triangle consumes three indices. Pass -1 to draw all triangles in the index
-		buffer. Default -1.
-		@throws	Error — Object Disposed: if this Context3D object has been disposed by
-		a calling `dispose()` or because the underlying rendering hardware has been lost.
-		@throws	Error — If this method is called too many times between calls to
-		`present()`. The maximum number of calls is 32,768.
-
-		The following errors are only thrown when `enableErrorChecking` property is true:
-		@throws	Error	Need To Clear Before Draw: If the buffer has not been cleared
-		since the last `present()` call.
-		@throws	Error	If a valid Program3D object is not set.
-		@throws	Error	No Valid Index Buffer Set: If an IndexBuffer3D object is not set.
-		@throws	Error	Sanity Check On Parameters Failed: when the number of triangles
-		to be drawn or the `firstIndex` exceed allowed values.
-		@throws	RangeError — Not Enough Indices In This Buffer: when there aren't enough
-		indices in the buffer to define the number of triangles to be drawn.
-		@throws	Error — Sample Binds Texture Also Bound To Render: when the render target
-		is a texture and that texture assigned to a texture input of the current fragment
-		program.
-		@throws	Error — Sample Binds Invalid Texture: an invalid texture is specified as
-		the input to the current fragment program.
-		@throws	Error — Sampler Format Does Not Match Texture Format: when the texture
-		assigned as the input to the current fragment program has a different format than
-		that specified for the sampler register. For example, a 2D texture is assigned to
-		a cube texture sampler.
-		@throws	Error — Sample Binds Undefined Texture: The current fragment program
-		accesses a texture register that has not been set (using `setTextureAt()`).
-		@throws	Error — Same Texture Needs Same Sampler Params: If a texture is used for
-		more than one sampler register, all of the samplers must have the same settings.
-		For example, you cannot set one sampler to clamp and another to wrap.
-		@throws	Error — Texture Bound But Not Used: A texture is set as a shader input,
-		but it is not used.
-		@throws	Error — Stream Is Not Used: A vertex buffer is assigned to a vertex
-		attribute input, but the vertex program does not reference the corresponding
-		register.
-		@throws	Error — Stream Is Invalid: a VertexBuffer3D object assigned to a vertex
-		program input is not a valid object.
-		@throws	RangeError — Stream Does Not Have Enough Vertices: A vertex buffer
-		supplying data for drawing the specified triangles does not have enough data.
-		@throws	RangeError — Stream Vertex Offset Out Of Bounds: The offset specified in
-		a `setVertexBufferAt()` call is negative or past the end of the buffer.
-		@throws	Error — Stream Read But Not Set: A vertex attribute used by the current
-		vertex program is not set (using `setVertexBufferAt()`).
-	**/
-	public function drawTriangles(indexBuffer:IndexBuffer3D, firstIndex:Int = 0, numTriangles:Int = -1):Void
-	{
-		#if !openfl_disable_display_render
-		if (__state.renderToTexture == null)
-		{
-			// TODO: Make sure state is correct for this?
-			if (__stage.context3D == this && !__stage.__renderer.__cleared)
-			{
-				__stage.__renderer.__clear();
-			}
-			else if (!__cleared)
-			{
-				// TODO: Throw error if error reporting is enabled?
-				clear(0, 0, 0, 0, 1, 0, Context3DClearMask.COLOR);
-			}
-		}
-
-		__flushGL();
-		#end
-
-		if (__state.program != null)
-		{
-			__state.program.__flush();
-		}
-
-		var count = (numTriangles == -1) ? indexBuffer.__numIndices : (numTriangles * 3);
-
-		__bindGLElementArrayBuffer(indexBuffer.__id);
-		gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, firstIndex * 2);
-	}
-
-	/**
-		Displays the back rendering buffer.
-
-		Calling the `present()` method makes the results of all rendering operations
-		since the last `present()` call visible and starts a new rendering cycle.
-		After calling `present`, you must call `clear()` before making another
-		`drawTriangles()` call. Otherwise, this function will alternately clear the
-		render buffer to yellow and green or, if `enableErrorChecking` has been set to
-		`true`, an exception is thrown.
-
-		Calling `present()` also resets the render target, just like calling
-		`setRenderToBackBuffer()`.
-
-		@throws	Error	Need To Clear Before Draw: If the `clear()` has not been called
-		since the previous call to `present()`. (Two consecutive `present()` calls are
-		not allowed without calling `clear()` in between.)
-		@throws	Error	3768: The Stage3D API may not be used during background execution.
-	**/
-	public function present():Void
-	{
-		setRenderToBackBuffer();
-
-		if (__stage3D != null && __backBufferTexture != null)
-		{
-			if (!__cleared)
-			{
-				// Make sure texture is initialized
-				// TODO: Throw error if error reporting is enabled?
-				clear(0, 0, 0, 0, 1, 0, Context3DClearMask.COLOR);
-			}
-
-			var cacheBuffer = __backBufferTexture;
-			__backBufferTexture = __frontBufferTexture;
-			__frontBufferTexture = cacheBuffer;
-
-			__state.__primaryGLFramebuffer = __backBufferTexture.__getGLFramebuffer(__state.backBufferEnableDepthAndStencil, __backBufferAntiAlias, 0);
-			__cleared = false;
-		}
-
-		__present = true;
-	}
-
-	/**
-		Specifies the factors used to blend the output color of a drawing operation with
-		the existing color.
-
-		The output (source) color of the pixel shader program is combined with the
-		existing (destination) color at that pixel according to the following formula:
-
-		`result color = (source color * sourceFactor) + (destination color * destinationFactor)`
-
-		The destination color is the current color in the render buffer for that pixel.
-		Thus it is the result of the most recent `clear()` call and any intervening
-		`drawTriangles()` calls.
-
-		Use `setBlendFactors()` to set the factors used to multiply the source and
-		destination colors before they are added together. The default blend factors
-		are, `sourceFactor = Context3DBlendFactor.ONE`, and
-		`destinationFactor = Context3DBlendFactor.ZERO`, which results in the source
-		color overwriting the destination color (in other words, no blending of the
-		two colors occurs). For normal alpha blending, use
-		`sourceFactor = Context3DBlendFactor.SOURCE_ALPHA` and
-		`destinationFactor = Context3DBlendFactor.ONE_MINUS_SOURCE_ALPHA`.
-
-		Use the constants defined in the Context3DBlendFactor class to set the
-		parameters of this function.
-
-		@param	sourceFactor	The factor with which to multiply the source color.
-		Defaults to `Context3DBlendFactor.ONE`.
-		@param	destinationFactor	The factor with which to multiply the destination
-		color. Defaults to `Context3DBlendFactor.ZERO`.
-		@throws	Error — Invalid Enum: when `sourceFactor` or `destinationFactor` is
-		not one of the recognized values, which are defined in the
-		Context3DBlendFactor class.
-	**/
-	public function setBlendFactors(sourceFactor:Context3DBlendFactor, destinationFactor:Context3DBlendFactor):Void
-	{
-		setBlendFactorsSeparate(sourceFactor, destinationFactor, sourceFactor, destinationFactor);
-	}
-
-	@:dox(hide) @:noCompletion private function setBlendFactorsSeparate(sourceRGBFactor:Context3DBlendFactor, destinationRGBFactor:Context3DBlendFactor,
-			sourceAlphaFactor:Context3DBlendFactor, destinationAlphaFactor:Context3DBlendFactor):Void
-	{
-		__state.blendSourceRGBFactor = sourceRGBFactor;
-		__state.blendDestinationRGBFactor = destinationRGBFactor;
-		__state.blendSourceAlphaFactor = sourceAlphaFactor;
-		__state.blendDestinationAlphaFactor = destinationAlphaFactor;
-
-		// TODO: Better way to handle this?
-		__setGLBlendEquation(gl.FUNC_ADD);
-	}
-
-	/**
-		Sets the mask used when writing colors to the render buffer.
-
-		Only color components for which the corresponding color mask parameter is `true`
-		are updated when a color is written to the render buffer. For example, if
-		you call: `setColorMask(true, false, false, false)`, only the red component
-		of a color is written to the buffer until you change the color mask again. The
-		color mask does not affect the behavior of the `clear()` method.
-
-		@param	red	set false to block changes to the red channel.
-		@param	green	set false to block changes to the green channel.
-		@param	blue	set false to block changes to the blue channel.
-		@param	alpha	set false to block changes to the alpha channel.
-	**/
-	public function setColorMask(red:Bool, green:Bool, blue:Bool, alpha:Bool):Void
-	{
-		__state.colorMaskRed = red;
-		__state.colorMaskGreen = green;
-		__state.colorMaskBlue = blue;
-		__state.colorMaskAlpha = alpha;
-	}
-
-	/**
-		Sets triangle culling mode.
-
-		Triangles may be excluded from the scene early in the rendering pipeline based
-		on their orientation relative to the view plane. Specify vertex order
-		consistently (clockwise or counter-clockwise) as seen from the outside of the
-		model to cull correctly.
-
-		@param	triangleFaceToCull	the culling mode. Use one of the constants defined
-		in the Context3DTriangleFace class.
-		@throws	Error	Invalid Enum Error: when triangleFaceToCull is not one of the
-		values defined in the Context3DTriangleFace class.
-	**/
-	public function setCulling(triangleFaceToCull:Context3DTriangleFace):Void
-	{
-		__state.culling = triangleFaceToCull;
-	}
-
-	/**
-		Sets type of comparison used for depth testing.
-
-		The depth of the source pixel output from the pixel shader program is compared
-		to the current value in the depth buffer. If the comparison evaluates as `false`,
-		then the source pixel is discarded. If `true`, then the source pixel is processed
-		by the next step in the rendering pipeline, the stencil test. In addition, the
-		depth buffer is updated with the depth of the source pixel, as long as the
-		`depthMask` parameter is set to `true`.
-
-		Sets the test used to compare depth values for source and destination pixels.
-		The source pixel is composited with the destination pixel when the comparison is
-		`true`. The comparison operator is applied as an infix operator between the
-		source and destination pixel values, in that order.
-
-		@param	depthMask	the destination depth value will be updated from the source
-		pixel when `true`.
-		@param	passCompareMode	the depth comparison test operation. One of the values
-		of Context3DCompareMode.
-	**/
-	public function setDepthTest(depthMask:Bool, passCompareMode:Context3DCompareMode):Void
-	{
-		__state.depthMask = depthMask;
-		__state.depthCompareMode = passCompareMode;
-	}
-
-	/**
-		Sets vertex and fragment shader programs to use for subsequent rendering.
-
-		@param	program	the Program3D object representing the vertex and fragment
-		programs to use.
-	**/
-	public function setProgram(program:Program3D):Void
-	{
-		__state.program = program;
-		__state.shader = null; // TODO: Merge this logic
-
-		if (program != null)
-		{
-			for (i in 0...program.__samplerStates.length)
-			{
-				if (__state.samplerStates[i] == null)
-				{
-					__state.samplerStates[i] = program.__samplerStates[i].clone();
-				}
-				else
-				{
-					__state.samplerStates[i].copyFrom(program.__samplerStates[i]);
-				}
-			}
-		}
-	}
-
-	/**
-		Set constants for use by shader programs using values stored in a ByteArray.
-
-		Sets constants that can be accessed from the vertex or fragment program.
-
-		@param	programType	one of Context3DProgramType.
-		@param	firstRegister	the index of the first shader program constant to set.
-		@param	numRegisters	the number of registers to set. Every register is read
-		as four float values.
-		@param	data	the source ByteArray object
-		@param	byteArrayOffset	an offset into the ByteArray for reading
-		@throws	TypeError	kNullPointerError when data is null.
-		@throws	RangeError	kConstantRegisterOutOfBounds when attempting to set more than
-		the maximum number of shader constants.
-		@throws	RangeError	kBadInputSize if `byteArrayOffset` is greater than or equal to
-		the length of data or no. of elements in `data - byteArrayOffset` is less than
-		`numRegisters*16`
-	**/
-	public function setProgramConstantsFromByteArray(programType:Context3DProgramType, firstRegister:Int, numRegisters:Int, data:ByteArray,
-			byteArrayOffset:UInt):Void
-	{
-		#if lime
-		if (numRegisters == 0 || __state.program == null) return;
-
-		if (__state.program != null && __state.program.__format == GLSL)
-		{
-			// TODO
-		}
-		else
-		{
-			// TODO: Cleanup?
-
-			if (numRegisters == -1)
-			{
-				numRegisters = ((data.length >> 2) - byteArrayOffset);
-			}
-
-			var isVertex = (programType == VERTEX);
-			var dest = isVertex ? __vertexConstants : __fragmentConstants;
-
-			var floatData = Float32Array.fromBytes(data, 0);
-			var outOffset = firstRegister * 4;
-			var inOffset = Std.int(byteArrayOffset / 4);
-
-			for (i in 0...(numRegisters * 4))
-			{
-				dest[outOffset + i] = floatData[inOffset + i];
-			}
-
-			if (__state.program != null)
-			{
-				__state.program.__markDirty(isVertex, firstRegister, numRegisters);
-			}
-		}
-		#end
-	}
-
-	/**
-		Sets constants for use by shader programs using values stored in a Matrix3D.
-
-		Use this function to pass a matrix to a shader program. The function sets 4
-		constant registers used by the vertex or fragment program. The matrix is
-		assigned to registers row by row. The first constant register is assigned the
-		top row of the matrix. You can set 128 registers for a vertex program and 28
-		for a fragment program.
-
-		@param	programType	The type of shader program, either
-		`Context3DProgramType.VERTEX` or `Context3DProgramType.FRAGMENT`.
-		@param	firstRegister	the index of the first constant register to set. Since
-		a Matrix3D has 16 values, four registers are set.
-		@param	matrix	the matrix containing the constant values.
-		@param	transposedMatrix	if `true` the matrix entries are copied to registers
-		in transposed order. The default value is `false`.
-		@throws	TypeError	Null Pointer Error: when matrix is `null`.
-		@throws	RangeError	Constant Register Out Of Bounds: when attempting to set more
-		than the maximum number of shader constant registers.
-	**/
-	public function setProgramConstantsFromMatrix(programType:Context3DProgramType, firstRegister:Int, matrix:Matrix3D, transposedMatrix:Bool = false):Void
-	{
-		#if lime
-		if (__state.program != null && __state.program.__format == GLSL)
-		{
-			__flushGLProgram();
-
-			// TODO: Cache value, prevent need to copy
-			var data = new Float32Array(16);
-			for (i in 0...16)
-			{
-				data[i] = matrix.rawData[i];
-			}
-
-			gl.uniformMatrix4fv(cast firstRegister, transposedMatrix, data);
-		}
-		else
-		{
-			var isVertex = (programType == VERTEX);
-			var dest = isVertex ? __vertexConstants : __fragmentConstants;
-			var source = matrix.rawData;
-			var i = firstRegister * 4;
-
-			if (transposedMatrix)
-			{
-				dest[i++] = source[0];
-				dest[i++] = source[4];
-				dest[i++] = source[8];
-				dest[i++] = source[12];
-
-				dest[i++] = source[1];
-				dest[i++] = source[5];
-				dest[i++] = source[9];
-				dest[i++] = source[13];
-
-				dest[i++] = source[2];
-				dest[i++] = source[6];
-				dest[i++] = source[10];
-				dest[i++] = source[14];
-
-				dest[i++] = source[3];
-				dest[i++] = source[7];
-				dest[i++] = source[11];
-				dest[i++] = source[15];
-			}
-			else
-			{
-				dest[i++] = source[0];
-				dest[i++] = source[1];
-				dest[i++] = source[2];
-				dest[i++] = source[3];
-
-				dest[i++] = source[4];
-				dest[i++] = source[5];
-				dest[i++] = source[6];
-				dest[i++] = source[7];
-
-				dest[i++] = source[8];
-				dest[i++] = source[9];
-				dest[i++] = source[10];
-				dest[i++] = source[11];
-
-				dest[i++] = source[12];
-				dest[i++] = source[13];
-				dest[i++] = source[14];
-				dest[i++] = source[15];
-			}
-
-			if (__state.program != null)
-			{
-				__state.program.__markDirty(isVertex, firstRegister, 4);
-			}
-		}
-		#end
-	}
-
-	/**
-		Sets the constant inputs for the shader programs.
-
-		Sets an array of constants to be accessed by a vertex or fragment shader
-		program. Constants set in Program3D are accessed within the shader programs as
-		constant registers. Each constant register is comprised of 4 floating point
-		values (x, y, z, w). Therefore every register requires 4 entries in the data
-		Vector. The number of registers that you can set for vertex program and
-		fragment program depends on the Context3DProfile.
-
-		@param	programType	The type of shader program, either
-		`Context3DProgramType.VERTEX` or `Context3DProgramType.FRAGMENT`.
-		@param	firstRegister	the index of the first constant register to set.
-		@param	data	the floating point constant values. There must be at least
-		`numRegisters` 4 elements in data.
-		@param	numRegisters	the number of constants to set. Specify -1, the default
-		value, to set enough registers to use all of the available data.
-		@throws	TypeError	Null Pointer Error: when data is `null`.
-		@throws	RangeError	Constant Register Out Of Bounds: when attempting to set more
-		than the maximum number of shader constant registers.
-		@throws	RangeError	Bad Input Size: When the number of elements in data is less
-		than `numRegisters*4`
-	**/
-	public function setProgramConstantsFromVector(programType:Context3DProgramType, firstRegister:Int, data:Vector<Float>, numRegisters:Int = -1):Void
-	{
-		if (numRegisters == 0) return;
-
-		if (__state.program != null && __state.program.__format == GLSL) {}
-		else
-		{
-			if (numRegisters == -1)
-			{
-				numRegisters = (data.length >> 2);
-			}
-
-			var isVertex = (programType == VERTEX);
-			var dest = isVertex ? __vertexConstants : __fragmentConstants;
-			var source = data;
-
-			var sourceIndex = 0;
-			var destIndex = firstRegister * 4;
-
-			for (i in 0...numRegisters)
-			{
-				dest[destIndex++] = source[sourceIndex++];
-				dest[destIndex++] = source[sourceIndex++];
-				dest[destIndex++] = source[sourceIndex++];
-				dest[destIndex++] = source[sourceIndex++];
-			}
-
-			if (__state.program != null)
-			{
-				__state.program.__markDirty(isVertex, firstRegister, numRegisters);
-			}
-		}
-	}
-
-	/**
-		Sets the back rendering buffer as the render target. Subsequent calls to
-		`drawTriangles()` and `clear()` methods result in updates to the back buffer.
-		Use this method to resume normal rendering after using the
-		`setRenderToTexture()` method.
-	**/
-	public function setRenderToBackBuffer():Void
-	{
-		__state.renderToTexture = null;
-	}
-
-	/**
-		Sets the specified texture as the rendering target.
-
-		Subsequent calls to `drawTriangles()` and `clear()` methods update the
-		specified texture instead of the back buffer. Mip maps are created
-		automatically. Use the `setRenderToBackBuffer()` to resume normal rendering to
-		the back buffer.
-
-		No clear is needed before drawing. If there is no clear operation, the render
-		content will be retained. depth buffer and stencil buffer will also not be
-		cleared. But it is forced to clear when first drawing. Calling `present()`
-		resets the target to the back buffer.
-
-		@param	texture	the target texture to render into. Set to `null` to resume
-		rendering to the back buffer (`setRenderToBackBuffer()` and `present` also reset
-		the target to the back buffer).
-		@param	enableDepthAndStencil	if `true`, depth and stencil testing are
-		available. If `false`, all depth and stencil state is ignored for subsequent
-		drawing operations.
-		@param	antiAlias	the antialiasing quality. Use 0 to disable antialiasing;
-		higher values improve antialiasing quality, but require more calculations. The
-		value is currently ignored by mobile platform and software rendering context.
-		@param	surfaceSelector	specifies which element of the texture to update.
-		Texture objects have one surface, so you must specify 0, the default value.
-		CubeTexture objects have six surfaces, so you can specify an integer from 0
-		through 5.
-		@param	colorOutputIndex	The output color register. Must be 0 for constrained
-		or baseline mode. Otherwise specifies the output color register.
-		@throws	ArgumentError	for a mismatched surfaceSelector parameter. The value
-		must be 0 for 2D textures and 0..5 for cube maps.
-		@throws	ArgumentError	texture is not derived from the TextureBase class
-		(either Texture or CubeTexture classes).
-		@throws	ArgumentError	colorOutputIndex must be an integer is from 0 through 3.
-		@throws	ArgumentError	this call requires a Context3D that is created with the
-		standard profile or above.
-	**/
-	public function setRenderToTexture(texture:TextureBase, enableDepthAndStencil:Bool = false, antiAlias:Int = 0, surfaceSelector:Int = 0):Void
-	{
-		__state.renderToTexture = texture;
-		__state.renderToTextureDepthStencil = enableDepthAndStencil;
-		__state.renderToTextureAntiAlias = antiAlias;
-		__state.renderToTextureSurfaceSelector = surfaceSelector;
-	}
-
-	/**
-		Manually override texture sampler state.
-
-		Texture sampling state is typically set at the time setProgram is called.
-		However, you can override texture sampler state with this function. If you do not
-		want the program to change sampler state, set the `ignoresamnpler` bit in AGAL
-		and use this function.
-
-		@param	sampler	sampler The sampler register to use. Maps to the sampler register
-		in AGAL.
-		@param	wrap	Wrapping mode. Defined in Context3DWrapMode. The default is repeat.
-		@param	filter	Texture filtering mode. Defined in Context3DTextureFilter. The
-		default is nearest.
-		@param	mipfilter	Mip map filter. Defined in Context3DMipFilter. The default
-		is none.
-		@throws	Error	sampler out of range
-		@throws	Error	wrap, filter, mipfilter bad enum
-		@throws	Error	Object Disposed: if this Context3D object has been disposed by a
-		calling `dispose()` or because the underlying rendering hardware has been lost.
-	**/
-	public function setSamplerStateAt(sampler:Int, wrap:Context3DWrapMode, filter:Context3DTextureFilter, mipfilter:Context3DMipFilter):Void
-	{
-		// if (sampler < 0 || sampler > Context3D.MAX_SAMPLERS) {
-
-		// 	throw new Error ("sampler out of range");
-
-		// }
-
-		if (__state.samplerStates[sampler] == null)
-		{
-			__state.samplerStates[sampler] = new SamplerState();
-		}
-
-		var state = __state.samplerStates[sampler];
-		state.wrap = wrap;
-		state.filter = filter;
-		state.mipfilter = mipfilter;
-	}
-
-	/**
-		Sets a scissor rectangle, which is type of drawing mask. The renderer only draws
-		to the area inside the scissor rectangle. Scissoring does not affect clear
-		operations.
-
-		Pass `null` to turn off scissoring.
-
-		@param	rectangle	The rectangle in which to draw. Specify the rectangle
-		position and dimensions in pixels. The coordinate system origin is the top left
-		corner of the viewport, with positive values increasing down and to the right
-		(the same as the normal OpenFL display coordinate system).
-	**/
-	public function setScissorRectangle(rectangle:Rectangle):Void
-	{
-		if (rectangle != null)
-		{
-			__state.scissorEnabled = true;
-			__state.scissorRectangle.copyFrom(rectangle);
-		}
-		else
-		{
-			__state.scissorEnabled = false;
-		}
-	}
-
-	/**
-		Sets stencil mode and operation.
-
-		An 8-bit stencil reference value can be associated with each draw call. During
-		rendering, the reference value can be tested against values stored previously
-		in the frame buffer. The result of the test can control the draw action and
-		whether or how the stored stencil value is updated. In addition, depth testing
-		controls whether stencil testing is performed. A failed depth test can also be
-		used to control the action taken on the stencil buffer.
-
-		In the pixel processing pipeline, depth testing is performed first. If the depth
-		test fails, a stencil buffer update action can be taken, but no further evaluation
-		of the stencil buffer value can be made. If the depth test passes, then the
-		stencil test is performed. Alternate actions can be taken depending on the outcome
-		of the stencil test.
-
-		The stencil reference value is set using `setStencilReferenceValue()`.
-
-		@param	triangleFace	the triangle orientations allowed to contribute to the
-		stencil operation. One of Context3DTriangleFace.
-		@param	compareMode	the test operator used to compare the current stencil
-		reference value and the destination pixel stencil value. Destination pixel color
-		and depth update is performed when the comparison is true. The stencil actions
-		are performed as requested in the following action parameters. The comparison
-		operator is applied as an infix operator between the current and destination
-		reference values, in that order (in pseudocode:
-		`if stencilReference OPERATOR stencilBuffer then pass`). Use one of the constants
-		defined in the Context3DCompareMode class.
-		@param	actionOnBothPass	action to be taken when both depth and stencil
-		comparisons pass. Use one of the constants defined in the Context3DStencilAction
-		class.
-		@param	actionOnDepthFail	action to be taken when depth comparison fails. Use
-		one of the constants defined in the Context3DStencilAction class.
-		@param	actionOnDepthPassStencilFail	action to be taken when depth comparison
-		passes and the stencil comparison fails. Use one of the constants defined in the
-		Context3DStencilAction class.
-		@throws	Error	Invalid Enum Error: when `triangleFace` is not one of the values
-		defined in the Context3DTriangleFace class.
-		@throws	Error	Invalid Enum Error: when `compareMode` is not one of the values
-		defined in the Context3DCompareMode class.
-		@throws	Error	Invalid Enum Error: when `actionOnBothPass`, `actionOnDepthFail`,
-		or `actionOnDepthPassStencilFail` is not one of the values defined in the
-		Context3DStencilAction class.
-	**/
-	public function setStencilActions(triangleFace:Context3DTriangleFace = FRONT_AND_BACK, compareMode:Context3DCompareMode = ALWAYS,
-			actionOnBothPass:Context3DStencilAction = KEEP, actionOnDepthFail:Context3DStencilAction = KEEP,
-			actionOnDepthPassStencilFail:Context3DStencilAction = KEEP):Void
-	{
-		__state.stencilTriangleFace = triangleFace;
-		__state.stencilCompareMode = compareMode;
-		__state.stencilPass = actionOnBothPass;
-		__state.stencilDepthFail = actionOnDepthFail;
-		__state.stencilFail = actionOnDepthPassStencilFail;
-	}
-
-	/**
-		Sets the stencil comparison value used for stencil tests.
-
-		Only the lower 8 bits of the reference value are used. The stencil buffer value
-		is also 8 bits in length. Use the `readMask` and `writeMask` to use the stencil
-		buffer as a bit field.
-
-		@param	referenceValue	an 8-bit reference value used in reference value
-		comparison tests.
-		@param	readMask	an 8-bit mask for applied to both the current stencil
-		buffer value and the reference value before the comparison.
-		@param	writeMask	an 8-bit mask applied to the reference value before updating
-		the stencil buffer.
-	**/
-	public function setStencilReferenceValue(referenceValue:UInt, readMask:UInt = 0xFF, writeMask:UInt = 0xFF):Void
-	{
-		__state.stencilReferenceValue = referenceValue;
-		__state.stencilReadMask = readMask;
-		__state.stencilWriteMask = writeMask;
-	}
-
-	/**
-		Specifies the texture to use for a texture input register of a fragment program.
-
-		A fragment program can read information from up to eight texture objects. Use
-		this function to assign a Texture or CubeTexture object to one of the sampler
-		registers used by the fragment program.
-
-		**Note:** if you change the active fragment program (with setProgram) to a
-		shader that uses fewer textures, set the unused registers to `null`:
-
-		``haxe
-		setTextureAt(7, null);
-		```
-
-		@param	sampler	the sampler register index, a value from 0 through 7.
-		@param	texture	the texture object to make available, either a Texture or a
-		CubeTexture instance.
-	**/
-	public function setTextureAt(sampler:Int, texture:TextureBase):Void
-	{
-		// if (sampler < 0 || sampler > Context3D.MAX_SAMPLERS) {
-
-		// 	throw new Error ("sampler out of range");
-
-		// }
-
-		__state.textures[sampler] = texture;
-	}
-
-	/**
-		Specifies which vertex data components correspond to a single vertex shader
-		program input.
-
-		Use the setVertexBufferAt method to identify which components of the data
-		defined for each vertex in a VertexBuffer3D buffer belong to which inputs to the
-		vertex program. The developer of the vertex program determines how much data is
-		needed per vertex. That data is mapped from 1 or more VertexBuffer3D stream(s) to
-		the attribute registers of the vertex shader program.
-
-		The smallest unit of data consumed by the vertex shader is a 32-bit data.
-		Offsets into the vertex stream are specified in multiples of 32-bits.
-
-		As an example, a programmer might define each vertex with the following data:
-
-		```
-		position:  x	float32
-				   y	float32
-				   z	float32
-		color:	 r	unsigned byte
-				   g	unsigned byte
-				   b	unsigned byte
-				   a	unsigned byte
-		```
-
-		Assuming the vertex was defined in a VertexBuffer3D object named buffer, it
-		would be assigned to a vertex shader with the following code:
-
-		```haxe
-		setVertexBufferAt(0, buffer, 0, Context3DVertexBufferFormat.FLOAT_3);   // attribute #0 will contain the position information
-		setVertexBufferAt(1, buffer, 3, Context3DVertexBufferFormat.BYTES_4);	// attribute #1 will contain the color information
-		```
-
-		@param	index	the index of the attribute register in the vertex shader (0
-		through 7).
-		@param	buffer	the buffer that contains the source vertex data to be fed to the
-		vertex shader.
-		@param	bufferOffset	an offset from the start of the data for a single vertex
-		at which to start reading this attribute. In the example above, the position data
-		has an offset of 0 because it is the first attribute; color has an offset of 3
-		because the color attribute follows the three 32-bit position values. The offset
-		is specified in units of 32 bits.
-		@param	format	a value from the Context3DVertexBufferFormat class specifying
-		the data type of this attribute.
-		@throws	Error	Invalid Enum: when format is not one of the values defined in
-		the Context3DVertexBufferFormat class.
-		@throws	RangeError	Attribute Register Out Of Bounds: when the index parameter
-		is outside the range from 0 through 7. (A maximum of eight vertex attribute
-		registers can be used by a shader.)
-	**/
-	public function setVertexBufferAt(index:Int, buffer:VertexBuffer3D, bufferOffset:Int = 0, format:Context3DVertexBufferFormat = FLOAT_4):Void
-	{
-		if (index < 0) return;
-
-		if (buffer == null)
-		{
-			gl.disableVertexAttribArray(index);
-			__bindGLArrayBuffer(null);
-			return;
-		}
-
-		__bindGLArrayBuffer(buffer.__id);
-		gl.enableVertexAttribArray(index);
-
-		var byteOffset = bufferOffset * 4;
-
-		switch (format)
-		{
-			case BYTES_4:
-				gl.vertexAttribPointer(index, 4, gl.UNSIGNED_BYTE, true, buffer.__stride, byteOffset);
-
-			case FLOAT_4:
-				gl.vertexAttribPointer(index, 4, gl.FLOAT, false, buffer.__stride, byteOffset);
-
-			case FLOAT_3:
-				gl.vertexAttribPointer(index, 3, gl.FLOAT, false, buffer.__stride, byteOffset);
-
-			case FLOAT_2:
-				gl.vertexAttribPointer(index, 2, gl.FLOAT, false, buffer.__stride, byteOffset);
-
-			case FLOAT_1:
-				gl.vertexAttribPointer(index, 1, gl.FLOAT, false, buffer.__stride, byteOffset);
-
-			default:
-				throw new IllegalOperationError();
-		}
-	}
-
-	@:noCompletion private function __bindGLArrayBuffer(buffer:GLBuffer):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__currentGLArrayBuffer != buffer #end)
-		{
-			gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-			__contextState.__currentGLArrayBuffer = buffer;
-		}
-	}
-
-	@:noCompletion private function __bindGLElementArrayBuffer(buffer:GLBuffer):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__currentGLElementArrayBuffer != buffer #end)
-		{
-			gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, buffer);
-			__contextState.__currentGLElementArrayBuffer = buffer;
-		}
-	}
-
-	@:noCompletion private function __bindGLFramebuffer(framebuffer:GLFramebuffer):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__currentGLFramebuffer != framebuffer #end)
-		{
-			gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
-			__contextState.__currentGLFramebuffer = framebuffer;
-		}
-	}
-
-	@:noCompletion private function __bindGLTexture2D(texture:GLTexture):Void
-	{
-		// TODO: Need to consider activeTexture ID
-
-		// if (#if openfl_disable_context_cache true #else __contextState.__currentGLTexture2D != texture #end) {
-
-		gl.bindTexture(gl.TEXTURE_2D, texture);
-		__contextState.__currentGLTexture2D = texture;
-
-		// }
-	}
-
-	@:noCompletion private function __bindGLTextureCubeMap(texture:GLTexture):Void
-	{
-		// TODO: Need to consider activeTexture ID
-
-		// if (#if openfl_disable_context_cache true #else __contextState.__currentGLTextureCubeMap != texture #end) {
-
-		gl.bindTexture(gl.TEXTURE_CUBE_MAP, texture);
-		__contextState.__currentGLTextureCubeMap = texture;
-
-		// }
-	}
-
-	@:noCompletion private function __dispose():Void
-	{
-		driverInfo += " (Disposed)";
-
-		if (__stage3D != null)
-		{
-			__stage3D.__indexBuffer = null;
-			__stage3D.__vertexBuffer = null;
-			__stage3D.context3D = null;
-			__stage3D = null;
-		}
-
-		__backBufferTexture = null;
-		__context = null;
-		__renderStage3DProgram = null;
-		__fragmentConstants = null;
-		__frontBufferTexture = null;
-		__positionScale = null;
-		__present = false;
-		__quadIndexBuffer = null;
-		__stage = null;
-		__vertexConstants = null;
-	}
-
-	@:noCompletion private function __drawTriangles(firstIndex:Int = 0, count:Int):Void
-	{
-		#if !openfl_disable_display_render
-		if (__state.renderToTexture == null)
-		{
-			// TODO: Make sure state is correct for this?
-			if (__stage.context3D == this && !__stage.__renderer.__cleared)
-			{
-				__stage.__renderer.__clear();
-			}
-			else if (!__cleared)
-			{
-				// TODO: Throw error if error reporting is enabled?
-				clear(0, 0, 0, 0, 1, 0, Context3DClearMask.COLOR);
-			}
-		}
-
-		__flushGL();
-		#end
-
-		if (__state.program != null)
-		{
-			__state.program.__flush();
-		}
-
-		gl.drawArrays(gl.TRIANGLES, firstIndex, count);
-	}
-
-	@:noCompletion private function __flushGL():Void
-	{
-		__flushGLProgram();
-		__flushGLFramebuffer();
-		__flushGLViewport();
-
-		__flushGLBlend();
-		__flushGLColor();
-		__flushGLCulling();
-		__flushGLDepth();
-		__flushGLScissor();
-		__flushGLStencil();
-		__flushGLTextures();
-	}
-
-	@:noCompletion private function __flushGLBlend():Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.blendDestinationRGBFactor != __state.blendDestinationRGBFactor
-			|| __contextState.blendSourceRGBFactor != __state.blendSourceRGBFactor
-			|| __contextState.blendDestinationAlphaFactor != __state.blendDestinationAlphaFactor
-			|| __contextState.blendSourceAlphaFactor != __state.blendSourceAlphaFactor #end)
-		{
-			__setGLBlend(true);
-
-			if (__state.blendDestinationRGBFactor == __state.blendDestinationAlphaFactor
-				&& __state.blendSourceRGBFactor == __state.blendSourceAlphaFactor)
-			{
-				gl.blendFunc(__getGLBlend(__state.blendSourceRGBFactor), __getGLBlend(__state.blendDestinationRGBFactor));
-			}
-			else
-			{
-				gl.blendFuncSeparate(__getGLBlend(__state.blendSourceRGBFactor), __getGLBlend(__state.blendDestinationRGBFactor),
-					__getGLBlend(__state.blendSourceAlphaFactor), __getGLBlend(__state.blendDestinationAlphaFactor));
-			}
-
-			__contextState.blendDestinationRGBFactor = __state.blendDestinationRGBFactor;
-			__contextState.blendSourceRGBFactor = __state.blendSourceRGBFactor;
-			__contextState.blendDestinationAlphaFactor = __state.blendDestinationAlphaFactor;
-			__contextState.blendSourceAlphaFactor = __state.blendSourceAlphaFactor;
-		}
-	}
-
-	@:noCompletion private inline function __flushGLColor():Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.colorMaskRed != __state.colorMaskRed
-			|| __contextState.colorMaskGreen != __state.colorMaskGreen
-			|| __contextState.colorMaskBlue != __state.colorMaskBlue
-			|| __contextState.colorMaskAlpha != __state.colorMaskAlpha #end)
-		{
-			gl.colorMask(__state.colorMaskRed, __state.colorMaskGreen, __state.colorMaskBlue, __state.colorMaskAlpha);
-			__contextState.colorMaskRed = __state.colorMaskRed;
-			__contextState.colorMaskGreen = __state.colorMaskGreen;
-			__contextState.colorMaskBlue = __state.colorMaskBlue;
-			__contextState.colorMaskAlpha = __state.colorMaskAlpha;
-		}
-	}
-
-	@:noCompletion private function __flushGLCulling():Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.culling != __state.culling #end)
-		{
-			if (__state.culling == NONE)
-			{
-				__setGLCullFace(false);
-			}
-			else
-			{
-				__setGLCullFace(true);
-
-				switch (__state.culling)
-				{
-					case NONE: // skip
-					case BACK:
-						gl.cullFace(gl.BACK);
-					case FRONT:
-						gl.cullFace(gl.FRONT);
-					case FRONT_AND_BACK:
-						gl.cullFace(gl.FRONT_AND_BACK);
-					default:
-						throw new IllegalOperationError();
-				}
-			}
-
-			__contextState.culling = __state.culling;
-		}
-	}
-
-	@:noCompletion private function __flushGLDepth():Void
-	{
-		var depthMask = (__state.depthMask
-			&& (__state.renderToTexture != null ? __state.renderToTextureDepthStencil : __state.backBufferEnableDepthAndStencil));
-
-		if (#if openfl_disable_context_cache true #else __contextState.depthMask != depthMask #end)
-		{
-			gl.depthMask(depthMask);
-			__contextState.depthMask = depthMask;
-		}
-
-		if (#if openfl_disable_context_cache true #else __contextState.depthCompareMode != __state.depthCompareMode #end)
-		{
-			switch (__state.depthCompareMode)
-			{
-				case ALWAYS:
-					gl.depthFunc(gl.ALWAYS);
-				case EQUAL:
-					gl.depthFunc(gl.EQUAL);
-				case GREATER:
-					gl.depthFunc(gl.GREATER);
-				case GREATER_EQUAL:
-					gl.depthFunc(gl.GEQUAL);
-				case LESS:
-					gl.depthFunc(gl.LESS);
-				case LESS_EQUAL:
-					gl.depthFunc(gl.LEQUAL);
-				case NEVER:
-					gl.depthFunc(gl.NEVER);
-				case NOT_EQUAL:
-					gl.depthFunc(gl.NOTEQUAL);
-				default:
-					throw new IllegalOperationError();
-			}
-
-			__contextState.depthCompareMode = __state.depthCompareMode;
-		}
-	}
-
-	@:noCompletion private function __flushGLFramebuffer():Void
-	{
-		if (__state.renderToTexture != null)
-		{
-			if (#if openfl_disable_context_cache true #else __contextState.renderToTexture != __state.renderToTexture
-				|| __contextState.renderToTextureSurfaceSelector != __state.renderToTextureSurfaceSelector #end)
-			{
-				var framebuffer = __state.renderToTexture.__getGLFramebuffer(__state.renderToTextureDepthStencil, __state.renderToTextureAntiAlias,
-					__state.renderToTextureSurfaceSelector);
-				__bindGLFramebuffer(framebuffer);
-
-				__contextState.renderToTexture = __state.renderToTexture;
-				__contextState.renderToTextureAntiAlias = __state.renderToTextureAntiAlias;
-				__contextState.renderToTextureDepthStencil = __state.renderToTextureDepthStencil;
-				__contextState.renderToTextureSurfaceSelector = __state.renderToTextureSurfaceSelector;
-			}
-
-			__setGLDepthTest(__state.renderToTextureDepthStencil);
-			__setGLStencilTest(__state.renderToTextureDepthStencil);
-
-			__setGLFrontFace(true);
-		}
-		else
-		{
-			if (__stage == null && backBufferWidth == 0 && backBufferHeight == 0)
-			{
-				throw new Error("Context3D backbuffer has not been configured");
-			}
-
-			if (#if openfl_disable_context_cache true #else __contextState.renderToTexture != null
-				|| __contextState.__currentGLFramebuffer != __state.__primaryGLFramebuffer
-				|| __contextState.backBufferEnableDepthAndStencil != __state.backBufferEnableDepthAndStencil #end
-			)
-			{
-				__bindGLFramebuffer(__state.__primaryGLFramebuffer);
-
-				__contextState.renderToTexture = null;
-				__contextState.backBufferEnableDepthAndStencil = __state.backBufferEnableDepthAndStencil;
-			}
-
-			__setGLDepthTest(__state.backBufferEnableDepthAndStencil);
-			__setGLStencilTest(__state.backBufferEnableDepthAndStencil);
-
-			__setGLFrontFace(__stage.context3D != this);
-		}
-	}
-
-	@:noCompletion private function __flushGLProgram():Void
-	{
-		var shader = __state.shader;
-		var program = __state.program;
-
-		if (#if openfl_disable_context_cache true #else __contextState.shader != shader #end)
-		{
-			// TODO: Merge this logic
-
-			if (__contextState.shader != null)
-			{
-				__contextState.shader.__disable();
-			}
-
-			if (shader != null)
-			{
-				shader.__enable();
-			}
-
-			__contextState.shader = shader;
-		}
-
-		if (#if openfl_disable_context_cache true #else __contextState.program != program #end)
-		{
-			if (__contextState.program != null)
-			{
-				__contextState.program.__disable();
-			}
-
-			if (program != null)
-			{
-				program.__enable();
-			}
-
-			__contextState.program = program;
-		}
-
-		if (program != null && program.__format == AGAL)
-		{
-			__positionScale[1] = (__stage.context3D == this && __state.renderToTexture == null) ? 1.0 : -1.0;
-			program.__setPositionScale(__positionScale);
-		}
-	}
-
-	@:noCompletion private function __flushGLScissor():Void
-	{
-		if (!__state.scissorEnabled)
-		{
-			if (#if openfl_disable_context_cache true #else __contextState.scissorEnabled != __state.scissorEnabled #end)
-			{
-				__setGLScissorTest(false);
-				__contextState.scissorEnabled = false;
-			}
-		}
-		else
-		{
-			__setGLScissorTest(true);
-			__contextState.scissorEnabled = true;
-
-			var scissorX = Std.int(__state.scissorRectangle.x);
-			var scissorY = Std.int(__state.scissorRectangle.y);
-			var scissorWidth = Std.int(__state.scissorRectangle.width);
-			var scissorHeight = Std.int(__state.scissorRectangle.height);
-			#if !openfl_dpi_aware
-			if (__backBufferWantsBestResolution)
-			{
-				scissorX = Std.int(__state.scissorRectangle.x * __stage.window.scale);
-				scissorY = Std.int(__state.scissorRectangle.y * __stage.window.scale);
-				scissorWidth = Std.int(__state.scissorRectangle.width * __stage.window.scale);
-				scissorHeight = Std.int(__state.scissorRectangle.height * __stage.window.scale);
-			}
-			#end
-
-			if (__state.renderToTexture == null && __stage3D == null)
-			{
-				var contextHeight = Std.int(__stage.window.height * __stage.window.scale);
-				scissorY = contextHeight - scissorHeight - scissorY;
-			}
-
-			if (#if openfl_disable_context_cache true #else __contextState.scissorRectangle.x != scissorX
-				|| __contextState.scissorRectangle.y != scissorY
-				|| __contextState.scissorRectangle.width != scissorWidth
-				|| __contextState.scissorRectangle.height != scissorHeight #end)
-			{
-				gl.scissor(scissorX, scissorY, scissorWidth, scissorHeight);
-				__contextState.scissorRectangle.setTo(scissorX, scissorY, scissorWidth, scissorHeight);
-			}
-		}
-	}
-
-	@:noCompletion private function __flushGLStencil():Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.stencilTriangleFace != __state.stencilTriangleFace
-			|| __contextState.stencilPass != __state.stencilPass
-			|| __contextState.stencilDepthFail != __state.stencilDepthFail
-			|| __contextState.stencilFail != __state.stencilFail #end)
-		{
-			gl.stencilOpSeparate(__getGLTriangleFace(__state.stencilTriangleFace), __getGLStencilAction(__state.stencilFail),
-				__getGLStencilAction(__state.stencilDepthFail), __getGLStencilAction(__state.stencilPass));
-			__contextState.stencilTriangleFace = __state.stencilTriangleFace;
-			__contextState.stencilPass = __state.stencilPass;
-			__contextState.stencilDepthFail = __state.stencilDepthFail;
-			__contextState.stencilFail = __state.stencilFail;
-		}
-
-		if (#if openfl_disable_context_cache true #else __contextState.stencilWriteMask != __state.stencilWriteMask #end)
-		{
-			gl.stencilMask(__state.stencilWriteMask);
-			__contextState.stencilWriteMask = __state.stencilWriteMask;
-		}
-
-		if (#if openfl_disable_context_cache true #else __contextState.stencilCompareMode != __state.stencilCompareMode
-			|| __contextState.stencilReferenceValue != __state.stencilReferenceValue
-			|| __contextState.stencilReadMask != __state.stencilReadMask #end
-		)
-		{
-			gl.stencilFunc(__getGLCompareMode(__state.stencilCompareMode), __state.stencilReferenceValue, __state.stencilReadMask);
-			__contextState.stencilCompareMode = __state.stencilCompareMode;
-			__contextState.stencilReferenceValue = __state.stencilReferenceValue;
-			__contextState.stencilReadMask = __state.stencilReadMask;
-		}
-	}
-
-	@:noCompletion private function __flushGLTextures():Void
-	{
-		var sampler = 0;
-		var texture, samplerState;
-
-		for (i in 0...__state.textures.length)
-		{
-			texture = __state.textures[i];
-			samplerState = __state.samplerStates[i];
-			if (samplerState == null)
-			{
-				__state.samplerStates[i] = new SamplerState();
-				samplerState = __state.samplerStates[i];
-			}
-
-			gl.activeTexture(gl.TEXTURE0 + sampler);
-
-			if (texture != null)
-			{
-				// if (#if openfl_disable_context_cache true #else texture != __contextState.textures[i] #end) {
-
-				// TODO: Cleaner approach?
-				if (texture.__textureTarget == gl.TEXTURE_2D)
-				{
-					__bindGLTexture2D(texture.__getTexture());
-				}
-				else
-				{
-					__bindGLTextureCubeMap(texture.__getTexture());
-				}
-
-				#if (desktop && !html5)
-				// TODO: Cache?
-				gl.enable(gl.TEXTURE_2D);
-				#end
-
-				__contextState.textures[i] = texture;
-
-				// }
-
-				texture.__setSamplerState(samplerState);
-			}
-			else
-			{
-				__bindGLTexture2D(null);
-			}
-
-			if (__state.program != null && __state.program.__format == AGAL && samplerState.textureAlpha)
-			{
-				gl.activeTexture(gl.TEXTURE0 + sampler + 4);
-
-				if (texture != null && texture.__alphaTexture != null)
-				{
-					if (texture.__alphaTexture.__textureTarget == gl.TEXTURE_2D)
-					{
-						__bindGLTexture2D(texture.__alphaTexture.__getTexture());
-					}
-					else
-					{
-						__bindGLTextureCubeMap(texture.__alphaTexture.__getTexture());
-					}
-
-					texture.__alphaTexture.__setSamplerState(samplerState);
-					gl.uniform1i(__state.program.__agalAlphaSamplerEnabled[sampler].location, 1);
-
-					#if (desktop && !html5)
-					// TODO: Cache?
-					gl.enable(gl.TEXTURE_2D);
-					#end
-				}
-				else
-				{
-					__bindGLTexture2D(null);
-					if (__state.program.__agalAlphaSamplerEnabled[sampler] != null)
-					{
-						gl.uniform1i(__state.program.__agalAlphaSamplerEnabled[sampler].location, 0);
-					}
-				}
-			}
-
-			sampler++;
-		}
-	}
-
-	@:noCompletion private function __flushGLViewport():Void
-	{
-		// TODO: Cache
-
-		if (__state.renderToTexture == null)
-		{
-			if (__stage.context3D == this)
-			{
-				var scaledBackBufferWidth = backBufferWidth;
-				var scaledBackBufferHeight = backBufferHeight;
-				#if !openfl_dpi_aware
-				if (__stage3D == null && !__backBufferWantsBestResolution)
-				{
-					scaledBackBufferWidth = Std.int(backBufferWidth * __stage.window.scale);
-					scaledBackBufferHeight = Std.int(backBufferHeight * __stage.window.scale);
-				}
-				#end
-				var x = __stage3D == null ? 0 : Std.int(__stage3D.x);
-				var y = Std.int((__stage.window.height * __stage.window.scale) - scaledBackBufferHeight - (__stage3D == null ? 0 : __stage3D.y));
-				gl.viewport(x, y, scaledBackBufferWidth, scaledBackBufferHeight);
-			}
-			else
-			{
-				gl.viewport(0, 0, backBufferWidth, backBufferHeight);
-			}
-		}
-		else
-		{
-			var width = 0, height = 0;
-
-			// TODO: Avoid use of Std.is
-			if ((__state.renderToTexture is Texture))
-			{
-				var texture2D:Texture = cast __state.renderToTexture;
-				width = texture2D.__width;
-				height = texture2D.__height;
-			}
-			else if ((__state.renderToTexture is RectangleTexture))
-			{
-				var rectTexture:RectangleTexture = cast __state.renderToTexture;
-				width = rectTexture.__width;
-				height = rectTexture.__height;
-			}
-			else if ((__state.renderToTexture is CubeTexture))
-			{
-				var cubeTexture:CubeTexture = cast __state.renderToTexture;
-				width = cubeTexture.__size;
-				height = cubeTexture.__size;
-			}
-
-			gl.viewport(0, 0, width, height);
-		}
-	}
-
-	@:noCompletion private function __getGLBlend(blendFactor:Context3DBlendFactor):Int
-	{
-		switch (blendFactor)
-		{
-			case DESTINATION_ALPHA:
-				return gl.DST_ALPHA;
-			case DESTINATION_COLOR:
-				return gl.DST_COLOR;
-			case ONE:
-				return gl.ONE;
-			case ONE_MINUS_DESTINATION_ALPHA:
-				return gl.ONE_MINUS_DST_ALPHA;
-			case ONE_MINUS_DESTINATION_COLOR:
-				return gl.ONE_MINUS_DST_COLOR;
-			case ONE_MINUS_SOURCE_ALPHA:
-				return gl.ONE_MINUS_SRC_ALPHA;
-			case ONE_MINUS_SOURCE_COLOR:
-				return gl.ONE_MINUS_SRC_COLOR;
-			case SOURCE_ALPHA:
-				return gl.SRC_ALPHA;
-			case SOURCE_COLOR:
-				return gl.SRC_COLOR;
-			case ZERO:
-				return gl.ZERO;
-			default:
-				throw new IllegalOperationError();
-		}
-
-		return 0;
-	}
-
-	@:noCompletion private function __getGLCompareMode(mode:Context3DCompareMode):Int
-	{
-		return switch (mode)
-		{
-			case ALWAYS: gl.ALWAYS;
-			case EQUAL: gl.EQUAL;
-			case GREATER: gl.GREATER;
-			case GREATER_EQUAL: gl.GEQUAL;
-			case LESS: gl.LESS;
-			case LESS_EQUAL: gl.LEQUAL; // TODO : wrong value
-			case NEVER: gl.NEVER;
-			case NOT_EQUAL: gl.NOTEQUAL;
-			default: gl.EQUAL;
-		}
-	}
-
-	@:noCompletion private function __getGLStencilAction(action:Context3DStencilAction):Int
-	{
-		return switch (action)
-		{
-			case DECREMENT_SATURATE: gl.DECR;
-			case DECREMENT_WRAP: gl.DECR_WRAP;
-			case INCREMENT_SATURATE: gl.INCR;
-			case INCREMENT_WRAP: gl.INCR_WRAP;
-			case INVERT: gl.INVERT;
-			case KEEP: gl.KEEP;
-			case SET: gl.REPLACE;
-			case ZERO: gl.ZERO;
-			default: gl.KEEP;
-		}
-	}
-
-	@:noCompletion private function __getGLTriangleFace(face:Context3DTriangleFace):Int
-	{
-		return switch (face)
-		{
-			case FRONT: gl.FRONT;
-			case BACK: gl.BACK;
-			case FRONT_AND_BACK: gl.FRONT_AND_BACK;
-			case NONE: gl.NONE;
-			default: gl.FRONT_AND_BACK;
-		}
-	}
-
-	@:noCompletion private function __renderStage3D(stage3D:Stage3D):Void
-	{
-		// Assume this is the primary Context3D
-
-		var context = stage3D.context3D;
-
-		if (context != null
-			&& context != this
-			&& context.__frontBufferTexture != null
-			&& stage3D.visible
-			&& backBufferHeight > 0
-			&& backBufferWidth > 0)
-		{
-			// if (!__stage.__renderer.__cleared) __stage.__renderer.__clear ();
-
-			if (__renderStage3DProgram == null)
-			{
-				var vertexAssembler = new AGALMiniAssembler();
-				vertexAssembler.assemble(Context3DProgramType.VERTEX, "m44 op, va0, vc0\n" + "mov v0, va1");
-
-				var fragmentAssembler = new AGALMiniAssembler();
-				fragmentAssembler.assemble(Context3DProgramType.FRAGMENT, "tex ft1, v0, fs0 <2d,nearest,nomip>\n" + "mov oc, ft1");
-
-				__renderStage3DProgram = createProgram();
-				__renderStage3DProgram.upload(vertexAssembler.agalcode, fragmentAssembler.agalcode);
-			}
-
-			setProgram(__renderStage3DProgram);
-
-			setBlendFactors(ONE, ZERO);
-			setColorMask(true, true, true, true);
-			setCulling(NONE);
-			setDepthTest(false, ALWAYS);
-			setStencilActions();
-			setStencilReferenceValue(0, 0, 0);
-			setScissorRectangle(null);
-
-			setTextureAt(0, context.__frontBufferTexture);
-			setVertexBufferAt(0, stage3D.__vertexBuffer, 0, Context3DVertexBufferFormat.FLOAT_3);
-			setVertexBufferAt(1, stage3D.__vertexBuffer, 3, Context3DVertexBufferFormat.FLOAT_2);
-			setProgramConstantsFromMatrix(Context3DProgramType.VERTEX, 0, stage3D.__renderTransform, true);
-			drawTriangles(stage3D.__indexBuffer);
-
-			__present = true;
-		}
-	}
-
-	@:noCompletion private function __setGLBlend(enable:Bool):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__enableGLBlend != enable #end)
-		{
-			if (enable)
-			{
-				gl.enable(gl.BLEND);
-			}
-			else
-			{
-				gl.disable(gl.BLEND);
-			}
-			__contextState.__enableGLBlend = enable;
-		}
-	}
-
-	@:noCompletion private function __setGLBlendEquation(value:Int):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__glBlendEquation != value #end)
-		{
-			gl.blendEquation(value);
-			__contextState.__glBlendEquation = value;
-		}
-	}
-
-	@:noCompletion private function __setGLCullFace(enable:Bool):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__enableGLCullFace != enable #end)
-		{
-			if (enable)
-			{
-				gl.enable(gl.CULL_FACE);
-			}
-			else
-			{
-				gl.disable(gl.CULL_FACE);
-			}
-			__contextState.__enableGLCullFace = enable;
-		}
-	}
-
-	@:noCompletion private function __setGLDepthTest(enable:Bool):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__enableGLDepthTest != enable #end)
-		{
-			if (enable)
-			{
-				gl.enable(gl.DEPTH_TEST);
-			}
-			else
-			{
-				gl.disable(gl.DEPTH_TEST);
-			}
-			__contextState.__enableGLDepthTest = enable;
-		}
-	}
-
-	@:noCompletion private function __setGLFrontFace(counterClockWise:Bool):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__frontFaceGLCCW != counterClockWise #end)
-		{
-			gl.frontFace(counterClockWise ? gl.CCW : gl.CW);
-			__contextState.__frontFaceGLCCW = counterClockWise;
-		}
-	}
-
-	@:noCompletion private function __setGLScissorTest(enable:Bool):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__enableGLScissorTest != enable #end)
-		{
-			if (enable)
-			{
-				gl.enable(gl.SCISSOR_TEST);
-			}
-			else
-			{
-				gl.disable(gl.SCISSOR_TEST);
-			}
-			__contextState.__enableGLScissorTest = enable;
-		}
-	}
-
-	@:noCompletion private function __setGLStencilTest(enable:Bool):Void
-	{
-		if (#if openfl_disable_context_cache true #else __contextState.__enableGLStencilTest != enable #end)
-		{
-			if (enable)
-			{
-				gl.enable(gl.STENCIL_TEST);
-			}
-			else
-			{
-				gl.disable(gl.STENCIL_TEST);
-			}
-			__contextState.__enableGLStencilTest = enable;
-		}
-	}
-
-	// Get & Set Methods
-	@:noCompletion private function get_enableErrorChecking():Bool
-	{
-		return __enableErrorChecking;
-	}
-
-	@:noCompletion private function set_enableErrorChecking(value:Bool):Bool
-	{
-		return __enableErrorChecking = value;
-	}
-
-	@:noCompletion private function get_totalGPUMemory():Int
-	{
-		if (__glMemoryCurrentAvailable != -1)
-		{
-			// TODO: Return amount used by this application only
-			var current = gl.getParameter(__glMemoryCurrentAvailable);
-			var total = gl.getParameter(__glMemoryTotalAvailable);
-
-			if (total > 0)
-			{
-				return (total - current) * 1024;
-			}
-		}
-		return 0;
-	}
-}
-#else
-typedef Context3D = flash.display3D.Context3D;
-#end
diff --git a/source/openfl/display3D/utils/UInt8Buff.hx b/source/openfl/display3D/utils/UInt8Buff.hx
deleted file mode 100644
index 46a820477c..0000000000
--- a/source/openfl/display3D/utils/UInt8Buff.hx
+++ /dev/null
@@ -1,95 +0,0 @@
-package openfl.display3D.utils;
-
-import flixel.util.FlxPool.IFlxPooled;
-import flixel.util.FlxPool;
-import lime.utils.UInt8Array;
-
-class UInt8Buff implements IFlxPooled
-{
-	static var _pools:Map<Int, FlxPool<UInt8Buff>> = [];
-
-	public static function getPool(length:Int) {
-		if(!_pools.exists(length)) {
-			_pools.set(length, new FlxPool<UInt8Buff>(UInt8Buff));
-		}
-		return _pools.get(length);
-	}
-
-	/**
-	 * Recycle or create new FlxRect.
-	 * Be sure to put() them back into the pool after you're done with them!
-	 */
-	public static inline function get(length:Int):UInt8Buff
-	{
-		var rect = getPool(length).get().set(length);
-		rect._inPool = false;
-		if(rect.buffer == null)
-			rect.buffer = new UInt8Array(length);
-		return rect;
-	}
-
-	/**
-	 * Recycle or create a new FlxRect which will automatically be released
-	 * to the pool when passed into a flixel function.
-	 */
-	public static inline function weak(length:Int):UInt8Buff
-	{
-		var rect = get(length);
-		rect._weak = true;
-		return rect;
-	}
-
-	var _weak:Bool = false;
-	var _inPool:Bool = false;
-
-	public var length(get, never):Int;
-
-	inline function get_length() {
-		return buffer.length;
-	}
-
-	public var buffer:UInt8Array;
-
-	@:keep
-	private function new(length:Int)
-	{
-		set(length);
-	}
-
-	/**
-	 * Add this FlxRect to the recycling pool.
-	 */
-	public inline function put():Void
-	{
-		if (!_inPool)
-		{
-			_inPool = true;
-			_weak = false;
-			getPool(length).putUnsafe(this);
-		}
-	}
-
-	/**
-	 * Add this FlxPoint to the recycling pool if it's a weak reference (allocated via weak()).
-	 */
-	public inline function putWeak():Void
-	{
-		if (_weak)
-		{
-			put();
-		}
-	}
-
-	/**
-	 * Does nothing
-	 */
-	private inline function set(_length:Int):UInt8Buff
-	{
-		return this;
-	}
-
-	/**
-	 * Necessary for IFlxDestroyable.
-	 */
-	public function destroy() {}
-}
diff --git a/source/openfl/media/Sound.hx b/source/openfl/media/Sound.hx
deleted file mode 100644
index 808399c380..0000000000
--- a/source/openfl/media/Sound.hx
+++ /dev/null
@@ -1,705 +0,0 @@
-package openfl.media;
-
-#if !flash
-import haxe.Int64;
-import openfl.events.Event;
-import openfl.events.EventDispatcher;
-import openfl.events.IOErrorEvent;
-import openfl.net.URLRequest;
-import openfl.utils.ByteArray;
-import openfl.utils.Future;
-#if lime
-import openfl.utils._internal.UInt8Array;
-import lime.media.AudioBuffer;
-import lime.media.AudioSource;
-#end
-
-/**
-	The Sound class lets you work with sound in an application. The Sound class
-	lets you create a Sound object, load and play an external MP3 file into
-	that object, close the sound stream, and access data about the sound, such
-	as information about the number of bytes in the stream and ID3 metadata.
-	More detailed control of the sound is performed through the sound source
-	 -  the SoundChannel or Microphone object for the sound  -  and through the
-	properties in the SoundTransform class that control the output of the sound
-	to the computer's speakers.
-
-	In Flash Player 10 and later and AIR 1.5 and later, you can also use
-	this class to work with sound that is generated dynamically. In this case,
-	the Sound object uses the function you assign to a `sampleData`
-	event handler to poll for sound data. The sound is played as it is
-	retrieved from a ByteArray object that you populate with sound data. You
-	can use `Sound.extract()` to extract sound data from a Sound
-	object, after which you can manipulate it before writing it back to the
-	stream for playback.
-
-	To control sounds that are embedded in a SWF file, use the properties in
-	the SoundMixer class.
-
-	**Note**: The ActionScript 3.0 Sound API differs from ActionScript
-	2.0. In ActionScript 3.0, you cannot take sound objects and arrange them in
-	a hierarchy to control their properties.
-
-	When you use this class, consider the following security model:
-
-
-	* Loading and playing a sound is not allowed if the calling file is in
-	a network sandbox and the sound file to be loaded is local.
-	* By default, loading and playing a sound is not allowed if the calling
-	file is local and tries to load and play a remote sound. A user must grant
-	explicit permission to allow this type of access.
-	* Certain operations dealing with sound are restricted. The data in a
-	loaded sound cannot be accessed by a file in a different domain unless you
-	implement a cross-domain policy file. Sound-related APIs that fall under
-	this restriction are `Sound.id3`,
-	`SoundMixer.computeSpectrum()`,
-	`SoundMixer.bufferTime`, and the `SoundTransform`
-	class.
-
-
-	However, in Adobe AIR, content in the `application` security
-	sandbox(content installed with the AIR application) are not restricted by
-	these security limitations.
-
-	For more information related to security, see the Flash Player Developer
-	Center Topic: [Security](http://www.adobe.com/go/devnet_security_en).
-
-	@event complete   Dispatched when data has loaded successfully.
-	@event id3		Dispatched by a Sound object when ID3 data is available
-					  for an MP3 sound.
-	@event ioError	Dispatched when an input/output error occurs that causes
-					  a load operation to fail.
-	@event open	   Dispatched when a load operation starts.
-	@event progress   Dispatched when data is received as a load operation
-					  progresses.
-	@event sampleData Dispatched when the runtime requests new audio data.
-**/
-#if !openfl_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(lime.media.AudioBuffer)
-@:access(lime.utils.AssetLibrary)
-@:access(openfl.media.SoundMixer)
-@:access(openfl.media.SoundChannel.new)
-@:autoBuild(openfl.utils._internal.AssetsMacro.embedSound())
-class Sound extends EventDispatcher
-{
-	/**
-		Returns the currently available number of bytes in this sound object. This
-		property is usually useful only for externally loaded files.
-	**/
-	public var bytesLoaded(default, null):Int;
-
-	/**
-		Returns the total number of bytes in this sound object.
-	**/
-	public var bytesTotal(default, null):Int;
-
-	/**
-		Provides access to the metadata that is part of an MP3 file.
-		MP3 sound files can contain ID3 tags, which provide metadata about the
-		file. If an MP3 sound that you load using the `Sound.load()` method
-		contains ID3 tags, you can query these properties. Only ID3 tags that
-		use the UTF-8 character set are supported.
-
-		Flash Player 9 and later and AIR support ID3 2.0 tags, specifically
-		2.3 and 2.4. The following tables list the standard ID3 2.0 tags and
-		the type of content the tags represent. The `Sound.id3` property
-		provides access to these tags through the format `my_sound.id3.COMM`,
-		`my_sound.id3.TIME`, and so on. The first table describes tags that
-		can be accessed either through the ID3 2.0 property name or the
-		ActionScript property name. The second table describes ID3 tags that
-		are supported but do not have predefined properties in ActionScript.
-
-		| ID3 2.0 tag | Corresponding Sound class property |
-		| --- | --- |
-		| COMM | Sound.id3.comment |
-		| TALB | Sound.id3.album |
-		| TCON | Sound.id3.genre |
-		| TIT2 | Sound.id3.songName |
-		| TPE1 | Sound.id3.artist |
-		| TRCK | Sound.id3.track |
-		| TYER | Sound.id3.year |
-
-		The following table describes ID3 tags that are supported but do not
-		have predefined properties in the Sound class. You access them by
-		calling `mySound.id3.TFLT`, `mySound.id3.TIME`, and so on. **NOTE:**
-		None of these tags are supported in Flash Lite 4.
-
-		| Property | Description |
-		| --- | --- |
-		| TFLT | File type |
-		| TIME | Time |
-		| TIT1 | Content group description |
-		| TIT2 | Title/song name/content description |
-		| TIT3 | Subtitle/description refinement |
-		| TKEY | Initial key |
-		| TLAN | Languages |
-		| TLEN | Length |
-		| TMED | Media type |
-		| TOAL | Original album/movie/show title |
-		| TOFN | Original filename |
-		| TOLY | Original lyricists/text writers |
-		| TOPE | Original artists/performers |
-		| TORY | Original release year |
-		| TOWN | File owner/licensee |
-		| TPE1 | Lead performers/soloists |
-		| TPE2 | Band/orchestra/accompaniment |
-		| TPE3 | Conductor/performer refinement |
-		| TPE4 | Interpreted, remixed, or otherwise modified by |
-		| TPOS | Part of a set |
-		| TPUB | Publisher |
-		| TRCK | Track number/position in set |
-		| TRDA | Recording dates |
-		| TRSN | Internet radio station name |
-		| TRSO | Internet radio station owner |
-		| TSIZ | Size |
-		| TSRC | ISRC (international standard recording code) |
-		| TSSE | Software/hardware and settings used for encoding |
-		| TYER | Year |
-		| WXXX | URL link frame |
-
-		When using this property, consider the Flash Player security model:
-
-		* The `id3` property of a Sound object is always permitted for SWF
-		files that are in the same security sandbox as the sound file. For
-		files in other sandboxes, there are security checks.
-		* When you load the sound, using the `load()` method of the Sound
-		class, you can specify a `context` parameter, which is a
-		SoundLoaderContext object. If you set the `checkPolicyFile` property
-		of the SoundLoaderContext object to `true`, Flash Player checks for a
-		URL policy file on the server from which the sound is loaded. If a
-		policy file exists and permits access from the domain of the loading
-		SWF file, then the file is allowed to access the `id3` property of the
-		Sound object; otherwise it is not.
-
-		However, in Adobe AIR, content in the `application` security sandbox
-		(content installed with the AIR application) are not restricted by
-		these security limitations.
-
-		For more information related to security, see the Flash Player
-		Developer Center Topic: <a
-		href="http://www.adobe.com/go/devnet_security_en"
-		scope="external">Security</a>.
-	**/
-	public var id3(get, never):ID3Info;
-
-	/**
-		Returns the buffering state of external MP3 files. If the value is
-		`true`, any playback is currently suspended while the object
-		waits for more data.
-	**/
-	public var isBuffering(default, null):Bool;
-
-	// @:noCompletion @:dox(hide) @:require(flash10_1) public var isURLInaccessible (default, null):Bool;
-
-	/**
-		The length of the current sound in milliseconds.
-	**/
-	public var length(get, never):Float;
-
-	/**
-		The URL from which this sound was loaded. This property is applicable only
-		to Sound objects that were loaded using the `Sound.load()`
-		method. For Sound objects that are associated with a sound asset from a
-		SWF file's library, the value of the `url` property is
-		`null`.
-
-		When you first call `Sound.load()`, the `url`
-		property initially has a value of `null`, because the final URL
-		is not yet known. The `url` property will have a non-null value
-		as soon as an `open` event is dispatched from the Sound
-		object.
-
-		The `url` property contains the final, absolute URL from
-		which a sound was loaded. The value of `url` is usually the
-		same as the value passed to the `stream` parameter of
-		`Sound.load()`. However, if you passed a relative URL to
-		`Sound.load()` the value of the `url` property
-		represents the absolute URL. Additionally, if the original URL request is
-		redirected by an HTTP server, the value of the `url` property
-		reflects the final URL from which the sound file was actually downloaded.
-		This reporting of an absolute, final URL is equivalent to the behavior of
-		`LoaderInfo.url`.
-
-		In some cases, the value of the `url` property is truncated;
-		see the `isURLInaccessible` property for details.
-	**/
-	public var url(default, null):String;
-
-	#if lime
-	@:noCompletion private var __buffer:AudioBuffer;
-	#end
-
-	#if openfljs
-	@:noCompletion private static function __init__()
-	{
-		untyped Object.defineProperties(Sound.prototype, {
-			"id3": {get: untyped #if haxe4 js.Syntax.code #else __js__ #end ("function () { return this.get_id3 (); }")},
-			"length": {get: untyped #if haxe4 js.Syntax.code #else __js__ #end ("function () { return this.get_length (); }")},
-		});
-	}
-	#end
-
-	/**
-		Creates a new Sound object. If you pass a valid URLRequest object to the
-		Sound constructor, the constructor automatically calls the
-		`load()` function for the Sound object. If you do not pass a
-		valid URLRequest object to the Sound constructor, you must call the
-		`load()` function for the Sound object yourself, or the stream
-		will not load.
-
-		Once `load()` is called on a Sound object, you can't later
-		load a different sound file into that Sound object. To load a different
-		sound file, create a new Sound object.
-		In Flash Player 10 and later and AIR 1.5 and later, instead of using
-		`load()`, you can use the `sampleData` event handler
-		to load sound dynamically into the Sound object.
-
-		@param stream  The URL that points to an external MP3 file.
-		@param context An optional SoundLoader context object, which can define
-					   the buffer time(the minimum number of milliseconds of MP3
-					   data to hold in the Sound object's buffer) and can specify
-					   whether the application should check for a cross-domain
-					   policy file prior to loading the sound.
-	**/
-	public function new(stream:URLRequest = null, context:SoundLoaderContext = null)
-	{
-		super(this);
-
-		bytesLoaded = 0;
-		bytesTotal = 0;
-		isBuffering = false;
-		url = null;
-
-		if (stream != null)
-		{
-			load(stream, context);
-		}
-	}
-
-	/**
-		Closes the stream, causing any download of data to cease. No data may
-		be read from the stream after the `close()` method is called.
-
-		@throws IOError The stream could not be closed, or the stream was not
-						open.
-	**/
-	public function close():Void
-	{
-		#if lime
-		if (__buffer != null)
-		{
-			__buffer.dispose();
-			__buffer = null;
-		}
-		#end
-	}
-
-	#if false
-	/**
-		Extracts raw sound data from a Sound object.
-		This method is designed to be used when you are working with
-		dynamically generated audio, using a function you assign to the
-		`sampleData` event for a different Sound object. That is, you can use
-		this method to extract sound data from a Sound object. Then you can
-		write the data to the byte array that another Sound object is using to
-		stream dynamic audio.
-
-		The audio data is placed in the target byte array starting from the
-		current position of the byte array. The audio data is always exposed
-		as 44100 Hz Stereo. The sample type is a 32-bit floating-point value,
-		which can be converted to a Number using `ByteArray.readFloat()`.
-
-		@param target A ByteArray object in which the extracted sound samples
-					  are placed.
-		@param length The number of sound samples to extract. A sample
-					  contains both the left and right channels נthat is,
-					  two 32-bit floating-point values.
-		@return The number of samples written to the ByteArray specified in
-				the `target` parameter.
-	**/
-	// @:noCompletion @:dox(hide) @:require(flash10) public function extract (target:ByteArray, length:Float, startPosition:Float = -1):Float;
-	#end
-
-	#if lime
-	/**
-		Creates a new Sound from an AudioBuffer immediately.
-
-		@param	buffer	An AudioBuffer instance
-		@returns	A new Sound
-	**/
-	public static function fromAudioBuffer(buffer:AudioBuffer):Sound
-	{
-		var sound = new Sound();
-		sound.__buffer = buffer;
-		return sound;
-	}
-	#end
-
-	/**
-		Creates a new Sound from a file path synchronously. This means that the
-		Sound will be returned immediately (if supported).
-
-		HTML5 and Flash do not support creating Sound synchronously, so these targets
-		always return `null`.
-
-		In order to load files from a remote web address, use the `loadFromFile` method,
-		which supports asynchronous loading.
-
-		@param	path	A local file path containing a sound
-		@returns	A new Sound if successful, or `null` if unsuccessful
-	**/
-	public static function fromFile(path:String):Sound
-	{
-		#if lime
-		return fromAudioBuffer(AudioBuffer.fromFile(path));
-		#else
-		return null;
-		#end
-	}
-
-	/**
-		Initiates loading of an external MP3 file from the specified URL. If you
-		provide a valid URLRequest object to the Sound constructor, the
-		constructor calls `Sound.load()` for you. You only need to call
-		`Sound.load()` yourself if you don't pass a valid URLRequest
-		object to the Sound constructor or you pass a `null` value.
-
-		Once `load()` is called on a Sound object, you can't later
-		load a different sound file into that Sound object. To load a different
-		sound file, create a new Sound object.
-
-		When using this method, consider the following security model:
-
-		* Calling `Sound.load()` is not allowed if the calling file
-		is in the local-with-file-system sandbox and the sound is in a network
-		sandbox.
-		* Access from the local-trusted or local-with-networking sandbox
-		requires permission from a website through a URL policy file.
-		* You cannot connect to commonly reserved ports. For a complete list
-		of blocked ports, see "Restricting Networking APIs" in the _ActionScript
-		3.0 Developer's Guide_.
-		* You can prevent a SWF file from using this method by setting the
-		`allowNetworking` parameter of the `object` and
-		`embed` tags in the HTML page that contains the SWF
-		content.
-
-		 In Flash Player 10 and later, if you use a multipart Content-Type(for
-		example "multipart/form-data") that contains an upload(indicated by a
-		"filename" parameter in a "content-disposition" header within the POST
-		body), the POST operation is subject to the security rules applied to
-		uploads:
-
-		* The POST operation must be performed in response to a user-initiated
-		action, such as a mouse click or key press.
-		* If the POST operation is cross-domain(the POST target is not on the
-		same server as the SWF file that is sending the POST request), the target
-		server must provide a URL policy file that permits cross-domain
-		access.
-
-
-		Also, for any multipart Content-Type, the syntax must be valid
-		(according to the RFC2046 standards). If the syntax appears to be invalid,
-		the POST operation is subject to the security rules applied to
-		uploads.
-
-		In Adobe AIR, content in the `application` security sandbox
-		(content installed with the AIR application) are not restricted by these
-		security limitations.
-
-		For more information related to security, see the Flash Player
-		Developer Center Topic: [Security](http://www.adobe.com/go/devnet_security_en).
-
-		@param stream  A URL that points to an external MP3 file.
-		@param context An optional SoundLoader context object, which can define
-					   the buffer time(the minimum number of milliseconds of MP3
-					   data to hold in the Sound object's buffer) and can specify
-					   whether the application should check for a cross-domain
-					   policy file prior to loading the sound.
-		@throws IOError	   A network error caused the load to fail.
-		@throws IOError	   The `digest` property of the
-							  `stream` object is not `null`.
-							  You should only set the `digest` property
-							  of a URLRequest object when calling the
-							  `URLLoader.load()` method when loading a
-							  SWZ file(an Adobe platform component).
-		@throws SecurityError Local untrusted files may not communicate with the
-							  Internet. You can work around this by reclassifying
-							  this file as local-with-networking or trusted.
-		@throws SecurityError You cannot connect to commonly reserved ports. For a
-							  complete list of blocked ports, see "Restricting
-							  Networking APIs" in the _ActionScript 3.0
-							  Developer's Guide_.
-	**/
-	public function load(stream:URLRequest, context:SoundLoaderContext = null):Void
-	{
-		url = stream.url;
-
-		#if lime
-		#if (js && html5)
-		var defaultLibrary = lime.utils.Assets.getLibrary("default");
-
-		if (defaultLibrary != null && defaultLibrary.cachedAudioBuffers.exists(url))
-		{
-			AudioBuffer_onURLLoad(defaultLibrary.cachedAudioBuffers.get(url));
-		}
-		else
-		{
-			AudioBuffer.loadFromFile(url).onComplete(AudioBuffer_onURLLoad).onError(function(_)
-			{
-				AudioBuffer_onURLLoad(null);
-			});
-		}
-		#else
-		AudioBuffer.loadFromFile(url).onComplete(AudioBuffer_onURLLoad).onError(function(_)
-		{
-			AudioBuffer_onURLLoad(null);
-		});
-		#end
-		#end
-	}
-
-	/**
-		Load MP3 sound data from a ByteArray object into a Sound object. The data will be read from the current
-		ByteArray position and will leave the ByteArray position at the end of the specified bytes length once
-		finished. If the MP3 sound data contains ID3 data ID3 events will be dispatched during this function call.
-		This function will throw an exception if the ByteArray object does not contain enough data.
-
-		@param	bytes
-		@param	bytesLength
-	**/
-	public function loadCompressedDataFromByteArray(bytes:ByteArray, bytesLength:Int):Void
-	{
-		if (bytes == null || bytesLength <= 0)
-		{
-			dispatchEvent(new IOErrorEvent(IOErrorEvent.IO_ERROR));
-			return;
-		}
-
-		if (bytes.position > 0 || bytes.length > bytesLength)
-		{
-			var copy = new ByteArray(bytesLength);
-			copy.writeBytes(bytes, bytes.position, bytesLength);
-			bytes = copy;
-		}
-
-		#if lime
-		__buffer = AudioBuffer.fromBytes(bytes);
-
-		if (__buffer == null)
-		{
-			dispatchEvent(new IOErrorEvent(IOErrorEvent.IO_ERROR));
-		}
-		else
-		{
-			dispatchEvent(new Event(Event.COMPLETE));
-		}
-		#else
-		dispatchEvent(new IOErrorEvent(IOErrorEvent.IO_ERROR));
-		#end
-	}
-
-	/**
-		Creates a new Sound from a file path or web address asynchronously. The file
-		load will occur in the background.
-
-		Progress, completion and error callbacks will be dispatched in the current
-		thread using callbacks attached to a returned Future object.
-
-		@param	path	A local file path or web address containing a sound
-		@returns	A Future Sound
-	**/
-	public static function loadFromFile(path:String):Future<Sound>
-	{
-		#if lime
-		return AudioBuffer.loadFromFile(path).then(function(audioBuffer)
-		{
-			return Future.withValue(fromAudioBuffer(audioBuffer));
-		});
-		#else
-		return cast Future.withError("Cannot load audio file");
-		#end
-	}
-
-	/**
-		Creates a new Sound from a set of file paths or web addresses asynchronously.
-		The audio backend will choose the first compatible file format, and will load the file
-		it selects in the background.
-
-		Progress, completion and error callbacks will be dispatched in the current
-		thread using callbacks attached to a returned Future object.
-
-		@param	paths	A set of local file paths or web addresses containing sound
-		@returns	A Future Sound
-	**/
-	public static function loadFromFiles(paths:Array<String>):Future<Sound>
-	{
-		#if lime
-		return AudioBuffer.loadFromFiles(paths).then(function(audioBuffer)
-		{
-			return Future.withValue(fromAudioBuffer(audioBuffer));
-		});
-		#else
-		return cast Future.withError("Cannot load audio files");
-		#end
-	}
-
-	/**
-		Load PCM 32-bit floating point sound data from a ByteArray object into a Sound object. The data will be read
-		from the current ByteArray position and will leave the ByteArray position at the end of the specified sample
-		length multiplied by either 1 channel or 2 channels if the stereo flag is set once finished.
-
-		Starting with Flash Player 11.8, the amount of audio data that can be passed to this function is limited. For
-		SWF versions >= 21, this function throws an exception if the amount of audio data passed into this function is
-		more than 1800 seconds. That is, samples / sampleRate should be less than or equal to 1800. For swf versions <
-		21, the runtime fails silently if the amount of audio data passed in is more than 12000 seconds. This is
-		provided only for backward compatibility.
-
-		This function throws an exception if the ByteArray object does not contain enough data.
-
-		@param	bytes
-		@param	samples
-		@param	format
-		@param	stereo
-		@param	sampleRate
-	**/
-	public function loadPCMFromByteArray(bytes:ByteArray, samples:Int, format:String = "float", stereo:Bool = true, sampleRate:Float = 44100):Void
-	{
-		if (bytes == null)
-		{
-			dispatchEvent(new IOErrorEvent(IOErrorEvent.IO_ERROR));
-			return;
-		}
-
-		var bitsPerSample = (format == "float" ? 32 : 16); // "short"
-		var channels = (stereo ? 2 : 1);
-		var bytesLength = Std.int(samples * channels * (bitsPerSample / 8));
-
-		if (bytes.position > 0 || bytes.length > bytesLength)
-		{
-			var copy = new ByteArray(bytesLength);
-			copy.writeBytes(bytes, bytes.position, bytesLength);
-			bytes = copy;
-		}
-
-		#if lime
-		var audioBuffer = new AudioBuffer();
-		audioBuffer.bitsPerSample = bitsPerSample;
-		audioBuffer.channels = channels;
-		audioBuffer.data = new UInt8Array(bytes);
-		audioBuffer.sampleRate = Std.int(sampleRate);
-
-		__buffer = audioBuffer;
-
-		dispatchEvent(new Event(Event.COMPLETE));
-		#else
-		dispatchEvent(new IOErrorEvent(IOErrorEvent.IO_ERROR));
-		#end
-	}
-
-	/**
-		Generates a new SoundChannel object to play back the sound. This method
-		returns a SoundChannel object, which you access to stop the sound and to
-		monitor volume.(To control the volume, panning, and balance, access the
-		SoundTransform object assigned to the sound channel.)
-
-		@param startTime	The initial position in milliseconds at which playback
-							should start.
-		@param loops		Defines the number of times a sound loops back to the
-							`startTime` value before the sound channel
-							stops playback.
-		@param sndTransform The initial SoundTransform object assigned to the
-							sound channel.
-		@return A SoundChannel object, which you use to control the sound. This
-				method returns `null` if you have no sound card or if
-				you run out of available sound channels. The maximum number of
-				sound channels available at once is 32.
-	**/
-	public function play(startTime:Float = 0.0, loops:Int = 0, sndTransform:SoundTransform = null):SoundChannel
-	{
-		#if lime
-		if (__buffer == null || SoundMixer.__soundChannels.length >= SoundMixer.MAX_ACTIVE_CHANNELS)
-		{
-			return null;
-		}
-
-		if (sndTransform == null)
-		{
-			sndTransform = new SoundTransform();
-		}
-		else
-		{
-			sndTransform = sndTransform.clone();
-		}
-
-		var pan = SoundMixer.__soundTransform.pan + sndTransform.pan;
-
-		if (pan > 1) pan = 1;
-		else if (pan < -1) pan = -1;
-
-		var volume = SoundMixer.__soundTransform.volume * sndTransform.volume;
-
-		var source = new AudioSource(__buffer);
-		source.offset = Std.int(startTime);
-		if (loops > 1) source.loops = loops - 1;
-
-		source.gain = volume;
-
-		var position = source.position;
-		position.x = pan;
-		position.z = -1 * Math.sqrt(1 - Math.pow(pan, 2));
-		source.position = position;
-
-		return new SoundChannel(source, sndTransform);
-		#else
-		return null;
-		#end
-	}
-
-	// Get & Set Methods
-	@:noCompletion private function get_id3():ID3Info
-	{
-		return new ID3Info();
-	}
-
-	@:noCompletion private function get_length():Float
-	{
-		#if lime
-		if (__buffer != null)
-		{
-			#if (js && html5 && howlerjs)
-			return __buffer.src.duration() * 1000;
-			#else
-			if (__buffer.data != null) return (__buffer.data.length >> 0) / __buffer.channels / (__buffer.bitsPerSample >> 3) / __buffer.sampleRate * 1000;
-			else if (__buffer.__srcVorbisFile != null) {
-				var x = __buffer.__srcVorbisFile.pcmTotal();
-				return (x.high * 4294967296. + (x.low >> 0)) / __buffer.sampleRate * 1000;
-			}
-			#end
-		}
-		#end
-
-		return 0;
-	}
-
-	// Event Handlers
-	#if lime
-	@:noCompletion private function AudioBuffer_onURLLoad(buffer:AudioBuffer):Void
-	{
-		if (buffer == null)
-		{
-			dispatchEvent(new IOErrorEvent(IOErrorEvent.IO_ERROR));
-		}
-		else
-		{
-			__buffer = buffer;
-			dispatchEvent(new Event(Event.COMPLETE));
-		}
-	}
-	#end
-}
-#else
-typedef Sound = flash.media.Sound;
-#end
diff --git a/source/openfl/media/SoundChannel.hx b/source/openfl/media/SoundChannel.hx
deleted file mode 100644
index cb054f93d5..0000000000
--- a/source/openfl/media/SoundChannel.hx
+++ /dev/null
@@ -1,400 +0,0 @@
-package openfl.media;
-
-#if !flash
-import haxe.Int64;
-
-import openfl.events.Event;
-import openfl.events.EventDispatcher;
-#if lime
-import lime.media.AudioSource;
-import lime.media.openal.AL;
-#end
-
-/**
-	The SoundChannel class controls a sound in an application. Every sound is
-	assigned to a sound channel, and the application can have multiple sound
-	channels that are mixed together. The SoundChannel class contains a
-	`stop()` method, properties for monitoring the amplitude
-	(volume) of the channel, and a property for assigning a SoundTransform
-	object to the channel.
-
-	@event soundComplete Dispatched when a sound has finished playing.
-
-	@see [Playing sounds](https://books.openfl.org/openfl-developers-guide/working-with-sound/playing-sounds.html)
-	@see `openfl.media.Sound`
-**/
-#if !openfl_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-#if lime_cffi
-@:access(lime._internal.backend.native.NativeAudioSource)
-@:access(lime.media.AudioSource)
-#end
-@:access(openfl.media.Sound)
-@:access(openfl.media.SoundMixer)
-@:final @:keep class SoundChannel extends EventDispatcher
-{
-	/**
-		The current amplitude(volume) of the left channel, from 0(silent) to 1
-		(full amplitude).
-	**/
-	public var leftPeak(get, null):Float;
-	
-	/**
-		The current amplitude(volume) of the right channel, from 0(silent) to 1
-		(full amplitude).
-	**/
-	public var rightPeak(get, null):Float;
-
-	/**
-		When the sound is playing, the `position` property indicates in
-		milliseconds the current point that is being played in the sound file.
-		When the sound is stopped or paused, the `position` property
-		indicates the last point that was played in the sound file.
-
-		A common use case is to save the value of the `position`
-		property when the sound is stopped. You can resume the sound later by
-		restarting it from that saved position.
-
-		If the sound is looped, `position` is reset to 0 at the
-		beginning of each loop.
-	**/
-	public var position(get, set):Float;
-
-	/**
-		The SoundTransform object assigned to the sound channel. A SoundTransform
-		object includes properties for setting volume, panning, left speaker
-		assignment, and right speaker assignment.
-	**/
-	public var soundTransform(get, set):SoundTransform;
-
-	/**
-		self explanatory
-	*/
-	public var loopTime(get, set):Float;
-	public var endTime(get, set):Null<Float>;
-	public var pitch(get, set):Float;
-	public var loops(get, set):Int;
-
-	@:noCompletion private var __sound:Sound;
-	@:noCompletion private var __isValid:Bool;
-	@:noCompletion private var __soundTransform:SoundTransform;
-	@:noCompletion private var __lastPeakTime:Float;
-	@:noCompletion private var __leftPeak:Float;
-	@:noCompletion private var __rightPeak:Float;
-	#if lime
-	@:noCompletion private var __source:AudioSource;
-	@:noCompletion private var __audioSource(get, set):AudioSource; // forward??? compatibility??
-	#end
-
-	#if openfljs
-	@:noCompletion private static function __init__()
-	{
-		untyped Object.defineProperties(SoundChannel.prototype, {
-			"position": {
-				get: untyped #if haxe4 js.Syntax.code #else __js__ #end ("function () { return this.get_position (); }"),
-				set: untyped #if haxe4 js.Syntax.code #else __js__ #end ("function (v) { return this.set_position (v); }")
-			},
-			"soundTransform": {
-				get: untyped #if haxe4 js.Syntax.code #else __js__ #end ("function () { return this.get_soundTransform (); }"),
-				set: untyped #if haxe4 js.Syntax.code #else __js__ #end ("function (v) { return this.set_soundTransform (v); }")
-			},
-		});
-	}
-	#end
-
-	@:noCompletion private function new(source:#if lime AudioSource #else Dynamic #end = null, soundTransform:SoundTransform = null):Void
-	{
-		super(this);
-
-		if (soundTransform != null) __soundTransform = soundTransform;
-		else __soundTransform = new SoundTransform();
-
-		__initAudioSource(source);
-
-		SoundMixer.__registerSoundChannel(this);
-	}
-
-	/**
-		Stops the sound playing in the channel.
-	**/
-	public function stop():Void
-	{
-		SoundMixer.__unregisterSoundChannel(this);
-
-		if (!__isValid) return;
-
-		#if lime
-		__source.stop();
-		#end
-		__dispose();
-	}
-
-	@:noCompletion private function __dispose():Void
-	{
-		if (!__isValid) return;
-
-		#if lime
-		__source.onComplete.remove(source_onComplete);
-		__source.dispose();
-		__source = null;
-		#end
-		__isValid = false;
-	}
-
-	@:noCompletion private function __updateTransform():Void
-	{
-		this.soundTransform = soundTransform;
-	}
-
-	@:noCompletion private function __updatePeaks(time:Float):Bool
-	{
-		if (Math.abs(time - __lastPeakTime) < 8) return false;
-		__lastPeakTime = time;
-
-		#if !macro
-		if (!__isValid) return false;
-
-		var buffer = __source.buffer;
-		var wordSize = buffer.bitsPerSample >> 3, byteSize = 1 << (buffer.bitsPerSample - 1);
-		var pos = Math.floor(time * buffer.sampleRate / 1000 * buffer.channels * wordSize);
-		var leftMin = 0, leftMax = 0, rightMin = 0, rightMax = 0, size = 0, buf;
-
-		#if lime_cffi
-		var backend = __source.__backend, i = 0;
-		if (backend.streamed) {
-			size = backend.bufferLengths[i = backend.bufferLengths.length - backend.requestBuffers];
-			buf = backend.bufferDatas[i].buffer;
-			pos -= Math.floor(backend.bufferTimes[i] * buffer.sampleRate * buffer.channels * wordSize);
-			while (pos > size) {
-				if (++i >= backend.bufferLengths.length) return false;
-				pos -= size;
-				buf = backend.bufferDatas[i].buffer;
-				size = backend.bufferLengths[i];
-			}
-		}
-		else
-		#end {
-			buf = buffer.data #if !js .buffer #end;
-			size = #if js buf.byteLength #else buf.length #end;
-		}
-
-		var s = Math.floor(Math.min(buffer.sampleRate / 80, 512)), c = 0, b;
-		pos -= pos % (buffer.channels * wordSize);
-
-		while (s > 0) {
-			b = funkin.backend.utils.AudioAnalyzer.getByte(buf, pos, wordSize);
-			if (c % 2 == 0) ((b > leftMax) ? (leftMax = b) : (if ((b = -b) > leftMin) (leftMin = b)));
-			else ((b > rightMax) ? (rightMax = b) : (if ((b = -b) > rightMin) (rightMin = b)));
-			if ((pos += wordSize) >= size) #if lime_cffi {
-				if (!backend.streamed || ++i >= backend.bufferLengths.length) break;
-				pos = 0;
-				buf = backend.bufferDatas[i].buffer;
-				size = backend.bufferLengths[i];
-			}
-			#else break; #end
-
-			if (++c > buffer.channels) {
-				c = 0;
-				s--;
-			}
-		}
-
-		if (buffer.channels == 1) __rightPeak = (__leftPeak = (leftMax + leftMin) / byteSize);
-		else {
-			__leftPeak = (leftMax + leftMin) / byteSize;
-			__rightPeak = (rightMax + rightMin) / byteSize;
-		}
-		#end
-
-		return true;
-	}
-
-	@:noCompletion private function __initAudioSource(source:#if lime AudioSource #else Dynamic #end):Void
-	{
-		#if lime
-		__source = source;
-		if (__source == null)
-		{
-			return;
-		}
-
-		__source.onComplete.add(source_onComplete);
-		__isValid = true;
-
-		__source.play();
-		#end
-	}
-
-	// Get & Set Methods
-	@:noCompletion private function get_position():Float
-	{
-		if (!__isValid) return 0;
-
-		#if lime
-		return __source.currentTime + __source.offset;
-		#else
-		return 0;
-		#end
-	}
-
-	@:noCompletion private function set_position(value:Float):Float
-	{
-		if (!__isValid) return 0;
-
-		#if lime
-		__source.currentTime = value - __source.offset;
-		#end
-		return value;
-	}
-
-	@:noCompletion private function get_soundTransform():SoundTransform
-	{
-		return __soundTransform.clone();
-	}
-
-	@:noCompletion private function set_soundTransform(value:SoundTransform):SoundTransform
-	{
-		if (value != null)
-		{
-			__soundTransform.pan = value.pan;
-			__soundTransform.volume = value.volume;
-
-			var pan = SoundMixer.__soundTransform.pan + __soundTransform.pan;
-
-			if (pan < -1) pan = -1;
-			if (pan > 1) pan = 1;
-
-			var volume = SoundMixer.__soundTransform.volume * __soundTransform.volume;
-
-			if (__isValid)
-			{
-				#if lime
-				// TODO: implement SoundTransform.leftToRight, etc. with Native setAngles?
-				__source.gain = volume;
-				__source.pan = pan;
-				return value;
-				#end
-			}
-		}
-
-		return value;
-	}
-
-	@:noCompletion private function get_pitch():Float
-	{
-		if (!__isValid) return 1;
-
-		#if lime
-		return __source.pitch;
-		#else
-		return 0;
-		#end
-	}
-
-	@:noCompletion private function set_pitch(value:Float):Float
-	{
-		if (!__isValid) return 1;
-
-		#if lime
-		return __source.pitch = value;
-		#else
-		return 0;
-		#end
-	}
-
-	@:noCompletion private function get_loopTime():Float
-	{
-		if (!__isValid) return -1;
-
-		#if lime
-		return __source.loopTime;
-		#else
-		return -1;
-		#end
-	}
-
-	@:noCompletion private function set_loopTime(value:Float):Float
-	{
-		if (!__isValid) return -1;
-
-		#if lime
-		return __source.loopTime = value;
-		#else
-		return -1;
-		#end
-	}
-
-	@:noCompletion private function get_endTime():Null<Float>
-	{
-		if (!__isValid) return null;
-
-		#if lime
-		return __source.length;
-		#else
-		return null;
-		#end
-	}
-
-	@:noCompletion private function set_endTime(value:Null<Float>):Null<Float>
-	{
-		if (!__isValid) return null;
-
-		#if lime
-		return __source.length = value;
-		#else
-		return null;
-		#end
-	}
-
-	@:noCompletion private function get_loops():Int
-	{
-		if (!__isValid) return 0;
-
-		#if lime
-		return __source.loops;
-		#else
-		return 0;
-		#end
-	}
-
-	@:noCompletion private function set_loops(value:Int):Int
-	{
-		if (!__isValid) return 0;
-
-		#if lime
-		return __source.loops = value;
-		#else
-		return 0;
-		#end
-	}
-
-	@:noCompletion private function get_leftPeak():Float
-	{
-		__updatePeaks(get_position());
-		return __leftPeak * (soundTransform == null ? 1 : soundTransform.volume);
-	}
-
-	@:noCompletion private function get_rightPeak():Float
-	{
-		__updatePeaks(get_position());
-		return __rightPeak * (soundTransform == null ? 1 : soundTransform.volume);
-	}
-
-
-	// Event Handlers
-	@:noCompletion private function source_onComplete():Void
-	{
-		SoundMixer.__unregisterSoundChannel(this);
-
-		__dispose();
-		dispatchEvent(new Event(Event.SOUND_COMPLETE));
-	}
-
-	@:noCompletion private function get___audioSource():AudioSource return __source;
-	@:noCompletion private function set___audioSource(source:AudioSource):AudioSource return __source = source;
-}
-#else
-typedef SoundChannel = flash.media.SoundChannel;
-#end
diff --git a/source/openfl/utils/Assets.hx b/source/openfl/utils/Assets.hx
deleted file mode 100644
index 0b8b7bf4de..0000000000
--- a/source/openfl/utils/Assets.hx
+++ /dev/null
@@ -1,859 +0,0 @@
-package openfl.utils;
-
-#if !macro
-import funkin.backend.system.Main;
-import funkin.options.Options;
-import funkin.backend.system.OptimizedBitmapData;
-#end
-import openfl.utils._internal.Log;
-import openfl.display.BitmapData;
-import openfl.display.MovieClip;
-import openfl.display.Sprite;
-import openfl.events.Event;
-import openfl.events.EventDispatcher;
-import openfl.media.Sound;
-import openfl.text.Font;
-#if lime
-import lime.app.Promise;
-import lime.utils.AssetLibrary as LimeAssetLibrary;
-import lime.utils.Assets as LimeAssets;
-#end
-#if lime_vorbis
-import lime.media.AudioBuffer;
-import lime.media.vorbis.VorbisFile;
-#end
-
-/**
-	The Assets class provides a cross-platform interface to access
-	embedded images, fonts, sounds and other resource files.
-
-	The contents are populated automatically when an application
-	is compiled using the OpenFL command-line tools, based on the
-	contents of the *.xml project file.
-
-	For most platforms, the assets are included in the same directory
-	or package as the application, and the paths are handled
-	automatically. For web content, the assets are preloaded before
-	the start of the rest of the application. You can customize the
-	preloader by extending the `NMEPreloader` class,
-	and specifying a custom preloader using <window preloader="" />
-	in the project file.
-**/
-#if !openfl_debug
-@:fileXml('tags="haxe,release"')
-@:noDebug
-#end
-@:access(openfl.display.BitmapData)
-@:access(openfl.display.Sprite)
-@:access(openfl.text.Font)
-@:access(openfl.utils.AssetLibrary)
-class Assets
-{
-	public static var cache:IAssetCache = new AssetCache();
-
-	@:noCompletion private static var dispatcher:EventDispatcher #if !macro = new EventDispatcher() #end;
-	private static var libraryBindings:Map<String, AssetLibrary> = new Map();
-
-	public static function addEventListener(type:String, listener:Dynamic, useCapture:Bool = false, priority:Int = 0, useWeakReference:Bool = false):Void
-	{
-		#if lime
-		if (!LimeAssets.onChange.has(LimeAssets_onChange))
-		{
-			LimeAssets.onChange.add(LimeAssets_onChange);
-		}
-		#end
-
-		dispatcher.addEventListener(type, listener, useCapture, priority, useWeakReference);
-	}
-
-	public static function dispatchEvent(event:Event):Bool
-	{
-		return dispatcher.dispatchEvent(event);
-	}
-
-	/**
-		Returns whether a specific asset exists
-		@param	id 		The ID or asset path for the asset
-		@param	type	The asset type to match, or null to match any type
-		@return		Whether the requested asset ID and type exists
-	**/
-	public static function exists(id:String, type:AssetType = null):Bool
-	{
-		#if lime
-		return LimeAssets.exists(id, cast type);
-		#else
-		return false;
-		#end
-	}
-
-	/**
-		Gets an instance of an embedded bitmap
-		@usage		var bitmap = new Bitmap (Assets.getBitmapData ("image.png"));
-		@param	id		The ID or asset path for the bitmap
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@param	pushToGPU		Whenever the image should be immediately pushed to GPU.
-		@return		A new BitmapData object
-	**/
-	public static function getBitmapData(id:String, useCache:Bool = true, pushToGPU:Bool = true):BitmapData
-	{
-		#if (lime && tools && !display)
-		if (useCache && cache.enabled && cache.hasBitmapData(id))
-		{
-			var bitmapData = cache.getBitmapData(id);
-
-			if (isValidBitmapData(bitmapData) && (pushToGPU || bitmapData.readable))
-			{
-				return bitmapData;
-			}
-		}
-
-		var image = LimeAssets.getImage(id, false);
-
-		if (image != null)
-		{
-			#if flash
-			var bitmapData = image.src;
-			#else
-			var bitmapData:BitmapData = null;
-			#if !macro if (pushToGPU && !Main.forceGPUOnlyBitmapsOff && Options.gpuOnlyBitmaps) {
-				bitmapData = new OptimizedBitmapData(0, 0, true, 0);
-				bitmapData.__fromImage(image);
-			} else #end {
-				bitmapData = BitmapData.fromImage(image);
-			}
-			#end
-
-			if (useCache && cache.enabled)
-			{
-				cache.setBitmapData(id, bitmapData);
-			}
-
-			return bitmapData;
-		}
-		#end
-
-		return null;
-	}
-
-	/**
-		Gets an instance of an embedded binary asset
-		@usage		var bytes = Assets.getBytes ("file.zip");
-		@param	id		The ID or asset path for the asset
-		@return		A new ByteArray object
-	**/
-	public static function getBytes(id:String):ByteArray
-	{
-		#if lime
-		return LimeAssets.getBytes(id);
-		#else
-		return null;
-		#end
-	}
-
-	/**
-		Gets an instance of an embedded font
-		@usage		var fontName = Assets.getFont ("font.ttf").fontName;
-		@param	id		The ID or asset path for the font
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		A new Font object
-	**/
-	public static function getFont(id:String, useCache:Bool = true):Font
-	{
-		#if (lime && tools && !display && !macro)
-		if (useCache && cache.enabled && cache.hasFont(id))
-		{
-			return cache.getFont(id);
-		}
-
-		var limeFont = LimeAssets.getFont(id, false);
-
-		if (limeFont != null)
-		{
-			#if flash
-			var font = limeFont.src;
-			#else
-			var font = new Font();
-			font.__fromLimeFont(limeFont);
-			#end
-
-			if (useCache && cache.enabled)
-			{
-				cache.setFont(id, font);
-			}
-
-			return font;
-		}
-		#end
-
-		return new Font();
-	}
-
-	public static function getLibrary(name:String):#if lime LimeAssetLibrary #else AssetLibrary #end
-	{
-		#if lime
-		return LimeAssets.getLibrary(name);
-		#else
-		return null;
-		#end
-	}
-
-	/**
-		Gets an instance of an included MovieClip
-		@usage		var movieClip = Assets.getMovieClip ("library:BouncingBall");
-		@param	id		The ID for the MovieClip
-		@return		A new MovieClip object
-	**/
-	public static function getMovieClip(id:String):MovieClip
-	{
-		#if (lime && tools && !display)
-		var libraryName = id.substring(0, id.indexOf(":"));
-		var symbolName = id.substr(id.indexOf(":") + 1);
-		var limeLibrary = getLibrary(libraryName);
-
-		if (limeLibrary != null)
-		{
-			if ((limeLibrary is AssetLibrary))
-			{
-				var library:AssetLibrary = cast limeLibrary;
-
-				if (library.exists(symbolName, cast AssetType.MOVIE_CLIP))
-				{
-					if (library.isLocal(symbolName, cast AssetType.MOVIE_CLIP))
-					{
-						return library.getMovieClip(symbolName);
-					}
-					else
-					{
-						Log.error("MovieClip asset \"" + id + "\" exists, but only asynchronously");
-						return null;
-					}
-				}
-			}
-
-			Log.error("There is no MovieClip asset with an ID of \"" + id + "\"");
-		}
-		else
-		{
-			Log.error("There is no asset library named \"" + libraryName + "\"");
-		}
-		#end
-
-		return null;
-	}
-
-	public static function getMusic(id:String, useCache:Bool = true, staticFallback:Bool = true):Sound
-	{
-		if (useCache && staticFallback && cache.enabled && cache.hasSound(id)) {
-			var sound = cache.getSound(id);
-			if (isValidSound(sound)) return sound;
-		}
-		/*#if (lime_vorbis && lime > "7.9.0" && !macro)
-		if (Options.streamedMusic) {
-			var bytes = getBytes(id);
-			if (bytes == null) return null;
-			// TODO: What if it is a WAV or non-Vorbis file?
-			var vorbisFile = VorbisFile.fromBytes(bytes);
-			if (vorbisFile != null) return Sound.fromAudioBuffer(AudioBuffer.fromVorbisFile(vorbisFile));
-		}
-		#end*/
-		return if (staticFallback) getSound(id, useCache); else null;
-	}
-
-	/**
-		Gets the file path (if available) for an asset
-		@usage		var path = Assets.getPath ("file.txt");
-		@param	id		The ID or asset path for the asset
-		@return		The path to the asset, or null if it does not exist
-	**/
-	public static function getPath(id:String):String
-	{
-		#if lime
-		return LimeAssets.getPath(id);
-		#else
-		return null;
-		#end
-	}
-
-	/**
-		Gets an instance of an embedded sound
-		@usage		var sound = Assets.getSound ("sound.wav");
-		@param	id		The ID or asset path for the sound
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		A new Sound object
-	**/
-	public static function getSound(id:String, useCache:Bool = true):Sound
-	{
-		#if (lime && tools && !display)
-		if (useCache && cache.enabled && cache.hasSound(id))
-		{
-			var sound = cache.getSound(id);
-
-			if (isValidSound(sound))
-			{
-				return sound;
-			}
-		}
-
-		var buffer = LimeAssets.getAudioBuffer(id, false);
-
-		if (buffer != null)
-		{
-			#if flash
-			var sound = buffer.src;
-			#else
-			var sound = Sound.fromAudioBuffer(buffer);
-			#end
-
-			if (useCache && cache.enabled)
-			{
-				cache.setSound(id, sound);
-			}
-
-			return sound;
-		}
-		#end
-
-		return null;
-	}
-
-	/**
-		Gets an instance of an embedded text asset
-		@usage		var text = Assets.getText ("text.txt");
-		@param	id		The ID or asset path for the asset
-		@return		A new String object
-	**/
-	public static function getText(id:String):String
-	{
-		#if lime
-		return LimeAssets.getText(id);
-		#else
-		return null;
-		#end
-	}
-
-	public static function hasEventListener(type:String):Bool
-	{
-		return dispatcher.hasEventListener(type);
-	}
-
-	public static function hasLibrary(name:String):Bool
-	{
-		#if lime
-		return LimeAssets.hasLibrary(name);
-		#else
-		return false;
-		#end
-	}
-
-	/**
-		Connects a user-defined class to a related asset class.
-
-		This method call is added to the beginning of user-defined class constructors when
-		the `@:bind` meta-data is used. This allows insertion of related asset resources in
-		compatible super classes, such as `openfl.display.MovieClip`.
-		@param	className 		The registered class name of the asset constructor
-		@param  instance		The current class instance to be bound (default is null)
-		@return		Whether asset binding was successful
-	**/
-	public static function initBinding(className:String, instance:Dynamic = null):Void
-	{
-		if (libraryBindings.exists(className))
-		{
-			var library = libraryBindings.get(className);
-			#if !flash
-			if (instance == null)
-			{
-				Sprite.__constructor = function(instance:Sprite)
-				{
-					instance.__bind(library, className);
-				}
-			}
-			else
-			{
-				Sprite.__constructor = null;
-				instance.__bind(library, className);
-			}
-			#else
-			// TODO: Consolidate behavior
-			library.bind(className);
-			#end
-		}
-		else
-		{
-			Log.warn("No asset is registered as \"" + className + "\"");
-		}
-	}
-
-	/**
-		Returns whether an asset is "local", and therefore can be loaded synchronously
-		@param	id 		The ID or asset path for the asset
-		@param	type	The asset type to match, or null to match any type
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return	Whether the asset is local
-	**/
-	public static function isLocal(id:String, type:AssetType = null, useCache:Bool = true):Bool
-	{
-		#if (lime && tools && !display)
-		if (useCache && cache.enabled)
-		{
-			if (type == AssetType.IMAGE || type == null)
-			{
-				if (cache.hasBitmapData(id)) return true;
-			}
-
-			if (type == AssetType.FONT || type == null)
-			{
-				if (cache.hasFont(id)) return true;
-			}
-
-			if (type == AssetType.SOUND || type == AssetType.MUSIC || type == null)
-			{
-				if (cache.hasSound(id)) return true;
-			}
-		}
-
-		var libraryName = id.substring(0, id.indexOf(":"));
-		var symbolName = id.substr(id.indexOf(":") + 1);
-		var library = getLibrary(libraryName);
-
-		if (library != null)
-		{
-			return library.isLocal(symbolName, cast type);
-		}
-		#end
-
-		return false;
-	}
-
-	@:analyzer(ignore) private static function isValidBitmapData(bitmapData:BitmapData):Bool
-	{
-		#if (lime && tools && !display)
-		#if flash
-		try
-		{
-			bitmapData.width;
-			return true;
-		}
-		catch (e:Dynamic)
-		{
-			return false;
-		}
-		#else
-		return (bitmapData != null && #if !lime_hybrid bitmapData.image != null #else bitmapData.__handle != null #end);
-		#end
-		#else
-		return true;
-		#end
-	}
-
-	@:noCompletion private static function isValidSound(sound:Sound):Bool
-	{
-		#if ((tools && !display) && (cpp || neko || nodejs))
-		return true;
-		// return (sound.__handle != null && sound.__handle != 0);
-		#else
-		return true;
-		#end
-	}
-
-	/**
-		Returns a list of all embedded assets (by type)
-		@param	type	The asset type to match, or null to match any type
-		@return	An array of asset ID values
-	**/
-	public static function list(type:AssetType = null):Array<String>
-	{
-		#if lime
-		return LimeAssets.list(cast type);
-		#else
-		return [];
-		#end
-	}
-
-	/**
-		Loads an included bitmap asset asynchronously
-		@usage	Assets.loadBitmapData ("image.png").onComplete (handleImage);
-		@param	id 		The ID or asset path for the asset
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		Returns a Future<BitmapData>
-	**/
-	public static function loadBitmapData(id:String, useCache:Null<Bool> = true):Future<BitmapData>
-	{
-		if (useCache == null) useCache = true;
-
-		#if (lime && tools && !display)
-		var promise = new Promise<BitmapData>();
-
-		if (useCache && cache.enabled && cache.hasBitmapData(id))
-		{
-			var bitmapData = cache.getBitmapData(id);
-
-			if (isValidBitmapData(bitmapData))
-			{
-				promise.complete(bitmapData);
-				return promise.future;
-			}
-		}
-
-		LimeAssets.loadImage(id, false).onComplete(function(image)
-		{
-			if (image != null)
-			{
-				#if flash
-				var bitmapData = image.src;
-				#else
-				var bitmapData:BitmapData = null;
-				#if !macro if (!Main.forceGPUOnlyBitmapsOff && Options.gpuOnlyBitmaps) {
-					bitmapData = new OptimizedBitmapData(0, 0, true, 0);
-					bitmapData.__fromImage(image);
-				} else #end {
-					bitmapData = BitmapData.fromImage(image);
-				}
-				#end
-
-				if (useCache && cache.enabled)
-				{
-					cache.setBitmapData(id, bitmapData);
-				}
-
-				promise.complete(bitmapData);
-			}
-			else
-			{
-				promise.error("[Assets] Could not load Image \"" + id + "\"");
-			}
-		}).onError(promise.error).onProgress(promise.progress);
-
-		return promise.future;
-		#else
-		return Future.withValue(getBitmapData(id, useCache));
-		#end
-	}
-
-	/**
-		Loads an included byte asset asynchronously
-		@usage	Assets.loadBytes ("file.zip").onComplete (handleBytes);
-		@param	id 		The ID or asset path for the asset
-		@return		Returns a Future<ByteArray>
-	**/
-	public static function loadBytes(id:String):Future<ByteArray>
-	{
-		#if lime
-		var promise = new Promise<ByteArray>();
-		var future = LimeAssets.loadBytes(id);
-
-		future.onComplete(function(bytes) promise.complete(bytes));
-		future.onProgress(function(progress, total) promise.progress(progress, total));
-		future.onError(function(msg) promise.error(msg));
-
-		return promise.future;
-		#else
-		return Future.withValue(getBytes(id));
-		#end
-	}
-
-	/**
-		Loads an included font asset asynchronously
-		@usage	Assets.loadFont ("font.ttf").onComplete (handleFont);
-		@param	id 		The ID or asset path for the asset
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		Returns a Future<Font>
-	**/
-	public static function loadFont(id:String, useCache:Null<Bool> = true):Future<Font>
-	{
-		if (useCache == null) useCache = true;
-
-		#if (lime && tools && !display && !macro)
-		var promise = new Promise<Font>();
-
-		if (useCache && cache.enabled && cache.hasFont(id))
-		{
-			promise.complete(cache.getFont(id));
-			return promise.future;
-		}
-
-		LimeAssets.loadFont(id)
-			.onComplete(function(limeFont)
-			{
-				#if flash
-				var font = limeFont.src;
-				#else
-				var font = new Font();
-				font.__fromLimeFont(limeFont);
-				#end
-
-				if (useCache && cache.enabled)
-				{
-					cache.setFont(id, font);
-				}
-
-				promise.complete(font);
-			})
-			.onError(promise.error)
-			.onProgress(promise.progress);
-
-		return promise.future;
-		#else
-		return Future.withValue(getFont(id, useCache));
-		#end
-	}
-
-	/**
-		Load an included AssetLibrary
-		@param	name		The name of the AssetLibrary to load
-		@return		Returns a Future<AssetLibrary>
-	**/
-	public static function loadLibrary(name:String):#if java Future<LimeAssetLibrary> #else Future<AssetLibrary> #end
-	{
-		#if lime
-		return LimeAssets.loadLibrary(name).then(function(library)
-		{
-			var _library:AssetLibrary = null;
-
-			if (library != null)
-			{
-				if ((library is AssetLibrary))
-				{
-					_library = cast library;
-				}
-				else
-				{
-					_library = new AssetLibrary();
-					_library.__proxy = library;
-					LimeAssets.registerLibrary(name, _library);
-				}
-			}
-
-			return Future.withValue(_library);
-		});
-		#else
-		return cast Future.withError("Cannot load library");
-		#end
-	}
-
-	/**
-		Loads an included music asset asynchronously
-		@usage	Assets.loadMusic ("music.ogg").onComplete (handleMusic);
-		@param	id 		The ID or asset path for the asset
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		Returns a Future<Sound>
-	**/
-	public static function loadMusic(id:String, useCache:Null<Bool> = true):Future<Sound>
-	{
-		if (useCache == null) useCache = true;
-
-		#if lime
-		#if !html5
-		var promise = new Promise<Sound>();
-
-		LimeAssets.loadAudioBuffer(id, useCache)
-			.onComplete(function(buffer)
-			{
-				if (buffer != null)
-				{
-					#if flash
-					var sound = buffer.src;
-					#else
-					var sound = Sound.fromAudioBuffer(buffer);
-					#end
-
-					if (useCache && cache.enabled)
-					{
-						cache.setSound(id, sound);
-					}
-
-					promise.complete(sound);
-				}
-				else
-				{
-					promise.error("[Assets] Could not load Sound \"" + id + "\"");
-				}
-			})
-			.onError(promise.error)
-			.onProgress(promise.progress);
-		return promise.future;
-		#else
-		var future = new Future<Sound>(function() return getMusic(id, useCache));
-		return future;
-		#end
-		#else
-		return Future.withValue(getMusic(id, useCache));
-		#end
-	}
-
-	/**
-		Loads an included MovieClip asset asynchronously
-		@usage	Assets.loadMovieClip ("library:BouncingBall").onComplete (handleMovieClip);
-		@param	id 		The ID for the asset
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		Returns a Future<MovieClip>
-	**/
-	public static function loadMovieClip(id:String):Future<MovieClip>
-	{
-		#if (lime && tools && !display)
-		var promise = new Promise<MovieClip>();
-
-		var libraryName = id.substring(0, id.indexOf(":"));
-		var symbolName = id.substr(id.indexOf(":") + 1);
-		var limeLibrary = getLibrary(libraryName);
-
-		if (limeLibrary != null)
-		{
-			if ((limeLibrary is AssetLibrary))
-			{
-				var library:AssetLibrary = cast limeLibrary;
-
-				if (library.exists(symbolName, cast AssetType.MOVIE_CLIP))
-				{
-					promise.completeWith(library.loadMovieClip(symbolName));
-					return promise.future;
-				}
-			}
-
-			promise.error("[Assets] There is no MovieClip asset with an ID of \"" + id + "\"");
-		}
-		else
-		{
-			promise.error("[Assets] There is no asset library named \"" + libraryName + "\"");
-		}
-
-		return promise.future;
-		#else
-		return Future.withValue(getMovieClip(id));
-		#end
-	}
-
-	/**
-		Loads an included sound asset asynchronously
-		@usage	Assets.loadSound ("sound.wav").onComplete (handleSound);
-		@param	id 		The ID or asset path for the asset
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		Returns a Future<Sound>
-	**/
-	public static function loadSound(id:String, useCache:Null<Bool> = true):Future<Sound>
-	{
-		if (useCache == null) useCache = true;
-
-		#if lime
-		var promise = new Promise<Sound>();
-
-		LimeAssets.loadAudioBuffer(id, useCache)
-			.onComplete(function(buffer)
-			{
-				if (buffer != null)
-				{
-					#if flash
-					var sound = buffer.src;
-					#else
-					var sound = Sound.fromAudioBuffer(buffer);
-					#end
-
-					if (useCache && cache.enabled)
-					{
-						cache.setSound(id, sound);
-					}
-
-					promise.complete(sound);
-				}
-				else
-				{
-					promise.error("[Assets] Could not load Sound \"" + id + "\"");
-				}
-			})
-			.onError(promise.error)
-			.onProgress(promise.progress);
-		return promise.future;
-		#else
-		return Future.withValue(getSound(id, useCache));
-		#end
-	}
-
-	/**
-		Loads an included text asset asynchronously
-		@usage	Assets.loadText ("text.txt").onComplete (handleString);
-		@param	id 		The ID or asset path for the asset
-		@param	useCache		(Optional) Whether to allow use of the asset cache (Default: true)
-		@return		Returns a Future<String>
-	**/
-	public static function loadText(id:String):Future<String>
-	{
-		#if lime
-		var future = LimeAssets.loadText(id);
-		return future;
-		#else
-		return Future.withValue(getText(id));
-		#end
-	}
-
-	/**
-		Registers an AssetLibrary binding for use with @:bind or Assets.bind
-		@param	className		The class name to use for the binding
-		@param	method		The AssetLibrary responsible for the binding
-	**/
-	public static function registerBinding(className:String, library:AssetLibrary):Void
-	{
-		libraryBindings.set(className, library);
-	}
-
-	/**
-		Registers a new AssetLibrary with the Assets class
-		@param	name		The name (prefix) to use for the library
-		@param	library		An AssetLibrary instance to register
-	**/
-	public static function registerLibrary(name:String, library:AssetLibrary):Void
-	{
-		#if lime
-		LimeAssets.registerLibrary(name, library);
-		#end
-	}
-
-	public static function removeEventListener(type:String, listener:Dynamic, capture:Bool = false):Void
-	{
-		dispatcher.removeEventListener(type, listener, capture);
-	}
-
-	@:noCompletion private static function resolveClass(name:String):Class<Dynamic>
-	{
-		return Type.resolveClass(name);
-	}
-
-	@:noCompletion private static function resolveEnum(name:String):Enum<Dynamic>
-	{
-		var value = Type.resolveEnum(name);
-
-		#if flash
-		if (value == null)
-		{
-			return cast Type.resolveClass(name);
-		}
-		#end
-
-		return value;
-	}
-
-	public static function unloadLibrary(name:String):Void
-	{
-		#if lime
-		LimeAssets.unloadLibrary(name);
-		#end
-	}
-
-	/**
-		Unregisters an AssetLibrary binding for use with @:bind or Assets.bind
-		@param	className		The class name to use for the binding
-		@param	method		The AssetLibrary responsible for the binding
-	**/
-	public static function unregisterBinding(className:String, library:AssetLibrary):Void
-	{
-		if (libraryBindings.exists(className) && libraryBindings.get(className) == library)
-		{
-			libraryBindings.remove(className);
-		}
-	}
-
-	// Event Handlers
-	@:noCompletion private static function LimeAssets_onChange():Void
-	{
-		dispatchEvent(new Event(Event.CHANGE));
-	}
-}